commit: 8dbb1b8af44280388f0a24d9cc83251b343b6a25
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 14 19:53:31 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Feb 14 20:04:55 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dbb1b8a
media-video/mplayer: Drop directfb support (#642506), stop using deprecated
eclasses
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../mplayer/files/mplayer-1.3-vdpau-x11.patch | 4 ++--
...mplayer-9999.ebuild => mplayer-1.3.0-r4.ebuild} | 24 +++++++++++++---------
media-video/mplayer/mplayer-9999.ebuild | 18 ++++++++--------
3 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch
b/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch
index ae21941a8aa..cfefb63deb9 100644
--- a/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch
+++ b/media-video/mplayer/files/mplayer-1.3-vdpau-x11.patch
@@ -7,8 +7,8 @@ commit d40e181bec22014a9ea312ab6837f7f0bc4f9e42 .
Index: libvo/vo_vdpau.c
===================================================================
---- libvo/vo_vdpau.c (revision 37931)
-+++ libvo/vo_vdpau.c (revision 37932)
+--- a/libvo/vo_vdpau.c (revision 37931)
++++ b/libvo/vo_vdpau.c (revision 37932)
@@ -34,6 +34,7 @@
#include <stdio.h>
diff --git a/media-video/mplayer/mplayer-9999.ebuild
b/media-video/mplayer/mplayer-1.3.0-r4.ebuild
similarity index 97%
copy from media-video/mplayer/mplayer-9999.ebuild
copy to media-video/mplayer/mplayer-1.3.0-r4.ebuild
index b75b7dbc479..d1f122ab57d 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r4.ebuild
@@ -1,17 +1,17 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
-inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
+inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua
bidi bl bluray
bs2b cddb +cdio cdparanoia cpudetection debug dga
-directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
+doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx
cpu_flags_x86_mmxext mng mp3 nas
+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
@@ -69,7 +69,6 @@ RDEPEND+="
cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia )
cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
dga? ( x11-libs/libXxf86dga )
- directfb? ( dev-libs/DirectFB )
dts? ( media-libs/libdca )
dv? ( media-libs/libdv )
dvb? ( virtual/linuxtv-dvb-headers )
@@ -156,9 +155,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~x86-solaris"
else
- KEYWORDS=""
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
fi
# faac codecs are nonfree
@@ -185,6 +184,8 @@ REQUIRED_USE="
xvmc? ( xv )"
RESTRICT="faac? ( bindist )"
+PATCHES=( "${FILESDIR}/${PN}-1.3-vdpau-x11.patch" )
+
pkg_setup() {
if [[ ${PV} == *9999* ]]; then
elog
@@ -238,11 +239,15 @@ src_unpack() {
}
src_prepare() {
+ default
+
local svf=snapshot_version
if [[ ${PV} = *9999* ]]; then
# Set SVN version manually
subversion_wc_info
printf "${ESVN_WC_REVISION}" > $svf
+ else
+ eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
fi
if [ ! -f VERSION ] ; then
[ -f "$svf" ] || die "Missing ${svf}. Did you generate your
snapshot with prepare_mplayer.sh?"
@@ -253,8 +258,6 @@ src_prepare() {
# fix path to bash executable in configure scripts
sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
- base_src_prepare
-
# Use sane default for >=virtual/udev-197
sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
}
@@ -414,7 +417,7 @@ src_configure() {
################
# Video Output #
################
- uses="directfb md5sum sdl yuv4mpeg"
+ uses="md5sum sdl yuv4mpeg"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
@@ -524,7 +527,8 @@ src_configure() {
}
src_compile() {
- base_src_compile
+ default
+
# Build only user-requested docs if they're available.
if use doc ; then
# select available languages from $LINGUAS
diff --git a/media-video/mplayer/mplayer-9999.ebuild
b/media-video/mplayer/mplayer-9999.ebuild
index b75b7dbc479..bc3255c4703 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,17 +1,17 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
+[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-r3" || SVN_ECLASS=""
-inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
+inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua
bidi bl bluray
bs2b cddb +cdio cdparanoia cpudetection debug dga
-directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
+doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx
cpu_flags_x86_mmxext mng mp3 nas
+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
@@ -69,7 +69,6 @@ RDEPEND+="
cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia )
cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
dga? ( x11-libs/libXxf86dga )
- directfb? ( dev-libs/DirectFB )
dts? ( media-libs/libdca )
dv? ( media-libs/libdv )
dvb? ( virtual/linuxtv-dvb-headers )
@@ -238,6 +237,8 @@ src_unpack() {
}
src_prepare() {
+ default
+
local svf=snapshot_version
if [[ ${PV} = *9999* ]]; then
# Set SVN version manually
@@ -253,8 +254,6 @@ src_prepare() {
# fix path to bash executable in configure scripts
sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
- base_src_prepare
-
# Use sane default for >=virtual/udev-197
sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
}
@@ -414,7 +413,7 @@ src_configure() {
################
# Video Output #
################
- uses="directfb md5sum sdl yuv4mpeg"
+ uses="md5sum sdl yuv4mpeg"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
@@ -524,7 +523,8 @@ src_configure() {
}
src_compile() {
- base_src_compile
+ default
+
# Build only user-requested docs if they're available.
if use doc ; then
# select available languages from $LINGUAS
