* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild
@ 2011-03-29 14:03 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-03-29 14:03 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/03/29 14:03:34
Modified: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild
Log:
Drop wrong pushd in doc compilation.
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Revision Changes Path
1.3 media-video/mplayer2/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.2&r2=1.3
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog 29 Mar 2011 12:44:12 -0000 1.2
+++ ChangeLog 29 Mar 2011 14:03:34 -0000 1.3
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.2 2011/03/29 12:44:12 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.3 2011/03/29 14:03:34 scarabeus Exp $
+
+ 29 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-2.0.ebuild,
+ mplayer2-9999.ebuild:
+ Drop wrong pushd in doc compilation.
29 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-2.0.ebuild,
mplayer2-9999.ebuild, metadata.xml:
1.3 media-video/mplayer2/mplayer2-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.2&r2=1.3
Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mplayer2-9999.ebuild 29 Mar 2011 12:44:12 -0000 1.2
+++ mplayer2-9999.ebuild 29 Mar 2011 14:03:34 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.2 2011/03/29 12:44:12 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.3 2011/03/29 14:03:34 scarabeus Exp $
EAPI=4
@@ -578,7 +578,6 @@
base_src_compile
# Build only user-requested docs if they're available.
if use doc ; then
- pushd mplayer
# select available languages from $LINGUAS
LINGUAS=${LINGUAS/zh/zh_CN}
local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
1.3 media-video/mplayer2/mplayer2-2.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?r1=1.2&r2=1.3
Index: mplayer2-2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mplayer2-2.0.ebuild 29 Mar 2011 12:44:12 -0000 1.2
+++ mplayer2-2.0.ebuild 29 Mar 2011 14:03:34 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.2 2011/03/29 12:44:12 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.3 2011/03/29 14:03:34 scarabeus Exp $
EAPI=4
@@ -578,7 +578,6 @@
base_src_compile
# Build only user-requested docs if they're available.
if use doc ; then
- pushd mplayer
# select available languages from $LINGUAS
LINGUAS=${LINGUAS/zh/zh_CN}
local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
^ permalink raw reply [flat|nested] 9+ messages in thread* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild
@ 2011-03-29 16:22 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-03-29 16:22 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/03/29 16:22:13
Modified: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild
Log:
Add back mp3 useflag and enable external mpet123 as the implementation for it. With -mp3 libavcodec implementation is used.
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Revision Changes Path
1.4 media-video/mplayer2/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.3&r2=1.4
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangeLog 29 Mar 2011 14:03:34 -0000 1.3
+++ ChangeLog 29 Mar 2011 16:22:13 -0000 1.4
@@ -1,6 +1,11 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.3 2011/03/29 14:03:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.4 2011/03/29 16:22:13 scarabeus Exp $
+
+ 29 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-2.0.ebuild,
+ mplayer2-9999.ebuild:
+ Add back mp3 useflag and enable external mpet123 as the implementation for
+ it. With -mp3 libavcodec implementation is used.
29 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-2.0.ebuild,
mplayer2-9999.ebuild:
1.4 media-video/mplayer2/mplayer2-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.3&r2=1.4
Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mplayer2-9999.ebuild 29 Mar 2011 14:03:34 -0000 1.3
+++ mplayer2-9999.ebuild 29 Mar 2011 16:22:13 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.3 2011/03/29 14:03:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.4 2011/03/29 16:22:13 scarabeus Exp $
EAPI=4
@@ -15,7 +15,7 @@
bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts custom-cflags debug dga
directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca esd +faad fbcon
ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa
-libcaca lirc +live mad md5sum +mmx mmxext mng mpg123 nas
+libcaca lirc +live mad md5sum +mmx mmxext mng +mp3 nas
+network nut +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
radio +rar +real +rtc samba +shm +symlink sdl +speex sse sse2 ssse3
tga +theora +truetype +unicode v4l v4l2 vdpau
@@ -106,7 +106,7 @@
live? ( media-plugins/live )
mad? ( media-libs/libmad )
mng? ( media-libs/libmng )
- mpg123? ( media-sound/mpg123 )
+ mp3? ( media-sound/mpg123 )
nas? ( media-libs/nas )
nut? ( >=media-libs/libnut-661 )
png? ( media-libs/libpng )
@@ -382,11 +382,12 @@
myconf+=" --disable-musepack" # deprecated, libavcodec Musepack decoder is preferred
myconf+=" --disable-mp3lib" # internal so disable
use dts || myconf+=" --disable-libdca"
+ use mp3 || myconf+=" --disable-mpg123"
uses="a52 bs2b dv vorbis"
for i in ${uses}; do
use ${i} || myconf+=" --disable-lib${i}"
done
- uses="faad gif jpeg live mad mng mpg123 png pnm speex tga theora xanim"
+ uses="faad gif jpeg live mad mng png pnm speex tga theora xanim"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
1.4 media-video/mplayer2/mplayer2-2.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?r1=1.3&r2=1.4
Index: mplayer2-2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mplayer2-2.0.ebuild 29 Mar 2011 14:03:34 -0000 1.3
+++ mplayer2-2.0.ebuild 29 Mar 2011 16:22:13 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.3 2011/03/29 14:03:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.4 2011/03/29 16:22:13 scarabeus Exp $
EAPI=4
@@ -15,7 +15,7 @@
bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts custom-cflags debug dga
directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca esd +faad fbcon
ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa
-libcaca lirc +live mad md5sum +mmx mmxext mng mpg123 nas
+libcaca lirc +live mad md5sum +mmx mmxext mng +mp3 nas
+network nut +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
radio +rar +real +rtc samba +shm +symlink sdl +speex sse sse2 ssse3
tga +theora +truetype +unicode v4l v4l2 vdpau
@@ -106,7 +106,7 @@
live? ( media-plugins/live )
mad? ( media-libs/libmad )
mng? ( media-libs/libmng )
- mpg123? ( media-sound/mpg123 )
+ mp3? ( media-sound/mpg123 )
nas? ( media-libs/nas )
nut? ( >=media-libs/libnut-661 )
png? ( media-libs/libpng )
@@ -382,11 +382,12 @@
myconf+=" --disable-musepack" # deprecated, libavcodec Musepack decoder is preferred
myconf+=" --disable-mp3lib" # internal so disable
use dts || myconf+=" --disable-libdca"
+ use mp3 || myconf+=" --disable-mpg123"
uses="a52 bs2b dv vorbis"
for i in ${uses}; do
use ${i} || myconf+=" --disable-lib${i}"
done
- uses="faad gif jpeg live mad mng mpg123 png pnm speex tga theora xanim"
+ uses="faad gif jpeg live mad mng png pnm speex tga theora xanim"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
^ permalink raw reply [flat|nested] 9+ messages in thread* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild
@ 2011-03-31 18:47 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 9+ messages in thread
From: Samuli Suominen (ssuominen) @ 2011-03-31 18:47 UTC (permalink / raw
To: gentoo-commits
ssuominen 11/03/31 18:47:37
Modified: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild
Log:
Reset KEYWORDS to something that has actually been tested.
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Revision Changes Path
1.8 media-video/mplayer2/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.7&r2=1.8
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChangeLog 31 Mar 2011 07:15:00 -0000 1.7
+++ ChangeLog 31 Mar 2011 18:47:37 -0000 1.8
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.7 2011/03/31 07:15:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.8 2011/03/31 18:47:37 ssuominen Exp $
+
+ 31 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> mplayer2-2.0.ebuild,
+ mplayer2-9999.ebuild:
+ Reset KEYWORDS to something that has actually been tested.
31 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
Describe symlink useflag for mplayer.
1.6 media-video/mplayer2/mplayer2-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.5&r2=1.6
Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mplayer2-9999.ebuild 31 Mar 2011 07:05:48 -0000 1.5
+++ mplayer2-9999.ebuild 31 Mar 2011 18:47:37 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.5 2011/03/31 07:05:48 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.6 2011/03/31 18:47:37 ssuominen Exp $
EAPI=4
@@ -156,7 +156,7 @@
SLOT="0"
LICENSE="GPL-3"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~amd64 ~x86"
else
KEYWORDS=""
fi
1.6 media-video/mplayer2/mplayer2-2.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?r1=1.5&r2=1.6
Index: mplayer2-2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mplayer2-2.0.ebuild 31 Mar 2011 07:05:48 -0000 1.5
+++ mplayer2-2.0.ebuild 31 Mar 2011 18:47:37 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.5 2011/03/31 07:05:48 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.6 2011/03/31 18:47:37 ssuominen Exp $
EAPI=4
@@ -156,7 +156,7 @@
SLOT="0"
LICENSE="GPL-3"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~amd64 ~x86"
else
KEYWORDS=""
fi
^ permalink raw reply [flat|nested] 9+ messages in thread* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild
@ 2011-04-03 20:03 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-04-03 20:03 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/04/03 20:03:02
Modified: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild
Log:
Drop symlink functionality so this can be unmasked again.
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Revision Changes Path
1.10 media-video/mplayer2/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.9&r2=1.10
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ChangeLog 3 Apr 2011 12:55:15 -0000 1.9
+++ ChangeLog 3 Apr 2011 20:03:02 -0000 1.10
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.9 2011/04/03 12:55:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.10 2011/04/03 20:03:02 scarabeus Exp $
+
+ 03 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-2.0.ebuild,
+ mplayer2-9999.ebuild:
+ Drop symlink functionality so this can be unmasked again.
03 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
Internal mp3lib was dropped.
1.8 media-video/mplayer2/mplayer2-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.7&r2=1.8
Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mplayer2-9999.ebuild 3 Apr 2011 12:55:15 -0000 1.7
+++ mplayer2-9999.ebuild 3 Apr 2011 20:03:02 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.7 2011/04/03 12:55:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.8 2011/04/03 20:03:02 scarabeus Exp $
EAPI=4
@@ -17,7 +17,7 @@
ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa
libcaca lirc +live mad md5sum +mmx mmxext mng +mp3 nas
+network nut +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
-radio +rar +real +rtc samba +shm +symlink sdl +speex sse sse2 ssse3
+radio +rar +real +rtc samba +shm sdl +speex sse sse2 ssse3
tga +theora +truetype +unicode v4l v4l2 vdpau
+vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvmc"
@@ -125,7 +125,6 @@
truetype? ( ${FONT_RDEPS} )
vorbis? ( media-libs/libvorbis )
xanim? ( media-video/xanim )
- symlink? ( !media-video/mplayer )
"
X_DEPS="
@@ -241,11 +240,11 @@
if [[ -n ${namesuf} ]]; then
sed -e "/elif linux ; then/a\ _exesuf=\"${namesuf}\"" \
-i configure || die
- sed -e "/ -m 644 DOCS\/man\/en\/mplayer/i\ mv DOCS\/man\/en\/mplayer.1 DOCS\/man\/en\/mplayer${namesuf}.1" \
- -e "/ -m 644 DOCS\/man\/\$(lang)\/mplayer/i\ mv DOCS\/man\/\$(lang)\/mplayer.1 DOCS\/man\/\$(lang)\/mplayer${namesuf}.1" \
+ sed -e "/ -m 644 DOCS\/man\/en\/mplayer/i\ mv DOCS\/man\/en\/mplayer.1 DOCS\/man\/en\/${PN}.1" \
+ -e "/ -m 644 DOCS\/man\/\$(lang)\/mplayer/i\ mv DOCS\/man\/\$(lang)\/mplayer.1 DOCS\/man\/\$(lang)\/${PN}.1" \
-e "s/er.1/er${namesuf}.1/g" \
-i Makefile || die
- sed -e "s/mplayer/mplayer${namesuf}/" \
+ sed -e "s/mplayer/${PN}/" \
-i TOOLS/midentify.sh || die
fi
@@ -566,8 +565,8 @@
--prefix="${EPREFIX}"/usr \
--bindir="${EPREFIX}"/usr/bin \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
- --confdir="${EPREFIX}"/etc/mplayer${namesuf} \
- --datadir="${EPREFIX}"/usr/share/mplayer${namesuf} \
+ --confdir="${EPREFIX}"/etc/${PN} \
+ --datadir="${EPREFIX}"/usr/share/${PN} \
--mandir="${EPREFIX}"/usr/share/man \
--localedir="${EPREFIX}"/usr/share/locale \
--enable-translation \
@@ -583,7 +582,7 @@
local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
local BUILT_DOCS=""
for i in ${LINGUAS} ; do
- hasq ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
+ has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
done
if [[ -z $BUILT_DOCS ]]; then
emake -j1 -C DOCS/xml html-chunked
@@ -620,31 +619,29 @@
fi
if ! use ass && ! use truetype; then
- dodir /usr/share/mplayer${namesuf}/fonts
+ dodir /usr/share/${PN}/fonts
# Do this generic, as the mplayer people like to change the structure
# of their zips ...
for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
cp -pPR "${i}" "${ED}/usr/share/mplayer${namesuf}/fonts"
done
# Fix the font symlink ...
- rm -rf "${ED}/usr/share/mplayer${namesuf}/font"
+ rm -rf "${ED}/usr/share/${PN}/font"
dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer${namesuf}/font
fi
- insinto /etc/mplayer${namesuf}
+ insinto /etc/${PN}
newins "${S}/etc/example.conf" mplayer.conf
- cat >> "${ED}/etc/mplayer${namesuf}/mplayer.conf" << _EOF_
+ cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
# Config options can be section specific, global
# options should go in the default section
[default]
_EOF_
doins "${S}/etc/input.conf"
- if use osdmenu; then
- doins "${S}/etc/menu.conf"
- fi
+ use osdmenu && doins "${S}/etc/menu.conf"
if use ass || use truetype; then
- cat >> "${ED}/etc/mplayer${namesuf}/mplayer.conf" << _EOF_
+ cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
fontconfig=1
subfont-osd-scale=4
subfont-text-scale=3
@@ -658,17 +655,11 @@
# bug 256203
if use rar; then
- cat >> "${ED}/etc/mplayer${namesuf}/mplayer.conf" << _EOF_
+ cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
unrarexec=${EPREFIX}/usr/bin/unrar
_EOF_
fi
- dosym ../../../etc/mplayer${namesuf}/mplayer.conf /usr/share/mplayer${namesuf}/mplayer.conf
+ dosym ../../../etc/${PN}/mplayer.conf /usr/share/${PN}/mplayer.conf
newbin "${S}/TOOLS/midentify.sh" midentify${namesuf}
-
- if [[ -n ${namesuf} ]] && use symlink; then
- dosym /etc/mplayer${namesuf} /etc/mplayer
- dosym "mplayer${namesuf}" /usr/bin/mplayer
- dosym "midentify${namesuf}" /usr/bin/midentify
- fi
}
1.7 media-video/mplayer2/mplayer2-2.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?r1=1.6&r2=1.7
Index: mplayer2-2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mplayer2-2.0.ebuild 31 Mar 2011 18:47:37 -0000 1.6
+++ mplayer2-2.0.ebuild 3 Apr 2011 20:03:02 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.6 2011/03/31 18:47:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.7 2011/04/03 20:03:02 scarabeus Exp $
EAPI=4
@@ -17,7 +17,7 @@
ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa
libcaca lirc +live mad md5sum +mmx mmxext mng +mp3 nas
+network nut +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
-radio +rar +real +rtc samba +shm +symlink sdl +speex sse sse2 ssse3
+radio +rar +real +rtc samba +shm sdl +speex sse sse2 ssse3
tga +theora +truetype +unicode v4l v4l2 vdpau
+vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvmc"
@@ -125,7 +125,6 @@
truetype? ( ${FONT_RDEPS} )
vorbis? ( media-libs/libvorbis )
xanim? ( media-video/xanim )
- symlink? ( !media-video/mplayer )
"
X_DEPS="
@@ -241,11 +240,11 @@
if [[ -n ${namesuf} ]]; then
sed -e "/elif linux ; then/a\ _exesuf=\"${namesuf}\"" \
-i configure || die
- sed -e "/ -m 644 DOCS\/man\/en\/mplayer/i\ mv DOCS\/man\/en\/mplayer.1 DOCS\/man\/en\/mplayer${namesuf}.1" \
- -e "/ -m 644 DOCS\/man\/\$(lang)\/mplayer/i\ mv DOCS\/man\/\$(lang)\/mplayer.1 DOCS\/man\/\$(lang)\/mplayer${namesuf}.1" \
+ sed -e "/ -m 644 DOCS\/man\/en\/mplayer/i\ mv DOCS\/man\/en\/mplayer.1 DOCS\/man\/en\/${PN}.1" \
+ -e "/ -m 644 DOCS\/man\/\$(lang)\/mplayer/i\ mv DOCS\/man\/\$(lang)\/mplayer.1 DOCS\/man\/\$(lang)\/${PN}.1" \
-e "s/er.1/er${namesuf}.1/g" \
-i Makefile || die
- sed -e "s/mplayer/mplayer${namesuf}/" \
+ sed -e "s/mplayer/${PN}/" \
-i TOOLS/midentify.sh || die
fi
@@ -567,8 +566,8 @@
--prefix="${EPREFIX}"/usr \
--bindir="${EPREFIX}"/usr/bin \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
- --confdir="${EPREFIX}"/etc/mplayer${namesuf} \
- --datadir="${EPREFIX}"/usr/share/mplayer${namesuf} \
+ --confdir="${EPREFIX}"/etc/${PN} \
+ --datadir="${EPREFIX}"/usr/share/${PN} \
--mandir="${EPREFIX}"/usr/share/man \
--localedir="${EPREFIX}"/usr/share/locale \
--enable-translation \
@@ -584,7 +583,7 @@
local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
local BUILT_DOCS=""
for i in ${LINGUAS} ; do
- hasq ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
+ has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
done
if [[ -z $BUILT_DOCS ]]; then
emake -j1 -C DOCS/xml html-chunked
@@ -621,31 +620,29 @@
fi
if ! use ass && ! use truetype; then
- dodir /usr/share/mplayer${namesuf}/fonts
+ dodir /usr/share/${PN}/fonts
# Do this generic, as the mplayer people like to change the structure
# of their zips ...
for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
cp -pPR "${i}" "${ED}/usr/share/mplayer${namesuf}/fonts"
done
# Fix the font symlink ...
- rm -rf "${ED}/usr/share/mplayer${namesuf}/font"
+ rm -rf "${ED}/usr/share/${PN}/font"
dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer${namesuf}/font
fi
- insinto /etc/mplayer${namesuf}
+ insinto /etc/${PN}
newins "${S}/etc/example.conf" mplayer.conf
- cat >> "${ED}/etc/mplayer${namesuf}/mplayer.conf" << _EOF_
+ cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
# Config options can be section specific, global
# options should go in the default section
[default]
_EOF_
doins "${S}/etc/input.conf"
- if use osdmenu; then
- doins "${S}/etc/menu.conf"
- fi
+ use osdmenu && doins "${S}/etc/menu.conf"
if use ass || use truetype; then
- cat >> "${ED}/etc/mplayer${namesuf}/mplayer.conf" << _EOF_
+ cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
fontconfig=1
subfont-osd-scale=4
subfont-text-scale=3
@@ -659,17 +656,11 @@
# bug 256203
if use rar; then
- cat >> "${ED}/etc/mplayer${namesuf}/mplayer.conf" << _EOF_
+ cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
unrarexec=${EPREFIX}/usr/bin/unrar
_EOF_
fi
- dosym ../../../etc/mplayer${namesuf}/mplayer.conf /usr/share/mplayer${namesuf}/mplayer.conf
+ dosym ../../../etc/${PN}/mplayer.conf /usr/share/${PN}/mplayer.conf
newbin "${S}/TOOLS/midentify.sh" midentify${namesuf}
-
- if [[ -n ${namesuf} ]] && use symlink; then
- dosym /etc/mplayer${namesuf} /etc/mplayer
- dosym "mplayer${namesuf}" /usr/bin/mplayer
- dosym "midentify${namesuf}" /usr/bin/midentify
- fi
}
^ permalink raw reply [flat|nested] 9+ messages in thread* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild
@ 2011-04-03 20:46 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-04-03 20:46 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/04/03 20:46:39
Modified: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild
Log:
Don't set any font defaults, just rely on upstream.
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Revision Changes Path
1.11 media-video/mplayer2/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.10&r2=1.11
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog 3 Apr 2011 20:03:02 -0000 1.10
+++ ChangeLog 3 Apr 2011 20:46:39 -0000 1.11
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.10 2011/04/03 20:03:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.11 2011/04/03 20:46:39 scarabeus Exp $
+
+ 03 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-2.0.ebuild,
+ mplayer2-9999.ebuild:
+ Don't set any font defaults, just rely on upstream.
03 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-2.0.ebuild,
mplayer2-9999.ebuild:
1.9 media-video/mplayer2/mplayer2-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.8&r2=1.9
Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mplayer2-9999.ebuild 3 Apr 2011 20:03:02 -0000 1.8
+++ mplayer2-9999.ebuild 3 Apr 2011 20:46:39 -0000 1.9
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.8 2011/04/03 20:03:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.9 2011/04/03 20:46:39 scarabeus Exp $
EAPI=4
@@ -640,20 +640,7 @@
doins "${S}/etc/input.conf"
use osdmenu && doins "${S}/etc/menu.conf"
- if use ass || use truetype; then
- cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-ass-hinting=3
-ass-use-margins=1
-ass-font-scale=2
-ass-border-color=00000000
-ass-color=ffff0000
-_EOF_
- fi
-
- # bug 256203
+ # set unrar path when required
if use rar; then
cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
unrarexec=${EPREFIX}/usr/bin/unrar
1.8 media-video/mplayer2/mplayer2-2.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?r1=1.7&r2=1.8
Index: mplayer2-2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mplayer2-2.0.ebuild 3 Apr 2011 20:03:02 -0000 1.7
+++ mplayer2-2.0.ebuild 3 Apr 2011 20:46:39 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.7 2011/04/03 20:03:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.8 2011/04/03 20:46:39 scarabeus Exp $
EAPI=4
@@ -641,20 +641,7 @@
doins "${S}/etc/input.conf"
use osdmenu && doins "${S}/etc/menu.conf"
- if use ass || use truetype; then
- cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-ass-hinting=3
-ass-use-margins=1
-ass-font-scale=2
-ass-border-color=00000000
-ass-color=ffff0000
-_EOF_
- fi
-
- # bug 256203
+ # set unrar path when required
if use rar; then
cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
unrarexec=${EPREFIX}/usr/bin/unrar
^ permalink raw reply [flat|nested] 9+ messages in thread* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild
@ 2011-04-03 22:16 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-04-03 22:16 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/04/03 22:16:37
Modified: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild
Log:
Drop local setting of version and rely on buildscript :)
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Revision Changes Path
1.12 media-video/mplayer2/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.11&r2=1.12
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog 3 Apr 2011 20:46:39 -0000 1.11
+++ ChangeLog 3 Apr 2011 22:16:37 -0000 1.12
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.11 2011/04/03 20:46:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.12 2011/04/03 22:16:37 scarabeus Exp $
+
+ 03 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-2.0.ebuild,
+ mplayer2-9999.ebuild:
+ Drop local setting of version and rely on buildscript :)
03 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-2.0.ebuild,
mplayer2-9999.ebuild:
1.10 media-video/mplayer2/mplayer2-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.9&r2=1.10
Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mplayer2-9999.ebuild 3 Apr 2011 20:46:39 -0000 1.9
+++ mplayer2-9999.ebuild 3 Apr 2011 22:16:37 -0000 1.10
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.9 2011/04/03 20:46:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.10 2011/04/03 22:16:37 scarabeus Exp $
EAPI=4
@@ -223,13 +223,6 @@
}
src_prepare() {
- if [[ ${PV} = *9999* ]]; then
- git_src_prepare
- # Set GIT version manually
- echo "GIT-r$(git rev-list HEAD|wc -l)-$(git describe --always)" \
- > VERSION || die
- fi
-
# fix path to bash executable in configure scripts
local bash_scripts="configure version.sh"
sed -i \
1.9 media-video/mplayer2/mplayer2-2.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?r1=1.8&r2=1.9
Index: mplayer2-2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mplayer2-2.0.ebuild 3 Apr 2011 20:46:39 -0000 1.8
+++ mplayer2-2.0.ebuild 3 Apr 2011 22:16:37 -0000 1.9
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.8 2011/04/03 20:46:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.9 2011/04/03 22:16:37 scarabeus Exp $
EAPI=4
@@ -223,13 +223,6 @@
}
src_prepare() {
- if [[ ${PV} = *9999* ]]; then
- git_src_prepare
- # Set GIT version manually
- echo "GIT-r$(git rev-list HEAD|wc -l)-$(git describe --always)" \
- > VERSION || die
- fi
-
# fix path to bash executable in configure scripts
local bash_scripts="configure version.sh"
sed -i \
^ permalink raw reply [flat|nested] 9+ messages in thread* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild
@ 2011-04-04 12:44 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-04-04 12:44 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/04/04 12:44:34
Modified: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild
Log:
Allow enabling/disabling xvid decoding over xvid.
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Revision Changes Path
1.13 media-video/mplayer2/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.12&r2=1.13
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ChangeLog 3 Apr 2011 22:16:37 -0000 1.12
+++ ChangeLog 4 Apr 2011 12:44:34 -0000 1.13
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.12 2011/04/03 22:16:37 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.13 2011/04/04 12:44:34 scarabeus Exp $
+
+ 04 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-2.0.ebuild,
+ mplayer2-9999.ebuild:
+ Allow enabling/disabling xvid decoding over xvid.
03 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-2.0.ebuild,
mplayer2-9999.ebuild:
1.11 media-video/mplayer2/mplayer2-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.10&r2=1.11
Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mplayer2-9999.ebuild 3 Apr 2011 22:16:37 -0000 1.10
+++ mplayer2-9999.ebuild 4 Apr 2011 12:44:34 -0000 1.11
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.10 2011/04/03 22:16:37 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.11 2011/04/04 12:44:34 scarabeus Exp $
EAPI=4
@@ -19,7 +19,7 @@
+network nut +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
radio +rar +real +rtc samba +shm sdl +speex sse sse2 ssse3
tga +theora +truetype +unicode v4l v4l2 vdpau
-+vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvmc"
++vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvid xvmc"
VIDEO_CARDS="s3virge mga tdfx vesa"
for x in ${VIDEO_CARDS}; do
@@ -125,6 +125,7 @@
truetype? ( ${FONT_RDEPS} )
vorbis? ( media-libs/libvorbis )
xanim? ( media-video/xanim )
+ xvid? ( media-libs/xvid )
"
X_DEPS="
@@ -378,17 +379,11 @@
for i in ${uses}; do
use ${i} || myconf+=" --disable-lib${i}"
done
- uses="faad gif jpeg live mad mng png pnm speex tga theora xanim"
+ uses="faad gif jpeg live mad mng png pnm speex tga theora xanim xvid"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
- # Encoding
- uses="xvid"
- for i in ${uses}; do
- myconf+=" --disable-${i}"
- done
-
#################
# Binary codecs #
#################
1.10 media-video/mplayer2/mplayer2-2.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?r1=1.9&r2=1.10
Index: mplayer2-2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mplayer2-2.0.ebuild 3 Apr 2011 22:16:37 -0000 1.9
+++ mplayer2-2.0.ebuild 4 Apr 2011 12:44:34 -0000 1.10
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.9 2011/04/03 22:16:37 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.10 2011/04/04 12:44:34 scarabeus Exp $
EAPI=4
@@ -19,7 +19,7 @@
+network nut +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
radio +rar +real +rtc samba +shm sdl +speex sse sse2 ssse3
tga +theora +truetype +unicode v4l v4l2 vdpau
-+vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvmc"
++vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvid xvmc"
VIDEO_CARDS="s3virge mga tdfx vesa"
for x in ${VIDEO_CARDS}; do
@@ -125,6 +125,7 @@
truetype? ( ${FONT_RDEPS} )
vorbis? ( media-libs/libvorbis )
xanim? ( media-video/xanim )
+ xvid? ( media-libs/xvid )
"
X_DEPS="
@@ -379,17 +380,11 @@
for i in ${uses}; do
use ${i} || myconf+=" --disable-lib${i}"
done
- uses="faad gif jpeg live mad mng png pnm speex tga theora xanim"
+ uses="faad gif jpeg live mad mng png pnm speex tga theora xanim xvid"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
- # Encoding
- uses="xvid"
- for i in ${uses}; do
- myconf+=" --disable-${i}"
- done
-
#################
# Binary codecs #
#################
^ permalink raw reply [flat|nested] 9+ messages in thread* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild
@ 2011-05-03 14:57 Jeremy Olexa (darkside)
0 siblings, 0 replies; 9+ messages in thread
From: Jeremy Olexa (darkside) @ 2011-05-03 14:57 UTC (permalink / raw
To: gentoo-commits
darkside 11/05/03 14:57:25
Modified: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild
Log:
Add ~amd64-linux, tested by myself
(Portage version: 2.1.9.46/cvs/Linux i686)
Revision Changes Path
1.16 media-video/mplayer2/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.15&r2=1.16
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ChangeLog 1 May 2011 16:34:44 -0000 1.15
+++ ChangeLog 3 May 2011 14:57:25 -0000 1.16
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.15 2011/05/01 16:34:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.16 2011/05/03 14:57:25 darkside Exp $
+
+ 03 May 2011; Jeremy Olexa <darkside@gentoo.org> mplayer2-2.0.ebuild,
+ mplayer2-9999.ebuild:
+ Add ~amd64-linux, tested by myself
01 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> +files/2.0-ffmpeg.patch,
mplayer2-2.0.ebuild:
1.13 media-video/mplayer2/mplayer2-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.12&r2=1.13
Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mplayer2-9999.ebuild 12 Apr 2011 17:19:10 -0000 1.12
+++ mplayer2-9999.ebuild 3 May 2011 14:57:25 -0000 1.13
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.12 2011/04/12 17:19:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.13 2011/05/03 14:57:25 darkside Exp $
EAPI=4
@@ -25,7 +25,7 @@
LICENSE="GPL-3"
SLOT="0"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~x86 ~amd64-linux"
else
KEYWORDS=""
fi
1.12 media-video/mplayer2/mplayer2-2.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?r1=1.11&r2=1.12
Index: mplayer2-2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mplayer2-2.0.ebuild 1 May 2011 16:34:44 -0000 1.11
+++ mplayer2-2.0.ebuild 3 May 2011 14:57:25 -0000 1.12
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.11 2011/05/01 16:34:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.12 2011/05/03 14:57:25 darkside Exp $
EAPI=4
@@ -156,7 +156,7 @@
SLOT="0"
LICENSE="GPL-3"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~x86 ~amd64-linux"
else
KEYWORDS=""
fi
^ permalink raw reply [flat|nested] 9+ messages in thread* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild
@ 2011-11-01 1:05 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 9+ messages in thread
From: Samuli Suominen (ssuominen) @ 2011-11-01 1:05 UTC (permalink / raw
To: gentoo-commits
ssuominen 11/11/01 01:05:08
Modified: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild
Log:
Rename USE="v4l2" to USE="v4l" while removing support for video4linux 1.x wrt #385241
(Portage version: 2.2.0_alpha71_p73/cvs/Linux x86_64)
Revision Changes Path
1.27 media-video/mplayer2/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/ChangeLog?r1=1.26&r2=1.27
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ChangeLog 31 Oct 2011 12:25:43 -0000 1.26
+++ ChangeLog 1 Nov 2011 01:05:08 -0000 1.27
@@ -1,6 +1,11 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.26 2011/10/31 12:25:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.27 2011/11/01 01:05:08 ssuominen Exp $
+
+ 01 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> mplayer2-2.0.ebuild,
+ mplayer2-9999.ebuild:
+ Rename USE="v4l2" to USE="v4l" while removing support for video4linux 1.x wrt
+ #385241
31 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
Drop the osdmenu useflag, as upstream dropped code for it.
1.17 media-video/mplayer2/mplayer2-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild?r1=1.16&r2=1.17
Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mplayer2-9999.ebuild 31 Oct 2011 12:25:43 -0000 1.16
+++ mplayer2-9999.ebuild 1 Nov 2011 01:05:08 -0000 1.17
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.16 2011/10/31 12:25:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.17 2011/11/01 01:05:08 ssuominen Exp $
EAPI=4
@@ -320,12 +320,13 @@
myconf+=" --disable-tv-bsdbt848"
# broken upstream, won't work with recent kernels
myconf+=" --disable-ivtv"
- if { use dvb || use v4l || use v4l2 || use pvr || use radio; }; then
+ # v4l1 is gone since linux-headers-2.6.38
+ myconf+=" --disable-tv-v4l1"
+ if { use dvb || use v4l || use pvr || use radio; }; then
use dvb || myconf+=" --disable-dvb"
use pvr || myconf+=" --disable-pvr"
- use v4l || myconf+=" --disable-tv-v4l1"
- use v4l2 || myconf+=" --disable-tv-v4l2"
- if use radio && { use dvb || use v4l || use v4l2; }; then
+ use v4l || myconf+=" --disable-tv-v4l2"
+ if use radio && { use dvb || use v4l; }; then
myconf+="
--enable-radio
--disable-radio-capture
@@ -339,7 +340,6 @@
else
myconf+="
--disable-tv
- --disable-tv-v4l1
--disable-tv-v4l2
--disable-radio
--disable-radio-v4l2
1.20 media-video/mplayer2/mplayer2-2.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild?r1=1.19&r2=1.20
Index: mplayer2-2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mplayer2-2.0.ebuild 9 Oct 2011 16:36:34 -0000 1.19
+++ mplayer2-2.0.ebuild 1 Nov 2011 01:05:08 -0000 1.20
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.19 2011/10/09 16:36:34 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.20 2011/11/01 01:05:08 ssuominen Exp $
EAPI=4
@@ -18,7 +18,7 @@
libcaca lirc +live mad md5sum +mmx mmxext mng +mp3 nas
+network nut +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
radio +rar +real +rtc samba +shm sdl +speex sse sse2 ssse3
-tga +theora +truetype +unicode v4l v4l2 vdpau
+tga +theora +truetype +unicode v4l vdpau
+vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvid xvmc"
VIDEO_CARDS="s3virge mga tdfx vesa"
@@ -342,12 +342,13 @@
myconf+=" --disable-tv-bsdbt848"
# broken upstream, won't work with recent kernels
myconf+=" --disable-ivtv"
- if { use dvb || use v4l || use v4l2 || use pvr || use radio; }; then
+ # v4l1 is gone since linux-headers-2.6.38
+ myconf+=" --disable-tv-v4l1"
+ if { use dvb || use v4l || use pvr || use radio; }; then
use dvb || myconf+=" --disable-dvb"
use pvr || myconf+=" --disable-pvr"
- use v4l || myconf+=" --disable-tv-v4l1"
- use v4l2 || myconf+=" --disable-tv-v4l2"
- if use radio && { use dvb || use v4l || use v4l2; }; then
+ use v4l || myconf+=" --disable-tv-v4l2"
+ if use radio && { use dvb || use v4l; }; then
myconf+="
--enable-radio
--disable-radio-capture
@@ -361,7 +362,6 @@
else
myconf+="
--disable-tv
- --disable-tv-v4l1
--disable-tv-v4l2
--disable-radio
--disable-radio-v4l2
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2011-11-01 1:05 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-29 14:03 [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: ChangeLog mplayer2-9999.ebuild mplayer2-2.0.ebuild Tomas Chvatal (scarabeus)
-- strict thread matches above, loose matches on Subject: below --
2011-03-29 16:22 Tomas Chvatal (scarabeus)
2011-03-31 18:47 Samuli Suominen (ssuominen)
2011-04-03 20:03 Tomas Chvatal (scarabeus)
2011-04-03 20:46 Tomas Chvatal (scarabeus)
2011-04-03 22:16 Tomas Chvatal (scarabeus)
2011-04-04 12:44 Tomas Chvatal (scarabeus)
2011-05-03 14:57 Jeremy Olexa (darkside)
2011-11-01 1:05 Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox