1 |
commit: 568f99f6c440db42edc001e6074a50eb614ae131 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 22 23:17:34 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 22 23:17:34 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=568f99f6 |
7 |
|
8 |
media-video/mplayer: Disable GIF support |
9 |
|
10 |
* mplayer relies on private APIs of giflib that |
11 |
have been moved around and will be removed in |
12 |
a future release. |
13 |
|
14 |
Bug: https://bugs.gentoo.org/682198 |
15 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
16 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
17 |
|
18 |
.../{mplayer-1.3.0-r5.ebuild => mplayer-1.3.0-r6.ebuild} | 8 +++++--- |
19 |
media-video/mplayer/mplayer-9999.ebuild | 10 ++++++---- |
20 |
2 files changed, 11 insertions(+), 7 deletions(-) |
21 |
|
22 |
diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r6.ebuild |
23 |
similarity index 97% |
24 |
rename from media-video/mplayer/mplayer-1.3.0-r5.ebuild |
25 |
rename to media-video/mplayer/mplayer-1.3.0-r6.ebuild |
26 |
index 925a8f47c76..7163acf21ea 100644 |
27 |
--- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild |
28 |
+++ b/media-video/mplayer/mplayer-1.3.0-r6.ebuild |
29 |
@@ -12,7 +12,7 @@ inherit toolchain-funcs flag-o-matic ${SVN_ECLASS} |
30 |
IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray |
31 |
bs2b cddb +cdio cdparanoia cpudetection debug dga |
32 |
doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon |
33 |
-ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa |
34 |
+ftp ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa |
35 |
+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas |
36 |
+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr |
37 |
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3 |
38 |
@@ -55,6 +55,8 @@ X_RDEPS=" |
39 |
" |
40 |
# Rar: althrought -gpl version is nice, it cant do most functions normal rars can |
41 |
# nemesi? ( net-libs/libnemesi ) |
42 |
+# mplayer relies on private APIs in giflib that have been removed: |
43 |
+# https://sourceforge.net/p/giflib/bugs/132/ |
44 |
RDEPEND+=" |
45 |
sys-libs/ncurses:0= |
46 |
app-arch/bzip2 |
47 |
@@ -84,7 +86,6 @@ RDEPEND+=" |
48 |
enca? ( app-i18n/enca ) |
49 |
faad? ( media-libs/faad2 ) |
50 |
ggi? ( media-libs/libggi media-libs/libggiwmh ) |
51 |
- gif? ( media-libs/giflib:0= ) |
52 |
gsm? ( media-sound/gsm ) |
53 |
iconv? ( virtual/libiconv ) |
54 |
jack? ( virtual/jack ) |
55 |
@@ -371,6 +372,7 @@ src_configure() { |
56 |
########## |
57 |
myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support |
58 |
myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2 |
59 |
+ myconf+=" --disable-gif" # relies on to-be-removed giflib internals https://sourceforge.net/p/giflib/bugs/132/ |
60 |
use dts || myconf+=" --disable-libdca" |
61 |
if ! use mp3; then |
62 |
myconf+=" |
63 |
@@ -383,7 +385,7 @@ src_configure() { |
64 |
use ${i} || myconf+=" --disable-lib${i}" |
65 |
done |
66 |
|
67 |
- uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor" |
68 |
+ uses="faad jpeg libmpeg2 live mad mng png pnm speex tga theora tremor" |
69 |
for i in ${uses}; do |
70 |
use ${i} || myconf+=" --disable-${i}" |
71 |
done |
72 |
|
73 |
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild |
74 |
index 8ca4b4a54f5..ab5fe353ff5 100644 |
75 |
--- a/media-video/mplayer/mplayer-9999.ebuild |
76 |
+++ b/media-video/mplayer/mplayer-9999.ebuild |
77 |
@@ -1,4 +1,4 @@ |
78 |
-# Copyright 1999-2019 Gentoo Authors |
79 |
+# Copyright 1999-2020 Gentoo Authors |
80 |
# Distributed under the terms of the GNU General Public License v2 |
81 |
|
82 |
EAPI=6 |
83 |
@@ -12,7 +12,7 @@ inherit toolchain-funcs flag-o-matic ${SVN_ECLASS} |
84 |
IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray |
85 |
bs2b cddb +cdio cdparanoia cpudetection debug dga |
86 |
doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon |
87 |
-ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa |
88 |
+ftp ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa |
89 |
+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas |
90 |
+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr |
91 |
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3 |
92 |
@@ -55,6 +55,8 @@ X_RDEPS=" |
93 |
" |
94 |
# Rar: althrought -gpl version is nice, it cant do most functions normal rars can |
95 |
# nemesi? ( net-libs/libnemesi ) |
96 |
+# mplayer relies on private APIs in giflib that have been removed: |
97 |
+# https://sourceforge.net/p/giflib/bugs/132/ |
98 |
RDEPEND+=" |
99 |
sys-libs/ncurses:0= |
100 |
app-arch/bzip2 |
101 |
@@ -84,7 +86,6 @@ RDEPEND+=" |
102 |
enca? ( app-i18n/enca ) |
103 |
faad? ( media-libs/faad2 ) |
104 |
ggi? ( media-libs/libggi media-libs/libggiwmh ) |
105 |
- gif? ( media-libs/giflib:0= ) |
106 |
gsm? ( media-sound/gsm ) |
107 |
iconv? ( virtual/libiconv ) |
108 |
jack? ( virtual/jack ) |
109 |
@@ -363,6 +364,7 @@ src_configure() { |
110 |
########## |
111 |
myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support |
112 |
myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2 |
113 |
+ myconf+=" --disable-gif" # relies on to-be-removed giflib internals https://sourceforge.net/p/giflib/bugs/132/ |
114 |
use dts || myconf+=" --disable-libdca" |
115 |
if ! use mp3; then |
116 |
myconf+=" |
117 |
@@ -375,7 +377,7 @@ src_configure() { |
118 |
use ${i} || myconf+=" --disable-lib${i}" |
119 |
done |
120 |
|
121 |
- uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor" |
122 |
+ uses="faad jpeg libmpeg2 live mad mng png pnm speex tga theora tremor" |
123 |
for i in ${uses}; do |
124 |
use ${i} || myconf+=" --disable-${i}" |
125 |
done |