1 |
scarabeus 11/03/29 16:22:13 |
2 |
|
3 |
Modified: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild |
4 |
Log: |
5 |
Add back mp3 useflag and enable external mpet123 as the implementation for it. With -mp3 libavcodec implementation is used. |
6 |
|
7 |
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.4 media-video/mplayer2/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.4&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.4&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.3&r2=1.4 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v |
19 |
retrieving revision 1.3 |
20 |
retrieving revision 1.4 |
21 |
diff -u -r1.3 -r1.4 |
22 |
--- ChangeLog 29 Mar 2011 14:03:34 -0000 1.3 |
23 |
+++ ChangeLog 29 Mar 2011 16:22:13 -0000 1.4 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for media-video/mplayer2 |
26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.3 2011/03/29 14:03:34 scarabeus Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.4 2011/03/29 16:22:13 scarabeus Exp $ |
29 |
+ |
30 |
+ 29 Mar 2011; Tomáš Chvátal <scarabeus@g.o> mplayer2-2.0.ebuild, |
31 |
+ mplayer2-9999.ebuild: |
32 |
+ Add back mp3 useflag and enable external mpet123 as the implementation for |
33 |
+ it. With -mp3 libavcodec implementation is used. |
34 |
|
35 |
29 Mar 2011; Tomáš Chvátal <scarabeus@g.o> mplayer2-2.0.ebuild, |
36 |
mplayer2-9999.ebuild: |
37 |
|
38 |
|
39 |
|
40 |
1.4 media-video/mplayer2/mplayer2-9999.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.4&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.4&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.3&r2=1.4 |
45 |
|
46 |
Index: mplayer2-9999.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v |
49 |
retrieving revision 1.3 |
50 |
retrieving revision 1.4 |
51 |
diff -u -r1.3 -r1.4 |
52 |
--- mplayer2-9999.ebuild 29 Mar 2011 14:03:34 -0000 1.3 |
53 |
+++ mplayer2-9999.ebuild 29 Mar 2011 16:22:13 -0000 1.4 |
54 |
@@ -1,6 +1,6 @@ |
55 |
# Copyright 1999-2011 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.3 2011/03/29 14:03:34 scarabeus Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.4 2011/03/29 16:22:13 scarabeus Exp $ |
59 |
|
60 |
EAPI=4 |
61 |
|
62 |
@@ -15,7 +15,7 @@ |
63 |
bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts custom-cflags debug dga |
64 |
directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca esd +faad fbcon |
65 |
ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa |
66 |
-libcaca lirc +live mad md5sum +mmx mmxext mng mpg123 nas |
67 |
+libcaca lirc +live mad md5sum +mmx mmxext mng +mp3 nas |
68 |
+network nut +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime |
69 |
radio +rar +real +rtc samba +shm +symlink sdl +speex sse sse2 ssse3 |
70 |
tga +theora +truetype +unicode v4l v4l2 vdpau |
71 |
@@ -106,7 +106,7 @@ |
72 |
live? ( media-plugins/live ) |
73 |
mad? ( media-libs/libmad ) |
74 |
mng? ( media-libs/libmng ) |
75 |
- mpg123? ( media-sound/mpg123 ) |
76 |
+ mp3? ( media-sound/mpg123 ) |
77 |
nas? ( media-libs/nas ) |
78 |
nut? ( >=media-libs/libnut-661 ) |
79 |
png? ( media-libs/libpng ) |
80 |
@@ -382,11 +382,12 @@ |
81 |
myconf+=" --disable-musepack" # deprecated, libavcodec Musepack decoder is preferred |
82 |
myconf+=" --disable-mp3lib" # internal so disable |
83 |
use dts || myconf+=" --disable-libdca" |
84 |
+ use mp3 || myconf+=" --disable-mpg123" |
85 |
uses="a52 bs2b dv vorbis" |
86 |
for i in ${uses}; do |
87 |
use ${i} || myconf+=" --disable-lib${i}" |
88 |
done |
89 |
- uses="faad gif jpeg live mad mng mpg123 png pnm speex tga theora xanim" |
90 |
+ uses="faad gif jpeg live mad mng png pnm speex tga theora xanim" |
91 |
for i in ${uses}; do |
92 |
use ${i} || myconf+=" --disable-${i}" |
93 |
done |
94 |
|
95 |
|
96 |
|
97 |
1.4 media-video/mplayer2/mplayer2-2.0.ebuild |
98 |
|
99 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.4&view=markup |
100 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.4&content-type=text/plain |
101 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?r1=1.3&r2=1.4 |
102 |
|
103 |
Index: mplayer2-2.0.ebuild |
104 |
=================================================================== |
105 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v |
106 |
retrieving revision 1.3 |
107 |
retrieving revision 1.4 |
108 |
diff -u -r1.3 -r1.4 |
109 |
--- mplayer2-2.0.ebuild 29 Mar 2011 14:03:34 -0000 1.3 |
110 |
+++ mplayer2-2.0.ebuild 29 Mar 2011 16:22:13 -0000 1.4 |
111 |
@@ -1,6 +1,6 @@ |
112 |
# Copyright 1999-2011 Gentoo Foundation |
113 |
# Distributed under the terms of the GNU General Public License v2 |
114 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.3 2011/03/29 14:03:34 scarabeus Exp $ |
115 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.4 2011/03/29 16:22:13 scarabeus Exp $ |
116 |
|
117 |
EAPI=4 |
118 |
|
119 |
@@ -15,7 +15,7 @@ |
120 |
bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts custom-cflags debug dga |
121 |
directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca esd +faad fbcon |
122 |
ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa |
123 |
-libcaca lirc +live mad md5sum +mmx mmxext mng mpg123 nas |
124 |
+libcaca lirc +live mad md5sum +mmx mmxext mng +mp3 nas |
125 |
+network nut +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime |
126 |
radio +rar +real +rtc samba +shm +symlink sdl +speex sse sse2 ssse3 |
127 |
tga +theora +truetype +unicode v4l v4l2 vdpau |
128 |
@@ -106,7 +106,7 @@ |
129 |
live? ( media-plugins/live ) |
130 |
mad? ( media-libs/libmad ) |
131 |
mng? ( media-libs/libmng ) |
132 |
- mpg123? ( media-sound/mpg123 ) |
133 |
+ mp3? ( media-sound/mpg123 ) |
134 |
nas? ( media-libs/nas ) |
135 |
nut? ( >=media-libs/libnut-661 ) |
136 |
png? ( media-libs/libpng ) |
137 |
@@ -382,11 +382,12 @@ |
138 |
myconf+=" --disable-musepack" # deprecated, libavcodec Musepack decoder is preferred |
139 |
myconf+=" --disable-mp3lib" # internal so disable |
140 |
use dts || myconf+=" --disable-libdca" |
141 |
+ use mp3 || myconf+=" --disable-mpg123" |
142 |
uses="a52 bs2b dv vorbis" |
143 |
for i in ${uses}; do |
144 |
use ${i} || myconf+=" --disable-lib${i}" |
145 |
done |
146 |
- uses="faad gif jpeg live mad mng mpg123 png pnm speex tga theora xanim" |
147 |
+ uses="faad gif jpeg live mad mng png pnm speex tga theora xanim" |
148 |
for i in ${uses}; do |
149 |
use ${i} || myconf+=" --disable-${i}" |
150 |
done |