From ac5d3f62a8339743e00c2f3f856541b6a8e5d595 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Mon, 1 Nov 2010 13:50:53 +0000 Subject: Fix mga videocard check per bug #341171. Add missing options per bug #334793. Package-Manager: portage-2.2_rc98/cvs/Linux x86_64 --- media-video/mplayer/ChangeLog | 6 ++++- media-video/mplayer/Manifest | 6 ++--- media-video/mplayer/metadata.xml | 2 ++ media-video/mplayer/mplayer-9999.ebuild | 44 ++++++++++++++++++--------------- 4 files changed, 34 insertions(+), 24 deletions(-) (limited to 'media-video') diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index f56371328b2d..02a30c3c4471 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/mplayer # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.763 2010/10/10 19:43:25 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.764 2010/11/01 13:50:53 scarabeus Exp $ + + 01 Nov 2010; Tomáš Chvátal mplayer-9999.ebuild, + metadata.xml: + Fix mga videocard check per bug #341171. Add missing options per bug #334793. 10 Oct 2010; Tomáš Chvátal mplayer-9999.ebuild, metadata.xml: diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 24e60b3f77a4..ad1a5c73a7aa 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -10,6 +10,6 @@ DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e4820 EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 18995 RMD160 fa5ca9232abb6950549ca6c2451dac48df3ebd62 SHA1 32f991515d16adacd04d0f4e11a601de0ea0e972 SHA256 72ae257b4c3d903d3fef8953691f39b256a64c6ffa3b62711c5a341ec2b20d82 EBUILD mplayer-1.0_rc4_p20100506.ebuild 20273 RMD160 e55bf61b411d66b2b8f26c237feb3217415df44e SHA1 7bee75c501fadb2fe7a2c406e441faf3ac0bf638 SHA256 3eb7a7cc77d11c17bd6641be595d9037b24ac19096eefc7807dd661562baba14 EBUILD mplayer-1.0_rc4_p20100612.ebuild 20255 RMD160 f3e11ef97eed0f62f507ca209bfdcc9edbbf853d SHA1 39deee8a1ffcb78f6795319f5c1bad89e1ff08be SHA256 4dac0c77e803da44f86b15080d924b87f3c4dc4037c167bbf86c4241e2e0c5e6 -EBUILD mplayer-9999.ebuild 20073 RMD160 e4e40ae4bc9d76a750105db0fc05ac972b64da16 SHA1 538755283b85a031f21be11ed619e0320a646c4e SHA256 b91136e992e2e4ea7154550f5c948f6a4003618db244bf0e5a441f7ae39961ed -MISC ChangeLog 134374 RMD160 57f71354cb2a7b2dd70e7d898bc1a7d1d84a830e SHA1 3aaea5d0cda24f3f6ec4a58993ddb25d6925c88a SHA256 d8064d37d9ebff2d394f13fc9aa9064a4e20a6911a6d5d8cd620954e8fa398a9 -MISC metadata.xml 3663 RMD160 13ae5725c38ebca3a8c96030b5ee9860c0cd111c SHA1 20cfe44eda534451641ab55fb790230bd14b1c5c SHA256 2a435064c022be90b65273068d55d3693012b03702a79d94c221dc920555d5f8 +EBUILD mplayer-9999.ebuild 20159 RMD160 088789b44eb77501fd807bb194ffdcc905378eef SHA1 2449e992cf751138e99f085f2fdd3ab99a38537c SHA256 a55b432400ea95337ae0f933420cb6942846023b7ba7243933854ff567cefa14 +MISC ChangeLog 134547 RMD160 e491ab8580d10fe0cf1a8e9b7cc0bbeaf02966f2 SHA1 8576b14d436ff127a441edf5f39b4efee73f9bf9 SHA256 2b070b3ef09b6119e19e4edafbb7d40187fe65f3c868669ebf2b004e016da285 +MISC metadata.xml 3853 RMD160 601221d6d34688188448df8807b16d032fc63843 SHA1 3d028c2ef8e478a133ba52aef26cb534d66a6462 SHA256 12cc09c6ffe86464b4049173d5321d407931f8f15e36a90a23a46c11b2e232c3 diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml index f958a2b9391c..92cdcbc8b42c 100644 --- a/media-video/mplayer/metadata.xml +++ b/media-video/mplayer/metadata.xml @@ -23,10 +23,12 @@ Use external faac library for AAC encoding Use external faad library for AAC decoding Build gmplayer, a GTK+ MPlayer gui (UNSUPPORTED) + Build support for mpeg2 over media-libs/libmpeg2 rather than using ffmpeg. Enables live.com streaming media support Enables md5sum video output Enables mmx2 support MNG input support + Enable support for mp3 decoding over media-sound/mpg123. Enables network streaming support Enables support for the NUT container format Enables support for on-screen display (OSD) menus diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index b1aa74bdc8ca..2e1f8ffe1c4b 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.82 2010/10/10 23:31:27 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.83 2010/11/01 13:50:53 scarabeus Exp $ EAPI=3 @@ -16,11 +16,12 @@ IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray bs2b +cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa -libcaca lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal -amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc -rtmp samba +shm +schroedinger sdl +speex sse sse2 ssse3 tga +theora +tremor -+truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix +vorbis vpx -win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran" +libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 mpg123 nas ++network nut openal amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime +radio +rar +real +rtc rtmp samba +shm +schroedinger sdl +speex sse sse2 ssse3 +tga +theora +tremor +truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix ++vorbis vpx win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc +zoran" [[ ${PV} == *9999* ]] && IUSE+=" external-ffmpeg" VIDEO_CARDS="s3virge mga tdfx vesa" @@ -96,6 +97,10 @@ RDEPEND+=" dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( media-tv/linuxtv-dvb-headers ) + dvd? ( + >=media-libs/libdvdread-4.1.3 + dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) + ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) @@ -115,11 +120,13 @@ RDEPEND+=" jpeg2k? ( media-libs/openjpeg ) ladspa? ( media-libs/ladspa-sdk ) libcaca? ( media-libs/libcaca ) + libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) + mpg123? ( media-sound/mpg123 ) nas? ( media-libs/nas ) nut? ( >=media-libs/libnut-661 ) openal? ( media-libs/openal ) @@ -310,8 +317,8 @@ src_configure() { # dvdread - accessing a DVD # dvdnav - navigation of menus # - # internal dvdread and dvdnav use flags enable internal - # versions of the libraries, which are snapshots of the fork. + # use external libdvdcss, dvdread and dvdnav + myconf+=" --disable-dvdread-internal --disable-libdvdcss-internal" if use dvd; then use dvdnav || myconf+=" --disable-dvdnav" @@ -319,8 +326,6 @@ src_configure() { myconf+=" --disable-dvdnav --disable-dvdread - --disable-dvdread-internal - --disable-libdvdcss-internal " fi @@ -382,7 +387,7 @@ src_configure() { ########## myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support myconf+=" --disable-faad-internal" # always use system media-libs/faad2 - myconf+=" --disable-libmpeg2-internal" # always use system version + myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2 use dirac || myconf+=" --disable-libdirac-lavc" use dts || myconf+=" --disable-libdca" if ! use mp3; then @@ -401,7 +406,7 @@ src_configure() { # https://bugs.gentoo.org/show_bug.cgi?id=299405#c6 { use amr && use !bindist ; } || myconf+=" --disable-libopencore_amrnb --disable-libopencore_amrwb" - uses="faad gif jpeg live mad mng png pnm speex tga theora xanim" + uses="faad gif jpeg libmpeg2 live mad mng mpg123 png pnm speex tga theora xanim" for i in ${uses}; do use ${i} || myconf+=" --disable-${i}" done @@ -478,7 +483,7 @@ src_configure() { use libcaca || myconf+=" --disable-caca" use zoran || myconf+=" --disable-zr" - if ! use kernel_linux && ! use video_cards_mga; then + if ! use kernel_linux || ! use video_cards_mga; then myconf+=" --disable-mga --disable-xmga" fi @@ -605,7 +610,6 @@ src_configure() { myconf+=" --enable-macosx-finder --enable-macosx-bundle - --enable-libdvdcss-internal " fi @@ -616,12 +620,12 @@ src_configure() { use external-ffmpeg && myconf+=" --disable-ffmpeg_a" fi - myconf="--cc=$(tc-getCC) \ - --host-cc=$(tc-getBUILD_CC) \ - --prefix=${EPREFIX}/usr \ - --confdir=${EPREFIX}/etc/mplayer \ - --datadir=${EPREFIX}/usr/share/mplayer \ - --libdir=${EPREFIX}/usr/$(get_libdir) \ + myconf="--cc=$(tc-getCC) + --host-cc=$(tc-getBUILD_CC) + --prefix=${EPREFIX}/usr + --confdir=${EPREFIX}/etc/mplayer + --datadir=${EPREFIX}/usr/share/mplayer + --libdir=${EPREFIX}/usr/$(get_libdir) ${myconf}" CFLAGS="${CFLAGS}" ./configure ${myconf} || die "configure died" -- cgit v1.2.3-65-gdbad