x11-wm/xpra: REQUIRE_USE dec_av2 for x264 and x265 decoding (thanks Christohper Harri...

Package-Manager: portage-2.2.28

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index f47e1bb82835067965568fbdd9fc07727da16ae9..6fe7cb20bd3833f6178e3da242a35605065a983c 100644 (file)
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -2,5 +2,4 @@ DIST xpra-0.14.27.tar.xz 1123504 SHA256 9d51d6e656a9afc6559ec4b671a706ba134257c8
 DIST xpra-0.14.34.tar.xz 1127536 SHA256 1f59e3d308bdff6e3b19df0c671a97d2a4bc8e1ec1c3dd49c2bbc8f9feefd8aa SHA512 e19cc701fce797ca96bbf1cc1e4140b8a1d35ca5c1a8bd3cf4a16623908c28c0dd119f654e103352a3a2ec09735bf8562f4669aefe39b746933202621e905230 WHIRLPOOL 32a175b04ab8b6bdf3e5a53bea91a6e01925a3f40358e3edf2a786d58d52e05d917a04f3ffdcf8bbee07fb5ce8c8d032e5cbc52542d9b16a13ba072ff4aa71af
 DIST xpra-0.15.10.tar.xz 1200040 SHA256 1403aaf571c486bb4a67bc9e9d431e5f863c9b7912bd65e6aec62fcea2d9d4e0 SHA512 add1e63da75b7e29163a7e0957e3f841019c557ba42b15f437ed385de99905cb28a3760386570b72c5d2ba305c5b7779a85ca39d4452ccd6133c26f0a7983d9a WHIRLPOOL a5c50b68b39786aad6c50332340bf421ac17f38948880acb49d55769e8a9b4fb48b068a0fea0e5e660e9621b460eb60d19131600173b826b54a4f7d2e623fb5f
 DIST xpra-0.16.3.tar.xz 1343392 SHA256 1516ab10eb348092077ffb698bce234d06a234a5748e422fdf92f34922fb39ea SHA512 1a6bbd01837e702e98ffcaffe12a2e5320108ef50f0fcc64a80735fb53a2b41e4cdda0e0a2d1a3b5f2159a81da4a7c2cac458ab4c2eed4de17adb4e963218590 WHIRLPOOL 621604bdfa2790d98e67b33b6703662f611cbbd81c23a40a96c6ae7f987a188826304caaf6fc8b08da78edba28b0129ee108234e13daa4fa46313b9cec6a5afe
-DIST xpra-0.17.3.tar.xz 1416376 SHA256 9cd07b8caa505a8b69f4e53062d38e124f6e610befa9bb2fb0331f29a947ca39 SHA512 d3a62c4c6c6f63d165fb605bacaf8f50e773dac09a92cbfdf521a91e085245cff287e6c534eb86fa5987c7d1ed04d4e55c1a812ca5e599311cb314e65b4d14dd WHIRLPOOL a3876fefba7ebfee79067fb00cfbb59db86ba88b5243b1472a6127e175a9359a471734b0a7603cae026421a113039f178d7d9d69f866e7d10d90be06a741983f
 DIST xpra-0.17.4.tar.xz 1416960 SHA256 92a7854b8ddad6a28efddf226bcbe8e79b051dff859246fcb5f2c7d0828f3d6d SHA512 5463d3ca659fe6d1617e69eee0b115f9df2f488c8c390a02e9eb31e04c29d262679a5463fdd13472cdd2328d01c52fde6ad9a87686fe95cb8adcbff97af6e324 WHIRLPOOL b3d3f6c4ed96dc3388059872cd194726bc4f27c2afd619dcaf25c50f6752dbadfbbf8df0bdc7274d2a3bc5434545d661a890ffcc3e89658e139fe863b5d58542

diff --git a/x11-wm/xpra/xpra-0.17.3.ebuild b/x11-wm/xpra/xpra-0.17.3.ebuild
deleted file mode 100644 (file)
index 85b7b25..0000000
--- a/x11-wm/xpra/xpra-0.17.3.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 compat
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils flag-o-matic user
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
-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 cups dec_av2 libav lz4 lzo opengl pulseaudio server sound vpx webp x264 x265"
-
-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? (
-               !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:1.0
-               media-libs/gst-plugins-base:1.0
-               dev-python/gst-python:1.0 )
-       vpx? ( media-libs/libvpx virtual/ffmpeg )
-       webp? ( media-libs/libwebp )
-       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}
-       dev-python/dbus-python[${PYTHON_USEDEP}]
-       dev-python/ipython[${PYTHON_USEDEP}]
-       dev-python/numpy[${PYTHON_USEDEP}]
-       dev-python/pillow[${PYTHON_USEDEP}]
-       dev-python/rencode[${PYTHON_USEDEP}]
-       virtual/ssh
-       x11-apps/xmodmap
-       cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
-       lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-       lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
-       opengl? (
-               client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
-       )
-       server? ( x11-base/xorg-server[-minimal,xvfb]
-               x11-drivers/xf86-input-void
-               x11-drivers/xf86-video-dummy
-       )"
-DEPEND="${COMMON_DEPEND}
-       virtual/pkgconfig
-       >=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-pkg_postinst() {
-       enewgroup ${PN}
-}
-
-python_prepare_all() {
-       rm -rf rencode || die
-
-       epatch \
-               "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
-               "${FILESDIR}"/${PN}-0.16.2-prefix.patch
-
-       if use libav ; then
-               if ! has_version ">=media-video/libav-9" ; then
-                       epatch patches/old-libav.patch
-               fi
-       fi
-
-       distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-       mydistutilsargs=(
-               $(use_with client)
-               $(use_with clipboard)
-               $(use_with csc csc_swscale)
-               $(use_with cups printing)
-               $(use_with dec_av2 dec_avcodec2)
-               $(use_with opengl)
-               $(use_with server shadow)
-               $(use_with server)
-               $(use_with sound)
-               $(use_with vpx)
-               $(use_with webp)
-               $(use_with x264 enc_x264)
-               $(use_with x265 enc_x265)
-               --with-Xdummy
-               --with-gtk2
-               --without-gtk3
-               --with-strict
-               --with-warn
-               --with-x11
-               --without-PIC
-               --without-debug )
-
-       # see https://www.xpra.org/trac/ticket/1080
-       # and http://trac.cython.org/ticket/395
-       append-cflags -fno-strict-aliasing
-}

diff --git a/x11-wm/xpra/xpra-0.17.4.ebuild b/x11-wm/xpra/xpra-0.17.4.ebuild
index 85b7b25586a1d30b12631631e6130578eb4a8d46..4b4e7090f39dd10612845b9356f707f759a3205f 100644 (file)
--- a/x11-wm/xpra/xpra-0.17.4.ebuild
+++ b/x11-wm/xpra/xpra-0.17.4.ebuild
@@ -19,7 +19,8 @@ IUSE="+client +clipboard csc cups dec_av2 libav lz4 lzo opengl pulseaudio server
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
        clipboard? ( || ( server client ) )
        opengl? ( client )
-       || ( client server )"
+       || ( client server )
+       client? ( x264? ( dec_av2 ) x265? ( dec_av2 ) )"
 
 # x264/old-libav.path situation see bug 459218
 COMMON_DEPEND=""${PYTHON_DEPS}"