diff options
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/xpra/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-wm/xpra/xpra-0.2.0-r1.ebuild (renamed from x11-wm/xpra/xpra-0.2.0.ebuild) | 15 |
2 files changed, 18 insertions, 5 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/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 |