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 1O5f1S-0007a6-VA for garchives@archives.gentoo.org; Sat, 24 Apr 2010 13:03:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0C28E0773; Sat, 24 Apr 2010 13:03:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7854BE0773 for ; Sat, 24 Apr 2010 13:03:43 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id F0D901B4001 for ; Sat, 24 Apr 2010 13:03:42 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 2139) id A63552C04C; Sat, 24 Apr 2010 13:03:41 +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: <20100424130341.A63552C04C@corvid.gentoo.org> Date: Sat, 24 Apr 2010 13:03:41 +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: c3707e86-ded2-4d11-b75e-a33ee21624a6 X-Archives-Hash: 3de82b68724fd46658ade97a43a795b7 aballier 10/04/24 13:03:41 Modified: ChangeLog mplayer-9999.ebuild Log: Disable opencore-amr support with bindist, Apache-2.0 vs GPL-2 issues, = https://bugs.gentoo.org/show_bug.cgi?id=3D299405#c6 (Portage version: 2.2_rc67/cvs/Linux x86_64) Revision Changes Path 1.726 media-video/mplayer/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplaye= r/ChangeLog?rev=3D1.726&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplaye= r/ChangeLog?rev=3D1.726&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplaye= r/ChangeLog?r1=3D1.725&r2=3D1.726 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.725 retrieving revision 1.726 diff -u -r1.725 -r1.726 --- ChangeLog 24 Apr 2010 12:44:45 -0000 1.725 +++ ChangeLog 24 Apr 2010 13:03:41 -0000 1.726 @@ -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.725= 2010/04/24 12:44:45 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.726= 2010/04/24 13:03:41 aballier Exp $ + + 24 Apr 2010; Alexis Ballier mplayer-9999.ebuild: + Disable opencore-amr support with bindist, Apache-2.0 vs GPL-2 issues, + https://bugs.gentoo.org/show_bug.cgi?id=3D299405#c6 =20 24 Apr 2010; Alexis Ballier mplayer-9999.ebuild: allow ass and truetype without X, by Andrew Savchenko, bug #299405 1.42 media-video/mplayer/mplayer-9999.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplaye= r/mplayer-9999.ebuild?rev=3D1.42&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplaye= r/mplayer-9999.ebuild?rev=3D1.42&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplaye= r/mplayer-9999.ebuild?r1=3D1.41&r2=3D1.42 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.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- mplayer-9999.ebuild 24 Apr 2010 12:47:28 -0000 1.41 +++ mplayer-9999.ebuild 24 Apr 2010 13:03:41 -0000 1.42 @@ -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.ebui= ld,v 1.41 2010/04/24 12:47:28 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebui= ld,v 1.42 2010/04/24 13:03:41 aballier Exp $ =20 EAPI=3D"2" =20 @@ -91,7 +91,7 @@ ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) - amr? ( media-libs/opencore-amr ) + amr? ( !bindist? ( media-libs/opencore-amr ) ) ass? ( ${FONT_RDEPS} media-libs/libass ) bidi? ( dev-libs/fribidi ) bs2b? ( media-libs/libbs2b ) @@ -419,7 +419,9 @@ fi use bs2b || myconf+=3D" --disable-libbs2b" use schroedinger || myconf+=3D" --disable-libschroedinger-lavc" - use amr || myconf+=3D" --disable-libopencore_amrnb --disable-libopencor= e_amrwb" + # Disable opencore-amr with bindist + # https://bugs.gentoo.org/show_bug.cgi?id=3D299405#c6 + { use amr && use !bindist ; } || myconf+=3D" --disable-libopencore_amrn= b --disable-libopencore_amrwb" if ! use png && ! use gmplayer; then myconf+=3D" --disable-png" fi