media-video/mplayer: drop native jpeg2k support. FFmpeg provides better support for...

Package-Manager: Portage-2.3.11, Repoman-2.3.3

diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
index 0e699eb68901daea0fd4519b9aadc3143bd82266..68459860f46aa0288248db9d90df7f6b01d61bde 100644 (file)
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
@@ -12,7 +12,7 @@ inherit toolchain-funcs eutils flag-o-matic multilib base ${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
-ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
+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
 radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
@@ -91,7 +91,6 @@ RDEPEND+="
        iconv? ( virtual/libiconv )
        jack? ( virtual/jack )
        jpeg? ( virtual/jpeg:0 )
-       jpeg2k? ( media-libs/openjpeg:0 )
        ladspa? ( media-libs/ladspa-sdk )
        libass? ( >=media-libs/libass-0.9.10:= )
        libcaca? ( media-libs/libcaca )
@@ -392,7 +391,8 @@ src_configure() {
        for i in ${uses}; do
                use ${i} || myconf+=" --disable-${i}"
        done
-       use jpeg2k || myconf+=" --disable-libopenjpeg"
+       # Pulls an outdated libopenjpeg, ffmpeg provides better support for it
+       myconf+=" --disable-libopenjpeg"
 
        # Encoding
        uses="faac x264 xvid toolame twolame"

diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 6257dc214add0ad6d865282698bd33e280c9630b..61554438bfc0d1862cd4a102cddf42ca1180087f 100644 (file)
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -12,7 +12,7 @@ inherit toolchain-funcs eutils flag-o-matic multilib base ${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
-ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
+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
 radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
@@ -91,7 +91,6 @@ RDEPEND+="
        iconv? ( virtual/libiconv )
        jack? ( virtual/jack )
        jpeg? ( virtual/jpeg:0 )
-       jpeg2k? ( media-libs/openjpeg:0 )
        ladspa? ( media-libs/ladspa-sdk )
        libass? ( >=media-libs/libass-0.9.10:= )
        libcaca? ( media-libs/libcaca )
@@ -390,7 +389,8 @@ src_configure() {
        for i in ${uses}; do
                use ${i} || myconf+=" --disable-${i}"
        done
-       use jpeg2k || myconf+=" --disable-libopenjpeg"
+       # Pulls an outdated libopenjpeg, ffmpeg provides better support for it
+       myconf+=" --disable-libopenjpeg"
 
        # Encoding
        uses="faac x264 xvid toolame twolame"