public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: ChangeLog mplayer2-9999.ebuild
@ 2011-04-03 12:55 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 8+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-04-03 12:55 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/04/03 12:55:15

  Modified:             ChangeLog mplayer2-9999.ebuild
  Log:
  Internal mp3lib was dropped.
  
  (Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

Revision  Changes    Path
1.9                  media-video/mplayer2/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ChangeLog	31 Mar 2011 18:47:37 -0000	1.8
+++ ChangeLog	3 Apr 2011 12:55:15 -0000	1.9
@@ -1,6 +1,9 @@
 # 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.8 2011/03/31 18:47:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.9 2011/04/03 12:55:15 scarabeus Exp $
+
+  03 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
+  Internal mp3lib was dropped.
 
   31 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> mplayer2-2.0.ebuild,
   mplayer2-9999.ebuild:



1.7                  media-video/mplayer2/mplayer2-9999.ebuild

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

Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mplayer2-9999.ebuild	31 Mar 2011 18:47:37 -0000	1.6
+++ mplayer2-9999.ebuild	3 Apr 2011 12:55:15 -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-9999.ebuild,v 1.6 2011/03/31 18:47:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.7 2011/04/03 12:55:15 scarabeus Exp $
 
 EAPI=4
 
@@ -380,7 +380,6 @@
 	# Codecs #
 	##########
 	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"






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

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: ChangeLog mplayer2-9999.ebuild
@ 2011-04-12 17:19 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 8+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-04-12 17:19 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/04/12 17:19:10

  Modified:             ChangeLog mplayer2-9999.ebuild
  Log:
  Update and reorder variables a bit. Based off Nikoli's patch.
  
  (Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

Revision  Changes    Path
1.14                 media-video/mplayer2/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ChangeLog	4 Apr 2011 12:44:34 -0000	1.13
+++ ChangeLog	12 Apr 2011 17:19:10 -0000	1.14
@@ -1,6 +1,9 @@
 # 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.13 2011/04/04 12:44:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.14 2011/04/12 17:19:10 scarabeus Exp $
+
+  12 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
+  Update and reorder variables a bit. Based off Nikoli's patch.
 
   04 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-2.0.ebuild,
   mplayer2-9999.ebuild:



1.12                 media-video/mplayer2/mplayer2-9999.ebuild

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

Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mplayer2-9999.ebuild	4 Apr 2011 12:44:34 -0000	1.11
+++ mplayer2-9999.ebuild	12 Apr 2011 17:19:10 -0000	1.12
@@ -1,16 +1,34 @@
 # 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.11 2011/04/04 12:44:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.12 2011/04/12 17:19:10 scarabeus Exp $
 
 EAPI=4
 
 EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git"
 [[ ${PV} = *9999* ]] && VCS_ECLASS="git"
+NAMESUF=${PN/mplayer/}
 
 inherit toolchain-funcs eutils flag-o-matic multilib base ${VCS_ECLASS}
 
-namesuf="${PN/mplayer/}"
+DESCRIPTION="Media Player for Linux"
+HOMEPAGE="http://www.mplayer2.org/"
+[[ ${PV} == *9999* ]] || \
+	RELEASE_URI="http://ftp.${PN}.org/pub/release/${P}.tar.xz"
+SRC_URI="${RELEASE_URI}
+	!truetype? (
+		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
+	)
+"
 
+LICENSE="GPL-3"
+SLOT="0"
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64 ~x86"
+else
+	KEYWORDS=""
+fi
 IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray
 bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts custom-cflags debug dga
 directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca esd +faad fbcon
@@ -26,29 +44,14 @@
 	IUSE+=" video_cards_${x}"
 done
 
-FONT_URI="
-	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
-"
-[[ ${PV} == *9999* ]] || \
-	RELEASE_URI="http://ftp.${PN}.org/pub/release/${P}.tar.xz"
-SRC_URI="${RELEASE_URI}
-	!truetype? ( ${FONT_URI} )
-"
-
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayer2.org/"
+# bindist does not cope with win32codecs, which are nonfree
+REQUIRED_USE="bindist? ( !win32codecs )"
 
 FONT_RDEPS="
 	virtual/ttf-fonts
 	media-libs/fontconfig
 	>=media-libs/freetype-2.2.1:2
 "
-X_RDEPS="
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-"
 # Rar: althrought -gpl version is nice, it cant do most functions normal rars can
 #	nemesi? ( net-libs/libnemesi )
 RDEPEND+="
@@ -61,7 +64,8 @@
 		)
 	)
 	X? (
-		${X_RDEPS}
+		x11-libs/libXext
+		x11-libs/libXxf86vm
 		dga? ( x11-libs/libXxf86dga )
 		ggi? (
 			media-libs/libggi
@@ -127,18 +131,14 @@
 	xanim? ( media-video/xanim )
 	xvid? ( media-libs/xvid )
 "
-
-X_DEPS="
-	x11-proto/videoproto
-	x11-proto/xf86vidmodeproto
-"
 ASM_DEP="dev-lang/yasm"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-lang/python
 	sys-devel/gettext
 	X? (
-		${X_DEPS}
+		x11-proto/videoproto
+		x11-proto/xf86vidmodeproto
 		dga? ( x11-proto/xf86dgaproto )
 		dxr3? ( media-video/em8300-libraries )
 		xinerama? ( x11-proto/xineramaproto )
@@ -153,20 +153,6 @@
 	x86-fbsd? ( ${ASM_DEP} )
 "
 
-SLOT="0"
-LICENSE="GPL-3"
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~x86"
-else
-	KEYWORDS=""
-fi
-
-# bindist does not cope with win32codecs, which are nonfree
-REQUIRED_USE="bindist? ( !win32codecs )"
-
-PATCHES=(
-)
-
 pkg_setup() {
 	if [[ ${PV} == *9999* ]]; then
 		elog
@@ -230,13 +216,12 @@
 		-e "1c\#!${EPREFIX}/bin/bash" \
 		${bash_scripts} || die
 
-	# We want mplayer${namesuf}
-	if [[ -n ${namesuf} ]]; then
-		sed -e "/elif linux ; then/a\  _exesuf=\"${namesuf}\"" \
+	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\/${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" \
+			-e "s/er.1/er${NAMESUF}.1/g" \
 			-i Makefile || die
 		sed -e "s/mplayer/${PN}/" \
 			-i TOOLS/midentify.sh || die
@@ -611,11 +596,11 @@
 		# 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"
+			cp -pPR "${i}" "${ED}/usr/share/${PN}/fonts"
 		done
 		# Fix the font symlink ...
 		rm -rf "${ED}/usr/share/${PN}/font"
-		dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer${namesuf}/font
+		dosym fonts/font-arial-14-iso-8859-1 /usr/share/${PN}/font
 	fi
 
 	insinto /etc/${PN}
@@ -636,5 +621,5 @@
 	fi
 	dosym ../../../etc/${PN}/mplayer.conf /usr/share/${PN}/mplayer.conf
 
-	newbin "${S}/TOOLS/midentify.sh" midentify${namesuf}
+	newbin "${S}/TOOLS/midentify.sh" midentify${NAMESUF}
 }






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

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: ChangeLog mplayer2-9999.ebuild
@ 2011-05-10 13:22 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 8+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-05-10 13:22 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/05/10 13:22:49

  Modified:             ChangeLog mplayer2-9999.ebuild
  Log:
  Drop xvmc support same as upstream did in git.
  
  (Portage version: 2.2.0_alpha32/cvs/Linux x86_64)

Revision  Changes    Path
1.17                 media-video/mplayer2/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ChangeLog	3 May 2011 14:57:25 -0000	1.16
+++ ChangeLog	10 May 2011 13:22:49 -0000	1.17
@@ -1,6 +1,9 @@
 # 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.16 2011/05/03 14:57:25 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.17 2011/05/10 13:22:49 scarabeus Exp $
+
+  10 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
+  Drop xvmc support same as upstream did in git.
 
   03 May 2011; Jeremy Olexa <darkside@gentoo.org> mplayer2-2.0.ebuild,
   mplayer2-9999.ebuild:



1.14                 media-video/mplayer2/mplayer2-9999.ebuild

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

Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mplayer2-9999.ebuild	3 May 2011 14:57:25 -0000	1.13
+++ mplayer2-9999.ebuild	10 May 2011 13:22:49 -0000	1.14
@@ -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.13 2011/05/03 14:57:25 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.14 2011/05/10 13:22:49 scarabeus Exp $
 
 EAPI=4
 
@@ -37,7 +37,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 xvid xvmc"
++vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvid"
 
 VIDEO_CARDS="s3virge mga tdfx vesa"
 for x in ${VIDEO_CARDS}; do
@@ -77,7 +77,6 @@
 		xscreensaver? ( x11-libs/libXScrnSaver )
 		xv? (
 			x11-libs/libXv
-			xvmc? ( x11-libs/libXvMC )
 		)
 	)
 	a52? ( media-libs/a52dec )
@@ -478,7 +477,7 @@
 	# X enabled configuration #
 	###########################
 	if use X; then
-		uses="dxr3 ggi xinerama"
+		uses="dxr3 ggi xinerama xv"
 		for i in ${uses}; do
 			use ${i} || myconf+=" --disable-${i}"
 		done
@@ -488,20 +487,6 @@
 		use vdpau || myconf+=" --disable-vdpau"
 		use video_cards_vesa || myconf+=" --disable-vesa"
 		use xscreensaver || myconf+=" --disable-xss"
-
-		if use xv; then
-			if use xvmc; then
-				myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
-			else
-				myconf+=" --disable-xvmc"
-			fi
-		else
-			myconf+="
-				--disable-xv
-				--disable-xvmc
-			"
-			use xvmc && elog "Disabling xvmc because it requires \"xv\" useflag enabled."
-		fi
 	else
 		myconf+="
 			--disable-dga1
@@ -513,7 +498,6 @@
 			--disable-xinerama
 			--disable-xss
 			--disable-xv
-			--disable-xvmc
 			--disable-x11
 		"
 		uses="dga dxr3 ggi opengl osdmenu vdpau xinerama xscreensaver xv"






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

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: ChangeLog mplayer2-9999.ebuild
@ 2011-05-10 13:27 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 8+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-05-10 13:27 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/05/10 13:27:54

  Modified:             ChangeLog mplayer2-9999.ebuild
  Log:
  Use git-2 eclass.
  
  (Portage version: 2.2.0_alpha32/cvs/Linux x86_64)

Revision  Changes    Path
1.18                 media-video/mplayer2/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ChangeLog	10 May 2011 13:22:49 -0000	1.17
+++ ChangeLog	10 May 2011 13:27:54 -0000	1.18
@@ -1,6 +1,9 @@
 # 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.17 2011/05/10 13:22:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.18 2011/05/10 13:27:54 scarabeus Exp $
+
+  10 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
+  Use git-2 eclass.
 
   10 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
   Drop xvmc support same as upstream did in git.



1.15                 media-video/mplayer2/mplayer2-9999.ebuild

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

Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mplayer2-9999.ebuild	10 May 2011 13:22:49 -0000	1.14
+++ mplayer2-9999.ebuild	10 May 2011 13:27:54 -0000	1.15
@@ -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/mplayer2/mplayer2-9999.ebuild,v 1.14 2011/05/10 13:22:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.15 2011/05/10 13:27:54 scarabeus Exp $
 
 EAPI=4
 
 EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git"
-[[ ${PV} = *9999* ]] && VCS_ECLASS="git"
+[[ ${PV} = *9999* ]] && VCS_ECLASS="git-2"
 NAMESUF=${PN/mplayer/}
 
 inherit toolchain-funcs eutils flag-o-matic multilib base ${VCS_ECLASS}
@@ -24,11 +24,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux"
-else
-	KEYWORDS=""
-fi
+[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray
 bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts custom-cflags debug dga
 directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca esd +faad fbcon
@@ -196,9 +192,9 @@
 
 src_unpack() {
 	if [[ ${PV} = *9999* ]]; then
-		git_src_unpack
+		git-2_src_unpack
 	else
-		unpack ${A}
+		default
 	fi
 
 	if ! use truetype; then






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

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: ChangeLog mplayer2-9999.ebuild
@ 2011-10-31 12:25 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 8+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-10-31 12:25 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/10/31 12:25:43

  Modified:             ChangeLog mplayer2-9999.ebuild
  Log:
  Drop the osdmenu useflag, as upstream dropped code for it.
  
  (Portage version: 2.2.0_alpha72/cvs/Linux x86_64)

Revision  Changes    Path
1.26                 media-video/mplayer2/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ChangeLog	9 Oct 2011 16:36:34 -0000	1.25
+++ ChangeLog	31 Oct 2011 12:25:43 -0000	1.26
@@ -1,6 +1,9 @@
 # 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.25 2011/10/09 16:36:34 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.26 2011/10/31 12:25:43 scarabeus Exp $
+
+  31 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
+  Drop the osdmenu useflag, as upstream dropped code for it.
 
   09 Oct 2011; Markus Meier <maekke@gentoo.org> mplayer2-2.0.ebuild:
   x86 stable, bug #365951



1.16                 media-video/mplayer2/mplayer2-9999.ebuild

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

Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mplayer2-9999.ebuild	10 May 2011 13:27:54 -0000	1.15
+++ mplayer2-9999.ebuild	31 Oct 2011 12:25:43 -0000	1.16
@@ -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.15 2011/05/10 13:27:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.16 2011/10/31 12:25:43 scarabeus Exp $
 
 EAPI=4
 
@@ -30,7 +30,7 @@
 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 +mp3 nas
-+network nut +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
++network nut +opengl oss png pnm pulseaudio pvr +quicktime
 radio +rar +real +rtc samba +shm sdl +speex sse sse2 ssse3
 tga +theora +truetype +unicode v4l v4l2 vdpau
 +vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvid"
@@ -479,7 +479,6 @@
 		done
 		use dga || myconf+=" --disable-dga1 --disable-dga2"
 		use opengl || myconf+=" --disable-gl"
-		use osdmenu && myconf+=" --enable-menu"
 		use vdpau || myconf+=" --disable-vdpau"
 		use video_cards_vesa || myconf+=" --disable-vesa"
 		use xscreensaver || myconf+=" --disable-xss"
@@ -496,7 +495,7 @@
 			--disable-xv
 			--disable-x11
 		"
-		uses="dga dxr3 ggi opengl osdmenu vdpau xinerama xscreensaver xv"
+		uses="dga dxr3 ggi opengl vdpau xinerama xscreensaver xv"
 		for i in ${uses}; do
 			use ${i} && elog "Useflag \"${i}\" require \"X\" useflag enabled to work."
 		done
@@ -591,7 +590,6 @@
 [default]
 _EOF_
 	doins "${S}/etc/input.conf"
-	use osdmenu && doins "${S}/etc/menu.conf"
 
 	# set unrar path when required
 	if use rar; then






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

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: ChangeLog mplayer2-9999.ebuild
@ 2012-05-18 19:38 Luca Barbato (lu_zero)
  0 siblings, 0 replies; 8+ messages in thread
From: Luca Barbato (lu_zero) @ 2012-05-18 19:38 UTC (permalink / raw
  To: gentoo-commits

lu_zero     12/05/18 19:38:43

  Modified:             ChangeLog mplayer2-9999.ebuild
  Log:
  Update live ebuild, thanks to Nikoli for the input
  
  (Portage version: 2.2.0_alpha103/cvs/Linux x86_64)

Revision  Changes    Path
1.49                 media-video/mplayer2/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ChangeLog	18 May 2012 05:08:06 -0000	1.48
+++ ChangeLog	18 May 2012 19:38:42 -0000	1.49
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.48 2012/05/18 05:08:06 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.49 2012/05/18 19:38:42 lu_zero Exp $
+
+  18 May 2012; Luca Barbato <lu_zero@gentoo.org> mplayer2-9999.ebuild:
+  Update live ebuild, thanks to Nikoli for the input
 
   18 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-9999.ebuild:
   Arts switch is gone.



1.33                 media-video/mplayer2/mplayer2-9999.ebuild

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

Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mplayer2-9999.ebuild	18 May 2012 05:08:06 -0000	1.32
+++ mplayer2-9999.ebuild	18 May 2012 19:38:42 -0000	1.33
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.32 2012/05/18 05:08:06 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.33 2012/05/18 19:38:42 lu_zero Exp $
 
 EAPI=4
 
@@ -210,7 +210,7 @@
 		${bash_scripts} || die
 
 	if [[ -n ${NAMESUF} ]]; then
-		sed -e "/elif linux ; then/a\  _exesuf=\"${NAMESUF}\"" \
+		sed -e "/^EXESUF/s,= \$_exesuf$,= ${NAMESUF}\$_exesuf," \
 			-i configure || die
 		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" \
@@ -420,7 +420,6 @@
 	# Audio Output #
 	################
 	myconf+=" --disable-rsound" # media-sound/rsound is in pro-audio overlay only
-	myconf+=" --disable-esd"
 	uses="alsa jack ladspa nas"
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"






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

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: ChangeLog mplayer2-9999.ebuild
@ 2012-07-20 15:42 Luca Barbato (lu_zero)
  0 siblings, 0 replies; 8+ messages in thread
From: Luca Barbato (lu_zero) @ 2012-07-20 15:42 UTC (permalink / raw
  To: gentoo-commits

lu_zero     12/07/20 15:42:01

  Modified:             ChangeLog mplayer2-9999.ebuild
  Log:
  Update to upstream changes
  
  (Portage version: 2.2.0_alpha119/cvs/Linux x86_64)

Revision  Changes    Path
1.60                 media-video/mplayer2/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ChangeLog	29 Jun 2012 12:37:28 -0000	1.59
+++ ChangeLog	20 Jul 2012 15:42:00 -0000	1.60
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.59 2012/06/29 12:37:28 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.60 2012/07/20 15:42:00 lu_zero Exp $
+
+  20 Jul 2012; Luca Barbato <lu_zero@gentoo.org> mplayer2-9999.ebuild:
+  Update to upstream changes
 
   29 Jun 2012; Brent Baude <ranger@gentoo.org> mplayer2-2.0_p20120309.ebuild:
   Marking mplayer2-2.0_p20120309 ppc for bug 416359



1.40                 media-video/mplayer2/mplayer2-9999.ebuild

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

Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- mplayer2-9999.ebuild	17 Jun 2012 05:38:52 -0000	1.39
+++ mplayer2-9999.ebuild	20 Jul 2012 15:42:00 -0000	1.40
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.39 2012/06/17 05:38:52 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.40 2012/07/20 15:42:00 lu_zero Exp $
 
 EAPI=4
 
@@ -154,6 +154,7 @@
 	virtual/pkgconfig
 	dev-lang/python
 	sys-devel/gettext
+	=dev-lang/python-3*
 	X? (
 		x11-proto/videoproto
 		x11-proto/xf86vidmodeproto
@@ -449,7 +450,6 @@
 
 	./configure \
 		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
 		--pkg-config="$(tc-getPKG_CONFIG)" \
 		--prefix="${EPREFIX}"/usr \
 		--bindir="${EPREFIX}"/usr/bin \






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

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: ChangeLog mplayer2-9999.ebuild
@ 2013-04-16  7:26 Sergey Popov (pinkbyte)
  0 siblings, 0 replies; 8+ messages in thread
From: Sergey Popov (pinkbyte) @ 2013-04-16  7:26 UTC (permalink / raw
  To: gentoo-commits

pinkbyte    13/04/16 07:26:33

  Modified:             ChangeLog mplayer2-9999.ebuild
  Log:
  Adjust ffmpeg dependency in live ebuild by maintainer's request
  
  (Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

Revision  Changes    Path
1.92                 media-video/mplayer2/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- ChangeLog	16 Apr 2013 07:24:39 -0000	1.91
+++ ChangeLog	16 Apr 2013 07:26:33 -0000	1.92
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.91 2013/04/16 07:24:39 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.92 2013/04/16 07:26:33 pinkbyte Exp $
+
+  16 Apr 2013; Sergey Popov <pinkbyte@gentoo.org> mplayer2-9999.ebuild:
+  Adjust ffmpeg dependency in live ebuild by maintainer's request
 
   16 Apr 2013; Sergey Popov <pinkbyte@gentoo.org>
   mplayer2-2.0_p20130126.ebuild, mplayer2-9999.ebuild:



1.55                 media-video/mplayer2/mplayer2-9999.ebuild

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

Index: mplayer2-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- mplayer2-9999.ebuild	16 Apr 2013 07:24:39 -0000	1.54
+++ mplayer2-9999.ebuild	16 Apr 2013 07:26:33 -0000	1.55
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.54 2013/04/16 07:24:39 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.55 2013/04/16 07:26:33 pinkbyte Exp $
 
 EAPI=4
 
@@ -122,7 +122,7 @@
 	vorbis? ( media-libs/libvorbis )
 	xanim? ( media-video/xanim )
 	xvid? ( media-libs/xvid )
-	>=virtual/ffmpeg-0.10.2
+	>=virtual/ffmpeg-9
 	symlink? ( !media-video/mplayer )
 "
 ASM_DEP="dev-lang/yasm"





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

end of thread, other threads:[~2013-04-16  7:26 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-10 13:27 [gentoo-commits] gentoo-x86 commit in media-video/mplayer2: ChangeLog mplayer2-9999.ebuild Tomas Chvatal (scarabeus)
  -- strict thread matches above, loose matches on Subject: below --
2013-04-16  7:26 Sergey Popov (pinkbyte)
2012-07-20 15:42 Luca Barbato (lu_zero)
2012-05-18 19:38 Luca Barbato (lu_zero)
2011-10-31 12:25 Tomas Chvatal (scarabeus)
2011-05-10 13:22 Tomas Chvatal (scarabeus)
2011-04-12 17:19 Tomas Chvatal (scarabeus)
2011-04-03 12:55 Tomas Chvatal (scarabeus)

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