| 1 |
commit: e58c93a656c1ecfc7b78408b78397737dd89a431 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 15 23:26:28 2022 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 15 23:30:44 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e58c93a6 |
| 7 |
|
| 8 |
x11-wm/xpra: Version bump to 4.3.1 |
| 9 |
|
| 10 |
A lot of unreleased fixes were needed to make the tests pass. |
| 11 |
|
| 12 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 13 |
|
| 14 |
x11-wm/xpra/Manifest | 2 + |
| 15 |
x11-wm/xpra/xpra-4.3.1.ebuild | 195 ++++++++++++++++++++++++++++++++++++++++++ |
| 16 |
2 files changed, 197 insertions(+) |
| 17 |
|
| 18 |
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest |
| 19 |
index 30c45f40eba5..227fbd0d94f1 100644 |
| 20 |
--- a/x11-wm/xpra/Manifest |
| 21 |
+++ b/x11-wm/xpra/Manifest |
| 22 |
@@ -1,3 +1,5 @@ |
| 23 |
DIST xpra-4.2.2.tar.gz 3894227 BLAKE2B a25dde9c3732e31cd8127393f89f2495e01896d18d5212b141b4046c265a9ead029bed68c9610c2330ec0a885af1eeb3f92aef2c16dd102293e34ac208be605a SHA512 3f81b5a2f7abdfc14f7e48ec708524e38142b984e6539e94a27b6aef7b5a5e063ef14e6b7383a7719ecc7687c62f49eeeb5668282c337d90a79194c354dedd24 |
| 24 |
DIST xpra-4.2.3.tar.gz 3897648 BLAKE2B e9d3b4f07f8fae88ad410201a503bc5c738daae91640843cfce2b70da03e916295709bb74ffbb5e70f8e8ba2dcc3085861bdd9b097d24096ccba332693cc076b SHA512 cebec316a0cbd673907379b54248901743a8bf6b6d25c7b36465794da4e1b19296b5fd465df8ba9d563b2a246fab572fa8db25c24c511da9ddc340a8c95557d5 |
| 25 |
DIST xpra-4.2.tar.gz 4057304 BLAKE2B 17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10 SHA512 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353 |
| 26 |
+DIST xpra-4.3.1-tests.patch 51444 BLAKE2B c645aa52bb06c3872f6c1c7aace099c10a6fd46dd4c386ec1a13f6326e3fc8860a71767510ce9b44375cc8b30cef563e4405b2834670a9d2c555d3359d16e99f SHA512 0c70c33e24980db31e904c91f987a73693bd2349958ea8392138987e1dc1852ea42a4ee7e3b238f01c92adc57dbe196e57f4c4accf27aade6c4ea55c1ff9b40c |
| 27 |
+DIST xpra-4.3.1.tar.gz 4174135 BLAKE2B ac007f812fa7d27c4a5edc231f5f0b79311916b4dcfd43f14bfce5cf9d55a5b5738ec484f9ec653e2901d0b1d9d316ac14202668e77b80a56da34b6f98b3cf32 SHA512 0423a2c3bf5df0b6fafffc788b9e648a5f4e41d68a5b8ea014349ea78062be91cfca38f68656d1399ad0e3ba21952e216f3acc3e5bc3387d992c29d4388b6a07 |
| 28 |
|
| 29 |
diff --git a/x11-wm/xpra/xpra-4.3.1.ebuild b/x11-wm/xpra/xpra-4.3.1.ebuild |
| 30 |
new file mode 100644 |
| 31 |
index 000000000000..dbc1bee840bb |
| 32 |
--- /dev/null |
| 33 |
+++ b/x11-wm/xpra/xpra-4.3.1.ebuild |
| 34 |
@@ -0,0 +1,195 @@ |
| 35 |
+# Copyright 1999-2022 Gentoo Authors |
| 36 |
+# Distributed under the terms of the GNU General Public License v2 |
| 37 |
+ |
| 38 |
+EAPI=8 |
| 39 |
+ |
| 40 |
+PYTHON_COMPAT=( python3_{7,8,9} ) |
| 41 |
+DISTUTILS_SINGLE_IMPL=yes |
| 42 |
+DISTUTILS_USE_SETUPTOOLS=no |
| 43 |
+inherit xdg xdg-utils distutils-r1 tmpfiles udev |
| 44 |
+ |
| 45 |
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy" |
| 46 |
+HOMEPAGE="https://xpra.org/" |
| 47 |
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz |
| 48 |
+ https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch" |
| 49 |
+ |
| 50 |
+LICENSE="GPL-2 BSD" |
| 51 |
+SLOT="0" |
| 52 |
+KEYWORDS="~amd64 ~x86" |
| 53 |
+IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test vpx webcam webp xdg xinerama" |
| 54 |
+ |
| 55 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 56 |
+ || ( client server ) |
| 57 |
+ cups? ( dbus ) |
| 58 |
+ opengl? ( client ) |
| 59 |
+ test? ( client clipboard dbus html server sound xdg xinerama ) |
| 60 |
+" |
| 61 |
+ |
| 62 |
+TDEPEND=" |
| 63 |
+ $(python_gen_cond_dep ' |
| 64 |
+ dev-python/netifaces[${PYTHON_USEDEP}] |
| 65 |
+ dev-python/pillow[jpeg?,${PYTHON_USEDEP}] |
| 66 |
+ dev-python/rencode[${PYTHON_USEDEP}] |
| 67 |
+ dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) |
| 68 |
+ xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] ) |
| 69 |
+ ') |
| 70 |
+ html? ( www-apps/xpra-html5 ) |
| 71 |
+ server? ( |
| 72 |
+ x11-base/xorg-server[-minimal,xvfb] |
| 73 |
+ x11-drivers/xf86-input-void |
| 74 |
+ ) |
| 75 |
+ xinerama? ( x11-libs/libfakeXinerama ) |
| 76 |
+" |
| 77 |
+DEPEND=" |
| 78 |
+ ${PYTHON_DEPS} |
| 79 |
+ $(python_gen_cond_dep ' |
| 80 |
+ dev-python/pygobject:3[${PYTHON_USEDEP},cairo] |
| 81 |
+ opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] ) |
| 82 |
+ sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] ) |
| 83 |
+ ') |
| 84 |
+ x11-libs/gtk+:3[introspection] |
| 85 |
+ x11-libs/libX11 |
| 86 |
+ x11-libs/libXcomposite |
| 87 |
+ x11-libs/libXdamage |
| 88 |
+ x11-libs/libXfixes |
| 89 |
+ x11-libs/libXrandr |
| 90 |
+ x11-libs/libXtst |
| 91 |
+ x11-libs/libxkbfile |
| 92 |
+ brotli? ( app-arch/brotli ) |
| 93 |
+ csc? ( >=media-video/ffmpeg-1.2.2:0= ) |
| 94 |
+ ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) |
| 95 |
+ jpeg? ( media-libs/libjpeg-turbo ) |
| 96 |
+ pulseaudio? ( |
| 97 |
+ media-sound/pulseaudio |
| 98 |
+ media-plugins/gst-plugins-pulse:1.0 |
| 99 |
+ ) |
| 100 |
+ sound? ( |
| 101 |
+ media-libs/gstreamer:1.0 |
| 102 |
+ media-libs/gst-plugins-base:1.0 |
| 103 |
+ ) |
| 104 |
+ vpx? ( media-libs/libvpx media-video/ffmpeg ) |
| 105 |
+ webp? ( media-libs/libwebp ) |
| 106 |
+" |
| 107 |
+RDEPEND=" |
| 108 |
+ ${DEPEND} |
| 109 |
+ ${TDEPEND} |
| 110 |
+ $(python_gen_cond_dep ' |
| 111 |
+ cups? ( dev-python/pycups[${PYTHON_USEDEP}] ) |
| 112 |
+ lz4? ( dev-python/lz4[${PYTHON_USEDEP}] ) |
| 113 |
+ lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] ) |
| 114 |
+ opengl? ( |
| 115 |
+ client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] ) |
| 116 |
+ ) |
| 117 |
+ webcam? ( |
| 118 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
| 119 |
+ dev-python/pyinotify[${PYTHON_USEDEP}] |
| 120 |
+ media-libs/opencv[${PYTHON_USEDEP},python] |
| 121 |
+ ) |
| 122 |
+ ') |
| 123 |
+ acct-group/xpra |
| 124 |
+ virtual/ssh |
| 125 |
+ x11-apps/xauth |
| 126 |
+ x11-apps/xmodmap |
| 127 |
+ ibus? ( app-i18n/ibus ) |
| 128 |
+ pinentry? ( app-crypt/pinentry ) |
| 129 |
+" |
| 130 |
+DEPEND+=" |
| 131 |
+ test? ( ${TDEPEND} ) |
| 132 |
+" |
| 133 |
+BDEPEND=" |
| 134 |
+ $(python_gen_cond_dep ' |
| 135 |
+ >=dev-python/cython-0.16[${PYTHON_USEDEP}] |
| 136 |
+ ') |
| 137 |
+ virtual/pkgconfig |
| 138 |
+ doc? ( app-text/pandoc ) |
| 139 |
+" |
| 140 |
+ |
| 141 |
+RESTRICT="!test? ( test )" |
| 142 |
+ |
| 143 |
+PATCHES=( |
| 144 |
+ "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch |
| 145 |
+ "${FILESDIR}"/${PN}-4.2-suid-warning.patch |
| 146 |
+ "${DISTDIR}"/${PN}-4.3.1-tests.patch |
| 147 |
+) |
| 148 |
+ |
| 149 |
+python_prepare_all() { |
| 150 |
+ distutils-r1_python_prepare_all |
| 151 |
+ |
| 152 |
+ # FIXME: There are hardcoded paths all over the place but the following |
| 153 |
+ # double-prefixes some files under /etc. Looks tricky to fix. :( |
| 154 |
+ #hprefixify $(find -type f \( -name "*.py" -o -name "*.conf" \)) |
| 155 |
+ |
| 156 |
+ sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \ |
| 157 |
+ -i setup.py || die |
| 158 |
+ |
| 159 |
+ if use minimal; then |
| 160 |
+ sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \ |
| 161 |
+ -i setup.py || die |
| 162 |
+ fi |
| 163 |
+} |
| 164 |
+ |
| 165 |
+python_configure_all() { |
| 166 |
+ sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \ |
| 167 |
+ -i setup.py || die |
| 168 |
+ |
| 169 |
+ DISTUTILS_ARGS=( |
| 170 |
+ --without-PIC |
| 171 |
+ --without-Xdummy |
| 172 |
+ $(use_with client) |
| 173 |
+ $(use_with clipboard) |
| 174 |
+ $(use_with csc csc_swscale) |
| 175 |
+ --without-csc_libyuv |
| 176 |
+ --without-cuda_rebuild |
| 177 |
+ --without-cuda_kernels |
| 178 |
+ $(use_with cups printing) |
| 179 |
+ --without-debug |
| 180 |
+ $(use_with dbus) |
| 181 |
+ $(use_with doc docs) |
| 182 |
+ $(use_with ffmpeg dec_avcodec2) |
| 183 |
+ $(use_with ffmpeg enc_ffmpeg) |
| 184 |
+ $(use_with ffmpeg enc_x264) |
| 185 |
+ $(use_with ffmpeg enc_x265) |
| 186 |
+ --with-gtk3 |
| 187 |
+ $(use_with jpeg jpeg_encoder) |
| 188 |
+ $(use_with jpeg jpeg_decoder) |
| 189 |
+ --without-mdns |
| 190 |
+ $(use_with opengl) |
| 191 |
+ $(use_with server shadow) |
| 192 |
+ $(use_with server) |
| 193 |
+ $(use_with sound) |
| 194 |
+ --with-strict |
| 195 |
+ $(use_with vpx) |
| 196 |
+ --with-warn |
| 197 |
+ $(use_with webcam) |
| 198 |
+ $(use_with webp) |
| 199 |
+ --with-x11 |
| 200 |
+ ) |
| 201 |
+ |
| 202 |
+ export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra" |
| 203 |
+} |
| 204 |
+ |
| 205 |
+python_test() { |
| 206 |
+ export XAUTHORITY=${HOME}/.Xauthority |
| 207 |
+ touch "${XAUTHORITY}" || die |
| 208 |
+ |
| 209 |
+ distutils_install_for_testing |
| 210 |
+ xdg_environment_reset |
| 211 |
+ |
| 212 |
+ PYTHONPATH=${S}/tests/unittests:${BUILD_DIR}/test/lib \ |
| 213 |
+ XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \ |
| 214 |
+ "${PYTHON}" "${S}"/tests/unittests/unit/run.py || die |
| 215 |
+} |
| 216 |
+ |
| 217 |
+python_install_all() { |
| 218 |
+ distutils-r1_python_prepare_all |
| 219 |
+ |
| 220 |
+ # Move udev dir to the right place. |
| 221 |
+ local dir=$(get_udevdir) |
| 222 |
+ dodir "${dir%/*}" |
| 223 |
+ mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die |
| 224 |
+} |
| 225 |
+ |
| 226 |
+pkg_postinst() { |
| 227 |
+ tmpfiles_process xpra.conf |
| 228 |
+ xdg_pkg_postinst |
| 229 |
+} |
Archives