public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-video/vlc: vlc-2.0.9.ebuild vlc-2.1.1.ebuild vlc-2.1.2.ebuild vlc-2.0.8.ebuild vlc-2.1.0.ebuild vlc-2.0.8a.ebuild ChangeLog
@ 2013-12-20 20:01 Tom Wijsman (tomwij)
  0 siblings, 0 replies; only message in thread
From: Tom Wijsman (tomwij) @ 2013-12-20 20:01 UTC (permalink / raw
  To: gentoo-commits

tomwij      13/12/20 20:01:29

  Modified:             vlc-2.0.9.ebuild vlc-2.1.1.ebuild vlc-2.1.2.ebuild
                        vlc-2.0.8.ebuild vlc-2.1.0.ebuild vlc-2.0.8a.ebuild
                        ChangeLog
  Log:
  Swapped ffmpeg and libpostproc order in postproc dependency line to aid Portage dependency resolution, low backtracking was causing blockers; reported by iamben.
  
  (Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

Revision  Changes    Path
1.5                  media-video/vlc/vlc-2.0.9.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.0.9.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.0.9.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.0.9.ebuild?r1=1.4&r2=1.5

Index: vlc-2.0.9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vlc-2.0.9.ebuild	6 Dec 2013 17:11:28 -0000	1.4
+++ vlc-2.0.9.ebuild	20 Dec 2013 20:01:29 -0000	1.5
@@ -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/vlc/vlc-2.0.9.ebuild,v 1.4 2013/12/06 17:11:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9.ebuild,v 1.5 2013/12/20 20:01:29 tomwij Exp $
 
 EAPI="5"
 
@@ -114,7 +114,7 @@
 		opus? ( >=media-libs/opus-1.0.3:0 )
 		png? ( media-libs/libpng:0= sys-libs/zlib:0 )
 		portaudio? ( >=media-libs/portaudio-19_pre:0 )
-		postproc? ( || ( media-video/ffmpeg:0= media-libs/libpostproc:0 ) )
+		postproc? ( || ( media-libs/libpostproc:0 media-video/ffmpeg:0= ) )
 		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
 		qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )



1.4                  media-video/vlc/vlc-2.1.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.1.ebuild?r1=1.3&r2=1.4

Index: vlc-2.1.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vlc-2.1.1.ebuild	7 Dec 2013 20:19:42 -0000	1.3
+++ vlc-2.1.1.ebuild	20 Dec 2013 20:01:29 -0000	1.4
@@ -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/vlc/vlc-2.1.1.ebuild,v 1.3 2013/12/07 20:19:42 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.1.ebuild,v 1.4 2013/12/20 20:01:29 tomwij Exp $
 
 EAPI="5"
 
@@ -115,7 +115,7 @@
 		opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
 		opus? ( >=media-libs/opus-1.0.3:0 )
 		png? ( media-libs/libpng:0= sys-libs/zlib:0 )
-		postproc? ( || ( >=media-video/ffmpeg-1.2:0= media-libs/libpostproc:0 ) )
+		postproc? ( || ( media-libs/libpostproc:0 >=media-video/ffmpeg-1.2:0= ) )
 		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
 		qt4? ( >=dev-qt/qtgui-4.6.0:4 >=dev-qt/qtcore-4.6.0:4 )



1.2                  media-video/vlc/vlc-2.1.2.ebuild

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

Index: vlc-2.1.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vlc-2.1.2.ebuild	15 Dec 2013 23:07:19 -0000	1.1
+++ vlc-2.1.2.ebuild	20 Dec 2013 20:01:29 -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/vlc/vlc-2.1.2.ebuild,v 1.1 2013/12/15 23:07:19 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild,v 1.2 2013/12/20 20:01:29 tomwij Exp $
 
 EAPI="5"
 
@@ -115,7 +115,7 @@
 		opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
 		opus? ( >=media-libs/opus-1.0.3:0 )
 		png? ( media-libs/libpng:0= sys-libs/zlib:0 )
-		postproc? ( || ( >=media-video/ffmpeg-1.2:0= media-libs/libpostproc:0 ) )
+		postproc? ( || ( media-libs/libpostproc:0 >=media-video/ffmpeg-1.2:0= ) )
 		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
 		qt4? ( >=dev-qt/qtgui-4.6.0:4 >=dev-qt/qtcore-4.6.0:4 )



1.5                  media-video/vlc/vlc-2.0.8.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.0.8.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.0.8.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.0.8.ebuild?r1=1.4&r2=1.5

Index: vlc-2.0.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.8.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vlc-2.0.8.ebuild	6 Dec 2013 17:11:28 -0000	1.4
+++ vlc-2.0.8.ebuild	20 Dec 2013 20:01:29 -0000	1.5
@@ -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/vlc/vlc-2.0.8.ebuild,v 1.4 2013/12/06 17:11:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.8.ebuild,v 1.5 2013/12/20 20:01:29 tomwij Exp $
 
 EAPI="5"
 
@@ -114,7 +114,7 @@
 		opus? ( >=media-libs/opus-1.0.3:0 )
 		png? ( media-libs/libpng:0= sys-libs/zlib:0 )
 		portaudio? ( >=media-libs/portaudio-19_pre:0 )
-		postproc? ( || ( media-video/ffmpeg:0= media-libs/libpostproc:0 ) )
+		postproc? ( || ( media-libs/libpostproc:0 media-video/ffmpeg:0= ) )
 		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
 		qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )



