[gentoo-commits] gentoo-x86 commit in x11-wm/xpra: metadata.xml xpra-0.10.0.ebuild ChangeLog

[gentoo-commits] gentoo-x86 commit in x11-wm/xpra: metadata.xml xpra-0.10.0.ebuild ChangeLog

[Michael Weber (xmw)]

xmw         13/08/16 19:26:43

  Modified:             metadata.xml xpra-0.10.0.ebuild ChangeLog
  Log:
  Required use, add gtk+:2 dep. Building against gtk+:3 or qt4 doesn't work.
  
  (Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

Revision  Changes    Path
1.9                  x11-wm/xpra/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/xpra/metadata.xml?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/xpra/metadata.xml?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/xpra/metadata.xml?r1=1.8&r2=1.9

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/xpra/metadata.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- metadata.xml	15 Aug 2013 11:50:37 -0000	1.8
+++ metadata.xml	16 Aug 2013 19:26:43 -0000	1.9
@@ -15,5 +15,7 @@
 	<flag name='rencode'>Enable rencode support</flag>
 	<flag name='vpx'>Enable vpx image format support</flag>
 	<flag name='webp'>Enable webp image format support</flag>
+	<flag name='csc'>Enable csc softscaler support</flag>
+	<flag name='dec_av'>Enable dec_avcodec support</flag>
 </use>
 </pkgmetadata>



1.2                  x11-wm/xpra/xpra-0.10.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/xpra/xpra-0.10.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/xpra/xpra-0.10.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/xpra/xpra-0.10.0.ebuild?r1=1.1&r2=1.2

Index: xpra-0.10.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.10.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xpra-0.10.0.ebuild	15 Aug 2013 11:50:37 -0000	1.1
+++ xpra-0.10.0.ebuild	16 Aug 2013 19:26:43 -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/x11-wm/xpra/xpra-0.10.0.ebuild,v 1.1 2013/08/15 11:50:37 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.10.0.ebuild,v 1.2 2013/08/16 19:26:43 xmw Exp $
 
 EAPI=5
 
@@ -14,31 +14,35 @@
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard gtk opengl pulseaudio qt4 +rencode server sound vpx webp x264"
+IUSE="+client +clipboard csc dec_av opengl pulseaudio +rencode server sound vpx webp x264"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	clipboard? ( || ( server client ) )
+	opengl? ( client )
+	|| ( client server )"
 
 # x264/old-libav.path situation see bug 459218
 COMMON_DEPEND=""${PYTHON_DEPS}"
 	dev-python/pygobject:2[${PYTHON_USEDEP}]
 	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	x11-libs/gtk+:2
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXdamage
 	x11-libs/libXfixes
 	x11-libs/libXrandr
 	x11-libs/libXtst
+	csc? ( || ( >=media-video/ffmpeg-1.2.2 media-video/libav ) )
+	dec_av? ( || ( >=media-video/ffmpeg-1.2.2 media-video/libav ) )
 	opengl? ( dev-python/pygtkglext )
 	pulseaudio? ( media-sound/pulseaudio )
 	sound? ( media-libs/gstreamer
 		media-libs/gst-plugins-base
 		dev-python/gst-python )
-	vpx? ( media-libs/libvpx
-		virtual/ffmpeg )
+	vpx? ( media-libs/libvpx virtual/ffmpeg )
 	webp? ( media-libs/libwebp )
 	x264? ( media-libs/x264
-		|| ( >=media-video/ffmpeg-1.0.4:0 media-video/libav )
-		virtual/ffmpeg )"
+		|| ( >=media-video/ffmpeg-1.0.4:0 media-video/libav ) )"
 
 RDEPEND="${COMMON_DEPEND}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
@@ -73,10 +77,12 @@
 	mydistutilsargs=(
 		$(use_with client)
 		$(use_with clipboard)
-		$(use_with gtk gtk2)
+		$(use_with csc csc_swscale)
+		$(use_with dec_av dec_avcodec)
 		$(use_with opengl)
-		$(use_with qt4)
 		$(use_with rencode)
+		$(use_with server cymaths)
+		$(use_with server shadow)
 		$(use_with server)
 		$(use_with sound)
 		$(use_with vpx)
@@ -84,13 +90,12 @@
 		$(use_with x264 enc_x264)
 		--with-Xdummy
 		--with-argb
-		--with-csc_swscale
 		--without-csc_nvcuda
-		--with-cymaths
 		--with-cyxor
-		--with-dec_avcodec
+		--with-gtk2
+		--without-gtk3
+		--without-qt4
 		--with-nvenc
-		--with-shadow
 		--with-strict
 		--with-warn
 		--with-x11



1.78                 x11-wm/xpra/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/xpra/ChangeLog?rev=1.78&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/xpra/ChangeLog?rev=1.78&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/xpra/ChangeLog?r1=1.77&r2=1.78

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- ChangeLog	15 Aug 2013 11:50:37 -0000	1.77
+++ ChangeLog	16 Aug 2013 19:26:43 -0000	1.78
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/xpra
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.77 2013/08/15 11:50:37 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.78 2013/08/16 19:26:43 xmw Exp $
+
+  16 Aug 2013; Michael Weber <xmw@gentoo.org> metadata.xml, xpra-0.10.0.ebuild:
+  Required use, add gtk+:2 dep. Building against gtk+:3 or qt4 doesn't work.
 
 *xpra-0.10.0 (15 Aug 2013)