summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2015-06-07 21:30:32 +0000
committerMichael Weber <xmw@gentoo.org>2015-06-07 21:30:32 +0000
commita3cbf61c6343012f70637bcf5cc4bdff446ea119 (patch)
tree56fb2461c3a599d695e88d915647ba2a9815b3b9 /x11-wm/xpra
parentAdd github to remote-id in metadata.xml (diff)
downloadgentoo-2-a3cbf61c6343012f70637bcf5cc4bdff446ea119.tar.gz
gentoo-2-a3cbf61c6343012f70637bcf5cc4bdff446ea119.tar.bz2
gentoo-2-a3cbf61c6343012f70637bcf5cc4bdff446ea119.zip
Add USE=x265
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Diffstat (limited to 'x11-wm/xpra')
-rw-r--r--x11-wm/xpra/ChangeLog5
-rw-r--r--x11-wm/xpra/xpra-0.14.25.ebuild13
2 files changed, 15 insertions, 3 deletions
diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog
index f349d454bd8a..d6b2788a389d 100644
--- a/x11-wm/xpra/ChangeLog
+++ b/x11-wm/xpra/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-wm/xpra
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.121 2015/06/07 17:10:50 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.122 2015/06/07 21:30:32 xmw Exp $
+
+ 07 Jun 2015; Michael Weber <xmw@gentoo.org> xpra-0.14.25.ebuild:
+ Add USE=x265
*xpra-0.15.0 (07 Jun 2015)
diff --git a/x11-wm/xpra/xpra-0.14.25.ebuild b/x11-wm/xpra/xpra-0.14.25.ebuild
index 0cb6709537ff..8ed6d14241e3 100644
--- a/x11-wm/xpra/xpra-0.14.25.ebuild
+++ b/x11-wm/xpra/xpra-0.14.25.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.14.25.ebuild,v 1.1 2015/06/07 15:51:11 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.14.25.ebuild,v 1.2 2015/06/07 21:30:32 xmw Exp $
EAPI=5
# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 copmat
@@ -14,7 +14,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz"
LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc dec_av dec_av2 libav opengl pulseaudio +rencode server sound vpx webp x264"
+IUSE="+client +clipboard csc dec_av dec_av2 libav opengl pulseaudio +rencode server sound vpx webp x264 x265"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
clipboard? ( || ( server client ) )
@@ -40,6 +40,10 @@ COMMON_DEPEND=""${PYTHON_DEPS}"
!libav? ( >=media-video/ffmpeg-1.2.2:0= )
libav? ( media-video/libav:0= )
)
+ dec_av2? (
+ !libav? ( >=media-video/ffmpeg-2:0= )
+ libav? ( media-video/libav:0= )
+ )
opengl? ( dev-python/pygtkglext )
pulseaudio? ( media-sound/pulseaudio )
sound? ( media-libs/gstreamer:0.10
@@ -50,6 +54,10 @@ COMMON_DEPEND=""${PYTHON_DEPS}"
x264? ( media-libs/x264
!libav? ( >=media-video/ffmpeg-1.0.4:0= )
libav? ( media-video/libav:0= )
+ )
+ x265? ( media-libs/x265
+ !libav? ( >=media-video/ffmpeg-2:0= )
+ libav? ( media-video/libav:0= )
)"
RDEPEND="${COMMON_DEPEND}
@@ -98,6 +106,7 @@ python_configure_all() {
$(use_with vpx)
$(use_with webp)
$(use_with x264 enc_x264)
+ $(use_with x265 enc_x265)
--with-Xdummy
--with-argb
--with-cyxor