* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild
@ 2010-04-24 13:03 99% Alexis Ballier (aballier)
0 siblings, 0 replies; 1+ results
From: Alexis Ballier (aballier) @ 2010-04-24 13:03 UTC (permalink / raw
To: gentoo-commits
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=299405#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/mplayer/ChangeLog?rev=1.726&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.726&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.725&r2=1.726
Index: ChangeLog
===================================================================
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 <aballier@gentoo.org> mplayer-9999.ebuild:
+ Disable opencore-amr support with bindist, Apache-2.0 vs GPL-2 issues,
+ https://bugs.gentoo.org/show_bug.cgi?id=299405#c6
24 Apr 2010; Alexis Ballier <aballier@gentoo.org> 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/mplayer/mplayer-9999.ebuild?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.41&r2=1.42
Index: mplayer-9999.ebuild
===================================================================
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.ebuild,v 1.41 2010/04/24 12:47:28 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.42 2010/04/24 13:03:41 aballier Exp $
EAPI="2"
@@ -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+=" --disable-libbs2b"
use schroedinger || myconf+=" --disable-libschroedinger-lavc"
- use amr || myconf+=" --disable-libopencore_amrnb --disable-libopencore_amrwb"
+ # Disable opencore-amr with bindist
+ # https://bugs.gentoo.org/show_bug.cgi?id=299405#c6
+ { use amr && use !bindist ; } || myconf+=" --disable-libopencore_amrnb --disable-libopencore_amrwb"
if ! use png && ! use gmplayer; then
myconf+=" --disable-png"
fi
^ permalink raw reply [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2010-04-24 13:03 99% [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild Alexis Ballier (aballier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox