Gentoo Archives: gentoo-commits

From: "Maxim Koltsov (maksbotan)" <maksbotan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: mplayer2-9999.ebuild mplayer2-2.0_p20130126.ebuild ChangeLog
Date: Fri, 01 Feb 2013 11:42:24
Message-Id: 20130201114221.885122171D@flycatcher.gentoo.org
1 maksbotan 13/02/01 11:42:21
2
3 Modified: mplayer2-9999.ebuild ChangeLog
4 Added: mplayer2-2.0_p20130126.ebuild
5 Log:
6 Add new snapshot, update live ebuild, thanks to Nikoli
7
8 (Portage version: 2.1.11.40/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)
9
10 Revision Changes Path
11 1.52 media-video/mplayer2/mplayer2-9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.52&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.52&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.51&r2=1.52
16
17 Index: mplayer2-9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
20 retrieving revision 1.51
21 retrieving revision 1.52
22 diff -u -r1.51 -r1.52
23 --- mplayer2-9999.ebuild 26 Dec 2012 08:51:52 -0000 1.51
24 +++ mplayer2-9999.ebuild 1 Feb 2013 11:42:21 -0000 1.52
25 @@ -1,6 +1,6 @@
26 -# Copyright 1999-2012 Gentoo Foundation
27 +# Copyright 1999-2013 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.51 2012/12/26 08:51:52 pinkbyte Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.52 2013/02/01 11:42:21 maksbotan Exp $
31
32 EAPI=4
33
34 @@ -268,8 +268,6 @@
35 # DVB / Video4Linux / Radio support #
36 #####################################
37 myconf+=" --disable-tv-bsdbt848"
38 - # v4l1 is gone since linux-headers-2.6.38
39 - myconf+=" --disable-tv-v4l1"
40 if { use dvb || use v4l || use pvr || use radio; }; then
41 use dvb || myconf+=" --disable-dvb"
42 use pvr || myconf+=" --disable-pvr"
43 @@ -409,16 +407,16 @@
44 --bindir="${EPREFIX}"/usr/bin \
45 --libdir="${EPREFIX}"/usr/$(get_libdir) \
46 --confdir="${EPREFIX}"/etc/${PN} \
47 - --datadir="${EPREFIX}"/usr/share/${PN} \
48 --mandir="${EPREFIX}"/usr/share/man \
49 --localedir="${EPREFIX}"/usr/share/locale \
50 --enable-translation \
51 ${myconf} || die
52 +
53 + MAKEOPTS+=" V=1"
54 }
55
56 src_compile() {
57 - # enable verbose build, bug #448196
58 - base_src_compile V=1
59 + base_src_compile
60 use doc && emake -C DOCS/xml html-chunked
61 }
62
63 @@ -473,4 +471,4 @@
64 dosym "midentify${NAMESUF}" /usr/bin/midentify
65 fi
66 fi
67 -}
68 +}
69 \ No newline at end of file
70
71
72
73 1.89 media-video/mplayer2/ChangeLog
74
75 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.89&view=markup
76 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.89&content-type=text/plain
77 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.88&r2=1.89
78
79 Index: ChangeLog
80 ===================================================================
81 RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
82 retrieving revision 1.88
83 retrieving revision 1.89
84 diff -u -r1.88 -r1.89
85 --- ChangeLog 30 Jan 2013 19:02:31 -0000 1.88
86 +++ ChangeLog 1 Feb 2013 11:42:21 -0000 1.89
87 @@ -1,6 +1,12 @@
88 # ChangeLog for media-video/mplayer2
89 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
90 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.88 2013/01/30 19:02:31 ago Exp $
91 +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.89 2013/02/01 11:42:21 maksbotan Exp $
92 +
93 +*mplayer2-2.0_p20130126 (01 Feb 2013)
94 +
95 + 01 Feb 2013; Maxim Koltsov <maksbotan@g.o>
96 + +mplayer2-2.0_p20130126.ebuild, mplayer2-9999.ebuild:
97 + Add new snapshot, update live ebuild, thanks to Nikoli
98
99 30 Jan 2013; Agostino Sarubbo <ago@g.o> mplayer2-2.0_p20120828.ebuild:
100 Stable for x86, wrt bug #447932
101
102
103
104 1.1 media-video/mplayer2/mplayer2-2.0_p20130126.ebuild
105
106 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild?rev=1.1&view=markup
107 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild?rev=1.1&content-type=text/plain
108
109 Index: mplayer2-2.0_p20130126.ebuild
110 ===================================================================
111 # Copyright 1999-2013 Gentoo Foundation
112 # Distributed under the terms of the GNU General Public License v2
113 # $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20130126.ebuild,v 1.1 2013/02/01 11:42:21 maksbotan Exp $
114
115 EAPI=4
116
117 [[ ${PV} = *9999* ]] && VCS_ECLASS="git-2" || VCS_ECLASS=""
118
119 inherit python toolchain-funcs eutils flag-o-matic multilib base ${VCS_ECLASS}
120
121 NAMESUF="${PN/mplayer/}"
122 DESCRIPTION="Media Player for Linux"
123 HOMEPAGE="http://www.mplayer2.org/"
124
125 if [[ ${PV} == *9999* ]]; then
126 EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git"
127 else
128 SRC_URI="http://rion-overlay.googlecode.com/files/${P}.tar.xz"
129 fi
130
131 LICENSE="GPL-3"
132 SLOT="0"
133 if [[ ${PV} == *9999* ]]; then
134 KEYWORDS=""
135 else
136 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
137 fi
138 IUSE="+a52 +alsa aqua bindist bluray bs2b cddb +cdio cpudetection debug
139 directfb doc +dts +dv dvb +dvd +dvdnav +enca +faad fbcon ftp gif +iconv
140 ipv6 jack joystick jpeg kernel_linux ladspa lcms +libass libcaca lirc mad
141 md5sum mng +mp3 +network nut +opengl oss png pnm portaudio +postproc
142 pulseaudio pvr +quicktime quvi radio +rar +real +rtc samba sdl +speex tga
143 +theora +unicode v4l vcd vdpau +vorbis win32codecs +X xanim xinerama
144 +xscreensaver +xv xvid yuv4mpeg
145 "
146 IUSE+=" symlink"
147
148 CPU_FEATURES="3dnow 3dnowext altivec +mmx mmxext +shm sse sse2 ssse3"
149 for x in ${CPU_FEATURES}; do
150 IUSE+=" ${x}"
151 done
152
153 # bindist does not cope with win32codecs, which are nonfree
154 REQUIRED_USE="
155 bindist? ( !win32codecs )
156 cddb? ( cdio network )
157 dvdnav? ( dvd )
158 lcms? ( opengl )
159 libass? ( iconv )
160 opengl? ( || ( aqua X ) )
161 radio? ( || ( dvb v4l ) )
162 vdpau? ( X )
163 xinerama? ( X )
164 xscreensaver? ( X )
165 xv? ( X )
166 "
167
168 # Rar: althrought -gpl version is nice, it cant do most functions normal rars can
169 RDEPEND+="
170 sys-libs/ncurses
171 sys-libs/zlib
172 !bindist? (
173 x86? (
174 win32codecs? ( media-libs/win32codecs )
175 )
176 )
177 X? (
178 x11-libs/libXext
179 x11-libs/libXxf86vm
180 opengl? ( virtual/opengl )
181 lcms? ( media-libs/lcms:2 )
182 vdpau? ( x11-libs/libvdpau )
183 xinerama? ( x11-libs/libXinerama )
184 xscreensaver? ( x11-libs/libXScrnSaver )
185 xv? (
186 x11-libs/libXv
187 )
188 )
189 a52? ( media-libs/a52dec )
190 alsa? ( media-libs/alsa-lib )
191 bluray? ( media-libs/libbluray )
192 bs2b? ( media-libs/libbs2b )
193 cdio? ( dev-libs/libcdio )
194 directfb? ( dev-libs/DirectFB )
195 dts? ( media-libs/libdca )
196 dv? ( media-libs/libdv )
197 dvb? ( virtual/linuxtv-dvb-headers )
198 dvd? (
199 >=media-libs/libdvdread-4.1.3
200 dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
201 )
202 enca? ( app-i18n/enca )
203 faad? ( media-libs/faad2 )
204 gif? ( media-libs/giflib )
205 iconv? ( virtual/libiconv )
206 jack? ( media-sound/jack-audio-connection-kit )
207 jpeg? ( virtual/jpeg )
208 ladspa? ( media-libs/ladspa-sdk )
209 libass? ( >=media-libs/libass-0.9.10[enca?,fontconfig] virtual/ttf-fonts )
210 libcaca? ( media-libs/libcaca )
211 lirc? ( app-misc/lirc )
212 mad? ( media-libs/libmad )
213 mng? ( media-libs/libmng )
214 mp3? ( media-sound/mpg123 )
215 nut? ( >=media-libs/libnut-661 )
216 png? ( media-libs/libpng )
217 pnm? ( media-libs/netpbm )
218 portaudio? ( >=media-libs/portaudio-19_pre20111121 )
219 postproc? ( || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) )
220 pulseaudio? ( media-sound/pulseaudio )
221 quvi? ( >=media-libs/libquvi-0.4.1 )
222 rar? (
223 || (
224 app-arch/unrar
225 app-arch/rar
226 )
227 )
228 samba? ( net-fs/samba )
229 sdl? ( media-libs/libsdl )
230 speex? ( media-libs/speex )
231 theora? ( media-libs/libtheora )
232 vorbis? ( media-libs/libvorbis )
233 xanim? ( media-video/xanim )
234 xvid? ( media-libs/xvid )
235 >=virtual/ffmpeg-0.10.2
236 symlink? ( !media-video/mplayer )
237 "
238 ASM_DEP="dev-lang/yasm"
239 DEPEND="${RDEPEND}
240 virtual/pkgconfig
241 >=dev-lang/python-2.7
242 dev-python/docutils
243 sys-devel/gettext
244 X? (
245 x11-proto/videoproto
246 x11-proto/xf86vidmodeproto
247 xinerama? ( x11-proto/xineramaproto )
248 xscreensaver? ( x11-proto/scrnsaverproto )
249 )
250 amd64? ( ${ASM_DEP} )
251 doc? (
252 dev-libs/libxslt app-text/docbook-xml-dtd
253 app-text/docbook-xsl-stylesheets
254 )
255 x86? ( ${ASM_DEP} )
256 x86-fbsd? ( ${ASM_DEP} )
257 "
258
259 PATCHES=(
260 "${FILESDIR}/${PN}-py2compat.patch"
261 )
262
263 pkg_setup() {
264 if [[ ${PV} == *9999* ]]; then
265 elog
266 elog "This is a live ebuild which installs the latest from upstream's"
267 elog "${VCS_ECLASS} repository, and is unsupported by Gentoo."
268 elog "Everything but bugs in the ebuild itself will be ignored."
269 elog
270 fi
271
272 if use cpudetection; then
273 ewarn
274 ewarn "You've enabled the cpudetection flag. This feature is"
275 ewarn "included mainly for people who want to use the same"
276 ewarn "binary on another system with a different CPU architecture."
277 ewarn "MPlayer will already detect your CPU settings by default at"
278 ewarn "buildtime; this flag is used for runtime detection."
279 ewarn "You won't need this turned on if you are only building"
280 ewarn "mplayer for this system. Also, if your compile fails, try"
281 ewarn "disabling this use flag."
282 fi
283
284 if use !libass; then
285 ewarn
286 ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
287 fi
288
289 einfo "For various format support you need to enable the support on your ffmpeg package:"
290 einfo " media-video/libav or media-video/ffmpeg"
291
292 # https://bugs.gentoo.org/show_bug.cgi?id=434356#c4
293 python_pkg_setup
294 major=$(python_get_version --major)
295 minor=$(python_get_version --minor)
296 [[ ( ${major} -eq 2 && ${minor} -ge 7 ) || ${major} -ge 3 ]] \
297 || die "Please eselect Python 2.7 or later"
298 }
299
300 src_prepare() {
301 # fix path to bash executable in configure scripts
302 local bash_scripts="configure version.sh"
303 sed -i -e "1c\#!${EPREFIX}/bin/bash" \
304 ${bash_scripts} || die
305
306 if [[ -n ${NAMESUF} ]]; then
307 sed -e "/^EXESUF/s,= \$_exesuf$,= ${NAMESUF}\$_exesuf," \
308 -i configure || die
309 sed -e "s/mplayer/${PN}/" \
310 -i TOOLS/midentify.sh || die
311 fi
312
313 base_src_prepare
314 }
315
316 src_configure() {
317 local myconf=""
318 local uses i
319
320 # mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
321 # compilation in almost every situation. The reason for this is
322 # because if --enable is used, it will force the build of that option,
323 # regardless of whether the dependency is available or not.
324
325 ###################
326 #Optional features#
327 ###################
328 # disable tremor, it needs libvorbisidec and is for FPU-less systems only
329 myconf+="
330 --disable-tremor
331 $(use_enable network networking)
332 $(use_enable joystick)
333 "
334 uses="bluray enca ftp libass rtc vcd"
335 for i in ${uses}; do
336 use ${i} || myconf+=" --disable-${i}"
337 done
338 use ipv6 || myconf+=" --disable-inet6"
339 use nut || myconf+=" --disable-libnut"
340 use quvi || myconf+=" --disable-libquvi"
341 use rar || myconf+=" --disable-unrarexec"
342 use samba || myconf+=" --disable-smb"
343 if ! use lirc; then
344 myconf+="
345 --disable-lirc
346 --disable-lircc
347 --disable-apple-ir
348 "
349 fi
350
351 ########
352 # CDDA #
353 ########
354 use cddb || myconf+=" --disable-cddb"
355 use cdio || myconf+=" --disable-libcdio"
356
357 ################################
358 # DVD read, navigation support #
359 ################################
360 #
361 # dvdread - accessing a DVD
362 # dvdnav - navigation of menus
363 #
364 # use external libdvdcss, dvdread and dvdnav
365 myconf+=" --disable-dvdread-internal --disable-libdvdcss-internal"
366 use dvd || myconf+=" --disable-dvdread"
367 use dvdnav || myconf+=" --disable-dvdnav"
368
369 #############
370 # Subtitles #
371 #############
372 #
373 # iconv optionally can use unicode
374 use iconv || myconf+=" --disable-iconv --charset=noconv"
375 use iconv && use unicode && myconf+=" --charset=UTF-8"
376
377 #####################################
378 # DVB / Video4Linux / Radio support #
379 #####################################
380 myconf+=" --disable-tv-bsdbt848"
381 if { use dvb || use v4l || use pvr || use radio; }; then
382 use dvb || myconf+=" --disable-dvb"
383 use pvr || myconf+=" --disable-pvr"
384 use v4l || myconf+=" --disable-tv-v4l2"
385 if use radio && { use dvb || use v4l; }; then
386 myconf+="
387 --enable-radio
388 --disable-radio-capture
389 "
390 else
391 myconf+="
392 --disable-radio-v4l2
393 --disable-radio-bsdbt848
394 "
395 fi
396 else
397 myconf+="
398 --disable-tv
399 --disable-tv-v4l2
400 --disable-radio
401 --disable-radio-v4l2
402 --disable-radio-bsdbt848
403 --disable-dvb
404 --disable-v4l2
405 --disable-pvr"
406 fi
407
408 ##########
409 # Codecs #
410 ##########
411 myconf+=" --disable-musepack" # deprecated, libavcodec Musepack decoder is preferred
412 use dts || myconf+=" --disable-libdca"
413 use mp3 || myconf+=" --disable-mpg123"
414 uses="a52 bs2b dv vorbis"
415 for i in ${uses}; do
416 use ${i} || myconf+=" --disable-lib${i}"
417 done
418 uses="faad gif jpeg mad mng png pnm speex tga theora xanim xvid"
419 for i in ${uses}; do
420 use ${i} || myconf+=" --disable-${i}"
421 done
422
423 #################
424 # Binary codecs #
425 #################
426 # bug 213836
427 if ! use x86 || ! use win32codecs; then
428 use quicktime || myconf+=" --disable-qtx"
429 fi
430
431 ######################
432 # RealPlayer support #
433 ######################
434 # Realplayer support shows up in four places:
435 # - libavcodec (internal)
436 # - win32codecs
437 # - realcodecs (win32codecs libs)
438 # - realcodecs (realplayer libs)
439
440 # internal
441 use real || myconf+=" --disable-real"
442
443 # Real binary codec support only available on x86, amd64
444 if use real; then
445 use x86 && myconf+=" --codecsdir=/opt/RealPlayer/codecs"
446 use amd64 && myconf+=" --codecsdir=/usr/$(get_libdir)/codecs"
447 fi
448 myconf+=" $(use_enable win32codecs win32dll)"
449
450 ################
451 # Video Output #
452 ################
453 uses="directfb md5sum sdl yuv4mpeg"
454 for i in ${uses}; do
455 use ${i} || myconf+=" --disable-${i}"
456 done
457 use libcaca || myconf+=" --disable-caca"
458 use postproc || myconf+=" --disable-libpostproc"
459
460 ################
461 # Audio Output #
462 ################
463 myconf+=" --disable-rsound" # media-sound/rsound is in pro-audio overlay only
464 uses="alsa jack ladspa portaudio"
465 for i in ${uses}; do
466 use ${i} || myconf+=" --disable-${i}"
467 done
468 #use openal && myconf+=" --enable-openal" # build fails
469 use pulseaudio || myconf+=" --disable-pulse"
470 if ! use radio; then
471 use oss || myconf+=" --disable-ossaudio"
472 fi
473
474 ####################
475 # Advanced Options #
476 ####################
477 # Platform specific flags, hardcoded on amd64 (see below)
478 use cpudetection && myconf+=" --enable-runtime-cpudetection"
479
480 for i in ${CPU_FEATURES//+/}; do
481 myconf+=" $(use_enable ${i})"
482 done
483
484 use debug && myconf+=" --enable-debug=3"
485
486 if use x86 && gcc-specs-pie; then
487 filter-flags -fPIC -fPIE
488 append-ldflags -nopie
489 fi
490
491 ###########################
492 # X enabled configuration #
493 ###########################
494 use X || myconf+=" --disable-x11"
495 uses="vdpau xinerama xv"
496 for i in ${uses}; do
497 use ${i} || myconf+=" --disable-${i}"
498 done
499 use opengl || myconf+=" --disable-gl"
500 use lcms || myconf+=" --disable-lcms2"
501 use xscreensaver || myconf+=" --disable-xss"
502
503 ############################
504 # OSX (aqua) configuration #
505 ############################
506 if use aqua; then
507 myconf+="
508 --enable-macosx-finder
509 --enable-macosx-bundle
510 "
511 fi
512
513 ./configure \
514 --cc="$(tc-getCC)" \
515 --pkg-config="$(tc-getPKG_CONFIG)" \
516 --prefix="${EPREFIX}"/usr \
517 --bindir="${EPREFIX}"/usr/bin \
518 --libdir="${EPREFIX}"/usr/$(get_libdir) \
519 --confdir="${EPREFIX}"/etc/${PN} \
520 --mandir="${EPREFIX}"/usr/share/man \
521 --localedir="${EPREFIX}"/usr/share/locale \
522 --enable-translation \
523 ${myconf} || die
524
525 MAKEOPTS+=" V=1"
526 }
527
528 src_compile() {
529 base_src_compile
530 use doc && emake -C DOCS/xml html-chunked
531 }
532
533 src_install() {
534 local i
535
536 emake \
537 DESTDIR="${D}" \
538 INSTALLSTRIP="" \
539 install
540
541 dodoc AUTHORS Copyright README etc/codecs.conf
542
543 docinto tech/
544 dodoc DOCS/tech/{*.txt,mpsub.sub,playtree}
545 docinto TOOLS/
546 dodoc -r TOOLS
547 if use real; then
548 docinto tech/realcodecs/
549 dodoc DOCS/tech/realcodecs/*
550 fi
551
552 if use doc; then
553 docinto html/
554 dohtml -r "${S}"/DOCS/HTML/*
555 fi
556
557 insinto /etc/${PN}
558 newins "${S}/etc/example.conf" mplayer.conf
559 cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
560 # Config options can be section specific, global
561 # options should go in the default section
562 [default]
563 _EOF_
564 doins "${S}/etc/input.conf"
565
566 # set unrar path when required
567 if use rar; then
568 cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
569 unrarexec=${EPREFIX}/usr/bin/unrar
570 _EOF_
571 fi
572 dosym ../../../etc/${PN}/mplayer.conf /usr/share/${PN}/mplayer.conf
573
574 newbin "${S}/TOOLS/midentify.sh" midentify${NAMESUF}
575
576 if [[ -n ${NAMESUF} ]]; then
577 mv "${ED}/usr/share/man/man1/mplayer.1" "${ED}/usr/share/man/man1/mplayer${NAMESUF}.1" || die
578
579 if use symlink; then
580 dosym "${PN}" /usr/bin/mplayer
581 dosym "midentify${NAMESUF}" /usr/bin/midentify
582 fi
583 fi
584 }