| 1 |
aballier 10/06/25 11:51:10 |
| 2 |
|
| 3 |
Modified: ChangeLog mplayer-9999.ebuild |
| 4 |
Log: |
| 5 |
disable faac with use bindist, by Nikoli <nikoli@×××××××.com>, bug #323353 |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.749 media-video/mplayer/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.749&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.749&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.748&r2=1.749 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v |
| 18 |
retrieving revision 1.748 |
| 19 |
retrieving revision 1.749 |
| 20 |
diff -u -r1.748 -r1.749 |
| 21 |
--- ChangeLog 13 Jun 2010 10:07:24 -0000 1.748 |
| 22 |
+++ ChangeLog 25 Jun 2010 11:51:10 -0000 1.749 |
| 23 |
@@ -1,6 +1,9 @@ |
| 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.748 2010/06/13 10:07:24 spatz Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.749 2010/06/25 11:51:10 aballier Exp $ |
| 28 |
+ |
| 29 |
+ 25 Jun 2010; Alexis Ballier <aballier@g.o> mplayer-9999.ebuild: |
| 30 |
+ disable faac with use bindist, by Nikoli <nikoli@×××××××.com>, bug #323353 |
| 31 |
|
| 32 |
13 Jun 2010; Dror Levin <spatz@g.o> |
| 33 |
mplayer-1.0_rc4_p20100612.ebuild: |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.66 media-video/mplayer/mplayer-9999.ebuild |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.66&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.66&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.65&r2=1.66 |
| 42 |
|
| 43 |
Index: mplayer-9999.ebuild |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v |
| 46 |
retrieving revision 1.65 |
| 47 |
retrieving revision 1.66 |
| 48 |
diff -u -r1.65 -r1.66 |
| 49 |
--- mplayer-9999.ebuild 12 Jun 2010 18:14:40 -0000 1.65 |
| 50 |
+++ mplayer-9999.ebuild 25 Jun 2010 11:51:10 -0000 1.66 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2010 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.65 2010/06/12 18:14:40 spatz Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.66 2010/06/25 11:51:10 aballier Exp $ |
| 56 |
|
| 57 |
EAPI="2" |
| 58 |
|
| 59 |
@@ -107,7 +107,7 @@ |
| 60 |
encode? ( |
| 61 |
!twolame? ( toolame? ( media-sound/toolame ) ) |
| 62 |
twolame? ( media-sound/twolame ) |
| 63 |
- faac? ( media-libs/faac ) |
| 64 |
+ faac? ( !bindist? ( media-libs/faac ) ) |
| 65 |
mp3? ( media-sound/lame ) |
| 66 |
x264? ( >=media-libs/x264-0.0.20100423 ) |
| 67 |
xvid? ( media-libs/xvid ) |
| 68 |
@@ -450,6 +450,11 @@ |
| 69 |
use ${i} || myconf+=" --disable-${i}" |
| 70 |
done |
| 71 |
use faac || myconf+=" --disable-faac-lavc" |
| 72 |
+ if use bindist |
| 73 |
+ then |
| 74 |
+ use faac && ewarn "faac is nonfree and cannot be distributed; disabling faac support." |
| 75 |
+ myconf+=" --disable-faac --disable-faac-lavc" |
| 76 |
+ fi |
| 77 |
else |
| 78 |
myconf+=" --disable-mencoder" |
| 79 |
myconf+=" --disable-faac-lavc" |
Archives