diff options
| author |   Michael Weber <xmw@gentoo.org> | 2012-05-23 22:57:51 +0000 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2012-05-23 22:57:51 +0000 |
| commit | d5481fdef91420f2cd02dcbdb0363750745e3699 (patch) | |
| tree | e295c06348ef639e6ed19a76fb400e608e95ff4f /x11-wm | |
| parent | Inherit user for enewuser/etc... (diff) | |
| download | historical-d5481fdef91420f2cd02dcbdb0363750745e3699.tar.gz historical-d5481fdef91420f2cd02dcbdb0363750745e3699.tar.bz2 historical-d5481fdef91420f2cd02dcbdb0363750745e3699.zip | |
Add USE flags ffmpeg and x264 (thans soxx)
Package-Manager: portage-2.1.10.62/cvs/Linux x86_64
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/xpra/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-wm/xpra/Manifest | 10 | ||||
| -rw-r--r-- | x11-wm/xpra/xpra-0.2.0-r1.ebuild (renamed from x11-wm/xpra/xpra-0.2.0.ebuild) | 15 |
3 files changed, 23 insertions, 10 deletions
diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog index d367991f81f4..d15a5ffcfa13 100644 --- a/x11-wm/xpra/ChangeLog +++ b/x11-wm/xpra/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-wm/xpra # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.11 2012/05/21 02:26:31 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.12 2012/05/23 22:57:51 xmw Exp $ + +*xpra-0.2.0-r1 (23 May 2012) + + 23 May 2012; Michael Weber <xmw@gentoo.org> -xpra-0.2.0.ebuild, + +xpra-0.2.0-r1.ebuild: + Add USE flags ffmpeg and x264 (thans soxx) 21 May 2012; Michael Weber <xmw@gentoo.org> xpra-0.2.0.ebuild: fix dependency on dev-python/cython (bug 416631, thanks Benjamin Bannier) diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest index ee188395b277..f4d3eb86cd98 100644 --- a/x11-wm/xpra/Manifest +++ b/x11-wm/xpra/Manifest @@ -4,13 +4,13 @@ Hash: SHA256 DIST xpra-0.1.0.1.tar.bz2 918610 RMD160 719a75182ad77672ef89b33cb7c66c904fb8a824 SHA1 ccd5543783125da730610c53150a71284f3773ed SHA256 ba387f10f368c6ce3be78b21d4b02a26e612620c450c104fa71b45c354dac771 DIST xpra-0.2.0.tar.bz2 1098392 RMD160 513fee8e8d0ce96ecaabcf190390ea13d7211e13 SHA1 18df5ccd34340ee860926ace63747d92eabccfa8 SHA256 1b5a88bafabefb0c1c4cdda40c2ac26d07b1bba4b6f880c73997630bc8905a90 EBUILD xpra-0.1.0.1.ebuild 1301 RMD160 fd2a463b9b816b9420c393d1309583b138bc6815 SHA1 a84b27a65cca7ad7ae930162a376b57f1427170d SHA256 a4a9c5092f873a92ac5386a22f16cf3f013f62bcdb091bf0051bdf074ec8e931 -EBUILD xpra-0.2.0.ebuild 1244 RMD160 689e62cf7c1d7738e304780ada76e4257fafdab4 SHA1 b56f3395832854cc626dad66682d1030767d120b SHA256 5f1b26287469356f6a475800711af89ecd83749820cbb524cd0399da36c08200 -MISC ChangeLog 1630 RMD160 84290c00e230a3df1c263bd85f8530e5140ef0cb SHA1 10c916789fdd9dbbf9b3087744ab8011ff03d870 SHA256 e0c3d3d383d8fcd1ed09fe7095ee4d8d7d978b984960874d42af7c5cba1bd28a +EBUILD xpra-0.2.0-r1.ebuild 1424 RMD160 05275d127166c5e8987c575ccc450b57453e8e25 SHA1 4995a635b32f57fa3bfb4bf45a1bb7167b57dc36 SHA256 00f5e6d7e0a1a95d04fc1cd71d6edc5ab43079929c70eab3749d5f34e33643c7 +MISC ChangeLog 1797 RMD160 0e9a5af9aed9de4749238867ce1d606a530c1097 SHA1 37dd2f83fd2f3a49a27881885d67664532c2700b SHA256 047d5e5b4f34befc4b9b38c4e9eb58c40731505be1f71c68d0c550e7da4aecce MISC metadata.xml 434 RMD160 597e0500dab96b90c1a7509383d88e72eee79886 SHA1 baf4ab9359a99b7aef156acc197d511a94d1a07d SHA256 f62a17ffbfedc2e09061cd87a2bcf6e72b3e913a5b1fe6d78df31ace921f99bf -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk+5p84ACgkQknrdDGLu8JDoTQD/Z2Dodu8dNQaRGLa1RkA1bsqz -Tr4N+BtHLQ1cP6fgGLgBAIrwwey0l4RX52in47uZ6hm/Oq+1DTwsY8XBghg0xXgf -=G/3+ +iF4EAREIAAYFAk+9a2QACgkQknrdDGLu8JD4lQEAmXuC5pqtP4XoX0AFezJO2ODl +LvKY2tdTOKNbrDJDdvcA/AxegMFDmx2YgiDXIbodLM99FfPnfEeLeZ/aW1Br1STx +=zIyj -----END PGP SIGNATURE----- diff --git a/x11-wm/xpra/xpra-0.2.0.ebuild b/x11-wm/xpra/xpra-0.2.0-r1.ebuild index 9704616d5470..d993361f73c4 100644 --- a/x11-wm/xpra/xpra-0.2.0.ebuild +++ b/x11-wm/xpra/xpra-0.2.0-r1.ebuild @@ -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/x11-wm/xpra/xpra-0.2.0.ebuild,v 1.2 2012/05/21 02:26:31 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.2.0-r1.ebuild,v 1.1 2012/05/23 22:57:51 xmw Exp $ EAPI=3 @@ -16,12 +16,16 @@ SRC_URI="http://xpra.org/src/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="jpeg libnotify parti png server ssh" +IUSE="ffmpeg jpeg libnotify parti png server ssh x264" COMMON_DEPEND="dev-python/pygtk:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage + ffmpeg? ( + virtual/ffmpeg + x264? ( media-libs/x264 ) + ) server? ( x11-libs/libXtst ) !x11-wm/parti" @@ -39,8 +43,11 @@ DEPEND="${COMMON_DEPEND} dev-python/cython" src_prepare() { - if ! use server; then - epatch disable-posix-server.patch + use server || epatch disable-posix-server.patch + if use ffmpeg ; then + use x264 || epatch disable-x264.patch + else + epatch disable-vpx.patch disable-x264.patch fi $(PYTHON -2) make_constants_pxi.py wimpiggy/lowlevel/constants.txt wimpiggy/lowlevel/constants.pxi || die |