1.11                 media-video/vlc/vlc-2.1.0.ebuild

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

Index: vlc-2.1.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.0.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vlc-2.1.0.ebuild	6 Dec 2013 17:11:28 -0000	1.10
+++ vlc-2.1.0.ebuild	20 Dec 2013 20:01:29 -0000	1.11
@@ -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/vlc/vlc-2.1.0.ebuild,v 1.10 2013/12/06 17:11:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.0.ebuild,v 1.11 2013/12/20 20:01:29 tomwij Exp $
 
 EAPI="5"
 
@@ -115,7 +115,7 @@
 		opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
 		opus? ( >=media-libs/opus-1.0.3:0 )
 		png? ( media-libs/libpng:0= sys-libs/zlib:0 )
-		postproc? ( || ( >=media-video/ffmpeg-1.2:0= media-libs/libpostproc:0 ) )
+		postproc? ( || ( media-libs/libpostproc:0 >=media-video/ffmpeg-1.2:0= ) )
 		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
 		qt4? ( >=dev-qt/qtgui-4.6.0:4 >=dev-qt/qtcore-4.6.0:4 )



1.5                  media-video/vlc/vlc-2.0.8a.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.0.8a.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.0.8a.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.0.8a.ebuild?r1=1.4&r2=1.5

Index: vlc-2.0.8a.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.8a.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vlc-2.0.8a.ebuild	6 Dec 2013 17:11:28 -0000	1.4
+++ vlc-2.0.8a.ebuild	20 Dec 2013 20:01:29 -0000	1.5
@@ -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/vlc/vlc-2.0.8a.ebuild,v 1.4 2013/12/06 17:11:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.8a.ebuild,v 1.5 2013/12/20 20:01:29 tomwij Exp $
 
 EAPI="5"
 
@@ -114,7 +114,7 @@
 		opus? ( >=media-libs/opus-1.0.3:0 )
 		png? ( media-libs/libpng:0= sys-libs/zlib:0 )
 		portaudio? ( >=media-libs/portaudio-19_pre:0 )
-		postproc? ( || ( media-video/ffmpeg:0= media-libs/libpostproc:0 ) )
+		postproc? ( || ( media-libs/libpostproc:0 media-video/ffmpeg:0= ) )
 		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
 		qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )



1.881                media-video/vlc/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v
retrieving revision 1.880
retrieving revision 1.881
diff -u -r1.880 -r1.881
--- ChangeLog	20 Dec 2013 19:57:22 -0000	1.880
+++ ChangeLog	20 Dec 2013 20:01:29 -0000	1.881
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.880 2013/12/20 19:57:22 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.881 2013/12/20 20:01:29 tomwij Exp $
+
+  20 Dec 2013; Tom Wijsman <TomWij@gentoo.org> vlc-2.0.8.ebuild,
+  vlc-2.0.8a.ebuild, vlc-2.0.9.ebuild, vlc-2.1.0.ebuild, vlc-2.1.1.ebuild,
+  vlc-2.1.2.ebuild:
+  Swapped ffmpeg and libpostproc order in postproc dependency line to aid
+  Portage dependency resolution, low backtracking was causing blockers; reported
+  by iamben.
 
   20 Dec 2013; Tom Wijsman <TomWij@gentoo.org> -vlc-2.0.6.ebuild:
   Drop old.





^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2013-12-20 20:01 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-20 20:01 [gentoo-commits] gentoo-x86 commit in media-video/vlc: vlc-2.0.9.ebuild vlc-2.1.1.ebuild vlc-2.1.2.ebuild vlc-2.0.8.ebuild vlc-2.1.0.ebuild vlc-2.0.8a.ebuild ChangeLog Tom Wijsman (tomwij)

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