1 |
lu_zero 11/12/01 20:13:49 |
2 |
|
3 |
Modified: mplayer2-2.0_p20111126.ebuild ChangeLog |
4 |
mplayer2-9999.ebuild metadata.xml |
5 |
Log: |
6 |
Minor retouches and forwarding the changes to the live ebuild, thanks a lot to Nikoli again |
7 |
|
8 |
(Portage version: 2.2.0_alpha76/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.2 media-video/mplayer2/mplayer2-2.0_p20111126.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20111126.ebuild?rev=1.2&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20111126.ebuild?rev=1.2&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20111126.ebuild?r1=1.1&r2=1.2 |
16 |
|
17 |
Index: mplayer2-2.0_p20111126.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20111126.ebuild,v |
20 |
retrieving revision 1.1 |
21 |
retrieving revision 1.2 |
22 |
diff -u -r1.1 -r1.2 |
23 |
--- mplayer2-2.0_p20111126.ebuild 30 Nov 2011 04:49:34 -0000 1.1 |
24 |
+++ mplayer2-2.0_p20111126.ebuild 1 Dec 2011 20:13:49 -0000 1.2 |
25 |
@@ -1,6 +1,6 @@ |
26 |
# Copyright 1999-2011 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20111126.ebuild,v 1.1 2011/11/30 04:49:34 lu_zero Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20111126.ebuild,v 1.2 2011/12/01 20:13:49 lu_zero Exp $ |
30 |
|
31 |
EAPI=4 |
32 |
|
33 |
@@ -30,7 +30,7 @@ |
34 |
if [[ ${PV} == *9999* ]]; then |
35 |
KEYWORDS="" |
36 |
else |
37 |
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" |
38 |
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux " |
39 |
fi |
40 |
IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl |
41 |
bluray bs2b +bzip2 cddb +cdio cdparanoia cpudetection custom-cpuopts |
42 |
@@ -102,6 +102,7 @@ |
43 |
a52? ( media-libs/a52dec ) |
44 |
aalib? ( media-libs/aalib ) |
45 |
alsa? ( media-libs/alsa-lib ) |
46 |
+ ass? ( ${FONT_RDEPS} >=media-libs/libass-0.9.10[enca?,fontconfig] ) |
47 |
bidi? ( dev-libs/fribidi ) |
48 |
bluray? ( media-libs/libbluray ) |
49 |
bs2b? ( media-libs/libbs2b ) |
50 |
@@ -123,7 +124,6 @@ |
51 |
jack? ( media-sound/jack-audio-connection-kit ) |
52 |
jpeg? ( virtual/jpeg ) |
53 |
ladspa? ( media-libs/ladspa-sdk ) |
54 |
- ass? ( ${FONT_RDEPS} >=media-libs/libass-0.9.10[enca?,fontconfig] ) |
55 |
libcaca? ( media-libs/libcaca ) |
56 |
lirc? ( app-misc/lirc ) |
57 |
live? ( media-plugins/live ) |
58 |
@@ -265,11 +265,12 @@ |
59 |
$(use_enable network networking) |
60 |
$(use_enable joystick) |
61 |
" |
62 |
- uses="ass bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild |
63 |
+ uses="bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild |
64 |
myconf+=" --disable-nemesi" # nemesi automagic disable |
65 |
for i in ${uses}; do |
66 |
use ${i} || myconf+=" --disable-${i}" |
67 |
done |
68 |
+ use ass || myconf+=" --disable-libass" |
69 |
use bidi || myconf+=" --disable-fribidi" |
70 |
use ipv6 || myconf+=" --disable-inet6" |
71 |
use nut || myconf+=" --disable-libnut" |
72 |
|
73 |
|
74 |
|
75 |
1.30 media-video/mplayer2/ChangeLog |
76 |
|
77 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.30&view=markup |
78 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.30&content-type=text/plain |
79 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.29&r2=1.30 |
80 |
|
81 |
Index: ChangeLog |
82 |
=================================================================== |
83 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v |
84 |
retrieving revision 1.29 |
85 |
retrieving revision 1.30 |
86 |
diff -u -r1.29 -r1.30 |
87 |
--- ChangeLog 30 Nov 2011 04:49:34 -0000 1.29 |
88 |
+++ ChangeLog 1 Dec 2011 20:13:49 -0000 1.30 |
89 |
@@ -1,6 +1,11 @@ |
90 |
# ChangeLog for media-video/mplayer2 |
91 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
92 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.29 2011/11/30 04:49:34 lu_zero Exp $ |
93 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.30 2011/12/01 20:13:49 lu_zero Exp $ |
94 |
+ |
95 |
+ 01 Dec 2011; Luca Barbato <lu_zero@g.o> mplayer2-2.0_p20111126.ebuild, |
96 |
+ mplayer2-9999.ebuild, metadata.xml: |
97 |
+ Minor retouches and forwarding the changes to the live ebuild, thanks a lot |
98 |
+ to Nikoli again |
99 |
|
100 |
*mplayer2-2.0_p20111126 (30 Nov 2011) |
101 |
|
102 |
|
103 |
|
104 |
|
105 |
1.19 media-video/mplayer2/mplayer2-9999.ebuild |
106 |
|
107 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.19&view=markup |
108 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.19&content-type=text/plain |
109 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.18&r2=1.19 |
110 |
|
111 |
Index: mplayer2-9999.ebuild |
112 |
=================================================================== |
113 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v |
114 |
retrieving revision 1.18 |
115 |
retrieving revision 1.19 |
116 |
diff -u -r1.18 -r1.19 |
117 |
--- mplayer2-9999.ebuild 30 Nov 2011 04:49:34 -0000 1.18 |
118 |
+++ mplayer2-9999.ebuild 1 Dec 2011 20:13:49 -0000 1.19 |
119 |
@@ -1,19 +1,22 @@ |
120 |
# Copyright 1999-2011 Gentoo Foundation |
121 |
# Distributed under the terms of the GNU General Public License v2 |
122 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.18 2011/11/30 04:49:34 lu_zero Exp $ |
123 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.19 2011/12/01 20:13:49 lu_zero Exp $ |
124 |
|
125 |
EAPI=4 |
126 |
|
127 |
-EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git" |
128 |
-[[ ${PV} = *9999* ]] && VCS_ECLASS="git-2" |
129 |
-NAMESUF=${PN/mplayer/} |
130 |
+[[ ${PV} = *9999* ]] && VCS_ECLASS="git-2" || VCS_ECLASS="" |
131 |
|
132 |
inherit toolchain-funcs eutils flag-o-matic multilib base ${VCS_ECLASS} |
133 |
|
134 |
+NAMESUF="${PN/mplayer/}" |
135 |
DESCRIPTION="Media Player for Linux" |
136 |
HOMEPAGE="http://www.mplayer2.org/" |
137 |
-[[ ${PV} == *9999* ]] || \ |
138 |
- RELEASE_URI="http://ftp.${PN}.org/pub/release/${P}.tar.xz" |
139 |
+ |
140 |
+if [[ ${PV} == *9999* ]]; then |
141 |
+ EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git" |
142 |
+else |
143 |
+ RELEASE_URI="http://dev.gentoo.org/~lu_zero/${PN}/${P}.tar.xz" |
144 |
+fi |
145 |
SRC_URI="${RELEASE_URI} |
146 |
!truetype? ( |
147 |
mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 |
148 |
@@ -24,16 +27,23 @@ |
149 |
|
150 |
LICENSE="GPL-3" |
151 |
SLOT="0" |
152 |
-[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~x86 ~amd64-linux" |
153 |
-IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray |
154 |
-bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts custom-cflags debug dga |
155 |
-directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca esd +faad fbcon |
156 |
-ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa |
157 |
-libcaca lirc +live mad md5sum +mmx mmxext mng +mp3 nas |
158 |
-+network nut +opengl oss png pnm pulseaudio pvr +quicktime |
159 |
-radio +rar +real +rtc samba +shm sdl +speex sse sse2 ssse3 |
160 |
-tga +theora +truetype +unicode v4l vdpau |
161 |
-+vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvid" |
162 |
+if [[ ${PV} == *9999* ]]; then |
163 |
+ KEYWORDS="" |
164 |
+else |
165 |
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux " |
166 |
+fi |
167 |
+IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl |
168 |
+bluray bs2b +bzip2 cddb +cdio cdparanoia cpudetection custom-cpuopts |
169 |
+custom-cflags debug dga +dirac directfb doc +dts +dv dvb +dvd +dvdnav |
170 |
+dxr3 +enca esd +faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick |
171 |
+jpeg jpeg2k kernel_linux ladspa libcaca lirc +live mad md5sum +mmx |
172 |
+mmxext mng +mp3 nas +network nut amr +opengl oss png pnm pulseaudio |
173 |
+pvr +quicktime radio +rar +real +rtc rtmp samba +shm +schroedinger |
174 |
+sdl +speex sse sse2 ssse3 tga +theora threads +truetype +unicode |
175 |
+v4l vdpau +vorbis vpx win32codecs +X xanim xinerama +xscreensaver |
176 |
++xv xvid |
177 |
+" |
178 |
+IUSE+=" symlink" |
179 |
|
180 |
VIDEO_CARDS="s3virge mga tdfx vesa" |
181 |
for x in ${VIDEO_CARDS}; do |
182 |
@@ -41,7 +51,20 @@ |
183 |
done |
184 |
|
185 |
# bindist does not cope with win32codecs, which are nonfree |
186 |
-REQUIRED_USE="bindist? ( !win32codecs )" |
187 |
+REQUIRED_USE="bindist? ( !win32codecs ) |
188 |
+ cdio? ( !cdparanoia ) |
189 |
+ cddb? ( || ( cdio cdparanoia ) network ) |
190 |
+ dvdnav? ( dvd ) |
191 |
+ radio? ( || ( dvb v4l ) ) |
192 |
+ dga? ( X ) |
193 |
+ dxr3? ( X ) |
194 |
+ ggi? ( X ) |
195 |
+ opengl? ( X ) |
196 |
+ vdpau? ( X ) |
197 |
+ xinerama? ( X ) |
198 |
+ xscreensaver? ( X ) |
199 |
+ xv? ( X ) |
200 |
+" |
201 |
|
202 |
FONT_RDEPS=" |
203 |
virtual/ttf-fonts |
204 |
@@ -50,8 +73,9 @@ |
205 |
" |
206 |
# Rar: althrought -gpl version is nice, it cant do most functions normal rars can |
207 |
# nemesi? ( net-libs/libnemesi ) |
208 |
+# virtual/ffmpeg does not have all USE |
209 |
+LIBAV_USE="[amr?,bzip2?,dirac?,gsm?,jpeg2k?,rtmp?,schroedinger?,threads?,vpx?]" |
210 |
RDEPEND+=" |
211 |
- virtual/ffmpeg |
212 |
sys-libs/ncurses |
213 |
sys-libs/zlib |
214 |
!bindist? ( |
215 |
@@ -125,6 +149,11 @@ |
216 |
vorbis? ( media-libs/libvorbis ) |
217 |
xanim? ( media-video/xanim ) |
218 |
xvid? ( media-libs/xvid ) |
219 |
+ || ( |
220 |
+ >=media-video/libav-0.6.2${LIBAV_USE} |
221 |
+ >=media-video/ffmpeg-0.6_p25423${LIBAV_USE} |
222 |
+ ) |
223 |
+ symlink? ( !media-video/mplayer ) |
224 |
" |
225 |
ASM_DEP="dev-lang/yasm" |
226 |
DEPEND="${RDEPEND} |
227 |
@@ -190,32 +219,17 @@ |
228 |
einfo " media-video/libav or media-video/ffmpeg" |
229 |
} |
230 |
|
231 |
-src_unpack() { |
232 |
- if [[ ${PV} = *9999* ]]; then |
233 |
- git-2_src_unpack |
234 |
- else |
235 |
- default |
236 |
- fi |
237 |
- |
238 |
- if ! use truetype; then |
239 |
- unpack font-arial-iso-8859-1.tar.bz2 \ |
240 |
- font-arial-iso-8859-2.tar.bz2 \ |
241 |
- font-arial-cp1250.tar.bz2 |
242 |
- fi |
243 |
-} |
244 |
- |
245 |
src_prepare() { |
246 |
# fix path to bash executable in configure scripts |
247 |
local bash_scripts="configure version.sh" |
248 |
- sed -i \ |
249 |
- -e "1c\#!${EPREFIX}/bin/bash" \ |
250 |
+ sed -i -e "1c\#!${EPREFIX}/bin/bash" \ |
251 |
${bash_scripts} || die |
252 |
|
253 |
if [[ -n ${NAMESUF} ]]; then |
254 |
sed -e "/elif linux ; then/a\ _exesuf=\"${NAMESUF}\"" \ |
255 |
-i configure || die |
256 |
- sed -e "/ -m 644 DOCS\/man\/en\/mplayer/i\ mv DOCS\/man\/en\/mplayer.1 DOCS\/man\/en\/${PN}.1" \ |
257 |
- -e "/ -m 644 DOCS\/man\/\$(lang)\/mplayer/i\ mv DOCS\/man\/\$(lang)\/mplayer.1 DOCS\/man\/\$(lang)\/${PN}.1" \ |
258 |
+ sed -e "\, -m 644 DOCS/man/en/mplayer,i\ mv DOCS/man/en/mplayer.1 DOCS/man/en/${PN}.1" \ |
259 |
+ -e "\, -m 644 DOCS/man/\$(lang)/mplayer,i\ mv DOCS/man/\$(lang)/mplayer.1 DOCS/man/\$(lang)/${PN}.1" \ |
260 |
-e "s/er.1/er${NAMESUF}.1/g" \ |
261 |
-i Makefile || die |
262 |
sed -e "s/mplayer/${PN}/" \ |
263 |
@@ -251,11 +265,12 @@ |
264 |
$(use_enable network networking) |
265 |
$(use_enable joystick) |
266 |
" |
267 |
- uses="ass bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild |
268 |
+ uses="bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild |
269 |
myconf+=" --disable-nemesi" # nemesi automagic disable |
270 |
for i in ${uses}; do |
271 |
use ${i} || myconf+=" --disable-${i}" |
272 |
done |
273 |
+ use ass || myconf+=" --disable-libass" |
274 |
use bidi || myconf+=" --disable-fribidi" |
275 |
use ipv6 || myconf+=" --disable-inet6" |
276 |
use nut || myconf+=" --disable-libnut" |
277 |
@@ -269,15 +284,12 @@ |
278 |
" |
279 |
fi |
280 |
|
281 |
- # libcdio support: prefer libcdio over cdparanoia |
282 |
- # don't check for cddb w/cdio |
283 |
- if use cdio; then |
284 |
- myconf+=" --disable-cdparanoia" |
285 |
- else |
286 |
- myconf+=" --disable-libcdio" |
287 |
- use cdparanoia || myconf+=" --disable-cdparanoia" |
288 |
- use cddb || myconf+=" --disable-cddb" |
289 |
- fi |
290 |
+ ######## |
291 |
+ # CDDA # |
292 |
+ ######## |
293 |
+ use cddb || myconf+=" --disable-cddb" |
294 |
+ use cdio || myconf+=" --disable-libcdio" |
295 |
+ use cdparanoia || myconf+=" --disable-cdparanoia" |
296 |
|
297 |
################################ |
298 |
# DVD read, navigation support # |
299 |
@@ -426,6 +438,7 @@ |
300 |
################ |
301 |
# Audio Output # |
302 |
################ |
303 |
+ myconf+=" --disable-rsound" # media-sound/rsound is in pro-audio overlay only |
304 |
uses="alsa esd jack ladspa nas" |
305 |
for i in ${uses}; do |
306 |
use ${i} || myconf+=" --disable-${i}" |
307 |
@@ -495,10 +508,6 @@ |
308 |
--disable-xv |
309 |
--disable-x11 |
310 |
" |
311 |
- uses="dga dxr3 ggi opengl vdpau xinerama xscreensaver xv" |
312 |
- for i in ${uses}; do |
313 |
- use ${i} && elog "Useflag \"${i}\" require \"X\" useflag enabled to work." |
314 |
- done |
315 |
fi |
316 |
|
317 |
############################ |
318 |
@@ -600,4 +609,9 @@ |
319 |
dosym ../../../etc/${PN}/mplayer.conf /usr/share/${PN}/mplayer.conf |
320 |
|
321 |
newbin "${S}/TOOLS/midentify.sh" midentify${NAMESUF} |
322 |
+ |
323 |
+ if [[ -n ${NAMESUF} ]] && use symlink; then |
324 |
+ dosym "${PN}" /usr/bin/mplayer |
325 |
+ dosym "midentify${NAMESUF}" /usr/bin/midentify |
326 |
+ fi |
327 |
} |
328 |
|
329 |
|
330 |
|
331 |
1.7 media-video/mplayer2/metadata.xml |
332 |
|
333 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/metadata.xml?rev=1.7&view=markup |
334 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/metadata.xml?rev=1.7&content-type=text/plain |
335 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/metadata.xml?r1=1.6&r2=1.7 |
336 |
|
337 |
Index: metadata.xml |
338 |
=================================================================== |
339 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/metadata.xml,v |
340 |
retrieving revision 1.6 |
341 |
retrieving revision 1.7 |
342 |
diff -u -r1.6 -r1.7 |
343 |
--- metadata.xml 30 Nov 2011 04:49:34 -0000 1.6 |
344 |
+++ metadata.xml 1 Dec 2011 20:13:49 -0000 1.7 |
345 |
@@ -55,7 +55,8 @@ |
346 |
<flag name="tga">Enables Targa video output</flag> |
347 |
<flag name="vdpau">Enables experimental VDPAU support (requires nVidia video cards) to offload MPEG2/MPEG4/VC1/WMV CPU processing to video card</flag> |
348 |
<flag name="vpx">Enables vp8 codec support using libvpx: Decoding vp8 does not require this to be enabled but libvpx can also be used for decoding; encoding vp8 requires this useflag to be enabled though.</flag> |
349 |
-<flag name="xanim">Enables support for xanim based codecs</flag> |
350 |
+ <flag name="symlink">Copy all binaries and configuration into locations occupied by <pkg>media-video/mplayer</pkg> and thus act like drop-in replacement.</flag> |
351 |
+ <flag name="xanim">Enables support for xanim based codecs</flag> |
352 |
<flag name="xvmc">Enables X-Video Motion Compensation support</flag> |
353 |
</use> |
354 |
</pkgmetadata> |