1 |
commit: 4cca9e506e6d9aa9b40c8fa38fb1f29ee6557e67 |
2 |
Author: Michael Weber <xmw <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 3 09:52:36 2016 +0000 |
4 |
Commit: Michael Weber <xmw <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 3 09:52:52 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cca9e50 |
7 |
|
8 |
x11-wm/xpra: REQUIRE_USE dec_av2 for x264 and x265 decoding (thanks Christohper Harrington, bug 586338), drop old. |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
x11-wm/xpra/Manifest | 1 - |
13 |
x11-wm/xpra/xpra-0.17.3.ebuild | 128 ----------------------------------------- |
14 |
x11-wm/xpra/xpra-0.17.4.ebuild | 3 +- |
15 |
3 files changed, 2 insertions(+), 130 deletions(-) |
16 |
|
17 |
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest |
18 |
index f47e1bb..6fe7cb2 100644 |
19 |
--- a/x11-wm/xpra/Manifest |
20 |
+++ b/x11-wm/xpra/Manifest |
21 |
@@ -2,5 +2,4 @@ DIST xpra-0.14.27.tar.xz 1123504 SHA256 9d51d6e656a9afc6559ec4b671a706ba134257c8 |
22 |
DIST xpra-0.14.34.tar.xz 1127536 SHA256 1f59e3d308bdff6e3b19df0c671a97d2a4bc8e1ec1c3dd49c2bbc8f9feefd8aa SHA512 e19cc701fce797ca96bbf1cc1e4140b8a1d35ca5c1a8bd3cf4a16623908c28c0dd119f654e103352a3a2ec09735bf8562f4669aefe39b746933202621e905230 WHIRLPOOL 32a175b04ab8b6bdf3e5a53bea91a6e01925a3f40358e3edf2a786d58d52e05d917a04f3ffdcf8bbee07fb5ce8c8d032e5cbc52542d9b16a13ba072ff4aa71af |
23 |
DIST xpra-0.15.10.tar.xz 1200040 SHA256 1403aaf571c486bb4a67bc9e9d431e5f863c9b7912bd65e6aec62fcea2d9d4e0 SHA512 add1e63da75b7e29163a7e0957e3f841019c557ba42b15f437ed385de99905cb28a3760386570b72c5d2ba305c5b7779a85ca39d4452ccd6133c26f0a7983d9a WHIRLPOOL a5c50b68b39786aad6c50332340bf421ac17f38948880acb49d55769e8a9b4fb48b068a0fea0e5e660e9621b460eb60d19131600173b826b54a4f7d2e623fb5f |
24 |
DIST xpra-0.16.3.tar.xz 1343392 SHA256 1516ab10eb348092077ffb698bce234d06a234a5748e422fdf92f34922fb39ea SHA512 1a6bbd01837e702e98ffcaffe12a2e5320108ef50f0fcc64a80735fb53a2b41e4cdda0e0a2d1a3b5f2159a81da4a7c2cac458ab4c2eed4de17adb4e963218590 WHIRLPOOL 621604bdfa2790d98e67b33b6703662f611cbbd81c23a40a96c6ae7f987a188826304caaf6fc8b08da78edba28b0129ee108234e13daa4fa46313b9cec6a5afe |
25 |
-DIST xpra-0.17.3.tar.xz 1416376 SHA256 9cd07b8caa505a8b69f4e53062d38e124f6e610befa9bb2fb0331f29a947ca39 SHA512 d3a62c4c6c6f63d165fb605bacaf8f50e773dac09a92cbfdf521a91e085245cff287e6c534eb86fa5987c7d1ed04d4e55c1a812ca5e599311cb314e65b4d14dd WHIRLPOOL a3876fefba7ebfee79067fb00cfbb59db86ba88b5243b1472a6127e175a9359a471734b0a7603cae026421a113039f178d7d9d69f866e7d10d90be06a741983f |
26 |
DIST xpra-0.17.4.tar.xz 1416960 SHA256 92a7854b8ddad6a28efddf226bcbe8e79b051dff859246fcb5f2c7d0828f3d6d SHA512 5463d3ca659fe6d1617e69eee0b115f9df2f488c8c390a02e9eb31e04c29d262679a5463fdd13472cdd2328d01c52fde6ad9a87686fe95cb8adcbff97af6e324 WHIRLPOOL b3d3f6c4ed96dc3388059872cd194726bc4f27c2afd619dcaf25c50f6752dbadfbbf8df0bdc7274d2a3bc5434545d661a890ffcc3e89658e139fe863b5d58542 |
27 |
|
28 |
diff --git a/x11-wm/xpra/xpra-0.17.3.ebuild b/x11-wm/xpra/xpra-0.17.3.ebuild |
29 |
deleted file mode 100644 |
30 |
index 85b7b25..0000000 |
31 |
--- a/x11-wm/xpra/xpra-0.17.3.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,128 +0,0 @@ |
34 |
-# Copyright 1999-2016 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
-# $Id$ |
37 |
-EAPI=5 |
38 |
- |
39 |
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 compat |
40 |
-PYTHON_COMPAT=( python2_7 ) |
41 |
-inherit distutils-r1 eutils flag-o-matic user |
42 |
- |
43 |
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy" |
44 |
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/" |
45 |
-SRC_URI="http://xpra.org/src/${P}.tar.xz" |
46 |
- |
47 |
-LICENSE="GPL-2 BSD" |
48 |
-SLOT="0" |
49 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
50 |
-IUSE="+client +clipboard csc cups dec_av2 libav lz4 lzo opengl pulseaudio server sound vpx webp x264 x265" |
51 |
- |
52 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
53 |
- clipboard? ( || ( server client ) ) |
54 |
- opengl? ( client ) |
55 |
- || ( client server )" |
56 |
- |
57 |
-# x264/old-libav.path situation see bug 459218 |
58 |
-COMMON_DEPEND=""${PYTHON_DEPS}" |
59 |
- dev-python/pygobject:2[${PYTHON_USEDEP}] |
60 |
- dev-python/pygtk:2[${PYTHON_USEDEP}] |
61 |
- x11-libs/gtk+:2 |
62 |
- x11-libs/libX11 |
63 |
- x11-libs/libXcomposite |
64 |
- x11-libs/libXdamage |
65 |
- x11-libs/libXfixes |
66 |
- x11-libs/libXrandr |
67 |
- x11-libs/libXtst |
68 |
- csc? ( |
69 |
- !libav? ( >=media-video/ffmpeg-1.2.2:0= ) |
70 |
- libav? ( media-video/libav:0= ) |
71 |
- ) |
72 |
- dec_av2? ( |
73 |
- !libav? ( >=media-video/ffmpeg-2:0= ) |
74 |
- libav? ( media-video/libav:0= ) |
75 |
- ) |
76 |
- opengl? ( dev-python/pygtkglext ) |
77 |
- pulseaudio? ( media-sound/pulseaudio ) |
78 |
- sound? ( media-libs/gstreamer:1.0 |
79 |
- media-libs/gst-plugins-base:1.0 |
80 |
- dev-python/gst-python:1.0 ) |
81 |
- vpx? ( media-libs/libvpx virtual/ffmpeg ) |
82 |
- webp? ( media-libs/libwebp ) |
83 |
- x264? ( media-libs/x264 |
84 |
- !libav? ( >=media-video/ffmpeg-1.0.4:0= ) |
85 |
- libav? ( media-video/libav:0= ) |
86 |
- ) |
87 |
- x265? ( media-libs/x265 |
88 |
- !libav? ( >=media-video/ffmpeg-2:0= ) |
89 |
- libav? ( media-video/libav:0= ) |
90 |
- )" |
91 |
- |
92 |
-RDEPEND="${COMMON_DEPEND} |
93 |
- dev-python/dbus-python[${PYTHON_USEDEP}] |
94 |
- dev-python/ipython[${PYTHON_USEDEP}] |
95 |
- dev-python/numpy[${PYTHON_USEDEP}] |
96 |
- dev-python/pillow[${PYTHON_USEDEP}] |
97 |
- dev-python/rencode[${PYTHON_USEDEP}] |
98 |
- virtual/ssh |
99 |
- x11-apps/xmodmap |
100 |
- cups? ( dev-python/pycups[${PYTHON_USEDEP}] ) |
101 |
- lz4? ( dev-python/lz4[${PYTHON_USEDEP}] ) |
102 |
- lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] ) |
103 |
- opengl? ( |
104 |
- client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] ) |
105 |
- ) |
106 |
- server? ( x11-base/xorg-server[-minimal,xvfb] |
107 |
- x11-drivers/xf86-input-void |
108 |
- x11-drivers/xf86-video-dummy |
109 |
- )" |
110 |
-DEPEND="${COMMON_DEPEND} |
111 |
- virtual/pkgconfig |
112 |
- >=dev-python/cython-0.16[${PYTHON_USEDEP}]" |
113 |
- |
114 |
-pkg_postinst() { |
115 |
- enewgroup ${PN} |
116 |
-} |
117 |
- |
118 |
-python_prepare_all() { |
119 |
- rm -rf rencode || die |
120 |
- |
121 |
- epatch \ |
122 |
- "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \ |
123 |
- "${FILESDIR}"/${PN}-0.16.2-prefix.patch |
124 |
- |
125 |
- if use libav ; then |
126 |
- if ! has_version ">=media-video/libav-9" ; then |
127 |
- epatch patches/old-libav.patch |
128 |
- fi |
129 |
- fi |
130 |
- |
131 |
- distutils-r1_python_prepare_all |
132 |
-} |
133 |
- |
134 |
-python_configure_all() { |
135 |
- mydistutilsargs=( |
136 |
- $(use_with client) |
137 |
- $(use_with clipboard) |
138 |
- $(use_with csc csc_swscale) |
139 |
- $(use_with cups printing) |
140 |
- $(use_with dec_av2 dec_avcodec2) |
141 |
- $(use_with opengl) |
142 |
- $(use_with server shadow) |
143 |
- $(use_with server) |
144 |
- $(use_with sound) |
145 |
- $(use_with vpx) |
146 |
- $(use_with webp) |
147 |
- $(use_with x264 enc_x264) |
148 |
- $(use_with x265 enc_x265) |
149 |
- --with-Xdummy |
150 |
- --with-gtk2 |
151 |
- --without-gtk3 |
152 |
- --with-strict |
153 |
- --with-warn |
154 |
- --with-x11 |
155 |
- --without-PIC |
156 |
- --without-debug ) |
157 |
- |
158 |
- # see https://www.xpra.org/trac/ticket/1080 |
159 |
- # and http://trac.cython.org/ticket/395 |
160 |
- append-cflags -fno-strict-aliasing |
161 |
-} |
162 |
|
163 |
diff --git a/x11-wm/xpra/xpra-0.17.4.ebuild b/x11-wm/xpra/xpra-0.17.4.ebuild |
164 |
index 85b7b25..4b4e709 100644 |
165 |
--- a/x11-wm/xpra/xpra-0.17.4.ebuild |
166 |
+++ b/x11-wm/xpra/xpra-0.17.4.ebuild |
167 |
@@ -19,7 +19,8 @@ IUSE="+client +clipboard csc cups dec_av2 libav lz4 lzo opengl pulseaudio server |
168 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
169 |
clipboard? ( || ( server client ) ) |
170 |
opengl? ( client ) |
171 |
- || ( client server )" |
172 |
+ || ( client server ) |
173 |
+ client? ( x264? ( dec_av2 ) x265? ( dec_av2 ) )" |
174 |
|
175 |
# x264/old-libav.path situation see bug 459218 |
176 |
COMMON_DEPEND=""${PYTHON_DEPS}" |