1 |
commit: d57dca20f6f8ee91ab021ac3b0cf86101521e974 |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 29 22:23:50 2020 +0000 |
4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 29 22:24:45 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d57dca20 |
7 |
|
8 |
x11-wm/xpra: Version bump |
9 |
|
10 |
Closes: https://bugs.gentoo.org/723484 |
11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
12 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
13 |
|
14 |
x11-wm/xpra/Manifest | 1 + |
15 |
x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch | 12 ++ |
16 |
x11-wm/xpra/metadata.xml | 1 + |
17 |
x11-wm/xpra/xpra-4.0.4.ebuild | 139 ++++++++++++++++++++++++ |
18 |
4 files changed, 153 insertions(+) |
19 |
|
20 |
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest |
21 |
index a6c194f8b9e..93154bc9e09 100644 |
22 |
--- a/x11-wm/xpra/Manifest |
23 |
+++ b/x11-wm/xpra/Manifest |
24 |
@@ -1,2 +1,3 @@ |
25 |
DIST xpra-3.0.2.tar.xz 2749196 BLAKE2B 3c8745657a12637704fb88ac7b867ab387ef7ed2250396d9e534aecf81e40f85332a2c51ba49638834012f4a4d85c03bd7e49ee259bb2400aeb60fb06abf8b59 SHA512 115f606ff5886d99a906f318cb1a7a4a86e80ebf23e4336e67938267d92ef624de577cc8fc06c6ce541b7c44a0cef58d930b5928f32e24dfc67c72127c7b623c |
26 |
DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647 SHA512 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681 |
27 |
+DIST xpra-4.0.4.tar.xz 2792512 BLAKE2B e16c47e82cf9f8712521c8f9c436b7bb819d9469fc0135ade1f2c9fc6f2a8a0fecf417caae87a1eca9c4b6daec1a82add5d6547208caee1a1d681ebc7b3d3d3b SHA512 91a90cdab775ec2501ef1601188b97ca4aa741e541f8d941add8d509767790a144b67f094177dda7539eff305710f2c834b90a93e9441437dac615677963094c |
28 |
|
29 |
diff --git a/x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch b/x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch |
30 |
new file mode 100644 |
31 |
index 00000000000..ae590110f1c |
32 |
--- /dev/null |
33 |
+++ b/x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch |
34 |
@@ -0,0 +1,12 @@ |
35 |
+diff -Nuar a/xpra/scripts/config.py b/xpra/scripts/config.py |
36 |
+--- a/xpra/scripts/config.py 2020-05-10 19:00:55.000000000 +0200 |
37 |
++++ b/xpra/scripts/config.py 2020-06-07 18:35:49.361899872 +0200 |
38 |
+@@ -150,7 +150,7 @@ |
39 |
+ if (xorg_stat.st_mode & stat.S_ISUID)!=0: |
40 |
+ if (xorg_stat.st_mode & stat.S_IROTH)==0: |
41 |
+ if warn: |
42 |
+- warn("%s is suid and not readable, Xdummy support unavailable" % xorg_bin) |
43 |
++ debug("%s is suid and not readable, Xdummy support unavailable" % xorg_bin) |
44 |
+ return get_Xvfb_command() |
45 |
+ debug("%s is suid and readable, using the xpra_Xdummy wrapper" % xorg_bin) |
46 |
+ use_wrapper = True |
47 |
|
48 |
diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml |
49 |
index e1742788d2b..349c6f4b186 100644 |
50 |
--- a/x11-wm/xpra/metadata.xml |
51 |
+++ b/x11-wm/xpra/metadata.xml |
52 |
@@ -17,6 +17,7 @@ |
53 |
<bugs-to>https://www.xpra.org/trac/report</bugs-to> |
54 |
</upstream> |
55 |
<use> |
56 |
+ <flag name="brotli">Enable brotli compression support</flag> |
57 |
<flag name="client">Build client-side code</flag> |
58 |
<flag name="clipboard">Enable clipboard support</flag> |
59 |
<flag name="csc">Enable csc softscaler support</flag> |
60 |
|
61 |
diff --git a/x11-wm/xpra/xpra-4.0.4.ebuild b/x11-wm/xpra/xpra-4.0.4.ebuild |
62 |
new file mode 100644 |
63 |
index 00000000000..ff3e6b93213 |
64 |
--- /dev/null |
65 |
+++ b/x11-wm/xpra/xpra-4.0.4.ebuild |
66 |
@@ -0,0 +1,139 @@ |
67 |
+# Copyright 1999-2020 Gentoo Authors |
68 |
+# Distributed under the terms of the GNU General Public License v2 |
69 |
+ |
70 |
+EAPI=6 |
71 |
+ |
72 |
+PYTHON_COMPAT=( python3_{6,7,8,9} ) |
73 |
+DISTUTILS_USE_SETUPTOOLS=no |
74 |
+inherit xdg distutils-r1 eutils flag-o-matic tmpfiles prefix |
75 |
+ |
76 |
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy" |
77 |
+HOMEPAGE="http://xpra.org/ http://xpra.org/src/" |
78 |
+SRC_URI="http://xpra.org/src/${P}.tar.xz" |
79 |
+ |
80 |
+LICENSE="GPL-2 BSD" |
81 |
+SLOT="0" |
82 |
+KEYWORDS="~amd64 ~x86" |
83 |
+IUSE="brotli +client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp" |
84 |
+ |
85 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE} |
86 |
+ || ( client server ) |
87 |
+ cups? ( dbus ) |
88 |
+ opengl? ( client ) |
89 |
+" |
90 |
+ |
91 |
+COMMON_DEPEND="${PYTHON_DEPS} |
92 |
+ dev-python/pygobject:3[${PYTHON_USEDEP}] |
93 |
+ x11-libs/gtk+:3[introspection] |
94 |
+ x11-libs/libX11 |
95 |
+ x11-libs/libXcomposite |
96 |
+ x11-libs/libXdamage |
97 |
+ x11-libs/libXfixes |
98 |
+ x11-libs/libXrandr |
99 |
+ x11-libs/libXtst |
100 |
+ x11-libs/libxkbfile |
101 |
+ brotli? ( app-arch/brotli ) |
102 |
+ csc? ( >=media-video/ffmpeg-1.2.2:0= ) |
103 |
+ ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) |
104 |
+ jpeg? ( media-libs/libjpeg-turbo ) |
105 |
+ opengl? ( dev-python/pyopengl ) |
106 |
+ pulseaudio? ( |
107 |
+ media-sound/pulseaudio |
108 |
+ media-plugins/gst-plugins-pulse:1.0 |
109 |
+ ) |
110 |
+ sound? ( media-libs/gstreamer:1.0 |
111 |
+ media-libs/gst-plugins-base:1.0 |
112 |
+ dev-python/gst-python:1.0 ) |
113 |
+ vpx? ( media-libs/libvpx media-video/ffmpeg ) |
114 |
+ webp? ( media-libs/libwebp ) |
115 |
+" |
116 |
+RDEPEND="${COMMON_DEPEND} |
117 |
+ acct-group/xpra |
118 |
+ dev-python/netifaces[${PYTHON_USEDEP}] |
119 |
+ dev-python/rencode[${PYTHON_USEDEP}] |
120 |
+ dev-python/pillow[jpeg?,${PYTHON_USEDEP}] |
121 |
+ virtual/ssh |
122 |
+ x11-apps/xmodmap |
123 |
+ cups? ( dev-python/pycups[${PYTHON_USEDEP}] ) |
124 |
+ dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) |
125 |
+ lz4? ( dev-python/lz4[${PYTHON_USEDEP}] ) |
126 |
+ lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] ) |
127 |
+ opengl? ( |
128 |
+ client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] ) |
129 |
+ ) |
130 |
+ server? ( x11-base/xorg-server[-minimal,xvfb] |
131 |
+ x11-drivers/xf86-input-void |
132 |
+ ) |
133 |
+ webcam? ( dev-python/numpy[${PYTHON_USEDEP}] |
134 |
+ media-libs/opencv[python] |
135 |
+ dev-python/pyinotify[${PYTHON_USEDEP}] )" |
136 |
+DEPEND="${COMMON_DEPEND} |
137 |
+ virtual/pkgconfig |
138 |
+ >=dev-python/cython-0.16[${PYTHON_USEDEP}]" |
139 |
+ |
140 |
+RESTRICT="!test? ( test )" |
141 |
+ |
142 |
+PATCHES=( |
143 |
+ "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch |
144 |
+ "${FILESDIR}"/${PN}-3.0.2-ldconfig.patch |
145 |
+ "${FILESDIR}"/${PN}-4.0.3-suid-warning.patch |
146 |
+) |
147 |
+ |
148 |
+pkg_postinst() { |
149 |
+ tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf |
150 |
+ |
151 |
+ xdg_pkg_postinst |
152 |
+} |
153 |
+ |
154 |
+python_prepare_all() { |
155 |
+ hprefixify -w '/os.path/' setup.py |
156 |
+ hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \ |
157 |
+ xpra/platform{/xposix,}/paths.py xpra/scripts/server.py |
158 |
+ |
159 |
+ distutils-r1_python_prepare_all |
160 |
+} |
161 |
+ |
162 |
+python_configure_all() { |
163 |
+ sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \ |
164 |
+ -i setup.py || die |
165 |
+ |
166 |
+ mydistutilsargs=( |
167 |
+ --without-PIC |
168 |
+ --without-Xdummy |
169 |
+ $(use_with client) |
170 |
+ $(use_with clipboard) |
171 |
+ $(use_with csc csc_swscale) |
172 |
+ --without-csc_libyuv |
173 |
+ --without-cuda_rebuild |
174 |
+ --without-cuda_kernels |
175 |
+ $(use_with cups printing) |
176 |
+ --without-debug |
177 |
+ $(use_with dbus) |
178 |
+ $(use_with ffmpeg dec_avcodec2) |
179 |
+ $(use_with ffmpeg enc_ffmpeg) |
180 |
+ $(use_with ffmpeg enc_x264) |
181 |
+ $(use_with ffmpeg enc_x265) |
182 |
+ --with-gtk3 |
183 |
+ --without-html5 |
184 |
+ $(use_with jpeg jpeg_encoder) |
185 |
+ $(use_with jpeg jpeg_decoder) |
186 |
+ --without-mdns |
187 |
+ --without-minify |
188 |
+ $(use_with opengl) |
189 |
+ $(use_with server shadow) |
190 |
+ $(use_with server) |
191 |
+ $(use_with sound) |
192 |
+ --with-strict |
193 |
+ $(use_with vpx) |
194 |
+ --with-warn |
195 |
+ $(use_with webcam) |
196 |
+ $(use_with webp) |
197 |
+ --with-x11 |
198 |
+ ) |
199 |
+ |
200 |
+ # see https://www.xpra.org/trac/ticket/1080 |
201 |
+ # and http://trac.cython.org/ticket/395 |
202 |
+ append-cflags -fno-strict-aliasing |
203 |
+ |
204 |
+ export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra" |
205 |
+} |