From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RbYDg-0004UY-Cs for garchives@archives.gentoo.org; Fri, 16 Dec 2011 13:53:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BBC5321C0BD; Fri, 16 Dec 2011 13:52:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7B35121C11C for ; Fri, 16 Dec 2011 13:52:55 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 882DA1B40B3 for ; Fri, 16 Dec 2011 13:52:54 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2139) id 5960E2004B; Fri, 16 Dec 2011 13:52:53 +0000 (UTC) From: "Alexis Ballier (aballier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, aballier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog mplayer-9999.ebuild X-VCS-Directories: media-video/mplayer X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier Content-Type: text/plain; charset=utf8 Message-Id: <20111216135253.5960E2004B@flycatcher.gentoo.org> Date: Fri, 16 Dec 2011 13:52:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 85475cb8-e44e-47c1-b58a-c86c22781a3d X-Archives-Hash: 6ea16692eed104e5bd791a95c6beb3ba aballier 11/12/16 13:52:53 Modified: ChangeLog mplayer-9999.ebuild Log: use libmpg123 for mp3 decoding and remove internal mp3lib, bug #384849 = by Samuli Suominen =20 (Portage version: 2.2.0_alpha81/cvs/Linux x86_64) Revision Changes Path 1.818 media-video/mplayer/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplaye= r/ChangeLog?rev=3D1.818&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplaye= r/ChangeLog?rev=3D1.818&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplaye= r/ChangeLog?r1=3D1.817&r2=3D1.818 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v retrieving revision 1.817 retrieving revision 1.818 diff -u -r1.817 -r1.818 --- ChangeLog 16 Dec 2011 13:36:05 -0000 1.817 +++ ChangeLog 16 Dec 2011 13:52:53 -0000 1.818 @@ -1,6 +1,10 @@ # ChangeLog for media-video/mplayer # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.817= 2011/12/16 13:36:05 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.818= 2011/12/16 13:52:53 aballier Exp $ + + 16 Dec 2011; Alexis Ballier mplayer-9999.ebuild: + use libmpg123 for mp3 decoding and remove internal mp3lib, bug #384849= by + Samuli Suominen =20 16 Dec 2011; Alexis Ballier mplayer-9999.ebuild: generate on the fly a snapshot version for live ebuilds and use that f= ile for 1.111 media-video/mplayer/mplayer-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplaye= r/mplayer-9999.ebuild?rev=3D1.111&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplaye= r/mplayer-9999.ebuild?rev=3D1.111&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplaye= r/mplayer-9999.ebuild?r1=3D1.110&r2=3D1.111 Index: mplayer-9999.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild= ,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- mplayer-9999.ebuild 16 Dec 2011 13:36:05 -0000 1.110 +++ mplayer-9999.ebuild 16 Dec 2011 13:52:53 -0000 1.111 @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebui= ld,v 1.110 2011/12/16 13:36:05 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebui= ld,v 1.111 2011/12/16 13:52:53 aballier Exp $ =20 EAPI=3D4 =20 @@ -14,7 +14,7 @@ bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga 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 ladsp= a -libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 mpg123 n= as +libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr +quickti= me radio +rar +real +rtc rtmp samba +shm sdl +speex sse sse2 ssse3 tga +theora +tremor +truetype +toolame +twolame +unicode v4l vdpau vidix @@ -121,7 +121,7 @@ lzo? ( >=3Ddev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) - mpg123? ( media-sound/mpg123 ) + mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) nut? ( >=3Dmedia-libs/libnut-661 ) openal? ( media-libs/openal ) @@ -396,10 +396,16 @@ myconf+=3D" --disable-musepack" # Use internal musepack codecs for SV7 = and SV8 support myconf+=3D" --disable-libmpeg2-internal" # always use system media-libs= /libmpeg2 use dts || myconf+=3D" --disable-libdca" + # Disable internal mp3lib, bug #384849 + # Samuli Suominen: Looks like MPlayer in Portage is using internal mp3l= ib by + # default, where as mpg123 upstream has incorporated all the optimizati= ons + # from mplayer's mp3lib in libmpg123 and more. + # It makes very little sense to use the internal copy as default anymor= e. + myconf+=3D" --disable-mp3lib" if ! use mp3; then myconf+=3D" --disable-mp3lame - --disable-mp3lib + --disable-mpg123 " fi uses=3D"a52 bs2b dv gsm lzo rtmp" @@ -407,7 +413,7 @@ use ${i} || myconf+=3D" --disable-lib${i}" done =20 - uses=3D"faad gif jpeg libmpeg2 live mad mng mpg123 png pnm speex tga th= eora xanim" + uses=3D"faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora xa= nim" for i in ${uses}; do use ${i} || myconf+=3D" --disable-${i}" done