| 1 |
commit: cd6726645e98469a68798e2554b0af3e860573f2 |
| 2 |
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 30 18:22:29 2016 +0000 |
| 4 |
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 30 18:22:29 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/dev/bircoph.git/commit/?id=cd672664 |
| 7 |
|
| 8 |
media-video/mplayer: update to EAPI 6 |
| 9 |
|
| 10 |
media-video/mplayer/mplayer-9999.ebuild | 17 +++++++++-------- |
| 11 |
1 file changed, 9 insertions(+), 8 deletions(-) |
| 12 |
|
| 13 |
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild |
| 14 |
index f578e19..60eb099 100644 |
| 15 |
--- a/media-video/mplayer/mplayer-9999.ebuild |
| 16 |
+++ b/media-video/mplayer/mplayer-9999.ebuild |
| 17 |
@@ -2,11 +2,11 @@ |
| 18 |
# Distributed under the terms of the GNU General Public License v2 |
| 19 |
# $Id$ |
| 20 |
|
| 21 |
-EAPI=4 |
| 22 |
+EAPI=6 |
| 23 |
|
| 24 |
ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" |
| 25 |
|
| 26 |
-inherit eutils flag-o-matic git-2 multilib subversion toolchain-funcs ${SVN_ECLASS} |
| 27 |
+inherit eutils flag-o-matic git-r3 multilib subversion toolchain-funcs ${SVN_ECLASS} |
| 28 |
|
| 29 |
IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext +a52 aalib +alsa altivec amr aqua bidi bindist bl bluray |
| 30 |
bs2b cddb +cdio cdparanoia cpudetection debug dga +dirac |
| 31 |
@@ -49,7 +49,7 @@ X_RDEPS=" |
| 32 |
# Rar: althrought -gpl version is nice, it cant do most functions normal rars can |
| 33 |
# nemesi? ( net-libs/libnemesi ) |
| 34 |
RDEPEND+=" |
| 35 |
- sys-libs/ncurses |
| 36 |
+ sys-libs/ncurses:0= |
| 37 |
app-arch/bzip2 |
| 38 |
sys-libs/zlib |
| 39 |
a52? ( media-libs/a52dec ) |
| 40 |
@@ -86,8 +86,8 @@ RDEPEND+=" |
| 41 |
gsm? ( media-sound/gsm ) |
| 42 |
iconv? ( virtual/libiconv ) |
| 43 |
jack? ( media-sound/jack-audio-connection-kit ) |
| 44 |
- jpeg? ( virtual/jpeg ) |
| 45 |
- jpeg2k? ( media-libs/openjpeg ) |
| 46 |
+ jpeg? ( virtual/jpeg:0= ) |
| 47 |
+ jpeg2k? ( media-libs/openjpeg:= ) |
| 48 |
ladspa? ( media-libs/ladspa-sdk ) |
| 49 |
libcaca? ( media-libs/libcaca ) |
| 50 |
libmpeg2? ( media-libs/libmpeg2 ) |
| 51 |
@@ -103,7 +103,7 @@ RDEPEND+=" |
| 52 |
openal? ( media-libs/openal ) |
| 53 |
opengl? ( virtual/opengl ) |
| 54 |
opus? ( media-libs/opus ) |
| 55 |
- png? ( media-libs/libpng ) |
| 56 |
+ png? ( media-libs/libpng:0= ) |
| 57 |
pnm? ( media-libs/netpbm ) |
| 58 |
pulseaudio? ( media-sound/pulseaudio ) |
| 59 |
rar? ( |
| 60 |
@@ -145,7 +145,6 @@ ASM_DEP="dev-lang/yasm" |
| 61 |
DEPEND="${RDEPEND} |
| 62 |
virtual/pkgconfig |
| 63 |
dga? ( x11-proto/xf86dgaproto ) |
| 64 |
- dxr3? ( media-video/em8300-libraries ) |
| 65 |
X? ( ${X_DEPS} ) |
| 66 |
xinerama? ( x11-proto/xineramaproto ) |
| 67 |
xscreensaver? ( x11-proto/scrnsaverproto ) |
| 68 |
@@ -227,7 +226,7 @@ src_unpack() { |
| 69 |
subversion_src_unpack |
| 70 |
cd "${WORKDIR}" |
| 71 |
rm -rf "${WORKDIR}/${P}/ffmpeg/" |
| 72 |
- ( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack ) |
| 73 |
+ ( S="${WORKDIR}/${P}/ffmpeg/" git-r3_src_unpack ) |
| 74 |
|
| 75 |
if ! use truetype; then |
| 76 |
unpack font-arial-iso-8859-1.tar.bz2 \ |
| 77 |
@@ -248,6 +247,8 @@ src_prepare() { |
| 78 |
|
| 79 |
# change libvbe header location according to Gentoo's libvbe |
| 80 |
epatch "${FILESDIR}/${PN}-vesa.patch" |
| 81 |
+ |
| 82 |
+ eapply_user |
| 83 |
} |
| 84 |
|
| 85 |
src_configure() { |
Archives