public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: metadata.xml ChangeLog mplayer-9999.ebuild
@ 2009-05-30 21:31 Steve Dibb (beandog)
  0 siblings, 0 replies; 8+ messages in thread
From: Steve Dibb (beandog) @ 2009-05-30 21:31 UTC (permalink / raw
  To: gentoo-commits

beandog     09/05/30 21:31:18

  Modified:             metadata.xml ChangeLog mplayer-9999.ebuild
  Log:
  Fix skin install, bug 271904; change gtk use flag to gmplayer
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.16                 media-video/mplayer/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/metadata.xml?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/metadata.xml?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/metadata.xml?r1=1.15&r2=1.16

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/metadata.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- metadata.xml	29 May 2009 02:17:58 -0000	1.15
+++ metadata.xml	30 May 2009 21:31:18 -0000	1.16
@@ -20,6 +20,7 @@
     <flag name="enca">Enables support for charset discovery and conversion</flag>
     <flag name="faac">Use external faac library for AAC encoding</flag>
     <flag name="faad">Use external faad library for AAC decoding</flag>
+	<flag name="gmplayer">Build gmplayer, a GTK+ MPlayer gui (UNSUPPORTED)</flag>
 	<flag name="gtk">Build gmplayer, a GTK+ MPlayer gui (UNSUPPORTED)</flag>
     <flag name="live">Enables live.com streaming media support</flag>
     <flag name="md5sum">Enables md5sum video output</flag>



1.634                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.634&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.634&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.633&r2=1.634

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.633
retrieving revision 1.634
diff -u -r1.633 -r1.634
--- ChangeLog	29 May 2009 02:17:59 -0000	1.633
+++ ChangeLog	30 May 2009 21:31:18 -0000	1.634
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.633 2009/05/29 02:17:59 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.634 2009/05/30 21:31:18 beandog Exp $
+
+  30 May 2009; Steve Dibb <beandog@gentoo.org> mplayer-9999.ebuild,
+  metadata.xml:
+  Fix skin install, bug 271904; change gtk use flag to gmplayer
 
   29 May 2009; Steve Dibb <beandog@gentoo.org>
   mplayer-1.0_rc2_p28450.ebuild, mplayer-9999.ebuild, metadata.xml:



1.4                  media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.3&r2=1.4

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mplayer-9999.ebuild	29 May 2009 02:17:59 -0000	1.3
+++ mplayer-9999.ebuild	30 May 2009 21:31:18 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.3 2009/05/29 02:17:59 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.4 2009/05/30 21:31:18 beandog Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@
 IUSE="3dnow 3dnowext +a52 +aac aalib +alsa altivec +amrnb +amrwb arts +ass
 bidi bindist bl +cddb +cdio cdparanoia cpudetection custom-cflags
 custom-cpuopts debug dga +dirac directfb doc +dts +dv dvb +dvd +dvdnav dxr3
-+enca +encode esd +faac +faad fbcon ftp gif ggi -gtk +iconv ipv6 jack
++enca +encode esd +faac +faad fbcon ftp gif ggi -gmplayer +iconv ipv6 jack
 joystick jpeg kernel_linux ladspa libcaca lirc +live lzo mad md5sum +mmx
 mmxext mng +mp2 +mp3 musepack nas +nemesi +network nut openal +opengl +osdmenu
 oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc samba
@@ -34,7 +34,7 @@
 	!iconv? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
 		mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
 		mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
-	gtk? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 )
+	gmplayer? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 )
 	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )"
 
 DESCRIPTION="Media Player for Linux"
@@ -76,7 +76,7 @@
 	gif? ( media-libs/giflib )
 	ggi? ( media-libs/libggi
 		media-libs/libggiwmh )
