* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: mplayer2-9999.ebuild ChangeLog
@ 2012-04-24 15:31 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 10+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-04-24 15:31 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/04/24 15:31:13
Modified: mplayer2-9999.ebuild ChangeLog
Log:
Drop removed switch. Thanks to Nikoli.
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Revision Changes Path
1.28 media-video/mplayer2/mplayer2-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.27&r2=1.28
Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mplayer2-9999.ebuild 10 Apr 2012 06:36:55 -0000 1.27
+++ mplayer2-9999.ebuild 24 Apr 2012 15:31:13 -0000 1.28
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.27 2012/04/10 06:36:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.28 2012/04/24 15:31:13 scarabeus Exp $
EAPI=4
@@ -248,7 +248,6 @@
myconf+="
--disable-svga
--disable-arts
- --disable-kai
--disable-tremor
$(use_enable network networking)
$(use_enable joystick)
1.44 media-video/mplayer2/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.43&r2=1.44
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ChangeLog 10 Apr 2012 06:36:55 -0000 1.43
+++ ChangeLog 24 Apr 2012 15:31:13 -0000 1.44
@@ -1,6 +1,9 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.43 2012/04/10 06:36:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.44 2012/04/24 15:31:13 scarabeus Exp $
+
+ 24 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
+ Drop removed switch. Thanks to Nikoli.
10 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org>
mplayer2-2.0_p20120309.ebuild, mplayer2-9999.ebuild:
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: mplayer2-9999.ebuild ChangeLog
@ 2012-04-29 18:11 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 10+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-04-29 18:11 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/04/29 18:11:44
Modified: mplayer2-9999.ebuild ChangeLog
Log:
So long cdparanoia, you served well. Thanks to Nikoli for the headsup. Fixes bug#414013
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Revision Changes Path
1.29 media-video/mplayer2/mplayer2-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.28&r2=1.29
Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mplayer2-9999.ebuild 24 Apr 2012 15:31:13 -0000 1.28
+++ mplayer2-9999.ebuild 29 Apr 2012 18:11:44 -0000 1.29
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.28 2012/04/24 15:31:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.29 2012/04/29 18:11:44 scarabeus Exp $
EAPI=4
@@ -33,7 +33,7 @@
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
fi
IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl
-bluray bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts
+bluray bs2b cddb +cdio cpudetection custom-cpuopts
debug directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +faad fbcon ftp
gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa libcaca lirc live
mad md5sum +mmx mmxext mng +mp3 nas +network nut +opengl oss png pnm pulseaudio
@@ -49,8 +49,7 @@
# bindist does not cope with win32codecs, which are nonfree
REQUIRED_USE="bindist? ( !win32codecs )
- cdio? ( !cdparanoia )
- cddb? ( || ( cdio cdparanoia ) network )
+ cddb? ( cdio network )
dvdnav? ( dvd )
radio? ( || ( dvb v4l ) )
dxr3? ( X )
@@ -100,7 +99,6 @@
bluray? ( media-libs/libbluray )
bs2b? ( media-libs/libbs2b )
cdio? ( dev-libs/libcdio )
- cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
directfb? ( dev-libs/DirectFB )
dts? ( media-libs/libdca )
dv? ( media-libs/libdv )
@@ -276,7 +274,6 @@
########
use cddb || myconf+=" --disable-cddb"
use cdio || myconf+=" --disable-libcdio"
- use cdparanoia || myconf+=" --disable-cdparanoia"
################################
# DVD read, navigation support #
1.45 media-video/mplayer2/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.44&r2=1.45
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ChangeLog 24 Apr 2012 15:31:13 -0000 1.44
+++ ChangeLog 29 Apr 2012 18:11:44 -0000 1.45
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.44 2012/04/24 15:31:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.45 2012/04/29 18:11:44 scarabeus Exp $
+
+ 29 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
+ So long cdparanoia, you served well. Thanks to Nikoli for the headsup. Fixes
+ bug#414013
24 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
Drop removed switch. Thanks to Nikoli.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: mplayer2-9999.ebuild ChangeLog
@ 2012-05-18 5:08 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 10+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-05-18 5:08 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/05/18 05:08:06
Modified: mplayer2-9999.ebuild ChangeLog
Log:
Arts switch is gone.
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Revision Changes Path
1.32 media-video/mplayer2/mplayer2-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.31&r2=1.32
Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mplayer2-9999.ebuild 14 May 2012 10:32:23 -0000 1.31
+++ mplayer2-9999.ebuild 18 May 2012 05:08:06 -0000 1.32
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.31 2012/05/14 10:32:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.32 2012/05/18 05:08:06 scarabeus Exp $
EAPI=4
@@ -239,11 +239,9 @@
#Optional features#
###################
# disable svga since we don't want it
- # disable arts since we don't have kde3
# disable tremor, it needs libvorbisidec and is for FPU-less systems only
myconf+="
--disable-svga
- --disable-arts
--disable-tremor
$(use_enable network networking)
$(use_enable joystick)
1.48 media-video/mplayer2/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.47&r2=1.48
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ChangeLog 14 May 2012 10:32:23 -0000 1.47
+++ ChangeLog 18 May 2012 05:08:06 -0000 1.48
@@ -1,6 +1,9 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.47 2012/05/14 10:32:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.48 2012/05/18 05:08:06 scarabeus Exp $
+
+ 18 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
+ Arts switch is gone.
14 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
mplayer2-2.0_p20120309.ebuild, mplayer2-9999.ebuild:
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: mplayer2-9999.ebuild ChangeLog
@ 2012-05-19 6:37 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 10+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-05-19 6:37 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/05/19 06:37:34
Modified: mplayer2-9999.ebuild ChangeLog
Log:
Add portaudio support. Thanks to Nikoli for noticing.
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Revision Changes Path
1.34 media-video/mplayer2/mplayer2-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.33&r2=1.34
Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- mplayer2-9999.ebuild 18 May 2012 19:38:42 -0000 1.33
+++ mplayer2-9999.ebuild 19 May 2012 06:37:34 -0000 1.34
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.33 2012/05/18 19:38:42 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.34 2012/05/19 06:37:34 scarabeus Exp $
EAPI=4
@@ -36,9 +36,10 @@
bs2b cddb +cdio cpudetection custom-cpuopts debug directfb doc +dts +dv dvb
+dvd +dvdnav dxr3 +enca +faad fbcon ftp gif ggi +iconv ipv6 jack joystick
jpeg kernel_linux ladspa libcaca lirc mad md5sum +mmx mmxext mng +mp3 nas
- +network nut +opengl oss png pnm pulseaudio pvr +quicktime radio +rar +real
- +rtc samba +shm sdl +speex sse sse2 ssse3 tga +theora +truetype +unicode
- v4l vdpau +vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvid"
+ +network nut +opengl oss png pnm portaudio pulseaudio pvr +quicktime radio
+ +rar +real +rtc samba +shm sdl +speex sse sse2 ssse3 tga +theora +truetype
+ +unicode v4l vdpau +vorbis win32codecs +X xanim xinerama +xscreensaver +xv
+ xvid"
IUSE+=" symlink"
VIDEO_CARDS="s3virge mga tdfx vesa"
@@ -122,6 +123,7 @@
nut? ( >=media-libs/libnut-661 )
png? ( media-libs/libpng )
pnm? ( media-libs/netpbm )
+ portaudio? ( >=media-libs/portaudio-19_pre20111121 )
pulseaudio? ( media-sound/pulseaudio )
rar? (
|| (
@@ -420,7 +422,7 @@
# Audio Output #
################
myconf+=" --disable-rsound" # media-sound/rsound is in pro-audio overlay only
- uses="alsa jack ladspa nas"
+ uses="alsa jack ladspa nas portaudio"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
1.50 media-video/mplayer2/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.49&r2=1.50
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ChangeLog 18 May 2012 19:38:42 -0000 1.49
+++ ChangeLog 19 May 2012 06:37:34 -0000 1.50
@@ -1,6 +1,9 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.49 2012/05/18 19:38:42 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.50 2012/05/19 06:37:34 scarabeus Exp $
+
+ 19 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
+ Add portaudio support. Thanks to Nikoli for noticing.
18 May 2012; Luca Barbato <lu_zero@gentoo.org> mplayer2-9999.ebuild:
Update live ebuild, thanks to Nikoli for the input
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: mplayer2-9999.ebuild ChangeLog
@ 2012-06-12 9:05 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 10+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-06-12 9:05 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/06/12 09:05:10
Modified: mplayer2-9999.ebuild ChangeLog
Log:
Merge with mplayer1 ebuild. Thanks to nikoli for the patchset.
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Revision Changes Path
1.37 media-video/mplayer2/mplayer2-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.36&r2=1.37
Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- mplayer2-9999.ebuild 22 May 2012 16:44:06 -0000 1.36
+++ mplayer2-9999.ebuild 12 Jun 2012 09:05:10 -0000 1.37
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.36 2012/05/22 16:44:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.37 2012/06/12 09:05:10 scarabeus Exp $
EAPI=4
@@ -32,40 +32,42 @@
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
fi
-IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray
- bs2b cddb +cdio cpudetection custom-cpuopts debug directfb doc +dts +dv dvb
- +dvd +dvdnav dxr3 +enca +faad fbcon ftp gif ggi +iconv ipv6 jack joystick
- jpeg kernel_linux ladspa libcaca lirc mad md5sum +mmx mmxext mng +mp3 nas
- +network nut +opengl oss png pnm portaudio postproc pulseaudio pvr +quicktime
- radio +rar +real +rtc samba +shm sdl +speex sse sse2 ssse3 tga +theora +truetype
- +unicode v4l vdpau +vorbis win32codecs +X xanim xinerama +xscreensaver +xv
- xvid"
+IUSE="+a52 aalib +alsa aqua +ass bidi bindist bl bluray bs2b cddb +cdio
+ cpudetection debug directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +faad
+ fbcon ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+ libcaca lirc mad md5sum mng +mp3 nas +network nut +opengl oss png pnm
+ portaudio postproc pulseaudio pvr +quicktime radio +rar +real +rtc samba
+ sdl +speex tga +theora +truetype +unicode v4l vdpau +vorbis win32codecs +X
+ xanim xinerama +xscreensaver +xv xvid"
IUSE+=" symlink"
-VIDEO_CARDS="s3virge mga tdfx vesa"
+CPU_FEATURES="3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3"
+for x in ${CPU_FEATURES}; do
+ IUSE+=" ${x}"
+done
+
+VIDEO_CARDS="s3virge mga tdfx"
for x in ${VIDEO_CARDS}; do
IUSE+=" video_cards_${x}"
done
# bindist does not cope with win32codecs, which are nonfree
-REQUIRED_USE="bindist? ( !win32codecs )
+REQUIRED_USE="
+ ass? ( truetype )
+ bindist? ( !win32codecs )
cddb? ( cdio network )
dvdnav? ( dvd )
- radio? ( || ( dvb v4l ) )
dxr3? ( X )
ggi? ( X )
opengl? ( X )
+ radio? ( || ( dvb v4l ) )
+ truetype? ( iconv )
vdpau? ( X )
xinerama? ( X )
xscreensaver? ( X )
xv? ( X )
"
-FONT_RDEPS="
- virtual/ttf-fonts
- media-libs/fontconfig
- >=media-libs/freetype-2.2.1:2
-"
# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
# nemesi? ( net-libs/libnemesi )
RDEPEND+="
@@ -94,7 +96,7 @@
a52? ( media-libs/a52dec )
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
- ass? ( ${FONT_RDEPS} >=media-libs/libass-0.9.10[enca?,fontconfig] )
+ ass? ( >=media-libs/libass-0.9.10[enca?,fontconfig] )
bidi? ( dev-libs/fribidi )
bluray? ( media-libs/libbluray )
bs2b? ( media-libs/libbs2b )
@@ -136,7 +138,11 @@
sdl? ( media-libs/libsdl )
speex? ( media-libs/speex )
theora? ( media-libs/libtheora )
- truetype? ( ${FONT_RDEPS} )
+ truetype? (
+ media-libs/fontconfig
+ >=media-libs/freetype-2.2.1:2
+ virtual/ttf-fonts
+ )
vorbis? ( media-libs/libvorbis )
xanim? ( media-video/xanim )
xvid? ( media-libs/xvid )
@@ -185,23 +191,6 @@
ewarn "disabling this use flag."
fi
- if use custom-cpuopts; then
- ewarn
- ewarn "You are using the custom-cpuopts flag which will"
- ewarn "specifically allow you to enable / disable certain"
- ewarn "CPU optimizations."
- ewarn
- ewarn "Most desktop users won't need this functionality, but it"
- ewarn "is included for corner cases like cross-compiling and"
- ewarn "certain profiles. If unsure, disable this flag and MPlayer"
- ewarn "will automatically detect and use your available CPU"
- ewarn "optimizations."
- ewarn
- ewarn "Using this flag means your build is unsupported, so"
- ewarn "please make sure your CPU optimization use flags (3dnow"
- ewarn "3dnowext mmx mmxext sse sse2 ssse3) are properly set."
- fi
-
einfo "For various format support you need to enable the support on your ffmpeg package:"
einfo " media-video/libav or media-video/ffmpeg"
}
@@ -283,14 +272,8 @@
#
# use external libdvdcss, dvdread and dvdnav
myconf+=" --disable-dvdread-internal --disable-libdvdcss-internal"
- if use dvd; then
- use dvdnav || myconf+=" --disable-dvdnav"
- else
- myconf+="
- --disable-dvdnav
- --disable-dvdread
- "
- fi
+ use dvd || myconf+=" --disable-dvdread"
+ use dvdnav || myconf+=" --disable-dvdnav"
#############
# Subtitles #
@@ -298,15 +281,8 @@
# SRT/ASS/SSA (subtitles) requires freetype support
# freetype support requires iconv
# iconv optionally can use unicode
- if ! use ass && ! use truetype; then
- myconf+=" --disable-freetype"
- if ! use iconv; then
- myconf+="
- --disable-iconv
- --charset=noconv
- "
- fi
- fi
+ use truetype || myconf+=" --disable-freetype"
+ use iconv || myconf+=" --disable-iconv --charset=noconv"
use iconv && use unicode && myconf+=" --charset=UTF-8"
#####################################
@@ -440,16 +416,9 @@
# Platform specific flags, hardcoded on amd64 (see below)
use cpudetection && myconf+=" --enable-runtime-cpudetection"
- # Turning off CPU optimizations usually will break the build.
- # However, this use flag, if enabled, will allow users to completely
- # specify which ones to use. If disabled, mplayer will automatically
- # enable all CPU optimizations that the host build supports.
- if use custom-cpuopts; then
- uses="3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3"
- for i in ${uses}; do
- myconf+=" $(use_enable ${i})"
- done
- fi
+ for i in ${CPU_FEATURES}; do
+ myconf+=" $(use_enable ${i})"
+ done
use debug && myconf+=" --enable-debug=3"
@@ -458,40 +427,16 @@
append-ldflags -nopie
fi
- is-flag -O? || append-flags -O2
-
- # workaround bug, x86 just has too few registers, see c.f.
- # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=402950#44
- # and 32-bits OSX, bug 329861
- if [[ ${CHOST} == i?86-* ]] ; then
- use debug || append-flags -fomit-frame-pointer
- fi
-
###########################
# X enabled configuration #
###########################
- myconf+=" --disable-dga1 --disable-dga2"
- if use X; then
- uses="dxr3 ggi xinerama xv"
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- use opengl || myconf+=" --disable-gl"
- use vdpau || myconf+=" --disable-vdpau"
- use video_cards_vesa || myconf+=" --disable-vesa"
- use xscreensaver || myconf+=" --disable-xss"
- else
- myconf+="
- --disable-dxr3
- --disable-ggi
- --disable-gl
- --disable-vdpau
- --disable-xinerama
- --disable-xss
- --disable-xv
- --disable-x11
- "
- fi
+ myconf+=" --disable-dga1 --disable-dga2 --disable-vesa"
+ uses="dxr3 ggi vdpau xinerama xv"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use opengl || myconf+=" --disable-gl"
+ use xscreensaver || myconf+=" --disable-xss"
############################
# OSX (aqua) configuration #
@@ -563,7 +508,7 @@
dohtml -r "${S}"/DOCS/HTML/*
fi
- if ! use ass && ! use truetype; then
+ if ! use truetype; then
dodir /usr/share/${PN}/fonts
# Do this generic, as the mplayer people like to change the structure
# of their zips ...
1.55 media-video/mplayer2/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.55&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.55&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.54&r2=1.55
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ChangeLog 22 May 2012 16:44:06 -0000 1.54
+++ ChangeLog 12 Jun 2012 09:05:10 -0000 1.55
@@ -1,6 +1,9 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.54 2012/05/22 16:44:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.55 2012/06/12 09:05:10 scarabeus Exp $
+
+ 12 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
+ Merge with mplayer1 ebuild. Thanks to nikoli for the patchset.
22 May 2012; Diego E. Pettenò <flameeyes@gentoo.org>
mplayer2-2.0_p20120309.ebuild, mplayer2-9999.ebuild:
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: mplayer2-9999.ebuild ChangeLog
@ 2012-06-12 13:11 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 10+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-06-12 13:11 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/06/12 13:11:33
Modified: mplayer2-9999.ebuild ChangeLog
Log:
Set + on desired default cpuopts to behave same way like before the split. Spotted by nikoli.
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Revision Changes Path
1.38 media-video/mplayer2/mplayer2-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.37&r2=1.38
Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mplayer2-9999.ebuild 12 Jun 2012 09:05:10 -0000 1.37
+++ mplayer2-9999.ebuild 12 Jun 2012 13:11:33 -0000 1.38
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.37 2012/06/12 09:05:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.38 2012/06/12 13:11:33 scarabeus Exp $
EAPI=4
@@ -41,7 +41,7 @@
xanim xinerama +xscreensaver +xv xvid"
IUSE+=" symlink"
-CPU_FEATURES="3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3"
+CPU_FEATURES="3dnow 3dnowext altivec +mmx mmxext +shm sse sse2 ssse3"
for x in ${CPU_FEATURES}; do
IUSE+=" ${x}"
done
@@ -417,7 +417,7 @@
use cpudetection && myconf+=" --enable-runtime-cpudetection"
for i in ${CPU_FEATURES}; do
- myconf+=" $(use_enable ${i})"
+ myconf+=" $(use_enable ${i/+/})"
done
use debug && myconf+=" --enable-debug=3"
1.56 media-video/mplayer2/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.55&r2=1.56
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- ChangeLog 12 Jun 2012 09:05:10 -0000 1.55
+++ ChangeLog 12 Jun 2012 13:11:33 -0000 1.56
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.55 2012/06/12 09:05:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.56 2012/06/12 13:11:33 scarabeus Exp $
+
+ 12 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
+ Set + on desired default cpuopts to behave same way like before the split.
+ Spotted by nikoli.
12 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
Merge with mplayer1 ebuild. Thanks to nikoli for the patchset.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: mplayer2-9999.ebuild ChangeLog
@ 2012-08-13 11:48 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 10+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-08-13 11:48 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/08/13 11:48:57
Modified: mplayer2-9999.ebuild ChangeLog
Log:
There needs to be only one dependency on py3.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Revision Changes Path
1.41 media-video/mplayer2/mplayer2-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.40&r2=1.41
Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- mplayer2-9999.ebuild 20 Jul 2012 15:42:00 -0000 1.40
+++ mplayer2-9999.ebuild 13 Aug 2012 11:48:57 -0000 1.41
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.40 2012/07/20 15:42:00 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.41 2012/08/13 11:48:57 scarabeus Exp $
EAPI=4
@@ -152,9 +152,8 @@
ASM_DEP="dev-lang/yasm"
DEPEND="${RDEPEND}
virtual/pkgconfig
- dev-lang/python
- sys-devel/gettext
=dev-lang/python-3*
+ sys-devel/gettext
X? (
x11-proto/videoproto
x11-proto/xf86vidmodeproto
1.62 media-video/mplayer2/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.62&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.62&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.61&r2=1.62
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ChangeLog 29 Jul 2012 18:07:35 -0000 1.61
+++ ChangeLog 13 Aug 2012 11:48:57 -0000 1.62
@@ -1,6 +1,9 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.61 2012/07/29 18:07:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.62 2012/08/13 11:48:57 scarabeus Exp $
+
+ 13 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
+ There needs to be only one dependency on py3.
29 Jul 2012; Raúl Porcel <armin76@gentoo.org> mplayer2-2.0_p20120309.ebuild:
alpha/arm/ia64/sparc stable wrt #416359
@@ -343,4 +346,3 @@
10 Jun 2010; Nikoli <nikoli@lavabit.com> +mplayer-uau-9999.ebuild,
+metadata.xml:
Initial ebuild
-
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: mplayer2-9999.ebuild ChangeLog
@ 2012-08-13 13:19 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 10+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-08-13 13:19 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/08/13 13:19:20
Modified: mplayer2-9999.ebuild ChangeLog
Log:
Add back support for building with python2. So at least I don't have to install py3.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Revision Changes Path
1.42 media-video/mplayer2/mplayer2-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.41&r2=1.42
Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- mplayer2-9999.ebuild 13 Aug 2012 11:48:57 -0000 1.41
+++ mplayer2-9999.ebuild 13 Aug 2012 13:19:20 -0000 1.42
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.41 2012/08/13 11:48:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.42 2012/08/13 13:19:20 scarabeus Exp $
EAPI=4
@@ -152,7 +152,7 @@
ASM_DEP="dev-lang/yasm"
DEPEND="${RDEPEND}
virtual/pkgconfig
- =dev-lang/python-3*
+ >=dev-lang/python-2.6
sys-devel/gettext
X? (
x11-proto/videoproto
@@ -170,6 +170,10 @@
x86-fbsd? ( ${ASM_DEP} )
"
+PATCHES=(
+ "${FILESDIR}/${PN}-py2compat.patch"
+)
+
pkg_setup() {
if [[ ${PV} == *9999* ]]; then
elog
1.63 media-video/mplayer2/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.63&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.63&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.62&r2=1.63
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ChangeLog 13 Aug 2012 11:48:57 -0000 1.62
+++ ChangeLog 13 Aug 2012 13:19:20 -0000 1.63
@@ -1,6 +1,11 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.62 2012/08/13 11:48:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.63 2012/08/13 13:19:20 scarabeus Exp $
+
+ 13 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+ +files/mplayer2-py2compat.patch, mplayer2-9999.ebuild:
+ Add back support for building with python2. So at least I don't have to
+ install py3.
13 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
There needs to be only one dependency on py3.
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: mplayer2-9999.ebuild ChangeLog
@ 2013-04-27 17:47 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 10+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2013-04-27 17:47 UTC (permalink / raw
To: gentoo-commits
scarabeus 13/04/27 17:47:58
Modified: mplayer2-9999.ebuild ChangeLog
Log:
Move the ebuild to python-r1 eclasses. Sync with mpv ebuild. Patch by Nikoli.
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Revision Changes Path
1.56 media-video/mplayer2/mplayer2-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.55&r2=1.56
Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- mplayer2-9999.ebuild 16 Apr 2013 07:26:33 -0000 1.55
+++ mplayer2-9999.ebuild 27 Apr 2013 17:47:58 -0000 1.56
@@ -1,30 +1,27 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.55 2013/04/16 07:26:33 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.56 2013/04/27 17:47:58 scarabeus Exp $
-EAPI=4
+EAPI=5
-[[ ${PV} = *9999* ]] && VCS_ECLASS="git-2" || VCS_ECLASS=""
+# https://bugs.gentoo.org/show_bug.cgi?id=434356#c4
+PYTHON_COMPAT=( python{2_7,3_1,3_2,3_3} )
-inherit python toolchain-funcs eutils flag-o-matic multilib base ${VCS_ECLASS}
+EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git"
+
+inherit toolchain-funcs flag-o-matic multilib base python-any-r1
+[[ ${PV} == *9999* ]] && inherit git-2
NAMESUF="${PN/mplayer/}"
DESCRIPTION="Media Player for Linux"
HOMEPAGE="http://www.mplayer2.org/"
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git"
-else
- SRC_URI="http://rion-overlay.googlecode.com/files/${P}.tar.xz"
-fi
+[[ ${PV} == *9999* ]] || \
+SRC_URI="http://rion-overlay.googlecode.com/files/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-if [[ ${PV} == *9999* ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-fi
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
IUSE="+a52 +alsa aqua bindist bluray bs2b cddb +cdio cpudetection debug
directfb doc +dts +dv dvb +dvd +dvdnav +enca +faad fbcon ftp gif +iconv
ipv6 jack joystick jpeg kernel_linux ladspa lcms +libass libcaca lirc mad
@@ -72,15 +69,18 @@
vdpau? ( x11-libs/libvdpau )
xinerama? ( x11-libs/libXinerama )
xscreensaver? ( x11-libs/libXScrnSaver )
- xv? (
- x11-libs/libXv
- )
+ xv? ( x11-libs/libXv )
)
a52? ( media-libs/a52dec )
alsa? ( media-libs/alsa-lib )
bluray? ( media-libs/libbluray )
bs2b? ( media-libs/libbs2b )
- cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
+ cdio? (
+ || (
+ dev-libs/libcdio-paranoia
+ <dev-libs/libcdio-0.90[-minimal]
+ )
+ )
directfb? ( dev-libs/DirectFB )
dts? ( media-libs/libdca )
dv? ( media-libs/libdv )
@@ -96,7 +96,10 @@
jack? ( media-sound/jack-audio-connection-kit )
jpeg? ( virtual/jpeg )
ladspa? ( media-libs/ladspa-sdk )
- libass? ( >=media-libs/libass-0.9.10[enca?,fontconfig] virtual/ttf-fonts )
+ libass? (
+ >=media-libs/libass-0.9.10[enca?,fontconfig]
+ virtual/ttf-fonts
+ )
libcaca? ( media-libs/libcaca )
lirc? ( app-misc/lirc )
mad? ( media-libs/libmad )
@@ -106,7 +109,12 @@
png? ( media-libs/libpng )
pnm? ( media-libs/netpbm )
portaudio? ( >=media-libs/portaudio-19_pre20111121 )
- postproc? ( || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) )
+ postproc? (
+ || (
+ media-libs/libpostproc
+ media-video/ffmpeg
+ )
+ )
pulseaudio? ( media-sound/pulseaudio )
quvi? ( >=media-libs/libquvi-0.4.1 )
rar? (
@@ -128,7 +136,7 @@
ASM_DEP="dev-lang/yasm"
DEPEND="${RDEPEND}
virtual/pkgconfig
- >=dev-lang/python-2.7
+ ${PYTHON_DEPS}
dev-python/docutils
sys-devel/gettext
X? (
@@ -154,7 +162,7 @@
if [[ ${PV} == *9999* ]]; then
elog
elog "This is a live ebuild which installs the latest from upstream's"
- elog "${VCS_ECLASS} repository, and is unsupported by Gentoo."
+ elog "git repository, and is unsupported by Gentoo."
elog "Everything but bugs in the ebuild itself will be ignored."
elog
fi
@@ -179,12 +187,7 @@
einfo "For various format support you need to enable the support on your ffmpeg package:"
einfo " media-video/libav or media-video/ffmpeg"
- # https://bugs.gentoo.org/show_bug.cgi?id=434356#c4
- python_pkg_setup
- major=$(python_get_version --major)
- minor=$(python_get_version --minor)
- [[ ( ${major} -eq 2 && ${minor} -ge 7 ) || ${major} -ge 3 ]] \
- || die "Please eselect Python 2.7 or later"
+ python-any-r1_pkg_setup
}
src_prepare() {
1.94 media-video/mplayer2/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.94&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.94&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.93&r2=1.94
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- ChangeLog 16 Apr 2013 07:28:10 -0000 1.93
+++ ChangeLog 27 Apr 2013 17:47:58 -0000 1.94
@@ -1,6 +1,9 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.93 2013/04/16 07:28:10 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.94 2013/04/27 17:47:58 scarabeus Exp $
+
+ 27 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
+ Move the ebuild to python-r1 eclasses. Sync with mpv ebuild. Patch by Nikoli.
16 Apr 2013; Sergey Popov <pinkbyte@gentoo.org> metadata.xml:
Remove redundant maintainer field for media-video
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: mplayer2-9999.ebuild ChangeLog
@ 2013-10-19 19:39 Tom Wijsman (tomwij)
0 siblings, 0 replies; 10+ messages in thread
From: Tom Wijsman (tomwij) @ 2013-10-19 19:39 UTC (permalink / raw
To: gentoo-commits
tomwij 13/10/19 19:39:40
Modified: mplayer2-9999.ebuild ChangeLog
Log:
Added REQUIRED_USE entry as the libass USE flag now needs iconv to be enabled, proxied commit for Nikoli; fixes bug #488604, reported by adel_blakdeath.
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Revision Changes Path
1.63 media-video/mplayer2/mplayer2-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.63&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.63&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.62&r2=1.63
Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- mplayer2-9999.ebuild 5 Sep 2013 18:58:07 -0000 1.62
+++ mplayer2-9999.ebuild 19 Oct 2013 19:39:40 -0000 1.63
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.62 2013/09/05 18:58:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.63 2013/10/19 19:39:40 tomwij Exp $
EAPI=5
@@ -39,6 +39,7 @@
dvdnav? ( dvd )
enca? ( iconv )
lcms? ( opengl )
+ libass? ( iconv )
opengl? ( || ( aqua X ) )
portaudio? ( threads )
pvr? ( v4l )
1.113 media-video/mplayer2/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.113&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.113&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.112&r2=1.113
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- ChangeLog 13 Oct 2013 10:17:39 -0000 1.112
+++ ChangeLog 19 Oct 2013 19:39:40 -0000 1.113
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.112 2013/10/13 10:17:39 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.113 2013/10/19 19:39:40 tomwij Exp $
+
+ 19 Oct 2013; Tom Wijsman <TomWij@gentoo.org> mplayer2-9999.ebuild:
+ Added REQUIRED_USE entry as the libass USE flag now needs iconv to be enabled,
+ proxied commit for Nikoli; fixes bug #488604, reported by adel_blakdeath.
13 Oct 2013; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
Updated Nikoli's e-mail address for easier automatic assignment.
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2013-10-19 19:39 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-19 6:37 [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: mplayer2-9999.ebuild ChangeLog Tomas Chvatal (scarabeus)
-- strict thread matches above, loose matches on Subject: below --
2013-10-19 19:39 Tom Wijsman (tomwij)
2013-04-27 17:47 Tomas Chvatal (scarabeus)
2012-08-13 13:19 Tomas Chvatal (scarabeus)
2012-08-13 11:48 Tomas Chvatal (scarabeus)
2012-06-12 13:11 Tomas Chvatal (scarabeus)
2012-06-12 9:05 Tomas Chvatal (scarabeus)
2012-05-18 5:08 Tomas Chvatal (scarabeus)
2012-04-29 18:11 Tomas Chvatal (scarabeus)
2012-04-24 15:31 Tomas Chvatal (scarabeus)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox