| 1 |
aballier 10/04/24 13:03:41 |
| 2 |
|
| 3 |
Modified: ChangeLog mplayer-9999.ebuild |
| 4 |
Log: |
| 5 |
Disable opencore-amr support with bindist, Apache-2.0 vs GPL-2 issues, https://bugs.gentoo.org/show_bug.cgi?id=299405#c6 |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.726 media-video/mplayer/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.726&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.726&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.725&r2=1.726 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v |
| 18 |
retrieving revision 1.725 |
| 19 |
retrieving revision 1.726 |
| 20 |
diff -u -r1.725 -r1.726 |
| 21 |
--- ChangeLog 24 Apr 2010 12:44:45 -0000 1.725 |
| 22 |
+++ ChangeLog 24 Apr 2010 13:03:41 -0000 1.726 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for media-video/mplayer |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.725 2010/04/24 12:44:45 aballier Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.726 2010/04/24 13:03:41 aballier Exp $ |
| 28 |
+ |
| 29 |
+ 24 Apr 2010; Alexis Ballier <aballier@g.o> mplayer-9999.ebuild: |
| 30 |
+ Disable opencore-amr support with bindist, Apache-2.0 vs GPL-2 issues, |
| 31 |
+ https://bugs.gentoo.org/show_bug.cgi?id=299405#c6 |
| 32 |
|
| 33 |
24 Apr 2010; Alexis Ballier <aballier@g.o> mplayer-9999.ebuild: |
| 34 |
allow ass and truetype without X, by Andrew Savchenko, bug #299405 |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.42 media-video/mplayer/mplayer-9999.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.42&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.42&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.41&r2=1.42 |
| 43 |
|
| 44 |
Index: mplayer-9999.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v |
| 47 |
retrieving revision 1.41 |
| 48 |
retrieving revision 1.42 |
| 49 |
diff -u -r1.41 -r1.42 |
| 50 |
--- mplayer-9999.ebuild 24 Apr 2010 12:47:28 -0000 1.41 |
| 51 |
+++ mplayer-9999.ebuild 24 Apr 2010 13:03:41 -0000 1.42 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2010 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.41 2010/04/24 12:47:28 aballier Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.42 2010/04/24 13:03:41 aballier Exp $ |
| 57 |
|
| 58 |
EAPI="2" |
| 59 |
|
| 60 |
@@ -91,7 +91,7 @@ |
| 61 |
) |
| 62 |
aalib? ( media-libs/aalib ) |
| 63 |
alsa? ( media-libs/alsa-lib ) |
| 64 |
- amr? ( media-libs/opencore-amr ) |
| 65 |
+ amr? ( !bindist? ( media-libs/opencore-amr ) ) |
| 66 |
ass? ( ${FONT_RDEPS} media-libs/libass ) |
| 67 |
bidi? ( dev-libs/fribidi ) |
| 68 |
bs2b? ( media-libs/libbs2b ) |
| 69 |
@@ -419,7 +419,9 @@ |
| 70 |
fi |
| 71 |
use bs2b || myconf+=" --disable-libbs2b" |
| 72 |
use schroedinger || myconf+=" --disable-libschroedinger-lavc" |
| 73 |
- use amr || myconf+=" --disable-libopencore_amrnb --disable-libopencore_amrwb" |
| 74 |
+ # Disable opencore-amr with bindist |
| 75 |
+ # https://bugs.gentoo.org/show_bug.cgi?id=299405#c6 |
| 76 |
+ { use amr && use !bindist ; } || myconf+=" --disable-libopencore_amrnb --disable-libopencore_amrwb" |
| 77 |
if ! use png && ! use gmplayer; then |
| 78 |
myconf+=" --disable-png" |
| 79 |
fi |
Archives