-	gtk? ( media-libs/libpng
+	gmplayer? ( media-libs/libpng
 		x11-libs/libXxf86vm
 		x11-libs/libXext
 		x11-libs/libXi
@@ -135,7 +135,7 @@
 	xinerama? ( x11-proto/xineramaproto )
 	xv? ( x11-proto/videoproto
 		  x11-proto/xf86vidmodeproto )
-	gtk? ( x11-proto/xextproto
+	gmplayer? ( x11-proto/xextproto
 		   x11-proto/xf86vidmodeproto )
 	X? ( x11-proto/xextproto
 		 x11-proto/xf86vidmodeproto )
@@ -164,10 +164,9 @@
 		elog "output messages.  See bug #228799."
 	fi
 
-	if use gtk; then
+	if use gmplayer; then
 		ewarn ""
-		ewarn "You've enabled the 'gtk' use flag which will build"
-		ewarn "GMPlayer, which is no longer actively developed upstream"
+		ewarn "GMPlayer is no longer actively developed upstream"
 		ewarn "and is not supported by Gentoo.  There are alternatives"
 		ewarn "for a GUI frontend: smplayer, gnome-mplayer and kmplayer."
 	fi
@@ -219,7 +218,10 @@
 			font-arial-cp1250.tar.bz2
 	fi
 
-	use gtk && unpack "Blue-${BLUV}.tar.bz2"
+
+	cd "${WORKDIR}"
+
+	use gmplayer && unpack "Blue-${BLUV}.tar.bz2"
 
 	use svga && unpack "svgalib_helper-${SVGV}-mplayer.tar.bz2"
 
@@ -367,7 +369,7 @@
 		--disable-mp3lib"
 	use schroedinger || myconf="${myconf} --disable-libschroedinger-lavc"
 	use xanim && myconf="${myconf} --xanimcodecsdir=/usr/lib/xanim/mods"
-	! use png && ! use gtk && myconf="${myconf} --disable-png"
+	! use png && ! use gmplayer && myconf="${myconf} --disable-png"
 	for x in gif jpeg live mad mng musepack pnm speex tga theora xanim; do
 		use ${x} || myconf="${myconf} --disable-${x}"
 	done
@@ -443,7 +445,7 @@
 
 	# GTK gmplayer gui
 	# Unsupported by Gentoo, upstream has dropped development
-	myconf="${myconf} $(use_enable gtk gui)"
+	myconf="${myconf} $(use_enable gmplayer gui)"
 
 	if use xv; then
 		if use xvmc; then
@@ -558,7 +560,7 @@
 	use doc && dohtml -r "${S}"/DOCS/HTML/*
 
 	# Install the default Skin and Gnome menu entry
-	if use gtk; then
+	if use gmplayer; then
 		dodir /usr/share/mplayer/skins
 		cp -r "${WORKDIR}/Blue" \
 			"${D}/usr/share/mplayer/skins/default" || die "cp skins died"






^ permalink raw reply	[flat|nested] 8+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: metadata.xml ChangeLog mplayer-9999.ebuild
@ 2009-07-27  6:56 Alexis Ballier (aballier)
  0 siblings, 0 replies; 8+ messages in thread
From: Alexis Ballier (aballier) @ 2009-07-27  6:56 UTC (permalink / raw
  To: gentoo-commits

aballier    09/07/27 06:56:35

  Modified:             metadata.xml ChangeLog mplayer-9999.ebuild
  Log:
  Add an option to link against system shared ffmpeg instead of building its own copy and statically linking to it. Saves around 40Mb here but is discouraged by upstream.
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.18                 media-video/mplayer/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/metadata.xml?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/metadata.xml?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/metadata.xml?r1=1.17&r2=1.18

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/metadata.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- metadata.xml	4 Jun 2009 16:40:43 -0000	1.17
+++ metadata.xml	27 Jul 2009 06:56:35 -0000	1.18
@@ -18,6 +18,7 @@
     <flag name="dvdnav">Use forked libdvdnav, navigate menus in GUIs</flag>
     <flag name="dxr3">Enable DXR3/H+ video output</flag>
     <flag name="enca">Enables support for charset discovery and conversion</flag>
+    <flag name="external-ffmpeg">Use shared FFmpeg libraries instead of static bundled ones. Discouraged by upstream.</flag>
     <flag name="faac">Use external faac library for AAC encoding</flag>
     <flag name="faad">Use external faad library for AAC decoding</flag>
 	<flag name="gmplayer">Build gmplayer, a GTK+ MPlayer gui (UNSUPPORTED)</flag>



1.654                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.654&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.654&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.653&r2=1.654

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.653
retrieving revision 1.654
diff -u -r1.653 -r1.654
--- ChangeLog	26 Jul 2009 10:48:35 -0000	1.653
+++ ChangeLog	27 Jul 2009 06:56:35 -0000	1.654
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.653 2009/07/26 10:48:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.654 2009/07/27 06:56:35 aballier Exp $
+
+  27 Jul 2009; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild,
+  metadata.xml:
+  Add an option to link against system shared ffmpeg instead of building its
+  own copy and statically linking to it. Saves around 40Mb here but is
+  discouraged by upstream.
 
   26 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
   mplayer-1.0_rc2_p20090530.ebuild, mplayer-9999.ebuild:



1.11                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.10&r2=1.11

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mplayer-9999.ebuild	26 Jul 2009 10:48:35 -0000	1.10
+++ mplayer-9999.ebuild	27 Jul 2009 06:56:35 -0000	1.11
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.10 2009/07/26 10:48:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.11 2009/07/27 06:56:35 aballier Exp $
 
 EAPI="2"
 
@@ -14,9 +14,9 @@
 IUSE="3dnow 3dnowext +a52 +aac aalib +alsa altivec +ass
 bidi bindist bl +cddb +cdio cdparanoia cpudetection custom-cflags
 custom-cpuopts debug dga +dirac directfb doc +dts +dv dvb +dvd +dvdnav dxr3
-+enca +encode esd +faac +faad fbcon ftp gif ggi -gmplayer +iconv ipv6 jack
-joystick jpeg kernel_linux ladspa libcaca lirc +live lzo mad md5sum +mmx
-mmxext mng +mp2 +mp3 nas +nemesi +network nut openal +opengl +osdmenu
++enca +encode esd external-ffmpeg +faac +faad fbcon ftp gif ggi -gmplayer +iconv
+ipv6 jack joystick jpeg kernel_linux ladspa libcaca lirc +live lzo mad md5sum
++mmx mmxext mng +mp2 +mp3 nas +nemesi +network nut openal +opengl +osdmenu
 oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc samba +shm
 +schroedinger sdl +speex sse sse2 ssse3 svga teletext tga +theora +tremor
 +truetype +unicode v4l v4l2 vdpau vidix +vorbis win32codecs +X +x264 xanim
@@ -87,6 +87,7 @@
 	)
 	esd? ( media-sound/esound )
 	enca? ( app-i18n/enca )
+	external-ffmpeg? ( media-video/ffmpeg )
 	faad? ( !aac? ( media-libs/faad2 ) )
 	gif? ( media-libs/giflib )
 	ggi? (
@@ -545,6 +546,12 @@
 		unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS YASMFLAGS
 	fi
 
+	#################
+	# External FFmpeg #
+	#################
+
+	use external-ffmpeg && myconf="${myconf} --disable-libavutil_a --disable-libavcodec_a --disable-libavformat_a --disable-libpostproc_a --disable-libswscale_a"
+
 	myconf="--cc=$(tc-getCC) \
 		--host-cc=$(tc-getBUILD_CC) \
 		--prefix=/usr \






^ permalink raw reply	[flat|nested] 8+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: metadata.xml ChangeLog mplayer-9999.ebuild
@ 2010-06-12 18:14 Dror Levin (spatz)
  0 siblings, 0 replies; 8+ messages in thread
From: Dror Levin (spatz) @ 2010-06-12 18:14 UTC (permalink / raw
  To: gentoo-commits

spatz       10/06/12 18:14:40

  Modified:             metadata.xml ChangeLog mplayer-9999.ebuild
  Log:
  Add vpx support via media-libs/libvpx.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.29                 media-video/mplayer/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?r1=1.28&r2=1.29

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/metadata.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- metadata.xml	23 Apr 2010 13:06:21 -0000	1.28
+++ metadata.xml	12 Jun 2010 18:14:40 -0000	1.29
@@ -44,6 +44,7 @@
 	<flag name="tremor">Enable internal support for Vorbis</flag>
 	<flag name="twolame">Enable twolame MPEG-2 encoding</flag>
     <flag name="vdpau">Enables experimental VDPAU support (requires nVidia video cards) to offload MPEG2/MPEG4/VC1/WMV CPU processing to video card</flag>
+	<flag name="vpx">Enables vp8 codec support using libvpx</flag>
     <flag name="vidix">Support for vidix video output</flag>
     <flag name="xanim">Enables support for xanim based codecs</flag>
     <flag name="xvmc">Enables X-Video Motion Compensation support</flag>



1.746                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.746&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.746&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.745&r2=1.746

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.745
retrieving revision 1.746
diff -u -r1.745 -r1.746
--- ChangeLog	11 Jun 2010 13:59:49 -0000	1.745
+++ ChangeLog	12 Jun 2010 18:14:40 -0000	1.746
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.745 2010/06/11 13:59:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.746 2010/06/12 18:14:40 spatz Exp $
+
+  12 Jun 2010; Dror Levin <spatz@gentoo.org> mplayer-9999.ebuild,
+  metadata.xml:
+  Add vpx support via media-libs/libvpx.
 
   11 Jun 2010; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
   fix the configure options building with mencoder disabled, bug #323097



1.65                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.65&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.65&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.64&r2=1.65

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- mplayer-9999.ebuild	11 Jun 2010 13:59:50 -0000	1.64
+++ mplayer-9999.ebuild	12 Jun 2010 18:14:40 -0000	1.65
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.64 2010/06/11 13:59:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.65 2010/06/12 18:14:40 spatz Exp $
 
 EAPI="2"
 
@@ -18,8 +18,8 @@
 libcaca lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal
 amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc
 samba +shm +schroedinger sdl +speex sse sse2 ssse3 svga tga +theora +tremor
-+truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix +vorbis win32codecs
-+X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran"
++truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix +vorbis vpx
+win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran"
 [[ ${PV} == *9999* ]] && IUSE+=" external-ffmpeg"
 
 VIDEO_CARDS="s3virge mga tdfx vesa"
@@ -147,6 +147,7 @@
 	theora? ( media-libs/libtheora[encode?] )
 	truetype? ( ${FONT_RDEPS} )
 	vorbis? ( media-libs/libvorbis )
+	vpx? ( media-libs/libvpx )
 	xanim? ( media-video/xanim )
 "
 
@@ -441,6 +442,7 @@
 			--disable-libvorbis
 		"
 	fi
+	use vpx || myconf+=" --disable-libvpx-lavc"
 	# Encoding
 	uses="faac x264 xvid toolame twolame"
 	if use encode; then






^ permalink raw reply	[flat|nested] 8+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: metadata.xml ChangeLog mplayer-9999.ebuild
@ 2010-07-17  3:09 Steve Dibb (beandog)
  0 siblings, 0 replies; 8+ messages in thread
From: Steve Dibb (beandog) @ 2010-07-17  3:09 UTC (permalink / raw
  To: gentoo-commits

beandog     10/07/17 03:09:49

  Modified:             metadata.xml ChangeLog mplayer-9999.ebuild
  Log:
  Add bluray use flag for playback through libbluray
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.30                 media-video/mplayer/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?r1=1.29&r2=1.30

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/metadata.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- metadata.xml	12 Jun 2010 18:14:40 -0000	1.29
+++ metadata.xml	17 Jul 2010 03:09:48 -0000	1.30
@@ -10,6 +10,7 @@
     <flag name="amr">Enables Adaptive Multi-Rate format support</flag>
     <flag name="ass">Internal SRT/SSA/ASS (SubRip / SubStation Alpha) subtitle support</flag>
     <flag name="bl">Blinkenlights video output</flag>
+    <flag name="bluray">Enable playback of Blu-ray filesystems</flag>
 	<flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
     <flag name="cdio">Use libcdio for CD support (instead of cdparanoia)</flag>
     <flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag>



1.755                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.755&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.755&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.754&r2=1.755

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.754
retrieving revision 1.755
diff -u -r1.754 -r1.755
--- ChangeLog	30 Jun 2010 16:45:23 -0000	1.754
+++ ChangeLog	17 Jul 2010 03:09:48 -0000	1.755
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.754 2010/06/30 16:45:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.755 2010/07/17 03:09:48 beandog Exp $
+
+  17 Jul 2010; Steve Dibb <beandog@gentoo.org> mplayer-9999.ebuild:
+  Add bluray use flag for playback through libbluray
 
   30 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
   Drop svga useflag.



1.71                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.71&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.71&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.70&r2=1.71

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- mplayer-9999.ebuild	30 Jun 2010 16:45:23 -0000	1.70
+++ mplayer-9999.ebuild	17 Jul 2010 03:09:49 -0000	1.71
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.70 2010/06/30 16:45:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.71 2010/07/17 03:09:49 beandog Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@
 
 [[ ${PV} != *9999* ]] && MPLAYER_REVISION=SVN-r30554
 
-IUSE="3dnow 3dnowext +a52 aalib +alsa altivec +ass bidi bindist bl bs2b
+IUSE="3dnow 3dnowext +a52 aalib +alsa altivec +ass bidi bindist bl bluray bs2b
 +cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac directfb
 doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon ftp
 gif ggi -gmplayer +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
@@ -95,6 +95,7 @@
 	amr? ( !bindist? ( media-libs/opencore-amr ) )
 	ass? ( ${FONT_RDEPS} media-libs/libass[enca?] )
 	bidi? ( dev-libs/fribidi )
+	bluray? ( media-libs/libbluray )
 	bs2b? ( media-libs/libbs2b )
 	cdio? ( dev-libs/libcdio )
 	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
@@ -290,6 +291,7 @@
 		use ${i} || myconf+=" --disable-${i}"
 	done
 	use bidi || myconf+=" --disable-fribidi"
+	use bluray || myconf+=" --disable-bluray"
 	use ipv6 || myconf+=" --disable-inet6"
 	use nut || myconf+=" --disable-libnut"
 	use rar || myconf+=" --disable-unrarexec"






^ permalink raw reply	[flat|nested] 8+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: metadata.xml ChangeLog mplayer-9999.ebuild
@ 2010-07-17  3:47 Steve Dibb (beandog)
  0 siblings, 0 replies; 8+ messages in thread
From: Steve Dibb (beandog) @ 2010-07-17  3:47 UTC (permalink / raw
  To: gentoo-commits

beandog     10/07/17 03:47:20

  Modified:             metadata.xml ChangeLog mplayer-9999.ebuild
  Log:
  Add support for external libass libraries, bug 327733
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.31                 media-video/mplayer/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?r1=1.30&r2=1.31

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/metadata.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- metadata.xml	17 Jul 2010 03:09:48 -0000	1.30
+++ metadata.xml	17 Jul 2010 03:47:20 -0000	1.31
@@ -23,6 +23,7 @@
     <flag name="faac">Use external faac library for AAC encoding</flag>
     <flag name="faad">Use external faad library for AAC decoding</flag>
 	<flag name="gmplayer">Build gmplayer, a GTK+ MPlayer gui (UNSUPPORTED)</flag>
+    <flag name="libass">External SRT/SSA/ASS (SubRip / SubStation Alpha) subtitle support through libass</flag>
     <flag name="live">Enables live.com streaming media support</flag>
     <flag name="md5sum">Enables md5sum video output</flag>
     <flag name="mmxext">Enables mmx2 support</flag>



1.756                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.756&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.756&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.755&r2=1.756

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.755
retrieving revision 1.756
diff -u -r1.755 -r1.756
--- ChangeLog	17 Jul 2010 03:09:48 -0000	1.755
+++ ChangeLog	17 Jul 2010 03:47:20 -0000	1.756
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.755 2010/07/17 03:09:48 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.756 2010/07/17 03:47:20 beandog Exp $
+
+  17 Jul 2010; Steve Dibb <beandog@gentoo.org> mplayer-9999.ebuild,
+  metadata.xml:
+  Add support for external libass libraries, bug 327733
 
   17 Jul 2010; Steve Dibb <beandog@gentoo.org> mplayer-9999.ebuild:
   Add bluray use flag for playback through libbluray



1.72                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.72&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.72&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.71&r2=1.72

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- mplayer-9999.ebuild	17 Jul 2010 03:09:49 -0000	1.71
+++ mplayer-9999.ebuild	17 Jul 2010 03:47:20 -0000	1.72
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.71 2010/07/17 03:09:49 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.72 2010/07/17 03:47:20 beandog Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@
 +cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac directfb
 doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon ftp
 gif ggi -gmplayer +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-libcaca lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal
+libass libcaca lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal
 amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc
 samba +shm +schroedinger sdl +speex sse sse2 ssse3 tga +theora +tremor
 +truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix +vorbis vpx
@@ -93,7 +93,7 @@
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	amr? ( !bindist? ( media-libs/opencore-amr ) )
-	ass? ( ${FONT_RDEPS} media-libs/libass[enca?] )
+	ass? ( ${FONT_RDEPS} )
 	bidi? ( dev-libs/fribidi )
 	bluray? ( media-libs/libbluray )
 	bs2b? ( media-libs/libbs2b )
@@ -121,6 +121,7 @@
 	jpeg? ( media-libs/jpeg )
 	jpeg2k? ( media-libs/openjpeg )
 	ladspa? ( media-libs/ladspa-sdk )
+	libass? ( ${FONT_RDEPS} media-libs/libass[enca?] )
 	libcaca? ( media-libs/libcaca )
 	lirc? ( app-misc/lirc )
 	live? ( media-plugins/live )
@@ -284,9 +285,8 @@
 		$(use_enable network)
 		$(use_enable joystick)
 	"
-	uses="ass bl enca ftp rtc" # nemesi <- not working with in-tree ebuild
+	uses="bl enca ftp rtc" # nemesi <- not working with in-tree ebuild
 	myconf+=" --disable-nemesi" # nemesi automagic disable
-	myconf+=" --disable-ass-internal" # always use system libass
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done
@@ -303,6 +303,22 @@
 			--disable-apple-ir
 		"
 	fi
+	
+	###########
+	#Subtitles#
+	###########
+
+	# ASS/SSA support
+
+	# MPlayer ships with an internal copy, or the user can choose
+	# to build against external libass.
+
+	# You need to disable internal support to enable external.
+	use libass && myconf+=" --disable-ass-internal"
+
+	if ! use ass && ! use libass; then
+		myconf+=" --disable-ass-internal --disable-ass"
+	fi
 
 	# libcdio support: prefer libcdio over cdparanoia
 	# don't check for cddb w/cdio






^ permalink raw reply	[flat|nested] 8+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: metadata.xml ChangeLog mplayer-9999.ebuild
@ 2010-10-10 19:43 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 8+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2010-10-10 19:43 UTC (permalink / raw
  To: gentoo-commits

scarabeus    10/10/10 19:43:25

  Modified:             metadata.xml ChangeLog mplayer-9999.ebuild
  Log:
  Replace rtmpdump with rtmp useflag. As is done in ffmpeg and xbmc.
  
  (Portage version: 2.2_rc91/cvs/Linux x86_64)

Revision  Changes    Path
1.34                 media-video/mplayer/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?r1=1.33&r2=1.34

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/metadata.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- metadata.xml	10 Oct 2010 08:49:51 -0000	1.33
+++ metadata.xml	10 Oct 2010 19:43:25 -0000	1.34
@@ -36,7 +36,7 @@
 	<flag name="rar">Enable Unique RAR File Library</flag>
 	<flag name="real">Adds real audo/video support</flag>
 	<flag name="rtc">Enables usage of the linux real time clock. The alternative is software emulation of rtc</flag>
-	<flag name="rtmpdump">Enables RTMPDump Streaming Media support</flag>
+	<flag name="rtmp">Enables RTMPDump Streaming Media support</flag>
 	<flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
 	<flag name="shm">Enable support for shm</flag>
 	<flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>



1.763                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.763&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.763&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.762&r2=1.763

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.762
retrieving revision 1.763
diff -u -r1.762 -r1.763
--- ChangeLog	10 Oct 2010 13:46:33 -0000	1.762
+++ ChangeLog	10 Oct 2010 19:43:25 -0000	1.763
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.762 2010/10/10 13:46:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.763 2010/10/10 19:43:25 scarabeus Exp $
+
+  10 Oct 2010; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild,
+  metadata.xml:
+  Replace rtmpdump with rtmp useflag. As is done in ffmpeg and xbmc.
 
   10 Oct 2010; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
   EAPI3fy for prefix support.



1.81                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.80&r2=1.81

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- mplayer-9999.ebuild	10 Oct 2010 13:46:33 -0000	1.80
+++ mplayer-9999.ebuild	10 Oct 2010 19:43:25 -0000	1.81
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.80 2010/10/10 13:46:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.81 2010/10/10 19:43:25 scarabeus Exp $
 
 EAPI=3
 
@@ -18,7 +18,7 @@
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
 libcaca lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal
 amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc
-rtmpdump samba +shm +schroedinger sdl +speex sse sse2 ssse3 tga +theora +tremor
+rtmp samba +shm +schroedinger sdl +speex sse sse2 ssse3 tga +theora +tremor
 +truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix +vorbis vpx
 win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran"
 [[ ${PV} == *9999* ]] && IUSE+=" external-ffmpeg"
@@ -132,7 +132,7 @@
 			app-arch/rar
 		)
 	)
-	rtmpdump? ( media-video/rtmpdump )
+	rtmp? ( media-video/rtmpdump )
 	samba? ( net-fs/samba )
 	schroedinger? ( media-libs/schroedinger )
 	sdl? ( media-libs/libsdl )
@@ -284,7 +284,6 @@
 	use ipv6 || myconf+=" --disable-inet6"
 	use nut || myconf+=" --disable-libnut"
 	use rar || myconf+=" --disable-unrarexec"
-	use rtmpdump || myconf+=" --disable-librtmp"
 	use samba || myconf+=" --disable-smb"
 	if ! use lirc; then
 		myconf+="
@@ -393,7 +392,7 @@
 			--disable-mp3lib
 		"
 	fi
-	uses="a52 bs2b dv gsm lzo"
+	uses="a52 bs2b dv gsm lzo rtmp"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-lib${i}"
 	done






^ permalink raw reply	[flat|nested] 8+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: metadata.xml ChangeLog mplayer-9999.ebuild
@ 2010-11-01 13:50 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 8+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2010-11-01 13:50 UTC (permalink / raw
  To: gentoo-commits

scarabeus    10/11/01 13:50:53

  Modified:             metadata.xml ChangeLog mplayer-9999.ebuild
  Log:
  Fix mga videocard check per bug #341171. Add missing options per bug #334793.
  
  (Portage version: 2.2_rc98/cvs/Linux x86_64)

Revision  Changes    Path
1.35                 media-video/mplayer/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?r1=1.34&r2=1.35

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/metadata.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- metadata.xml	10 Oct 2010 19:43:25 -0000	1.34
+++ metadata.xml	1 Nov 2010 13:50:53 -0000	1.35
@@ -23,10 +23,12 @@
 	<flag name="faac">Use external faac library for AAC encoding</flag>
 	<flag name="faad">Use external faad library for AAC decoding</flag>
 	<flag name="gmplayer">Build gmplayer, a GTK+ MPlayer gui (UNSUPPORTED)</flag>
+	<flag name="libmpeg2">Build support for mpeg2 over media-libs/libmpeg2 rather than using ffmpeg.</flag>
 	<flag name="live">Enables live.com streaming media support</flag>
 	<flag name="md5sum">Enables md5sum video output</flag>
 	<flag name="mmxext">Enables mmx2 support</flag>
 	<flag name="mng">MNG input support</flag>
+	<flag name="mpg123">Enable support for mp3 decoding over media-sound/mpg123.</flag>
 	<flag name="network">Enables network streaming support</flag>
 	<flag name="nut">Enables support for the NUT container format</flag>
 	<flag name="osdmenu">Enables support for on-screen display (OSD) menus</flag>



1.764                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.764&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.764&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.763&r2=1.764

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.763
retrieving revision 1.764
diff -u -r1.763 -r1.764
--- ChangeLog	10 Oct 2010 19:43:25 -0000	1.763
+++ ChangeLog	1 Nov 2010 13:50:53 -0000	1.764
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.763 2010/10/10 19:43:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.764 2010/11/01 13:50:53 scarabeus Exp $
+
+  01 Nov 2010; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild,
+  metadata.xml:
+  Fix mga videocard check per bug #341171. Add missing options per bug #334793.
 
   10 Oct 2010; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild,
   metadata.xml:



1.83                 media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.83&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.83&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.82&r2=1.83

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- mplayer-9999.ebuild	10 Oct 2010 23:31:27 -0000	1.82
+++ mplayer-9999.ebuild	1 Nov 2010 13:50:53 -0000	1.83
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.82 2010/10/10 23:31:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.83 2010/11/01 13:50:53 scarabeus Exp $
 
 EAPI=3
 
@@ -16,11 +16,12 @@
 bs2b +cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac
 directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-libcaca lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal
-amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc
-rtmp samba +shm +schroedinger sdl +speex sse sse2 ssse3 tga +theora +tremor
-+truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix +vorbis vpx
-win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran"
+libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 mpg123 nas
++network nut openal amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
+radio +rar +real +rtc rtmp samba +shm +schroedinger sdl +speex sse sse2 ssse3
+tga +theora +tremor +truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix
++vorbis vpx win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc
+zoran"
 [[ ${PV} == *9999* ]] && IUSE+=" external-ffmpeg"
 
 VIDEO_CARDS="s3virge mga tdfx vesa"
@@ -96,6 +97,10 @@
 	dts? ( media-libs/libdca )
 	dv? ( media-libs/libdv )
 	dvb? ( media-tv/linuxtv-dvb-headers )
+	dvd? (
+		>=media-libs/libdvdread-4.1.3
+		dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
+	)
 	encode? (
 		!twolame? ( toolame? ( media-sound/toolame ) )
 		twolame? ( media-sound/twolame )
@@ -115,11 +120,13 @@
 	jpeg2k? ( media-libs/openjpeg )
 	ladspa? ( media-libs/ladspa-sdk )
 	libcaca? ( media-libs/libcaca )
+	libmpeg2? ( media-libs/libmpeg2 )
 	lirc? ( app-misc/lirc )
 	live? ( media-plugins/live )
 	lzo? ( >=dev-libs/lzo-2 )
 	mad? ( media-libs/libmad )
 	mng? ( media-libs/libmng )
+	mpg123? ( media-sound/mpg123 )
 	nas? ( media-libs/nas )
 	nut? ( >=media-libs/libnut-661 )
 	openal? ( media-libs/openal )
@@ -310,8 +317,8 @@
 	# dvdread - accessing a DVD
 	# dvdnav - navigation of menus
 	#
-	# internal dvdread and dvdnav use flags enable internal
-	# versions of the libraries, which are snapshots of the fork.
+	# use external libdvdcss, dvdread and dvdnav
+	myconf+=" --disable-dvdread-internal --disable-libdvdcss-internal"
 
 	if use dvd; then
 		use dvdnav || myconf+=" --disable-dvdnav"
@@ -319,8 +326,6 @@
 		myconf+="
 			--disable-dvdnav
 			--disable-dvdread
-			--disable-dvdread-internal
-			--disable-libdvdcss-internal
 		"
 	fi
 
@@ -382,7 +387,7 @@
 	##########
 	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
 	myconf+=" --disable-faad-internal" # always use system media-libs/faad2
-	myconf+=" --disable-libmpeg2-internal" # always use system version
+	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
 	use dirac || myconf+=" --disable-libdirac-lavc"
 	use dts || myconf+=" --disable-libdca"
 	if ! use mp3; then
@@ -401,7 +406,7 @@
 	# https://bugs.gentoo.org/show_bug.cgi?id=299405#c6
 	{ use amr && use !bindist ; } || myconf+=" --disable-libopencore_amrnb --disable-libopencore_amrwb"
 
-	uses="faad gif jpeg live mad mng png pnm speex tga theora xanim"
+	uses="faad gif jpeg libmpeg2 live mad mng mpg123 png pnm speex tga theora xanim"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done
@@ -478,7 +483,7 @@
 	use libcaca || myconf+=" --disable-caca"
 	use zoran || myconf+=" --disable-zr"
 
-	if ! use kernel_linux && ! use video_cards_mga; then
+	if ! use kernel_linux || ! use video_cards_mga; then
 		 myconf+=" --disable-mga --disable-xmga"
 	fi
 
@@ -605,7 +610,6 @@
 		myconf+="
 			--enable-macosx-finder
 			--enable-macosx-bundle
-			--enable-libdvdcss-internal
 		"
 	fi
 
@@ -616,12 +620,12 @@
 		use external-ffmpeg && myconf+=" --disable-ffmpeg_a"
 	fi
 
-	myconf="--cc=$(tc-getCC) \
-		--host-cc=$(tc-getBUILD_CC) \
-		--prefix=${EPREFIX}/usr \
-		--confdir=${EPREFIX}/etc/mplayer \
-		--datadir=${EPREFIX}/usr/share/mplayer \
-		--libdir=${EPREFIX}/usr/$(get_libdir) \
+	myconf="--cc=$(tc-getCC)
+		--host-cc=$(tc-getBUILD_CC)
+		--prefix=${EPREFIX}/usr
+		--confdir=${EPREFIX}/etc/mplayer
+		--datadir=${EPREFIX}/usr/share/mplayer
+		--libdir=${EPREFIX}/usr/$(get_libdir)
 		${myconf}"
 
 	CFLAGS="${CFLAGS}" ./configure ${myconf} || die "configure died"






^ permalink raw reply	[flat|nested] 8+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: metadata.xml ChangeLog mplayer-9999.ebuild
@ 2011-06-08 19:33 Alexis Ballier (aballier)
  0 siblings, 0 replies; 8+ messages in thread
From: Alexis Ballier (aballier) @ 2011-06-08 19:33 UTC (permalink / raw
  To: gentoo-commits

aballier    11/06/08 19:33:06

  Modified:             metadata.xml ChangeLog mplayer-9999.ebuild
  Log:
  Always use system ffmpeg, use only the required internal headers from ffmpeg, bug #361731
  
  (Portage version: 2.2.0_alpha38/cvs/Linux x86_64)

Revision  Changes    Path
1.37                 media-video/mplayer/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/metadata.xml?r1=1.36&r2=1.37

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/metadata.xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- metadata.xml	7 Nov 2010 20:32:59 -0000	1.36
+++ metadata.xml	8 Jun 2011 19:33:06 -0000	1.37
@@ -19,7 +19,6 @@
 	<flag name="dvdnav">Use forked libdvdnav, navigate menus in GUIs</flag>
 	<flag name="dxr3">Enable DXR3/H+ video output</flag>
 	<flag name="enca">Enables support for charset discovery and conversion</flag>
-	<flag name="external-ffmpeg">Use shared FFmpeg libraries instead of static bundled ones. Discouraged by upstream.</flag>
 	<flag name="faac">Use external faac library for AAC encoding</flag>
 	<flag name="faad">Use external faad library for AAC decoding</flag>
 	<flag name="gmplayer">Build gmplayer, a GTK+ MPlayer gui (UNSUPPORTED)</flag>



1.791                media-video/mplayer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.791&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.791&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.790&r2=1.791

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.790
retrieving revision 1.791
diff -u -r1.790 -r1.791
--- ChangeLog	22 May 2011 23:42:13 -0000	1.790
+++ ChangeLog	8 Jun 2011 19:33:06 -0000	1.791
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.790 2011/05/22 23:42:13 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.791 2011/06/08 19:33:06 aballier Exp $
+
+  08 Jun 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild,
+  +files/dump_ffmpeg.sh, metadata.xml:
+  Always use system ffmpeg, use only the required internal headers from ffmpeg,
+  bug #361731
 
   22 May 2011; Joseph Jezak <josejx@gentoo.org>
   mplayer-1.0_rc4_p20101114.ebuild:



1.100                media-video/mplayer/mplayer-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.100&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.100&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.99&r2=1.100

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- mplayer-9999.ebuild	3 Apr 2011 10:24:10 -0000	1.99
+++ mplayer-9999.ebuild	8 Jun 2011 19:33:06 -0000	1.100
@@ -1,11 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.99 2011/04/03 10:24:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.100 2011/06/08 19:33:06 aballier Exp $
 
 EAPI=4
 
-EGIT_REPO_URI="git://git.libav.org/libav.git"
-EGIT_PROJECT="libav" # git eclass sets it to PN otherwise
+EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
+EGIT_PROJECT="ffmpeg" # git eclass sets it to PN otherwise
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 [[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git" || SVN_ECLASS=""
 
@@ -15,16 +15,15 @@
 [[ ${PV} != *9999* ]] && MPLAYER_REVISION=SVN-r33094
 
 IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray
-bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac
+bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga
 directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon
 ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
 libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 mpg123 nas
-+network nut openal amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
-radio +rar +real +rtc rtmp samba +shm +schroedinger sdl +speex sse sse2 ssse3
++network nut openal +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
+radio +rar +real +rtc rtmp samba +shm sdl +speex sse sse2 ssse3
 tga +theora +tremor +truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix
-+vorbis vpx win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc
++vorbis win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc
 zoran"
-[[ ${PV} == *9999* ]] && IUSE+=" external-ffmpeg"
 
 VIDEO_CARDS="s3virge mga tdfx vesa"
 for x in ${VIDEO_CARDS}; do
@@ -57,13 +56,13 @@
 	x11-libs/libXext
 	x11-libs/libXxf86vm
 "
-[[ ${PV} == *9999* ]] && RDEPEND+=" external-ffmpeg? ( virtual/ffmpeg )"
 # Rar: althrought -gpl version is nice, it cant do most functions normal rars can
 #	nemesi? ( net-libs/libnemesi )
 RDEPEND+="
 	sys-libs/ncurses
 	app-arch/bzip2
 	sys-libs/zlib
+	>=virtual/ffmpeg-0.6.90
 	!bindist? (
 		x86? (
 			win32codecs? ( media-libs/win32codecs )
@@ -88,14 +87,12 @@
 	a52? ( media-libs/a52dec )
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
-	amr? ( !bindist? ( media-libs/opencore-amr ) )
 	ass? ( ${FONT_RDEPS} >=media-libs/libass-0.9.10[enca?] )
 	bidi? ( dev-libs/fribidi )
 	bluray? ( media-libs/libbluray )
 	bs2b? ( media-libs/libbs2b )
 	cdio? ( dev-libs/libcdio )
 	cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
-	dirac? ( media-video/dirac )
 	directfb? ( dev-libs/DirectFB )
 	dts? ( media-libs/libdca )
 	dv? ( media-libs/libdv )
@@ -144,13 +141,11 @@
 	)
 	rtmp? ( media-video/rtmpdump )
 	samba? ( net-fs/samba )
-	schroedinger? ( media-libs/schroedinger )
 	sdl? ( media-libs/libsdl )
 	speex? ( media-libs/speex )
 	theora? ( media-libs/libtheora[encode?] )
 	truetype? ( ${FONT_RDEPS} )
 	vorbis? ( media-libs/libvorbis )
-	vpx? ( media-libs/libvpx )
 	xanim? ( media-video/xanim )
 "
 
@@ -185,7 +180,7 @@
 	KEYWORDS=""
 fi
 
-# bindist does not cope with amr codecs (#299405#c6), faac codecs are nonfree, win32codecs are nonfree
+# faac codecs are nonfree, win32codecs are nonfree
 # libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
 # dvd navigation requires dvd read support
 # ass and freetype font require iconv and ass requires freetype fonts
@@ -193,7 +188,7 @@
 # libvorbis require external tremor to work
 # radio requires oss or alsa backend
 # xvmc requires xvideo support
-REQUIRED_USE="bindist? ( !amr !faac !win32codecs )"
+REQUIRED_USE="bindist? ( !faac !win32codecs )"
 
 PATCHES=(
 )
@@ -243,6 +238,10 @@
 		cd "${WORKDIR}"
 		rm -rf "${WORKDIR}/${P}/ffmpeg/"
 		( S="${WORKDIR}/${P}/ffmpeg/" git_src_unpack )
+		cd "${S}"
+		cp "${FILESDIR}/dump_ffmpeg.sh" . || die
+		chmod +x dump_ffmpeg.sh
+		./dump_ffmpeg.sh || die
 	else
 		unpack ${A}
 	fi
@@ -400,12 +399,10 @@
 	##########
 	myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
 	myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
-	use dirac || myconf+=" --disable-libdirac-lavc"
 	use dts || myconf+=" --disable-libdca"
 	if ! use mp3; then
 		myconf+="
 			--disable-mp3lame
-			--disable-mp3lame-lavc
 			--disable-mp3lib
 		"
 	fi
@@ -413,8 +410,6 @@
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-lib${i}"
 	done
-	use schroedinger || myconf+=" --disable-libschroedinger-lavc"
-	use amr || myconf+=" --disable-libopencore_amrnb --disable-libopencore_amrwb"
 
 	uses="faad gif jpeg libmpeg2 live mad mng mpg123 png pnm speex tga theora xanim"
 	for i in ${uses}; do
@@ -431,21 +426,18 @@
 			--disable-libvorbis
 		"
 	fi
-	use vpx || myconf+=" --disable-libvpx-lavc"
 	# Encoding
 	uses="faac x264 xvid toolame twolame"
 	if use encode; then
 		for i in ${uses}; do
 			use ${i} || myconf+=" --disable-${i}"
 		done
-		use faac || myconf+=" --disable-faac-lavc"
 		if use bindist && use faac; then
 			ewarn "faac is nonfree and cannot be distributed; disabling faac support."
-			myconf+=" --disable-faac --disable-faac-lavc"
+			myconf+=" --disable-faac"
 		fi
 	else
 		myconf+=" --disable-mencoder"
-		myconf+=" --disable-faac-lavc"
 		for i in ${uses}; do
 			myconf+=" --disable-${i}"
 			use ${i} && elog "Useflag \"${i}\" require \"encode\" useflag enabled to work."
@@ -622,9 +614,7 @@
 	###################
 	# External FFmpeg #
 	###################
-	if [[ ${PV} == *9999* ]]; then
-		use external-ffmpeg && myconf+=" --disable-ffmpeg_a"
-	fi
+	myconf+=" --disable-ffmpeg_a"
 
 	myconf="--cc=$(tc-getCC)
 		--host-cc=$(tc-getBUILD_CC)






^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2011-06-08 19:33 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-17  3:09 [gentoo-commits] gentoo-x86 commit in media-video/mplayer: metadata.xml ChangeLog mplayer-9999.ebuild Steve Dibb (beandog)
  -- strict thread matches above, loose matches on Subject: below --
2011-06-08 19:33 Alexis Ballier (aballier)
2010-11-01 13:50 Tomas Chvatal (scarabeus)
2010-10-10 19:43 Tomas Chvatal (scarabeus)
2010-07-17  3:47 Steve Dibb (beandog)
2010-06-12 18:14 Dror Levin (spatz)
2009-07-27  6:56 Alexis Ballier (aballier)
2009-05-30 21:31 Steve Dibb (beandog)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox