public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: mplayer-1.2_pre20130729.ebuild ChangeLog mplayer-9999.ebuild
@ 2013-08-11 22:52 Alexis Ballier (aballier)
  0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier (aballier) @ 2013-08-11 22:52 UTC (permalink / raw
  To: gentoo-commits

aballier    13/08/11 22:52:39

  Modified:             mplayer-1.2_pre20130729.ebuild ChangeLog
                        mplayer-9999.ebuild
  Log:
  depend on ffmpeg:0
  
  (Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.2                  media-video/mplayer/mplayer-1.2_pre20130729.ebuild

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

Index: mplayer-1.2_pre20130729.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20130729.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mplayer-1.2_pre20130729.ebuild	29 Jul 2013 21:38:05 -0000	1.1
+++ mplayer-1.2_pre20130729.ebuild	11 Aug 2013 22:52:39 -0000	1.2
@@ -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/mplayer/mplayer-1.2_pre20130729.ebuild,v 1.1 2013/07/29 21:38:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20130729.ebuild,v 1.2 2013/08/11 22:52:39 aballier Exp $
 
 EAPI=5
 
@@ -60,7 +60,7 @@
 	sys-libs/ncurses
 	app-arch/bzip2
 	sys-libs/zlib
-	|| ( >=media-video/ffmpeg-1.2.1:= >=media-video/libav-9.8:= )
+	|| ( >=media-video/ffmpeg-1.2.1:0= >=media-video/libav-9.8:= )
 	a52? ( media-libs/a52dec )
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )



1.910                media-video/mplayer/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.909
retrieving revision 1.910
diff -u -r1.909 -r1.910
--- ChangeLog	29 Jul 2013 21:38:05 -0000	1.909
+++ ChangeLog	11 Aug 2013 22:52:39 -0000	1.910
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.909 2013/07/29 21:38:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.910 2013/08/11 22:52:39 aballier Exp $
+
+  11 Aug 2013; Alexis Ballier <aballier@gentoo.org>
+  mplayer-1.2_pre20130729.ebuild, mplayer-9999.ebuild:
+  depend on ffmpeg:0
 
 *mplayer-1.2_pre20130729 (29 Jul 2013)
 



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

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

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- mplayer-9999.ebuild	29 Jul 2013 20:55:00 -0000	1.152
+++ mplayer-9999.ebuild	11 Aug 2013 22:52:39 -0000	1.153
@@ -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/mplayer/mplayer-9999.ebuild,v 1.152 2013/07/29 20:55:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.153 2013/08/11 22:52:39 aballier Exp $
 
 EAPI=5
 
@@ -60,7 +60,7 @@
 	sys-libs/ncurses
 	app-arch/bzip2
 	sys-libs/zlib
-	|| ( >=media-video/ffmpeg-2.0:= >=media-video/libav-9:= )
+	|| ( >=media-video/ffmpeg-2.0:0= >=media-video/libav-9:= )
 	a52? ( media-libs/a52dec )
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )





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

* [gentoo-commits] gentoo-x86 commit in media-video/mplayer: mplayer-1.2_pre20130729.ebuild ChangeLog mplayer-9999.ebuild
@ 2014-07-21 15:44 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2014-07-21 15:44 UTC (permalink / raw
  To: gentoo-commits

ssuominen    14/07/21 15:44:05

  Modified:             mplayer-1.2_pre20130729.ebuild ChangeLog
                        mplayer-9999.ebuild
  Log:
  Fix prev. commit and fix ChangeLog entry accordingly.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

Revision  Changes    Path
1.8                  media-video/mplayer/mplayer-1.2_pre20130729.ebuild

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

Index: mplayer-1.2_pre20130729.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20130729.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mplayer-1.2_pre20130729.ebuild	21 Jul 2014 15:20:46 -0000	1.7
+++ mplayer-1.2_pre20130729.ebuild	21 Jul 2014 15:44:05 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20130729.ebuild,v 1.7 2014/07/21 15:20:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20130729.ebuild,v 1.8 2014/07/21 15:44:05 ssuominen Exp $
 
 EAPI=5
 
@@ -531,7 +531,6 @@
 	# Build only user-requested docs if they're available.
 	if use doc ; then
 		# select available languages from $LINGUAS
-		LINGUAS=${LINGUAS/zh/zh_CN}
 		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
 		local BUILT_DOCS=""
 		for i in ${LINGUAS} ; do



1.917                media-video/mplayer/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v
retrieving revision 1.916
retrieving revision 1.917
diff -u -r1.916 -r1.917
--- ChangeLog	21 Jul 2014 15:23:36 -0000	1.916
+++ ChangeLog	21 Jul 2014 15:44:05 -0000	1.917
@@ -1,11 +1,15 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.916 2014/07/21 15:23:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.917 2014/07/21 15:44:05 ssuominen Exp $
 
   21 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
   mplayer-1.2_pre20130729.ebuild, mplayer-9999.ebuild:
-  Fix building with LINGUAS="zh" by replacing it with LINGUAS="zh_CN" which is
-  the only "zh" language supported by mplayer wrt #482968 by "Hamlet"
+  Fix building by moving replacing of LINGUAS="zh" to LINGUAS="zh_CN" from
+  src_compile() to src_configure() wrt #482968 by "Hamlet"
+  However, should port strip-linguas() from eutils.eclass to mplayer's ebuild
+  because LINGUAS="zh zh_CN" works but LINGUAS="zh_CN zh" ends up as
+  LINGUAS="zh_CN_CN zh" which isn't fatal but will prevent installation
+  of documentation.
 
   21 Jul 2014; Rick Farina <zerochaos@gentoo.org>
   mplayer-1.2_pre20130729.ebuild, mplayer-9999.ebuild:



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

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

Index: mplayer-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- mplayer-9999.ebuild	21 Jul 2014 15:23:36 -0000	1.158
+++ mplayer-9999.ebuild	21 Jul 2014 15:44:05 -0000	1.159
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.158 2014/07/21 15:23:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.159 2014/07/21 15:44:05 ssuominen Exp $
 
 EAPI=5
 
@@ -529,7 +529,6 @@
 	# Build only user-requested docs if they're available.
 	if use doc ; then
 		# select available languages from $LINGUAS
-		LINGUAS=${LINGUAS/zh/zh_CN}
 		local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
 		local BUILT_DOCS=""
 		for i in ${LINGUAS} ; do





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

end of thread, other threads:[~2014-07-21 15:44 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-11 22:52 [gentoo-commits] gentoo-x86 commit in media-video/mplayer: mplayer-1.2_pre20130729.ebuild ChangeLog mplayer-9999.ebuild Alexis Ballier (aballier)
  -- strict thread matches above, loose matches on Subject: below --
2014-07-21 15:44 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