* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/, x11-wm/xpra/files/
@ 2016-02-22 13:37 Michael Weber
0 siblings, 0 replies; 17+ messages in thread
From: Michael Weber @ 2016-02-22 13:37 UTC (permalink / raw
To: gentoo-commits
commit: dd59b94f89dc4959162efbf82c49f58914e4ed0d
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 13:34:38 2016 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 13:37:24 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd59b94f
x11-wm/xpra: Version bump.
Package-Manager: portage-2.2.27
x11-wm/xpra/Manifest | 1 +
x11-wm/xpra/files/xpra-0.16.2-prefix.patch | 27 +++++++
x11-wm/xpra/xpra-0.16.2.ebuild | 124 +++++++++++++++++++++++++++++
3 files changed, 152 insertions(+)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index b9a8ad2..7f89891 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1,4 @@
DIST xpra-0.14.27.tar.xz 1123504 SHA256 9d51d6e656a9afc6559ec4b671a706ba134257c8e6d909d2514a3ca653502efb SHA512 5f195b211b8e78091ba42661c08f367d66e2a34ebcea9e5df57f0408cf1c4232294d38692171abbfe7396a1da28b2cc4100252dc034872a278530c48282db5cf WHIRLPOOL b14d58cddd03093a598e99d69fb145a5a04347f48fc0ec0b0311efa7bc75f5a51be5db93a361032ead2e021d2c8ead13986a3bd7434108506bbc4b601556141b
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.2.tar.xz 1341856 SHA256 ce99b941f63aeae465c9d095bcdef857227f8102759df3d013fbfb65c8cea540 SHA512 a5431367918551c630a7f80bd59c51b3bd360472ee268b7865862f4de03b0962b534ab65c4926faa386098c48cdab49f8d7e91b60b998017df52ab077d270a33 WHIRLPOOL bb3c89eb6f32349f26b076abea5535b9e37a3ea2789be9aa35723a383603cce090044d8b8631817b5eda0b158ddcf2c278240e977a3daed0c8fe510e576f4135
diff --git a/x11-wm/xpra/files/xpra-0.16.2-prefix.patch b/x11-wm/xpra/files/xpra-0.16.2-prefix.patch
new file mode 100644
index 0000000..4559578
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-0.16.2-prefix.patch
@@ -0,0 +1,27 @@
+--- xpra-0.16.2/setup.py
++++ xpra-0.16.2/setup.py
+@@ -1723,8 +1723,8 @@
+ #prepare default [/usr/local]/etc configuration files:
+ if '--user' in sys.argv:
+ etc_prefix = 'etc/xpra'
+- elif sys.prefix == '/usr':
+- etc_prefix = '/etc/xpra'
++ elif sys.prefix[-4:] == '/usr':
++ etc_prefix = sys.prefix[:-4] + '/etc/xpra'
+ else:
+ etc_prefix = sys.prefix + '/etc/xpra'
+
+--- xpra-0.16.2/xpra/platform/paths.py
++++ xpra-0.16.2/xpra/platform/paths.py
+@@ -40,9 +40,9 @@
+ def do_get_system_conf_dirs():
+ prefix = get_install_prefix()
+ #the system wide configuration directory
+- if prefix == '/usr':
++ if prefix[-4:] == '/usr':
+ #default posix config location:
+- return ['/etc/xpra']
++ return [sys.prefix[:-4] + '/etc/xpra']
+ #hope the prefix is something like "/usr/local" or "$HOME/.local":
+ return [prefix + '/etc/xpra/']
+
diff --git a/x11-wm/xpra/xpra-0.16.2.ebuild b/x11-wm/xpra/xpra-0.16.2.ebuild
new file mode 100644
index 0000000..3843985
--- /dev/null
+++ b/x11-wm/xpra/xpra-0.16.2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 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
+
+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[${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}]"
+
+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
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/, x11-wm/xpra/files/
@ 2017-03-10 12:17 Michael Weber
0 siblings, 0 replies; 17+ messages in thread
From: Michael Weber @ 2017-03-10 12:17 UTC (permalink / raw
To: gentoo-commits
commit: 2af42ded5bf1269982f90979283c15bb523b17e9
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 12:17:31 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 12:17:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2af42ded
x11-wm/xpra: Remove old versions.
Package-Manager: Portage-2.3.4, Repoman-2.3.2
x11-wm/xpra/Manifest | 2 -
x11-wm/xpra/files/xpra-0.14.0-prefix.patch | 27 -----
x11-wm/xpra/files/xpra-1.0.1-cflags-param.patch | 17 ----
x11-wm/xpra/metadata.xml | 2 -
x11-wm/xpra/xpra-0.14.27.ebuild | 120 ----------------------
x11-wm/xpra/xpra-0.14.36.ebuild | 126 ------------------------
6 files changed, 294 deletions(-)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index c24987a13c7..d92829160b1 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1 @@
-DIST xpra-0.14.27.tar.xz 1123504 SHA256 9d51d6e656a9afc6559ec4b671a706ba134257c8e6d909d2514a3ca653502efb SHA512 5f195b211b8e78091ba42661c08f367d66e2a34ebcea9e5df57f0408cf1c4232294d38692171abbfe7396a1da28b2cc4100252dc034872a278530c48282db5cf WHIRLPOOL b14d58cddd03093a598e99d69fb145a5a04347f48fc0ec0b0311efa7bc75f5a51be5db93a361032ead2e021d2c8ead13986a3bd7434108506bbc4b601556141b
-DIST xpra-0.14.36.tar.xz 1128276 SHA256 f929a9d05e2bc95cd7316efb839b8b1bcb88917ea513aa0c17adac4674702142 SHA512 bec07df063e72c42d2d2b4fff74ec01a6db8d97dae8c8f38ef0c994988ebcb8ee38363028eb7b64b562a540574f084e00a84f1c6e9e03bdbc47bfcd4d38a29aa WHIRLPOOL 650aa8d0c11114141c3ae44ccf8216a06812986fdf923334c025126c4341e686cdf65a00789d1b24895bc056b47b113c2c9474b60ed2e041a0b5b6619f6f7cda
DIST xpra-1.0.3.tar.xz 1888908 SHA256 f83c5946f67fe26eee8b44fba0fa30bca9fbc7aa58ee66b903b7385c2d332166 SHA512 3b6371d478147a5d932df1c8428e9132831fcbf17e51f48fb384c30548efee9758c94a6781c255b5fe211c5040993f30b054aa33f3fced85484fcc9d2ca009a1 WHIRLPOOL 989db8ac2caa3a5a0e1294754cabe6bc8cadb087a6ffa24de3039c674126886a41ecab930c46700dccdf3adc738572e04652123c9523512c050ffdff3d295b02
diff --git a/x11-wm/xpra/files/xpra-0.14.0-prefix.patch b/x11-wm/xpra/files/xpra-0.14.0-prefix.patch
deleted file mode 100644
index 140abbbbbc0..00000000000
--- a/x11-wm/xpra/files/xpra-0.14.0-prefix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- xpra-0.14.0/xpra/platform/paths.py
-+++ xpra-0.14.0/xpra/platform/paths.py
-@@ -22,9 +22,9 @@
-
- def get_system_conf_dir():
- #the system wide configuration directory
-- if sys.prefix == '/usr':
-+ if sys.prefix[-4:] == '/usr':
- #default posix config location:
-- default_conf_dir = '/etc/xpra'
-+ default_conf_dir = sys.prefix[:-4] + '/etc/xpra'
- else:
- #hope the prefix is something like "/usr/local":
- default_conf_dir = sys.prefix + '/etc/xpra/'
---- xpra-0.14.0/setup.py
-+++ xpra-0.14.0/setup.py
-@@ -1470,8 +1470,8 @@
- #prepare default [/usr/local]/etc configuration files:
- if '--user' in sys.argv:
- etc_prefix = 'etc/xpra'
-- elif sys.prefix == '/usr':
-- etc_prefix = '/etc/xpra'
-+ elif sys.prefix[-4:] == '/usr':
-+ etc_prefix = sys.prefix[:-4] + '/etc/xpra'
- else:
- etc_prefix = sys.prefix + '/etc/xpra'
-
diff --git a/x11-wm/xpra/files/xpra-1.0.1-cflags-param.patch b/x11-wm/xpra/files/xpra-1.0.1-cflags-param.patch
deleted file mode 100644
index 11dbb81ae7b..00000000000
--- a/x11-wm/xpra/files/xpra-1.0.1-cflags-param.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- xpra-1.0.1/setup.py
-+++ xpra-1.0.1/setup.py
-@@ -696,7 +696,14 @@
- for s in (pkg_config_out, env_cflags, env_ldflags):
- if not s:
- continue
-+ ahead = False
- for token in s.split():
-+ if token == '--param':
-+ ahead = True
-+ continue
-+ if ahead:
-+ ahead = False
-+ continue
- if token[:2] in ignored_flags:
- pass
- elif token[:2] in flag_map:
diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index f8a239bbf46..3ac00fd3656 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -12,11 +12,9 @@
<flag name="client">Build client-side code</flag>
<flag name="clipboard">Enable clipboard support</flag>
<flag name="csc">Enable csc softscaler support</flag>
- <flag name="dec_av">Enable dec_avcodec support</flag>
<flag name="dec_av2">Enable dec_avcodec2 support</flag>
<flag name="enc_ffmpeg">Enable advanced ffmpeg/libav encoder support</flag>
<flag name="lz4">Enable support for lz4 compression</flag>
- <flag name="rencode">Enable rencode support</flag>
<flag name="server">Build server-side code</flag>
<flag name="vpx">Enable vpx image format support</flag>
<flag name="webp">Enable webp image format support</flag>
diff --git a/x11-wm/xpra/xpra-0.14.27.ebuild b/x11-wm/xpra/xpra-0.14.27.ebuild
deleted file mode 100644
index 2823a4e53d3..00000000000
--- a/x11-wm/xpra/xpra-0.14.27.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 copmat
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils
-
-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 dec_av dec_av2 libav opengl pulseaudio +rencode 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_av? (
- !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
- media-libs/gst-plugins-base:0.10
- dev-python/gst-python:0.10 )
- 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}]
- virtual/ssh
- x11-apps/setxkbmap
- x11-apps/xmodmap
- 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}]"
-
-python_prepare_all() {
- epatch \
- "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
- "${FILESDIR}"/${PN}-0.14.0-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 dec_av dec_avcodec)
- $(use_with dec_av2 dec_avcodec2)
- $(use_with opengl)
- $(use_with rencode)
- $(use_with server cymaths)
- $(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-argb
- --with-cyxor
- --with-gtk2
- --without-gtk3
- --without-qt4
- --with-strict
- --with-warn
- --with-x11
- --without-PIC
- --without-debug )
-}
diff --git a/x11-wm/xpra/xpra-0.14.36.ebuild b/x11-wm/xpra/xpra-0.14.36.ebuild
deleted file mode 100644
index 0b26a1e3eea..00000000000
--- a/x11-wm/xpra/xpra-0.14.36.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 copmat
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils
-
-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 dec_av dec_av2 libav lz4 lzo opengl pulseaudio +rencode 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_av? (
- !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
- media-libs/gst-plugins-base:0.10
- dev-python/gst-python:0.10 )
- 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}]
- virtual/ssh
- x11-apps/setxkbmap
- x11-apps/xmodmap
- 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}]"
-
-python_prepare_all() {
- epatch \
- "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
- "${FILESDIR}"/${PN}-0.14.0-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 dec_av dec_avcodec)
- $(use_with dec_av2 dec_avcodec2)
- $(use_with opengl)
- $(use_with rencode)
- $(use_with server cymaths)
- $(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-argb
- --with-cyxor
- --with-gtk2
- --without-gtk3
- --without-qt4
- --with-strict
- --with-warn
- --with-x11
- --without-PIC
- --without-debug )
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/, x11-wm/xpra/files/
@ 2018-12-02 22:39 Andreas K. Hüttel
0 siblings, 0 replies; 17+ messages in thread
From: Andreas K. Hüttel @ 2018-12-02 22:39 UTC (permalink / raw
To: gentoo-commits
commit: ec15f34e4e1679ee9cd8e2b6d18b9a903b668019
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 2 22:34:09 2018 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Dec 2 22:34:09 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec15f34e
x11-wm/xpra: Remove old
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
x11-wm/xpra/Manifest | 3 -
.../files/xpra-0.17.4-deprecated-avcodec.patch | 11 --
x11-wm/xpra/files/xpra-1.0.4-suid-warning.patch | 11 --
x11-wm/xpra/xpra-1.0.9.ebuild | 146 --------------------
x11-wm/xpra/xpra-2.1.3.ebuild | 145 --------------------
x11-wm/xpra/xpra-2.2.1.ebuild | 148 ---------------------
6 files changed, 464 deletions(-)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index ea040408485..ce352da7345 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,5 +1,2 @@
-DIST xpra-1.0.9.tar.xz 1899744 BLAKE2B a8577712c29ff637e69f0faf8224c3318397d104364376415c78099d236746c519ead198fd7436ca6ddccfa0888c394ea0ac81165a5d7d27ded0dbed66f27754 SHA512 99422ac58ebba4e1ba1ce47cf819c119249298ea4f9803d3fb9c4a3939ffd6baf3f34f6f6b3f1645fc17bd00b80410ff11f1fe30c5f79f797acf25b0ce2dd9ec
-DIST xpra-2.1.3.tar.xz 2070192 BLAKE2B b1f54705c877317bf0a3397303af2a516f6e7deb6baa252065f768bd3fd07ec87991b04c14a3aa054da0655543185dfdb99fa2972fb1cd8a2a04d72bb31fafc6 SHA512 aa916953d34477c2c80d99a4d5733586b4122edbc18f2c9952a5d3c9581f7b8e8c55cb1ed4077989876a9a7431faa9c4f7f96f82fc007034f92cacad16429ef8
-DIST xpra-2.2.1.tar.xz 2195508 BLAKE2B 5f94e96ddce7df0001ca3ffbc64570c59f02b1b49fc45c364999f47d188b1ef349018e36ed070cf8c26f60efc77c24741f44856f307b68535c982e6082dc0d7a SHA512 fca213a72805b6b1d533f91cd5e4186bd881e083663488b697c71c79fb4a3bf312fd1491aef78cf363e429c5841d706e444c9e69c72351b1551ea7fc9395c0c6
DIST xpra-2.2.2.tar.xz 2195836 BLAKE2B 39d8354738df399d98248a0d455c3b7fa6124f374f0f6e0a476bae53b9728b9ab16c11bd759b6ff52a28295445809fb18b3379b7fc620f0916944f738a00b280 SHA512 5c09e29732c9ca7d03557e4e6070517b192484e67944532d5aeca53e518c8617f7d3a5919a2557050fbb9aa4123a0302a53720dd7036823db83588264dd3e6d2
DIST xpra-2.2.6.tar.xz 2198720 BLAKE2B 41f238e98dbb60598cffcc3960375a525658c72db478acace0acb964fe3ee039acb5e352a76ffb5724b6c4acd63ea510505f6841f688c67d0ae2a3cbc2270642 SHA512 f47b7a8b08fc90bdf3cba91e4f7343785cdf6e24a0979f4564e9f6885b0f36c03ff5656e2d7ac5fd21895faca7b00e8839ebd66c82122a2c7cab2b40bd44e745
diff --git a/x11-wm/xpra/files/xpra-0.17.4-deprecated-avcodec.patch b/x11-wm/xpra/files/xpra-0.17.4-deprecated-avcodec.patch
deleted file mode 100644
index 13bd4be892d..00000000000
--- a/x11-wm/xpra/files/xpra-0.17.4-deprecated-avcodec.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpra-0.17.4/setup.py
-+++ xpra-0.17.4/setup.py
-@@ -660,7 +660,7 @@
- "-Wno-unused-function",
- "-Wno-sometimes-uninitialized"]
- elif get_gcc_version()>=[4, 4]:
-- eifd = ["-Werror",
-+ eifd = ["-Werror", "-Wno-error=deprecated-declarations",
- #CentOS 6.x gives us some invalid warnings in nvenc, ignore those:
- #"-Wno-error=uninitialized",
- #needed on Debian and Ubuntu to avoid this error:
diff --git a/x11-wm/xpra/files/xpra-1.0.4-suid-warning.patch b/x11-wm/xpra/files/xpra-1.0.4-suid-warning.patch
deleted file mode 100644
index 9af267cb450..00000000000
--- a/x11-wm/xpra/files/xpra-1.0.4-suid-warning.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpra-1.0.4/xpra/scripts/config.py
-+++ xpra-1.0.4/xpra/scripts/config.py
-@@ -130,7 +130,7 @@
- xorg_stat = os.stat(xorg_bin)
- if (xorg_stat.st_mode & stat.S_ISUID)!=0:
- if (xorg_stat.st_mode & stat.S_IROTH)==0:
-- warn("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
-+ debug("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
- return get_Xvfb_command()
- debug("%s is suid and readable, using the xpra_Xdummy wrapper" % xorg_bin)
- use_wrapper = True
diff --git a/x11-wm/xpra/xpra-1.0.9.ebuild b/x11-wm/xpra/xpra-1.0.9.ebuild
deleted file mode 100644
index 299bde46e31..00000000000
--- a/x11-wm/xpra/xpra-1.0.9.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# 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 tmpfiles xdg
-
-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 dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- clipboard? ( || ( server client ) )
- cups? ( dbus )
- opengl? ( client )
- || ( client server )
- client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) )"
-
-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
- x11-libs/libxkbfile
- csc? (
- !libav? ( >=media-video/ffmpeg-1.2.2:0= )
- libav? ( media-video/libav:0= )
- )
- dec_avcodec2? (
- !libav? ( >=media-video/ffmpeg-2:0= )
- libav? ( media-video/libav:0= )
- )
- enc_ffmpeg? (
- !libav? ( >=media-video/ffmpeg-3.2.2:0= )
- libav? ( media-video/libav:0= )
- )
- enc_x264? ( media-libs/x264
- !libav? ( >=media-video/ffmpeg-1.0.4:0= )
- libav? ( media-video/libav:0= )
- )
- enc_x265? ( media-libs/x265
- !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 )
- )"
-
-RDEPEND="${COMMON_DEPEND}
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/netifaces[${PYTHON_USEDEP}]
- dev-python/rencode[${PYTHON_USEDEP}]
- virtual/ssh
- x11-apps/xmodmap
- cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
- dbus? ( dev-python/dbus-python[${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}] )
- )
- pillow? ( dev-python/pillow[${PYTHON_USEDEP}] )
- server? ( x11-base/xorg-server[-minimal,xvfb]
- x11-drivers/xf86-input-void
- )
- webcam? ( dev-python/numpy[${PYTHON_USEDEP}]
- media-libs/opencv[python]
- dev-python/pyinotify[${PYTHON_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- >=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch
- "${FILESDIR}"/${PN}-0.17.4-deprecated-avcodec.patch
- "${FILESDIR}"/${PN}-1.0.4-suid-warning.patch )
-
-pkg_postinst() {
- enewgroup ${PN}
- tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
-
- xdg_pkg_postinst
-}
-
-python_prepare_all() {
- sed -e "s:/var/run/xpra:${EROOT}run/xpra:" \
- -i tmpfiles.d/xpra.conf
-
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- sed -e "/'pulseaudio'/s:not OSX and not WIN32:$(usex pulseaudio True False):" \
- -i setup.py || die
-
- mydistutilsargs=(
- --without-PIC
- --without-Xdummy
- $(use_with client)
- $(use_with clipboard)
- $(use_with csc csc_swscale)
- $(use_with cups printing)
- --without-debug
- $(use_with dbus)
- $(use_with dec_avcodec2)
- $(use_with enc_ffmpeg)
- $(use_with enc_x264)
- $(use_with enc_x265)
- --with-gtk2
- --without-gtk3
- --without-html5
- --without-mdns
- --without-minify
- $(use_with opengl)
- $(use_with server shadow)
- $(use_with server)
- $(use_with sound)
- --with-strict
- $(use_with vpx)
- --with-warn
- $(use_with webcam)
- $(use_with webp)
- --with-x11
- )
-
- # see https://www.xpra.org/trac/ticket/1080
- # and http://trac.cython.org/ticket/395
- append-cflags -fno-strict-aliasing
-
- export XPRA_SOCKET_DIRS="${EROOT}run/xpra"
-}
diff --git a/x11-wm/xpra/xpra-2.1.3.ebuild b/x11-wm/xpra/xpra-2.1.3.ebuild
deleted file mode 100644
index d9f9bec1770..00000000000
--- a/x11-wm/xpra/xpra-2.1.3.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils flag-o-matic user tmpfiles xdg
-
-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 dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- clipboard? ( || ( server client ) )
- cups? ( dbus )
- opengl? ( client )
- || ( client server )
- client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) )"
-
-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
- x11-libs/libxkbfile
- csc? (
- !libav? ( >=media-video/ffmpeg-1.2.2:0= )
- libav? ( media-video/libav:0= )
- )
- dec_avcodec2? (
- !libav? ( >=media-video/ffmpeg-2:0= )
- libav? ( media-video/libav:0= )
- )
- enc_ffmpeg? (
- !libav? ( >=media-video/ffmpeg-3.2.2:0= )
- libav? ( media-video/libav:0= )
- )
- enc_x264? ( media-libs/x264
- !libav? ( >=media-video/ffmpeg-1.0.4:0= )
- libav? ( media-video/libav:0= )
- )
- enc_x265? ( media-libs/x265
- !libav? ( >=media-video/ffmpeg-2:0= )
- libav? ( media-video/libav:0= ) )
- jpeg? ( media-libs/libjpeg-turbo )
- 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 )"
-
-RDEPEND="${COMMON_DEPEND}
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/netifaces[${PYTHON_USEDEP}]
- dev-python/rencode[${PYTHON_USEDEP}]
- virtual/ssh
- x11-apps/xmodmap
- cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
- dbus? ( dev-python/dbus-python[${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}] )
- )
- pillow? ( dev-python/pillow[${PYTHON_USEDEP}] )
- server? ( x11-base/xorg-server[-minimal,xvfb]
- x11-drivers/xf86-input-void
- )
- webcam? ( dev-python/numpy[${PYTHON_USEDEP}]
- media-libs/opencv[python]
- dev-python/pyinotify[${PYTHON_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- >=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch
- "${FILESDIR}"/${PN}-2.0-suid-warning.patch )
-
-pkg_postinst() {
- enewgroup ${PN}
- tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
-
- xdg_pkg_postinst
-}
-
-python_prepare_all() {
- sed -e "s:/var/run/xpra:${EROOT}run/xpra:" \
- -i tmpfiles.d/xpra.conf
-
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
- -i setup.py || die
-
- mydistutilsargs=(
- --without-PIC
- --without-Xdummy
- $(use_with client)
- $(use_with clipboard)
- $(use_with csc csc_swscale)
- --without-csc_libyuv
- $(use_with cups printing)
- --without-debug
- $(use_with dbus)
- $(use_with dec_avcodec2)
- $(use_with enc_ffmpeg)
- $(use_with enc_x264)
- $(use_with enc_x265)
- --with-gtk2
- --without-gtk3
- --without-html5
- $(use_with jpeg)
- --without-mdns
- --without-minify
- $(use_with opengl)
- $(use_with server shadow)
- $(use_with server)
- $(use_with sound)
- --with-strict
- $(use_with vpx)
- --with-warn
- $(use_with webcam)
- --with-x11
- )
-
- # see https://www.xpra.org/trac/ticket/1080
- # and http://trac.cython.org/ticket/395
- append-cflags -fno-strict-aliasing
-
- export XPRA_SOCKET_DIRS="${EROOT}run/xpra"
-}
diff --git a/x11-wm/xpra/xpra-2.2.1.ebuild b/x11-wm/xpra/xpra-2.2.1.ebuild
deleted file mode 100644
index 5dcafddd7a5..00000000000
--- a/x11-wm/xpra/xpra-2.2.1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3
-PYTHON_COMPAT=( python2_7 )
-inherit xdg distutils-r1 eutils flag-o-matic user tmpfiles prefix
-
-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 dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- clipboard? ( || ( server client ) )
- cups? ( dbus )
- opengl? ( client )
- || ( client server )
- client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) )"
-
-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
- x11-libs/libxkbfile
- csc? (
- !libav? ( >=media-video/ffmpeg-1.2.2:0= )
- libav? ( media-video/libav:0= )
- )
- dec_avcodec2? (
- !libav? ( >=media-video/ffmpeg-2:0= )
- libav? ( media-video/libav:0= )
- )
- enc_ffmpeg? (
- !libav? ( >=media-video/ffmpeg-3.2.2:0= )
- libav? ( media-video/libav:0= )
- )
- enc_x264? ( media-libs/x264
- !libav? ( >=media-video/ffmpeg-1.0.4:0= )
- libav? ( media-video/libav:0= )
- )
- enc_x265? ( media-libs/x265
- !libav? ( >=media-video/ffmpeg-2:0= )
- libav? ( media-video/libav:0= ) )
- jpeg? ( media-libs/libjpeg-turbo )
- 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 )"
-
-RDEPEND="${COMMON_DEPEND}
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/netifaces[${PYTHON_USEDEP}]
- dev-python/rencode[${PYTHON_USEDEP}]
- virtual/ssh
- x11-apps/xmodmap
- cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
- dbus? ( dev-python/dbus-python[${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}] )
- )
- pillow? ( dev-python/pillow[${PYTHON_USEDEP}] )
- server? ( x11-base/xorg-server[-minimal,xvfb]
- x11-drivers/xf86-input-void
- )
- webcam? ( dev-python/numpy[${PYTHON_USEDEP}]
- media-libs/opencv[python]
- dev-python/pyinotify[${PYTHON_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- >=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch
- "${FILESDIR}"/${PN}-2.0-suid-warning.patch )
-
-pkg_postinst() {
- enewgroup ${PN}
- tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
-
- xdg_pkg_postinst
-}
-
-python_prepare_all() {
- hprefixify -w '/os.path/' setup.py
- hprefixify tmpfiles.d/xpra.conf xpra/server/{server,socket}_util.py \
- xpra/platform{/xposix,}/paths.py xpra/scripts/server.py
-
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
- -i setup.py || die
-
- mydistutilsargs=(
- --without-PIC
- --without-Xdummy
- $(use_with client)
- $(use_with clipboard)
- $(use_with csc csc_swscale)
- --without-csc_libyuv
- $(use_with cups printing)
- --without-debug
- $(use_with dbus)
- $(use_with dec_avcodec2)
- $(use_with enc_ffmpeg)
- $(use_with enc_x264)
- $(use_with enc_x265)
- --with-gtk2
- --without-gtk3
- --without-html5
- $(use_with jpeg)
- --without-mdns
- --without-minify
- $(use_with opengl)
- $(use_with server shadow)
- $(use_with server)
- $(use_with sound)
- --with-strict
- $(use_with vpx)
- --with-warn
- $(use_with webcam)
- $(use_with webp)
- --with-x11
- )
-
- # see https://www.xpra.org/trac/ticket/1080
- # and http://trac.cython.org/ticket/395
- append-cflags -fno-strict-aliasing
-
- export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/, x11-wm/xpra/files/
@ 2019-11-29 4:41 Benda XU
0 siblings, 0 replies; 17+ messages in thread
From: Benda XU @ 2019-11-29 4:41 UTC (permalink / raw
To: gentoo-commits
commit: 297945bba01199f3e880e9449c85c09eab8e9e21
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 29 04:30:21 2019 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Fri Nov 29 04:41:14 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=297945bb
x11-wm/xpra: version bump to Python 3.
Add myself to maintainers.
Closes: https://bugs.gentoo.org/696784
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
x11-wm/xpra/Manifest | 1 +
.../xpra-3.0.2_ignore-gentoo-no-compile.patch | 13 ++
x11-wm/xpra/metadata.xml | 4 +
x11-wm/xpra/xpra-3.0.2.ebuild | 154 +++++++++++++++++++++
4 files changed, 172 insertions(+)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 748ea77fabc..8366143c645 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1,4 @@
DIST xpra-2.2.2.tar.xz 2195836 BLAKE2B 39d8354738df399d98248a0d455c3b7fa6124f374f0f6e0a476bae53b9728b9ab16c11bd759b6ff52a28295445809fb18b3379b7fc620f0916944f738a00b280 SHA512 5c09e29732c9ca7d03557e4e6070517b192484e67944532d5aeca53e518c8617f7d3a5919a2557050fbb9aa4123a0302a53720dd7036823db83588264dd3e6d2
DIST xpra-2.2.6.tar.xz 2198720 BLAKE2B 41f238e98dbb60598cffcc3960375a525658c72db478acace0acb964fe3ee039acb5e352a76ffb5724b6c4acd63ea510505f6841f688c67d0ae2a3cbc2270642 SHA512 f47b7a8b08fc90bdf3cba91e4f7343785cdf6e24a0979f4564e9f6885b0f36c03ff5656e2d7ac5fd21895faca7b00e8839ebd66c82122a2c7cab2b40bd44e745
DIST xpra-2.4.3.tar.xz 2434852 BLAKE2B 3d2dd4d8a64a20a88004a91f95d8e6165f45dac7a3d725f41c437d605f55bbd903284e7e829e02c1e94e33c3777ce660c55b469fb5b1f6c5025853b0cae1a6c3 SHA512 5174f7852571eaeb6c2fb629aa2686e19bff7251622ff08903af188989f132b73e4509c98edfac9cddd0f582e63d0ffae94442111a7bfcef8013b3fc87dffd54
+DIST xpra-3.0.2.tar.xz 2749196 BLAKE2B 3c8745657a12637704fb88ac7b867ab387ef7ed2250396d9e534aecf81e40f85332a2c51ba49638834012f4a4d85c03bd7e49ee259bb2400aeb60fb06abf8b59 SHA512 115f606ff5886d99a906f318cb1a7a4a86e80ebf23e4336e67938267d92ef624de577cc8fc06c6ce541b7c44a0cef58d930b5928f32e24dfc67c72127c7b623c
diff --git a/x11-wm/xpra/files/xpra-3.0.2_ignore-gentoo-no-compile.patch b/x11-wm/xpra/files/xpra-3.0.2_ignore-gentoo-no-compile.patch
new file mode 100644
index 00000000000..5823ac8c167
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-3.0.2_ignore-gentoo-no-compile.patch
@@ -0,0 +1,13 @@
+Index: xpra-3.0.2/setup.py
+===================================================================
+--- xpra-3.0.2.orig/setup.py
++++ xpra-3.0.2/setup.py
+@@ -516,7 +516,7 @@ def cython_add(extension, min_version="0
+ #python2.7 setup.py build -b build-2.7 install --no-compile \
+ # --root=/var/tmp/portage/x11-wm/xpra-0.7.0/temp/images/2.7
+ if "--no-compile" in sys.argv and not ("build" in sys.argv and "install" in sys.argv):
+- return
++ pass
+ assert cython_ENABLED, "cython compilation is disabled"
+ cython_version_check(min_version)
+ from Cython.Distutils import build_ext
diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index 9ac095e40d6..653674e9188 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -5,6 +5,10 @@
<email>dilfridge@gentoo.org</email>
<name>Andreas K. Huettel</name>
</maintainer>
+<maintainer type="person">
+ <email>heroxbd@gentoo.org</email>
+ <name>Benda Xu</name>
+</maintainer>
<upstream>
<bugs-to>https://www.xpra.org/trac/report</bugs-to>
</upstream>
diff --git a/x11-wm/xpra/xpra-3.0.2.ebuild b/x11-wm/xpra/xpra-3.0.2.ebuild
new file mode 100644
index 00000000000..26a8b868a47
--- /dev/null
+++ b/x11-wm/xpra/xpra-3.0.2.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3
+PYTHON_COMPAT=( python3_6 )
+inherit xdg distutils-r1 eutils flag-o-matic user tmpfiles prefix
+
+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"
+IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ clipboard? ( || ( server client ) )
+ cups? ( dbus )
+ opengl? ( client )
+ || ( client server )
+ client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) )"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/libxkbfile
+ csc? (
+ !libav? ( >=media-video/ffmpeg-1.2.2:0= )
+ libav? ( media-video/libav:0= )
+ )
+ dec_avcodec2? (
+ !libav? ( >=media-video/ffmpeg-2:0=[x264,x265] )
+ libav? ( media-video/libav:0=[x264,x265] )
+ )
+ enc_ffmpeg? (
+ !libav? ( >=media-video/ffmpeg-3.2.2:0= )
+ libav? ( media-video/libav:0= )
+ )
+ enc_x264? ( media-libs/x264
+ !libav? ( >=media-video/ffmpeg-1.0.4:0=[x264] )
+ libav? ( media-video/libav:0=[x264] )
+ )
+ enc_x265? ( media-libs/x265
+ !libav? ( >=media-video/ffmpeg-2:0=[x264] )
+ libav? ( media-video/libav:0=[x264] ) )
+ jpeg? ( media-libs/libjpeg-turbo )
+ 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 )"
+
+RDEPEND="${COMMON_DEPEND}
+ dev-python/netifaces[${PYTHON_USEDEP}]
+ dev-python/rencode[${PYTHON_USEDEP}]
+ dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+ virtual/ssh
+ x11-apps/xmodmap
+ cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+ dbus? ( dev-python/dbus-python[${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
+ )
+ webcam? ( dev-python/numpy[${PYTHON_USEDEP}]
+ media-libs/opencv[python]
+ dev-python/pyinotify[${PYTHON_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+ >=dev-python/cython-0.16[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
+ "${FILESDIR}"/${PN}-2.0-suid-warning.patch )
+
+pkg_postinst() {
+ enewgroup ${PN}
+ tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
+
+ xdg_pkg_postinst
+}
+
+python_prepare_all() {
+ hprefixify -w '/os.path/' setup.py
+ hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
+ xpra/platform{/xposix,}/paths.py xpra/scripts/server.py
+
+ distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+ sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
+ -i setup.py || die
+
+ mydistutilsargs=(
+ --without-PIC
+ --without-Xdummy
+ $(use_with client)
+ $(use_with clipboard)
+ $(use_with csc csc_swscale)
+ --without-csc_libyuv
+ --without-cuda_rebuild
+ --without-cuda_kernels
+ $(use_with cups printing)
+ --without-debug
+ $(use_with dbus)
+ $(use_with dec_avcodec2)
+ $(use_with enc_ffmpeg)
+ $(use_with enc_x264)
+ $(use_with enc_x265)
+ --without-gtk2
+ --with-gtk3
+ --without-html5
+ $(use_with jpeg jpeg_encoder)
+ $(use_with jpeg jpeg_decoder)
+ --without-mdns
+ --without-minify
+ $(use_with opengl)
+ $(use_with server shadow)
+ $(use_with server)
+ $(use_with sound)
+ --with-strict
+ $(use_with vpx)
+ --with-warn
+ $(use_with webcam)
+ $(use_with webp)
+ --with-x11
+ )
+
+ # see https://www.xpra.org/trac/ticket/1080
+ # and http://trac.cython.org/ticket/395
+ append-cflags -fno-strict-aliasing
+
+ export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
+}
+
+src_compile() {
+ # xpra calls `ldconfig -p` during compile to locate libraries.
+ addpredict /etc
+ distutils-r1_src_compile
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/, x11-wm/xpra/files/
@ 2019-12-16 14:11 Benda XU
0 siblings, 0 replies; 17+ messages in thread
From: Benda XU @ 2019-12-16 14:11 UTC (permalink / raw
To: gentoo-commits
commit: c4e62235cc5085750be9c498b95570f785cf2049
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 16 14:11:14 2019 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Dec 16 14:11:27 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4e62235
x11-wm/xpra: fix for USE=-dbus.
This patch allows xpra to be started without Python dbus module when
USE=-dbus.
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
x11-wm/xpra/files/xpra-3.0.2-dbus.patch | 29 +++++++++++++++++++++++++++++
x11-wm/xpra/xpra-3.0.2.ebuild | 2 ++
2 files changed, 31 insertions(+)
diff --git a/x11-wm/xpra/files/xpra-3.0.2-dbus.patch b/x11-wm/xpra/files/xpra-3.0.2-dbus.patch
new file mode 100644
index 00000000000..e0f14b8ba59
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-3.0.2-dbus.patch
@@ -0,0 +1,29 @@
+Remove dbus functionality if USE=dbus is not specified.
+
+Index: xpra-3.0.2/xpra/scripts/server.py
+===================================================================
+--- xpra-3.0.2.orig/xpra/scripts/server.py
++++ xpra-3.0.2/xpra/scripts/server.py
+@@ -748,14 +748,9 @@ def do_run_server(error_cb, opts, mode,
+ log("chdir(%s)", opts.chdir)
+ os.chdir(opts.chdir)
+
+- dbus_pid, dbus_env = 0, {}
+ if not shadowing and POSIX and not OSX and not clobber:
+ no_gtk()
+ assert starting or starting_desktop or proxying
+- from xpra.server.dbus.dbus_start import start_dbus
+- dbus_pid, dbus_env = start_dbus(opts.dbus_launch)
+- if dbus_env:
+- os.environ.update(dbus_env)
+
+ display = None
+ if not proxying:
+@@ -835,7 +830,6 @@ def do_run_server(error_cb, opts, mode,
+ app.display_name = display_name
+ app.init(opts)
+ app.init_sockets(sockets)
+- app.init_dbus(dbus_pid, dbus_env)
+ if not shadowing and (xvfb_pid or clobber):
+ app.init_display_pid(xvfb_pid)
+ app.original_desktop_display = desktop_display
diff --git a/x11-wm/xpra/xpra-3.0.2.ebuild b/x11-wm/xpra/xpra-3.0.2.ebuild
index c57900d96ee..f3cb1bc10de 100644
--- a/x11-wm/xpra/xpra-3.0.2.ebuild
+++ b/x11-wm/xpra/xpra-3.0.2.ebuild
@@ -97,6 +97,8 @@ pkg_postinst() {
}
python_prepare_all() {
+ use dbus || eapply ${FILESDIR}/${PN}-3.0.2-dbus.patch
+
hprefixify -w '/os.path/' setup.py
hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
xpra/platform{/xposix,}/paths.py xpra/scripts/server.py
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/, x11-wm/xpra/files/
@ 2020-01-16 11:31 Andreas K. Hüttel
0 siblings, 0 replies; 17+ messages in thread
From: Andreas K. Hüttel @ 2020-01-16 11:31 UTC (permalink / raw
To: gentoo-commits
commit: fd2f00eb3b1c022857d05d7e35d81072827897d9
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 11:30:15 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 11:30:46 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd2f00eb
x11-wm/xpra: Fix bug 702310 with a sledgehammer
We don't have the library that it's looking for packaged anyway, so
it doesnt matter whether finding it fails. Make the ldconfig call
go away.
Closes: https://bugs.gentoo.org/702310
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch | 33 +++++++++++++++++++++++++++++
x11-wm/xpra/xpra-3.0.2.ebuild | 13 +++++-------
2 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch b/x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch
new file mode 100644
index 00000000000..8475d47b8b3
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch
@@ -0,0 +1,33 @@
+diff -ruN xpra-3.0.2.orig/xpra/x11/fakeXinerama.py xpra-3.0.2/xpra/x11/fakeXinerama.py
+--- xpra-3.0.2.orig/xpra/x11/fakeXinerama.py 2019-09-24 15:54:02.000000000 +0200
++++ xpra-3.0.2/xpra/x11/fakeXinerama.py 2020-01-16 12:20:22.620519078 +0100
+@@ -23,29 +23,6 @@
+
+ def find_libfakeXinerama():
+ libname = "fakeXinerama"
+- try:
+- from ctypes.util import find_library
+- flibname = find_library("fakeXinerama")
+- if flibname:
+- libname = flibname
+- except Exception:
+- pass
+- if POSIX:
+- for lib_dir in os.environ.get("LD_LIBRARY_PATH", "/usr/lib").split(os.pathsep):
+- lib_path = os.path.join(lib_dir, libname)
+- if not os.path.exists(lib_dir):
+- continue
+- if os.path.exists(lib_path) and os.path.isfile(lib_path):
+- return lib_path
+- if LINUX:
+- try:
+- libpath = find_lib_ldconfig("fakeXinerama")
+- if libpath:
+- return libpath
+- except Exception as e:
+- log("find_libfakeXinerama()", exc_info=True)
+- log.error("Error: cannot launch ldconfig -p to locate libfakeXinerama:")
+- log.error(" %s", e)
+ return find_lib(libname)
+
+ current_xinerama_config = None
diff --git a/x11-wm/xpra/xpra-3.0.2.ebuild b/x11-wm/xpra/xpra-3.0.2.ebuild
index 97a0b1489c0..2d11aede8ca 100644
--- a/x11-wm/xpra/xpra-3.0.2.ebuild
+++ b/x11-wm/xpra/xpra-3.0.2.ebuild
@@ -86,8 +86,11 @@ DEPEND="${COMMON_DEPEND}
RESTRICT="!test? ( test )"
-PATCHES=( "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
- "${FILESDIR}"/${PN}-2.0-suid-warning.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
+ "${FILESDIR}"/${PN}-2.0-suid-warning.patch
+ "${FILESDIR}"/${PN}-3.0.2-ldconfig.patch
+)
pkg_postinst() {
enewgroup ${PN}
@@ -151,9 +154,3 @@ python_configure_all() {
export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
}
-
-src_compile() {
- # xpra calls `ldconfig -p` during compile to locate libraries.
- addpredict /etc
- distutils-r1_src_compile
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/, x11-wm/xpra/files/
@ 2020-10-29 22:24 Andreas K. Hüttel
0 siblings, 0 replies; 17+ messages in thread
From: Andreas K. Hüttel @ 2020-10-29 22:24 UTC (permalink / raw
To: gentoo-commits
commit: d57dca20f6f8ee91ab021ac3b0cf86101521e974
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 22:23:50 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 22:24:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d57dca20
x11-wm/xpra: Version bump
Closes: https://bugs.gentoo.org/723484
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
x11-wm/xpra/Manifest | 1 +
x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch | 12 ++
x11-wm/xpra/metadata.xml | 1 +
x11-wm/xpra/xpra-4.0.4.ebuild | 139 ++++++++++++++++++++++++
4 files changed, 153 insertions(+)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index a6c194f8b9e..93154bc9e09 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,2 +1,3 @@
DIST xpra-3.0.2.tar.xz 2749196 BLAKE2B 3c8745657a12637704fb88ac7b867ab387ef7ed2250396d9e534aecf81e40f85332a2c51ba49638834012f4a4d85c03bd7e49ee259bb2400aeb60fb06abf8b59 SHA512 115f606ff5886d99a906f318cb1a7a4a86e80ebf23e4336e67938267d92ef624de577cc8fc06c6ce541b7c44a0cef58d930b5928f32e24dfc67c72127c7b623c
DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647 SHA512 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
+DIST xpra-4.0.4.tar.xz 2792512 BLAKE2B e16c47e82cf9f8712521c8f9c436b7bb819d9469fc0135ade1f2c9fc6f2a8a0fecf417caae87a1eca9c4b6daec1a82add5d6547208caee1a1d681ebc7b3d3d3b SHA512 91a90cdab775ec2501ef1601188b97ca4aa741e541f8d941add8d509767790a144b67f094177dda7539eff305710f2c834b90a93e9441437dac615677963094c
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
new file mode 100644
index 00000000000..ae590110f1c
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch
@@ -0,0 +1,12 @@
+diff -Nuar a/xpra/scripts/config.py b/xpra/scripts/config.py
+--- a/xpra/scripts/config.py 2020-05-10 19:00:55.000000000 +0200
++++ b/xpra/scripts/config.py 2020-06-07 18:35:49.361899872 +0200
+@@ -150,7 +150,7 @@
+ if (xorg_stat.st_mode & stat.S_ISUID)!=0:
+ if (xorg_stat.st_mode & stat.S_IROTH)==0:
+ if warn:
+- warn("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
++ debug("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
+ return get_Xvfb_command()
+ debug("%s is suid and readable, using the xpra_Xdummy wrapper" % xorg_bin)
+ use_wrapper = True
diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index e1742788d2b..349c6f4b186 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -17,6 +17,7 @@
<bugs-to>https://www.xpra.org/trac/report</bugs-to>
</upstream>
<use>
+ <flag name="brotli">Enable brotli compression support</flag>
<flag name="client">Build client-side code</flag>
<flag name="clipboard">Enable clipboard support</flag>
<flag name="csc">Enable csc softscaler support</flag>
diff --git a/x11-wm/xpra/xpra-4.0.4.ebuild b/x11-wm/xpra/xpra-4.0.4.ebuild
new file mode 100644
index 00000000000..ff3e6b93213
--- /dev/null
+++ b/x11-wm/xpra/xpra-4.0.4.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit xdg distutils-r1 eutils flag-o-matic tmpfiles prefix
+
+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"
+IUSE="brotli +client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ || ( client server )
+ cups? ( dbus )
+ opengl? ( client )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ x11-libs/gtk+:3[introspection]
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/libxkbfile
+ brotli? ( app-arch/brotli )
+ csc? ( >=media-video/ffmpeg-1.2.2:0= )
+ ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
+ jpeg? ( media-libs/libjpeg-turbo )
+ opengl? ( dev-python/pyopengl )
+ pulseaudio? (
+ media-sound/pulseaudio
+ media-plugins/gst-plugins-pulse:1.0
+ )
+ sound? ( media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ dev-python/gst-python:1.0 )
+ vpx? ( media-libs/libvpx media-video/ffmpeg )
+ webp? ( media-libs/libwebp )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/xpra
+ dev-python/netifaces[${PYTHON_USEDEP}]
+ dev-python/rencode[${PYTHON_USEDEP}]
+ dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+ virtual/ssh
+ x11-apps/xmodmap
+ cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+ dbus? ( dev-python/dbus-python[${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
+ )
+ webcam? ( dev-python/numpy[${PYTHON_USEDEP}]
+ media-libs/opencv[python]
+ dev-python/pyinotify[${PYTHON_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+ >=dev-python/cython-0.16[${PYTHON_USEDEP}]"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
+ "${FILESDIR}"/${PN}-3.0.2-ldconfig.patch
+ "${FILESDIR}"/${PN}-4.0.3-suid-warning.patch
+)
+
+pkg_postinst() {
+ tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
+
+ xdg_pkg_postinst
+}
+
+python_prepare_all() {
+ hprefixify -w '/os.path/' setup.py
+ hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
+ xpra/platform{/xposix,}/paths.py xpra/scripts/server.py
+
+ distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+ sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
+ -i setup.py || die
+
+ mydistutilsargs=(
+ --without-PIC
+ --without-Xdummy
+ $(use_with client)
+ $(use_with clipboard)
+ $(use_with csc csc_swscale)
+ --without-csc_libyuv
+ --without-cuda_rebuild
+ --without-cuda_kernels
+ $(use_with cups printing)
+ --without-debug
+ $(use_with dbus)
+ $(use_with ffmpeg dec_avcodec2)
+ $(use_with ffmpeg enc_ffmpeg)
+ $(use_with ffmpeg enc_x264)
+ $(use_with ffmpeg enc_x265)
+ --with-gtk3
+ --without-html5
+ $(use_with jpeg jpeg_encoder)
+ $(use_with jpeg jpeg_decoder)
+ --without-mdns
+ --without-minify
+ $(use_with opengl)
+ $(use_with server shadow)
+ $(use_with server)
+ $(use_with sound)
+ --with-strict
+ $(use_with vpx)
+ --with-warn
+ $(use_with webcam)
+ $(use_with webp)
+ --with-x11
+ )
+
+ # see https://www.xpra.org/trac/ticket/1080
+ # and http://trac.cython.org/ticket/395
+ append-cflags -fno-strict-aliasing
+
+ export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/, x11-wm/xpra/files/
@ 2021-05-30 7:56 James Le Cuirot
0 siblings, 0 replies; 17+ messages in thread
From: James Le Cuirot @ 2021-05-30 7:56 UTC (permalink / raw
To: gentoo-commits
commit: e11d7375480a0b0a7199d3fcbcf8e2cefb0c5f77
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun May 30 07:53:59 2021 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun May 30 07:56:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e11d7375
x11-wm/xpra: Version bump to 4.2
Adds ibus and pinentry USE flags.
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
x11-wm/xpra/Manifest | 1 +
x11-wm/xpra/files/xpra-4.2-suid-warning.patch | 12 ++
x11-wm/xpra/metadata.xml | 2 +
x11-wm/xpra/xpra-4.2.ebuild | 170 ++++++++++++++++++++++++++
4 files changed, 185 insertions(+)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 9e57431ebb4..58025dff631 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1,4 @@
DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647 SHA512 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
DIST xpra-4.1.2.tar.xz 2676588 BLAKE2B db3694fdd9f7e20ba93099ecde50d712de41bb64a2d317b9f10e349b7f501015d083c212250206c0f3e25e154311a096ce4c17972131af68584be666bbf7e067 SHA512 860533c4173b92ee110e65849110870a3b129b993d8a2a2308142474164e4f1c45984669e7e3963540290192310de5d2de0e0713b80f4cb8c6ae7f9c3bb0814e
DIST xpra-4.1.3.tar.gz 3850971 BLAKE2B b5f5a0546c785762974f27650408cb83fdfa2ac8a5b5dd8c6b08a9978ff17a0dfc85f95fde405689a19517ef66bcc7aefc1dad71acc2dda7883ed38d3c22b91c SHA512 e401793ae9a4539d39bc161be4d34af2dca81c78f189664d8ebdefff99d413d364d4ceb37dd776b027b206119da81957ef7436a727c00d3ad5895a3c90742e39
+DIST xpra-4.2.tar.gz 4057304 BLAKE2B 17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10 SHA512 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353
diff --git a/x11-wm/xpra/files/xpra-4.2-suid-warning.patch b/x11-wm/xpra/files/xpra-4.2-suid-warning.patch
new file mode 100644
index 00000000000..b1b2afb4e18
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.2-suid-warning.patch
@@ -0,0 +1,12 @@
+diff --color -Naur a/xpra/scripts/config.py b/xpra/scripts/config.py
+--- a/xpra/scripts/config.py 2021-05-19 16:18:30.475153200 +0100
++++ b/xpra/scripts/config.py 2021-05-30 08:50:42.326953006 +0100
+@@ -159,7 +159,7 @@
+ if (xorg_stat.st_mode & stat.S_ISUID)!=0:
+ if (xorg_stat.st_mode & stat.S_IROTH)==0:
+ if warn_fn:
+- warn_fn("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
++ debug("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
+ return get_Xvfb_command()
+ debug("%s is suid and readable, using the xpra_Xdummy wrapper" % xorg_bin)
+ use_wrapper = True
diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index ce472786e3a..a90f8afcffa 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -25,7 +25,9 @@
<flag name="client">Build client-side code</flag>
<flag name="clipboard">Enable clipboard support</flag>
<flag name="csc">Enable csc softscaler support</flag>
+ <flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
<flag name="pillow">Enable pillow support</flag>
+ <flag name="pinentry">Use <pkg>app-crypt/pinentry</pkg> for password entry</flag>
<flag name="server">Build server-side code</flag>
<flag name="vpx">Enable vpx image format support</flag>
<flag name="webcam">Enable webcam support via opencv</flag>
diff --git a/x11-wm/xpra/xpra-4.2.ebuild b/x11-wm/xpra/xpra-4.2.ebuild
new file mode 100644
index 00000000000..1f8dc0a75fa
--- /dev/null
+++ b/x11-wm/xpra/xpra-4.2.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_SETUPTOOLS=no
+inherit xdg distutils-r1 tmpfiles prefix udev
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
+HOMEPAGE="https://xpra.org/"
+SRC_URI="https://xpra.org/src/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio server sound test vpx webcam webp"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ || ( client server )
+ cups? ( dbus )
+ opengl? ( client )
+"
+
+DEPEND="
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+ opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+ sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+ ')
+ x11-libs/gtk+:3[introspection]
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/libxkbfile
+ brotli? ( app-arch/brotli )
+ csc? ( >=media-video/ffmpeg-1.2.2:0= )
+ ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
+ jpeg? ( media-libs/libjpeg-turbo )
+ pulseaudio? (
+ media-sound/pulseaudio
+ media-plugins/gst-plugins-pulse:1.0
+ )
+ sound? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ vpx? ( media-libs/libvpx media-video/ffmpeg )
+ webp? ( media-libs/libwebp )
+"
+RDEPEND="
+ ${DEPEND}
+ $(python_gen_cond_dep '
+ dev-python/netifaces[${PYTHON_USEDEP}]
+ dev-python/rencode[${PYTHON_USEDEP}]
+ dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+ cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+ dbus? ( dev-python/dbus-python[${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}] )
+ )
+ webcam? (
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pyinotify[${PYTHON_USEDEP}]
+ media-libs/opencv[${PYTHON_USEDEP},python]
+ )
+ ')
+ acct-group/xpra
+ virtual/ssh
+ x11-apps/xmodmap
+ ibus? ( app-i18n/ibus )
+ pinentry? ( app-crypt/pinentry )
+ server? (
+ x11-base/xorg-server[-minimal,xvfb]
+ x11-drivers/xf86-input-void
+ )
+"
+BDEPEND="
+ virtual/pkgconfig
+ $(python_gen_cond_dep '
+ >=dev-python/cython-0.16[${PYTHON_USEDEP}]
+ ')
+ doc? ( app-text/pandoc )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
+ "${FILESDIR}"/${PN}-3.0.2-ldconfig.patch
+ "${FILESDIR}"/${PN}-4.2-suid-warning.patch
+)
+
+pkg_postinst() {
+ tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
+
+ xdg_pkg_postinst
+}
+
+python_prepare_all() {
+ hprefixify -w '/os.path/' setup.py
+ hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
+ xpra/platform{/xposix,}/paths.py xpra/scripts/server.py
+
+ sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \
+ -i setup.py || die
+
+ if use minimal; then
+ sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \
+ -i setup.py || die
+ fi
+
+ distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+ sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
+ -i setup.py || die
+
+ mydistutilsargs=(
+ --without-PIC
+ --without-Xdummy
+ $(use_with client)
+ $(use_with clipboard)
+ $(use_with csc csc_swscale)
+ --without-csc_libyuv
+ --without-cuda_rebuild
+ --without-cuda_kernels
+ $(use_with cups printing)
+ --without-debug
+ $(use_with dbus)
+ $(use_with doc docs)
+ $(use_with ffmpeg dec_avcodec2)
+ $(use_with ffmpeg enc_ffmpeg)
+ $(use_with ffmpeg enc_x264)
+ $(use_with ffmpeg enc_x265)
+ --with-gtk3
+ $(use_with jpeg jpeg_encoder)
+ $(use_with jpeg jpeg_decoder)
+ --without-mdns
+ $(use_with opengl)
+ $(use_with server shadow)
+ $(use_with server)
+ $(use_with sound)
+ --with-strict
+ $(use_with vpx)
+ --with-warn
+ $(use_with webcam)
+ $(use_with webp)
+ --with-x11
+ )
+
+ export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
+}
+
+python_install_all() {
+ distutils-r1_python_prepare_all
+
+ # Move udev dir to the right place.
+ local dir=$(get_udevdir)
+ dodir "${dir%/*}"
+ mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/, x11-wm/xpra/files/
@ 2021-07-18 10:43 Conrad Kostecki
0 siblings, 0 replies; 17+ messages in thread
From: Conrad Kostecki @ 2021-07-18 10:43 UTC (permalink / raw
To: gentoo-commits
commit: eb9e0c13c683f840add259c55d87467d2e750cbb
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 18 10:42:48 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jul 18 10:42:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb9e0c13
x11-wm/xpra: drop old version
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
x11-wm/xpra/Manifest | 2 -
x11-wm/xpra/files/xpra-2.0-suid-warning.patch | 11 --
x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch | 12 --
x11-wm/xpra/xpra-3.0.5-r2.ebuild | 147 ---------------------
x11-wm/xpra/xpra-4.1.3.ebuild | 168 ------------------------
5 files changed, 340 deletions(-)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 59734fa8ff1..384b7becefb 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,4 +1,2 @@
-DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647 SHA512 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
-DIST xpra-4.1.3.tar.gz 3850971 BLAKE2B b5f5a0546c785762974f27650408cb83fdfa2ac8a5b5dd8c6b08a9978ff17a0dfc85f95fde405689a19517ef66bcc7aefc1dad71acc2dda7883ed38d3c22b91c SHA512 e401793ae9a4539d39bc161be4d34af2dca81c78f189664d8ebdefff99d413d364d4ceb37dd776b027b206119da81957ef7436a727c00d3ad5895a3c90742e39
DIST xpra-4.2.1.tar.gz 3878766 BLAKE2B c537b54b8ea5cc1ad2909eeccf61eba59a518165eb72c7d4984d26f378e4babca997c2f6cf78f5ba947edbc4ad6c4085c86793aad9b01f1fca2b22b1daaabda9 SHA512 553d8c11f1a77a2a58cbad7df0d899c611e21eb01dad3516f99f1fb9cc7a4507ba7557807b62ddea7101ca01bab123962a34b9c3369db06d1bb318debd91dc55
DIST xpra-4.2.tar.gz 4057304 BLAKE2B 17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10 SHA512 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353
diff --git a/x11-wm/xpra/files/xpra-2.0-suid-warning.patch b/x11-wm/xpra/files/xpra-2.0-suid-warning.patch
deleted file mode 100644
index 806694f2431..00000000000
--- a/x11-wm/xpra/files/xpra-2.0-suid-warning.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpra-2.0/xpra/scripts/config.py
-+++ xpra-2.0/xpra/scripts/config.py
-@@ -127,7 +127,7 @@
- xorg_stat = os.stat(xorg_bin)
- if (xorg_stat.st_mode & stat.S_ISUID)!=0:
- if (xorg_stat.st_mode & stat.S_IROTH)==0:
-- warn("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
-+ debug("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
- return get_Xvfb_command()
- debug("%s is suid and readable, using the xpra_Xdummy wrapper" % xorg_bin)
- use_wrapper = True
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
deleted file mode 100644
index ae590110f1c..00000000000
--- a/x11-wm/xpra/files/xpra-4.0.3-suid-warning.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar a/xpra/scripts/config.py b/xpra/scripts/config.py
---- a/xpra/scripts/config.py 2020-05-10 19:00:55.000000000 +0200
-+++ b/xpra/scripts/config.py 2020-06-07 18:35:49.361899872 +0200
-@@ -150,7 +150,7 @@
- if (xorg_stat.st_mode & stat.S_ISUID)!=0:
- if (xorg_stat.st_mode & stat.S_IROTH)==0:
- if warn:
-- warn("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
-+ debug("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
- return get_Xvfb_command()
- debug("%s is suid and readable, using the xpra_Xdummy wrapper" % xorg_bin)
- use_wrapper = True
diff --git a/x11-wm/xpra/xpra-3.0.5-r2.ebuild b/x11-wm/xpra/xpra-3.0.5-r2.ebuild
deleted file mode 100644
index 1371e2b78d8..00000000000
--- a/x11-wm/xpra/xpra-3.0.5-r2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg distutils-r1 flag-o-matic user tmpfiles prefix
-
-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"
-IUSE="+client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- || ( client server )
- cups? ( dbus )
- opengl? ( client )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- x11-libs/gtk+:3[introspection]
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXtst
- x11-libs/libxkbfile
- csc? ( >=media-video/ffmpeg-1.2.2:0= )
- ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
- jpeg? ( media-libs/libjpeg-turbo )
- opengl? ( dev-python/pyopengl )
- pulseaudio? (
- media-sound/pulseaudio
- media-plugins/gst-plugins-pulse:1.0
- )
- sound? ( media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- dev-python/gst-python:1.0 )
- vpx? ( media-libs/libvpx media-video/ffmpeg )
- webp? ( media-libs/libwebp )
-"
-RDEPEND="${COMMON_DEPEND}
- dev-python/netifaces[${PYTHON_USEDEP}]
- dev-python/rencode[${PYTHON_USEDEP}]
- dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
- virtual/ssh
- x11-apps/xmodmap
- cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
- dbus? ( dev-python/dbus-python[${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
- )
- webcam? ( dev-python/numpy[${PYTHON_USEDEP}]
- media-libs/opencv[python]
- dev-python/pyinotify[${PYTHON_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- >=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
- "${FILESDIR}"/${PN}-2.0-suid-warning.patch
- "${FILESDIR}"/${PN}-3.0.2-ldconfig.patch
-)
-
-src_install() {
- distutils-r1_src_install
-
- mkdir -p "${ED}/usr/share/metainfo" || die
- mv "${ED}/usr/share/appdata/"* "${ED}/usr/share/metainfo/" || die
- rmdir "${ED}/usr/share/appdata" || die
-}
-
-pkg_postinst() {
- enewgroup ${PN}
- tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
-
- xdg_pkg_postinst
-}
-
-python_prepare_all() {
- hprefixify -w '/os.path/' setup.py
- hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
- xpra/platform{/xposix,}/paths.py xpra/scripts/server.py
-
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
- -i setup.py || die
-
- mydistutilsargs=(
- --without-PIC
- --without-Xdummy
- $(use_with client)
- $(use_with clipboard)
- $(use_with csc csc_swscale)
- --without-csc_libyuv
- --without-cuda_rebuild
- --without-cuda_kernels
- $(use_with cups printing)
- --without-debug
- $(use_with dbus)
- $(use_with ffmpeg dec_avcodec2)
- $(use_with ffmpeg enc_ffmpeg)
- $(use_with ffmpeg enc_x264)
- $(use_with ffmpeg enc_x265)
- --without-gtk2
- --with-gtk3
- --without-html5
- $(use_with jpeg jpeg_encoder)
- $(use_with jpeg jpeg_decoder)
- --without-mdns
- --without-minify
- $(use_with opengl)
- $(use_with server shadow)
- $(use_with server)
- $(use_with sound)
- --with-strict
- $(use_with vpx)
- --with-warn
- $(use_with webcam)
- $(use_with webp)
- --with-x11
- )
-
- # see https://www.xpra.org/trac/ticket/1080
- # and http://trac.cython.org/ticket/395
- append-cflags -fno-strict-aliasing
-
- export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
-}
diff --git a/x11-wm/xpra/xpra-4.1.3.ebuild b/x11-wm/xpra/xpra-4.1.3.ebuild
deleted file mode 100644
index db407cd0db7..00000000000
--- a/x11-wm/xpra/xpra-4.1.3.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg distutils-r1 tmpfiles prefix udev
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="https://xpra.org/"
-SRC_URI="https://xpra.org/src/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg +lz4 lzo minimal opengl pillow pulseaudio server sound test vpx webcam webp"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- || ( client server )
- cups? ( dbus )
- opengl? ( client )
-"
-
-DEPEND="
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
- opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
- sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
- ')
- x11-libs/gtk+:3[introspection]
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXtst
- x11-libs/libxkbfile
- brotli? ( app-arch/brotli )
- csc? ( >=media-video/ffmpeg-1.2.2:0= )
- ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
- jpeg? ( media-libs/libjpeg-turbo )
- pulseaudio? (
- media-sound/pulseaudio
- media-plugins/gst-plugins-pulse:1.0
- )
- sound? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- vpx? ( media-libs/libvpx media-video/ffmpeg )
- webp? ( media-libs/libwebp )
-"
-RDEPEND="
- ${DEPEND}
- $(python_gen_cond_dep '
- dev-python/netifaces[${PYTHON_USEDEP}]
- dev-python/rencode[${PYTHON_USEDEP}]
- dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
- cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
- dbus? ( dev-python/dbus-python[${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}] )
- )
- webcam? (
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pyinotify[${PYTHON_USEDEP}]
- media-libs/opencv[${PYTHON_USEDEP},python]
- )
- ')
- acct-group/xpra
- virtual/ssh
- x11-apps/xmodmap
- server? (
- x11-base/xorg-server[-minimal,xvfb]
- x11-drivers/xf86-input-void
- )
-"
-BDEPEND="
- virtual/pkgconfig
- $(python_gen_cond_dep '
- >=dev-python/cython-0.16[${PYTHON_USEDEP}]
- ')
- doc? ( app-text/pandoc )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
- "${FILESDIR}"/${PN}-3.0.2-ldconfig.patch
- "${FILESDIR}"/${PN}-4.0.3-suid-warning.patch
-)
-
-pkg_postinst() {
- tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
-
- xdg_pkg_postinst
-}
-
-python_prepare_all() {
- hprefixify -w '/os.path/' setup.py
- hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
- xpra/platform{/xposix,}/paths.py xpra/scripts/server.py
-
- sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \
- -i setup.py || die
-
- if use minimal; then
- sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \
- -i setup.py || die
- fi
-
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
- -i setup.py || die
-
- mydistutilsargs=(
- --without-PIC
- --without-Xdummy
- $(use_with client)
- $(use_with clipboard)
- $(use_with csc csc_swscale)
- --without-csc_libyuv
- --without-cuda_rebuild
- --without-cuda_kernels
- $(use_with cups printing)
- --without-debug
- $(use_with dbus)
- $(use_with doc docs)
- $(use_with ffmpeg dec_avcodec2)
- $(use_with ffmpeg enc_ffmpeg)
- $(use_with ffmpeg enc_x264)
- $(use_with ffmpeg enc_x265)
- --with-gtk3
- $(use_with jpeg jpeg_encoder)
- $(use_with jpeg jpeg_decoder)
- --without-mdns
- $(use_with opengl)
- $(use_with server shadow)
- $(use_with server)
- $(use_with sound)
- --with-strict
- $(use_with vpx)
- --with-warn
- $(use_with webcam)
- $(use_with webp)
- --with-x11
- )
-
- export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
-}
-
-python_install_all() {
- distutils-r1_python_prepare_all
-
- # Move udev dir to the right place.
- local dir=$(get_udevdir)
- dodir "${dir%/*}"
- mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/, x11-wm/xpra/files/
@ 2021-09-04 10:18 James Le Cuirot
0 siblings, 0 replies; 17+ messages in thread
From: James Le Cuirot @ 2021-09-04 10:18 UTC (permalink / raw
To: gentoo-commits
commit: 81c161656c900dfc8fe0aa3f343c781ade6153b8
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 4 10:17:10 2021 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Sep 4 10:17:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81c16165
x11-wm/xpra: Bump to 4.2.2, add tests
The tests required tweaks but they should work in the next release.
I had to drop prefix support because it's broken and hard to fix.
Closes: https://bugs.gentoo.org/802105
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
x11-wm/xpra/Manifest | 1 +
x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch | 36 ++++
x11-wm/xpra/files/xpra-4.2.2-dup-ip.patch | 40 +++++
x11-wm/xpra/files/xpra-4.2.2-ldconfig.patch | 22 +++
.../files/xpra-4.2.2-true-false-bin-path.patch | 38 ++++
x11-wm/xpra/metadata.xml | 2 +
x11-wm/xpra/xpra-4.2.2.ebuild | 200 +++++++++++++++++++++
7 files changed, 339 insertions(+)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 384b7becefb..9eb5666590e 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,2 +1,3 @@
DIST xpra-4.2.1.tar.gz 3878766 BLAKE2B c537b54b8ea5cc1ad2909eeccf61eba59a518165eb72c7d4984d26f378e4babca997c2f6cf78f5ba947edbc4ad6c4085c86793aad9b01f1fca2b22b1daaabda9 SHA512 553d8c11f1a77a2a58cbad7df0d899c611e21eb01dad3516f99f1fb9cc7a4507ba7557807b62ddea7101ca01bab123962a34b9c3369db06d1bb318debd91dc55
+DIST xpra-4.2.2.tar.gz 3894227 BLAKE2B a25dde9c3732e31cd8127393f89f2495e01896d18d5212b141b4046c265a9ead029bed68c9610c2330ec0a885af1eeb3f92aef2c16dd102293e34ac208be605a SHA512 3f81b5a2f7abdfc14f7e48ec708524e38142b984e6539e94a27b6aef7b5a5e063ef14e6b7383a7719ecc7687c62f49eeeb5668282c337d90a79194c354dedd24
DIST xpra-4.2.tar.gz 4057304 BLAKE2B 17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10 SHA512 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353
diff --git a/x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch b/x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch
new file mode 100644
index 00000000000..0d34ab0ef2f
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch
@@ -0,0 +1,36 @@
+diff --git a/tests/unittests/unit/net/compression_test.py b/tests/unittests/unit/net/compression_test.py
+index 29ac7f2d2..89b68fdbf 100755
+--- a/tests/unittests/unit/net/compression_test.py
++++ b/tests/unittests/unit/net/compression_test.py
+@@ -11,7 +11,6 @@ from xpra.net import compression
+ class TestCompression(unittest.TestCase):
+
+ def test_main(self):
+- compression.sanity_checks()
+ compression.init_all()
+ assert compression.use("zlib")
+ assert compression.get_compression_caps()
+diff --git a/tests/unittests/unit/net/packet_encoding_test.py b/tests/unittests/unit/net/packet_encoding_test.py
+index 69ef95c65..eead158b0 100755
+--- a/tests/unittests/unit/net/packet_encoding_test.py
++++ b/tests/unittests/unit/net/packet_encoding_test.py
+@@ -12,7 +12,6 @@ class TestPacketEncoding(unittest.TestCase):
+
+ def test_env_log(self):
+ packet_encoding.init_all()
+- packet_encoding.sanity_checks()
+ assert packet_encoding.get_packet_encoding_caps()
+ assert packet_encoding.get_enabled_encoders()
+ for x in packet_encoding.get_enabled_encoders():
+diff --git a/tests/unittests/unit/scripts/main_test.py b/tests/unittests/unit/scripts/main_test.py
+index 6dd54069c..f9478c2ab 100755
+--- a/tests/unittests/unit/scripts/main_test.py
++++ b/tests/unittests/unit/scripts/main_test.py
+@@ -121,7 +121,6 @@ class TestMain(unittest.TestCase):
+ t("tcp://fe80::c1:ac45:7351:ea69%eth1:14500", {"host" : "fe80::c1:ac45:7351:ea69%eth1", "port" : 14500})
+ t("tcp://[fe80::c1:ac45:7351:ea69]:14500", {"host" : "fe80::c1:ac45:7351:ea69", "port" : 14500})
+ t("tcp://host/100,key1=value1", {"key1" : "value1"})
+- t("tcp://host/key1=value1", {"key1" : "value1"})
+ try:
+ from xpra.net.vsock import CID_ANY, PORT_ANY #@UnresolvedImport
+ t("vsock://any:any/", {"vsock" : (CID_ANY, PORT_ANY)})
diff --git a/x11-wm/xpra/files/xpra-4.2.2-dup-ip.patch b/x11-wm/xpra/files/xpra-4.2.2-dup-ip.patch
new file mode 100644
index 00000000000..f689166dec9
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.2.2-dup-ip.patch
@@ -0,0 +1,40 @@
+diff --git a/tests/unittests/unit/net/net_util_test.py b/tests/unittests/unit/net/net_util_test.py
+index 1ceaf4573..870801666 100755
+--- a/tests/unittests/unit/net/net_util_test.py
++++ b/tests/unittests/unit/net/net_util_test.py
+@@ -6,6 +6,7 @@
+
+ import unittest
+
++from collections import defaultdict
+ from xpra.net.net_util import (
+ get_info, get_interfaces, get_interfaces_addresses, #get_interface,
+ get_gateways, get_bind_IPs, do_get_bind_ifacemask,
+@@ -26,10 +27,8 @@ class TestVersionUtilModule(unittest.TestCase):
+ ifaces = get_interfaces()
+ if not ifaces:
+ return
++ ip_ifaces = defaultdict(list)
+ for iface in ifaces:
+- ipmasks = do_get_bind_ifacemask(iface)
+- for ip, _ in ipmasks:
+- assert get_iface(ip)==iface
+ if if_nametoindex:
+ try:
+ i = if_nametoindex(iface)
+@@ -37,7 +36,14 @@ class TestVersionUtilModule(unittest.TestCase):
+ pass
+ else:
+ if if_indextoname:
+- assert if_indextoname(i)==iface
++ assert if_indextoname(i)==iface, "expected interface %s for index %i but got %s" % (
++ iface, i, if_indextoname(i))
++ ipmasks = do_get_bind_ifacemask(iface)
++ for ip, _ in ipmasks:
++ ip_ifaces[ip].append(iface)
++ for ip, ifaces in ip_ifaces.items():
++ assert get_iface(ip) in ifaces, "expected interface for ip %s to be one of %s but got %s" % (
++ ip, ifaces, get_iface(ip))
+ ia = get_interfaces_addresses()
+ assert ia
+ #for iface, address in ia.items():
diff --git a/x11-wm/xpra/files/xpra-4.2.2-ldconfig.patch b/x11-wm/xpra/files/xpra-4.2.2-ldconfig.patch
new file mode 100644
index 00000000000..2cd009994c4
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.2.2-ldconfig.patch
@@ -0,0 +1,22 @@
+From f97daef82521c9297f6cc2d7925fe5c6ed526ad1 Mon Sep 17 00:00:00 2001
+From: totaam <antoine@xpra.org>
+Date: Sun, 22 Aug 2021 21:31:52 +0700
+Subject: [PATCH] #3239 with shell=True, best not to use a list
+
+---
+ xpra/os_util.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xpra/os_util.py b/xpra/os_util.py
+index 2f8c0d64a..2f309f888 100644
+--- a/xpra/os_util.py
++++ b/xpra/os_util.py
+@@ -786,7 +786,7 @@ def find_lib_ldconfig(libname):
+ ldconfig = t
+ break
+ import subprocess
+- p = subprocess.Popen([ldconfig, "-p"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
++ p = subprocess.Popen("%s -p" % ldconfig, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+ data = bytestostr(p.communicate()[0])
+
+ libpath = re.search(pattern, data, re.MULTILINE) #@UndefinedVariable
diff --git a/x11-wm/xpra/files/xpra-4.2.2-true-false-bin-path.patch b/x11-wm/xpra/files/xpra-4.2.2-true-false-bin-path.patch
new file mode 100644
index 00000000000..255e8073861
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.2.2-true-false-bin-path.patch
@@ -0,0 +1,38 @@
+From 6e9ef70facfcc280e4c98892d2af6636d122c762 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Tue, 24 Aug 2021 09:56:26 +0100
+Subject: [PATCH] Execute true and false from /bin, not /usr/bin
+
+Some distributions now have /bin symlinked to /usr/bin, but not all of
+them. /bin should work everywhere.
+---
+ tests/unittests/unit/server/auth_test.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/unittests/unit/server/auth_test.py b/tests/unittests/unit/server/auth_test.py
+index 373db96e5..8e6be8e20 100755
+--- a/tests/unittests/unit/server/auth_test.py
++++ b/tests/unittests/unit/server/auth_test.py
+@@ -73,7 +73,7 @@ class TestAuth(unittest.TestCase):
+ kwargs["connection"] = "fake-connection-data"
+ #exec auth would fail during rpmbuild without a default command:
+ if "command" not in kwargs:
+- kwargs["command"] = "/usr/bin/true"
++ kwargs["command"] = "/bin/true"
+ return c(username, **kwargs)
+
+ def _test_module(self, module):
+@@ -380,8 +380,8 @@ class TestAuth(unittest.TestCase):
+ a = self._init_auth("exec", **kwargs)
+ assert not a.requires_challenge(), "%s should not require a challenge" % a
+ assert self.capsauth(a)==success, "%s should have %s using cmd=%s" % (a, ["failed", "succeeded"][success], cmd)
+- exec_cmd("/usr/bin/true", True)
+- exec_cmd("/usr/bin/false", False)
++ exec_cmd("/bin/true", True)
++ exec_cmd("/bin/false", False)
+
+
+ def main():
+--
+2.32.0
+
diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index a90f8afcffa..3440980db47 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -25,11 +25,13 @@
<flag name="client">Build client-side code</flag>
<flag name="clipboard">Enable clipboard support</flag>
<flag name="csc">Enable csc softscaler support</flag>
+ <flag name="html">Install the HTML5 client</flag>
<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
<flag name="pillow">Enable pillow support</flag>
<flag name="pinentry">Use <pkg>app-crypt/pinentry</pkg> for password entry</flag>
<flag name="server">Build server-side code</flag>
<flag name="vpx">Enable vpx image format support</flag>
<flag name="webcam">Enable webcam support via opencv</flag>
+ <flag name="xdg">Enable support for XDG-based menus</flag>
</use>
</pkgmetadata>
diff --git a/x11-wm/xpra/xpra-4.2.2.ebuild b/x11-wm/xpra/xpra-4.2.2.ebuild
new file mode 100644
index 00000000000..48f142fd675
--- /dev/null
+++ b/x11-wm/xpra/xpra-4.2.2.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_SETUPTOOLS=no
+inherit xdg xdg-utils distutils-r1 tmpfiles udev
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
+HOMEPAGE="https://xpra.org/"
+SRC_URI="https://xpra.org/src/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ || ( client server )
+ cups? ( dbus )
+ opengl? ( client )
+ test? ( client clipboard dbus html server sound xdg xinerama )
+"
+
+TDEPEND="
+ $(python_gen_cond_dep '
+ dev-python/netifaces[${PYTHON_USEDEP}]
+ dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+ dev-python/rencode[${PYTHON_USEDEP}]
+ dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+ xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] )
+ ')
+ html? ( www-apps/xpra-html5 )
+ server? (
+ x11-base/xorg-server[-minimal,xvfb]
+ x11-drivers/xf86-input-void
+ )
+ xinerama? ( x11-libs/libfakeXinerama )
+"
+DEPEND="
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+ opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+ sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+ ')
+ x11-libs/gtk+:3[introspection]
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/libxkbfile
+ brotli? ( app-arch/brotli )
+ csc? ( >=media-video/ffmpeg-1.2.2:0= )
+ ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
+ jpeg? ( media-libs/libjpeg-turbo )
+ pulseaudio? (
+ media-sound/pulseaudio
+ media-plugins/gst-plugins-pulse:1.0
+ )
+ sound? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ vpx? ( media-libs/libvpx media-video/ffmpeg )
+ webp? ( media-libs/libwebp )
+"
+RDEPEND="
+ ${DEPEND}
+ ${TDEPEND}
+ $(python_gen_cond_dep '
+ 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}] )
+ )
+ webcam? (
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pyinotify[${PYTHON_USEDEP}]
+ media-libs/opencv[${PYTHON_USEDEP},python]
+ )
+ ')
+ acct-group/xpra
+ virtual/ssh
+ x11-apps/xauth
+ x11-apps/xmodmap
+ ibus? ( app-i18n/ibus )
+ pinentry? ( app-crypt/pinentry )
+"
+DEPEND+="
+ test? ( ${TDEPEND} )
+"
+BDEPEND="
+ $(python_gen_cond_dep '
+ >=dev-python/cython-0.16[${PYTHON_USEDEP}]
+ ')
+ virtual/pkgconfig
+ doc? ( app-text/pandoc )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
+ "${FILESDIR}"/${PN}-4.2.2-ldconfig.patch
+ "${FILESDIR}"/${PN}-4.2-suid-warning.patch
+ "${FILESDIR}"/${PN}-4.2.2-true-false-bin-path.patch
+ "${FILESDIR}"/${PN}-4.2.2-dup-ip.patch
+ "${FILESDIR}"/${PN}-4.2.2-bad-tests.patch
+)
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ # FIXME: There are hardcoded paths all over the place but the following
+ # double-prefixes some files under /etc. Looks tricky to fix. :(
+ #hprefixify $(find -type f \( -name "*.py" -o -name "*.conf" \))
+
+ sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \
+ -i setup.py || die
+
+ if use minimal; then
+ sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \
+ -i setup.py || die
+ fi
+
+ # Upstream says these tests are currently broken.
+ rm tests/unittests/unit/net/subprocess_wrapper_test.py tests/unittests/unit/net/protocol_test.py || die
+}
+
+python_configure_all() {
+ sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
+ -i setup.py || die
+
+ mydistutilsargs=(
+ --without-PIC
+ --without-Xdummy
+ $(use_with client)
+ $(use_with clipboard)
+ $(use_with csc csc_swscale)
+ --without-csc_libyuv
+ --without-cuda_rebuild
+ --without-cuda_kernels
+ $(use_with cups printing)
+ --without-debug
+ $(use_with dbus)
+ $(use_with doc docs)
+ $(use_with ffmpeg dec_avcodec2)
+ $(use_with ffmpeg enc_ffmpeg)
+ $(use_with ffmpeg enc_x264)
+ $(use_with ffmpeg enc_x265)
+ --with-gtk3
+ $(use_with jpeg jpeg_encoder)
+ $(use_with jpeg jpeg_decoder)
+ --without-mdns
+ $(use_with opengl)
+ $(use_with server shadow)
+ $(use_with server)
+ $(use_with sound)
+ --with-strict
+ $(use_with vpx)
+ --with-warn
+ $(use_with webcam)
+ $(use_with webp)
+ --with-x11
+ )
+
+ export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
+}
+
+python_test() {
+ export XAUTHORITY=${HOME}/.Xauthority
+ touch "${XAUTHORITY}" || die
+
+ distutils_install_for_testing
+ xdg_environment_reset
+
+ PYTHONPATH=${S}/tests/unittests:${BUILD_DIR}/test/lib \
+ XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \
+ "${PYTHON}" tests/unittests/unit/run.py || die
+}
+
+python_install_all() {
+ distutils-r1_python_prepare_all
+
+ # Move udev dir to the right place.
+ local dir=$(get_udevdir)
+ dodir "${dir%/*}"
+ mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+}
+
+pkg_postinst() {
+ tmpfiles_process xpra.conf
+ xdg_pkg_postinst
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/, x11-wm/xpra/files/
@ 2021-10-06 12:08 James Le Cuirot
0 siblings, 0 replies; 17+ messages in thread
From: James Le Cuirot @ 2021-10-06 12:08 UTC (permalink / raw
To: gentoo-commits
commit: 2c1c7d7e9717d3eba8abb0395e4a85e2f3268d5e
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 6 12:06:32 2021 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Oct 6 12:08:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c1c7d7e
x11-wm/xpra: Version bump to 4.2.3
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
x11-wm/xpra/Manifest | 1 +
x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch | 30 +++++
x11-wm/xpra/xpra-4.2.3.ebuild | 199 ++++++++++++++++++++++++++++++
3 files changed, 230 insertions(+)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 9eb5666590e..e38e029bc47 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1,4 @@
DIST xpra-4.2.1.tar.gz 3878766 BLAKE2B c537b54b8ea5cc1ad2909eeccf61eba59a518165eb72c7d4984d26f378e4babca997c2f6cf78f5ba947edbc4ad6c4085c86793aad9b01f1fca2b22b1daaabda9 SHA512 553d8c11f1a77a2a58cbad7df0d899c611e21eb01dad3516f99f1fb9cc7a4507ba7557807b62ddea7101ca01bab123962a34b9c3369db06d1bb318debd91dc55
DIST xpra-4.2.2.tar.gz 3894227 BLAKE2B a25dde9c3732e31cd8127393f89f2495e01896d18d5212b141b4046c265a9ead029bed68c9610c2330ec0a885af1eeb3f92aef2c16dd102293e34ac208be605a SHA512 3f81b5a2f7abdfc14f7e48ec708524e38142b984e6539e94a27b6aef7b5a5e063ef14e6b7383a7719ecc7687c62f49eeeb5668282c337d90a79194c354dedd24
+DIST xpra-4.2.3.tar.gz 3897648 BLAKE2B e9d3b4f07f8fae88ad410201a503bc5c738daae91640843cfce2b70da03e916295709bb74ffbb5e70f8e8ba2dcc3085861bdd9b097d24096ccba332693cc076b SHA512 cebec316a0cbd673907379b54248901743a8bf6b6d25c7b36465794da4e1b19296b5fd465df8ba9d563b2a246fab572fa8db25c24c511da9ddc340a8c95557d5
DIST xpra-4.2.tar.gz 4057304 BLAKE2B 17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10 SHA512 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353
diff --git a/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch b/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch
new file mode 100644
index 00000000000..337527305ec
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch
@@ -0,0 +1,30 @@
+diff --git a/tests/unittests/unit/net/net_util_test.py b/tests/unittests/unit/net/net_util_test.py
+index 5c6e3096c..870801666 100755
+--- a/tests/unittests/unit/net/net_util_test.py
++++ b/tests/unittests/unit/net/net_util_test.py
+@@ -27,11 +27,8 @@ class TestVersionUtilModule(unittest.TestCase):
+ ifaces = get_interfaces()
+ if not ifaces:
+ return
++ ip_ifaces = defaultdict(list)
+ for iface in ifaces:
+- ipmasks = do_get_bind_ifacemask(iface)
+- for ip, _ in ipmasks:
+- assert get_iface(ip)==iface, "expected interface %s for ip %s but got %s" % (
+- iface, ip, get_iface(ip))
+ if if_nametoindex:
+ try:
+ i = if_nametoindex(iface)
+@@ -41,6 +38,12 @@ class TestVersionUtilModule(unittest.TestCase):
+ if if_indextoname:
+ assert if_indextoname(i)==iface, "expected interface %s for index %i but got %s" % (
+ iface, i, if_indextoname(i))
++ ipmasks = do_get_bind_ifacemask(iface)
++ for ip, _ in ipmasks:
++ ip_ifaces[ip].append(iface)
++ for ip, ifaces in ip_ifaces.items():
++ assert get_iface(ip) in ifaces, "expected interface for ip %s to be one of %s but got %s" % (
++ ip, ifaces, get_iface(ip))
+ ia = get_interfaces_addresses()
+ assert ia
+ #for iface, address in ia.items():
diff --git a/x11-wm/xpra/xpra-4.2.3.ebuild b/x11-wm/xpra/xpra-4.2.3.ebuild
new file mode 100644
index 00000000000..6280862e546
--- /dev/null
+++ b/x11-wm/xpra/xpra-4.2.3.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_USE_SETUPTOOLS=no
+inherit xdg xdg-utils distutils-r1 tmpfiles udev
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
+HOMEPAGE="https://xpra.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ || ( client server )
+ cups? ( dbus )
+ opengl? ( client )
+ test? ( client clipboard dbus html server sound xdg xinerama )
+"
+
+TDEPEND="
+ $(python_gen_cond_dep '
+ dev-python/netifaces[${PYTHON_USEDEP}]
+ dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+ dev-python/rencode[${PYTHON_USEDEP}]
+ dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+ xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] )
+ ')
+ html? ( www-apps/xpra-html5 )
+ server? (
+ x11-base/xorg-server[-minimal,xvfb]
+ x11-drivers/xf86-input-void
+ )
+ xinerama? ( x11-libs/libfakeXinerama )
+"
+DEPEND="
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+ opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+ sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+ ')
+ x11-libs/gtk+:3[introspection]
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/libxkbfile
+ brotli? ( app-arch/brotli )
+ csc? ( >=media-video/ffmpeg-1.2.2:0= )
+ ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
+ jpeg? ( media-libs/libjpeg-turbo )
+ pulseaudio? (
+ media-sound/pulseaudio
+ media-plugins/gst-plugins-pulse:1.0
+ )
+ sound? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ vpx? ( media-libs/libvpx media-video/ffmpeg )
+ webp? ( media-libs/libwebp )
+"
+RDEPEND="
+ ${DEPEND}
+ ${TDEPEND}
+ $(python_gen_cond_dep '
+ 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}] )
+ )
+ webcam? (
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pyinotify[${PYTHON_USEDEP}]
+ media-libs/opencv[${PYTHON_USEDEP},python]
+ )
+ ')
+ acct-group/xpra
+ virtual/ssh
+ x11-apps/xauth
+ x11-apps/xmodmap
+ ibus? ( app-i18n/ibus )
+ pinentry? ( app-crypt/pinentry )
+"
+DEPEND+="
+ test? ( ${TDEPEND} )
+"
+BDEPEND="
+ $(python_gen_cond_dep '
+ >=dev-python/cython-0.16[${PYTHON_USEDEP}]
+ ')
+ virtual/pkgconfig
+ doc? ( app-text/pandoc )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
+ "${FILESDIR}"/${PN}-4.2-suid-warning.patch
+ "${FILESDIR}"/${PN}-4.2.2-true-false-bin-path.patch
+ "${FILESDIR}"/${PN}-4.2.3-dup-ip.patch
+ "${FILESDIR}"/${PN}-4.2.2-bad-tests.patch
+)
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ # FIXME: There are hardcoded paths all over the place but the following
+ # double-prefixes some files under /etc. Looks tricky to fix. :(
+ #hprefixify $(find -type f \( -name "*.py" -o -name "*.conf" \))
+
+ sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \
+ -i setup.py || die
+
+ if use minimal; then
+ sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \
+ -i setup.py || die
+ fi
+
+ # Upstream says these tests are currently broken.
+ rm tests/unittests/unit/net/subprocess_wrapper_test.py tests/unittests/unit/net/protocol_test.py || die
+}
+
+python_configure_all() {
+ sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
+ -i setup.py || die
+
+ mydistutilsargs=(
+ --without-PIC
+ --without-Xdummy
+ $(use_with client)
+ $(use_with clipboard)
+ $(use_with csc csc_swscale)
+ --without-csc_libyuv
+ --without-cuda_rebuild
+ --without-cuda_kernels
+ $(use_with cups printing)
+ --without-debug
+ $(use_with dbus)
+ $(use_with doc docs)
+ $(use_with ffmpeg dec_avcodec2)
+ $(use_with ffmpeg enc_ffmpeg)
+ $(use_with ffmpeg enc_x264)
+ $(use_with ffmpeg enc_x265)
+ --with-gtk3
+ $(use_with jpeg jpeg_encoder)
+ $(use_with jpeg jpeg_decoder)
+ --without-mdns
+ $(use_with opengl)
+ $(use_with server shadow)
+ $(use_with server)
+ $(use_with sound)
+ --with-strict
+ $(use_with vpx)
+ --with-warn
+ $(use_with webcam)
+ $(use_with webp)
+ --with-x11
+ )
+
+ export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
+}
+
+python_test() {
+ export XAUTHORITY=${HOME}/.Xauthority
+ touch "${XAUTHORITY}" || die
+
+ distutils_install_for_testing
+ xdg_environment_reset
+
+ PYTHONPATH=${S}/tests/unittests:${BUILD_DIR}/test/lib \
+ XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \
+ "${PYTHON}" tests/unittests/unit/run.py || die
+}
+
+python_install_all() {
+ distutils-r1_python_prepare_all
+
+ # Move udev dir to the right place.
+ local dir=$(get_udevdir)
+ dodir "${dir%/*}"
+ mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+}
+
+pkg_postinst() {
+ tmpfiles_process xpra.conf
+ xdg_pkg_postinst
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/, x11-wm/xpra/files/
@ 2022-01-15 23:31 James Le Cuirot
0 siblings, 0 replies; 17+ messages in thread
From: James Le Cuirot @ 2022-01-15 23:31 UTC (permalink / raw
To: gentoo-commits
commit: 0e863ca57cec68d5e748a7eb30f2d323f7898099
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 15 23:29:04 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Jan 15 23:30:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e863ca5
x11-wm/xpra: Drop old 4.2.2
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
x11-wm/xpra/Manifest | 1 -
x11-wm/xpra/files/xpra-4.2.2-dup-ip.patch | 40 ------
x11-wm/xpra/files/xpra-4.2.2-ldconfig.patch | 22 ---
x11-wm/xpra/xpra-4.2.2.ebuild | 200 ----------------------------
4 files changed, 263 deletions(-)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 227fbd0d94f1..dd83568444b8 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,4 +1,3 @@
-DIST xpra-4.2.2.tar.gz 3894227 BLAKE2B a25dde9c3732e31cd8127393f89f2495e01896d18d5212b141b4046c265a9ead029bed68c9610c2330ec0a885af1eeb3f92aef2c16dd102293e34ac208be605a SHA512 3f81b5a2f7abdfc14f7e48ec708524e38142b984e6539e94a27b6aef7b5a5e063ef14e6b7383a7719ecc7687c62f49eeeb5668282c337d90a79194c354dedd24
DIST xpra-4.2.3.tar.gz 3897648 BLAKE2B e9d3b4f07f8fae88ad410201a503bc5c738daae91640843cfce2b70da03e916295709bb74ffbb5e70f8e8ba2dcc3085861bdd9b097d24096ccba332693cc076b SHA512 cebec316a0cbd673907379b54248901743a8bf6b6d25c7b36465794da4e1b19296b5fd465df8ba9d563b2a246fab572fa8db25c24c511da9ddc340a8c95557d5
DIST xpra-4.2.tar.gz 4057304 BLAKE2B 17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10 SHA512 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353
DIST xpra-4.3.1-tests.patch 51444 BLAKE2B c645aa52bb06c3872f6c1c7aace099c10a6fd46dd4c386ec1a13f6326e3fc8860a71767510ce9b44375cc8b30cef563e4405b2834670a9d2c555d3359d16e99f SHA512 0c70c33e24980db31e904c91f987a73693bd2349958ea8392138987e1dc1852ea42a4ee7e3b238f01c92adc57dbe196e57f4c4accf27aade6c4ea55c1ff9b40c
diff --git a/x11-wm/xpra/files/xpra-4.2.2-dup-ip.patch b/x11-wm/xpra/files/xpra-4.2.2-dup-ip.patch
deleted file mode 100644
index f689166dec9d..000000000000
--- a/x11-wm/xpra/files/xpra-4.2.2-dup-ip.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/tests/unittests/unit/net/net_util_test.py b/tests/unittests/unit/net/net_util_test.py
-index 1ceaf4573..870801666 100755
---- a/tests/unittests/unit/net/net_util_test.py
-+++ b/tests/unittests/unit/net/net_util_test.py
-@@ -6,6 +6,7 @@
-
- import unittest
-
-+from collections import defaultdict
- from xpra.net.net_util import (
- get_info, get_interfaces, get_interfaces_addresses, #get_interface,
- get_gateways, get_bind_IPs, do_get_bind_ifacemask,
-@@ -26,10 +27,8 @@ class TestVersionUtilModule(unittest.TestCase):
- ifaces = get_interfaces()
- if not ifaces:
- return
-+ ip_ifaces = defaultdict(list)
- for iface in ifaces:
-- ipmasks = do_get_bind_ifacemask(iface)
-- for ip, _ in ipmasks:
-- assert get_iface(ip)==iface
- if if_nametoindex:
- try:
- i = if_nametoindex(iface)
-@@ -37,7 +36,14 @@ class TestVersionUtilModule(unittest.TestCase):
- pass
- else:
- if if_indextoname:
-- assert if_indextoname(i)==iface
-+ assert if_indextoname(i)==iface, "expected interface %s for index %i but got %s" % (
-+ iface, i, if_indextoname(i))
-+ ipmasks = do_get_bind_ifacemask(iface)
-+ for ip, _ in ipmasks:
-+ ip_ifaces[ip].append(iface)
-+ for ip, ifaces in ip_ifaces.items():
-+ assert get_iface(ip) in ifaces, "expected interface for ip %s to be one of %s but got %s" % (
-+ ip, ifaces, get_iface(ip))
- ia = get_interfaces_addresses()
- assert ia
- #for iface, address in ia.items():
diff --git a/x11-wm/xpra/files/xpra-4.2.2-ldconfig.patch b/x11-wm/xpra/files/xpra-4.2.2-ldconfig.patch
deleted file mode 100644
index 2cd009994c4b..000000000000
--- a/x11-wm/xpra/files/xpra-4.2.2-ldconfig.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f97daef82521c9297f6cc2d7925fe5c6ed526ad1 Mon Sep 17 00:00:00 2001
-From: totaam <antoine@xpra.org>
-Date: Sun, 22 Aug 2021 21:31:52 +0700
-Subject: [PATCH] #3239 with shell=True, best not to use a list
-
----
- xpra/os_util.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xpra/os_util.py b/xpra/os_util.py
-index 2f8c0d64a..2f309f888 100644
---- a/xpra/os_util.py
-+++ b/xpra/os_util.py
-@@ -786,7 +786,7 @@ def find_lib_ldconfig(libname):
- ldconfig = t
- break
- import subprocess
-- p = subprocess.Popen([ldconfig, "-p"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-+ p = subprocess.Popen("%s -p" % ldconfig, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
- data = bytestostr(p.communicate()[0])
-
- libpath = re.search(pattern, data, re.MULTILINE) #@UndefinedVariable
diff --git a/x11-wm/xpra/xpra-4.2.2.ebuild b/x11-wm/xpra/xpra-4.2.2.ebuild
deleted file mode 100644
index 48f142fd675d..000000000000
--- a/x11-wm/xpra/xpra-4.2.2.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg xdg-utils distutils-r1 tmpfiles udev
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="https://xpra.org/"
-SRC_URI="https://xpra.org/src/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- || ( client server )
- cups? ( dbus )
- opengl? ( client )
- test? ( client clipboard dbus html server sound xdg xinerama )
-"
-
-TDEPEND="
- $(python_gen_cond_dep '
- dev-python/netifaces[${PYTHON_USEDEP}]
- dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
- dev-python/rencode[${PYTHON_USEDEP}]
- dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
- xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] )
- ')
- html? ( www-apps/xpra-html5 )
- server? (
- x11-base/xorg-server[-minimal,xvfb]
- x11-drivers/xf86-input-void
- )
- xinerama? ( x11-libs/libfakeXinerama )
-"
-DEPEND="
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
- opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
- sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
- ')
- x11-libs/gtk+:3[introspection]
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXtst
- x11-libs/libxkbfile
- brotli? ( app-arch/brotli )
- csc? ( >=media-video/ffmpeg-1.2.2:0= )
- ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
- jpeg? ( media-libs/libjpeg-turbo )
- pulseaudio? (
- media-sound/pulseaudio
- media-plugins/gst-plugins-pulse:1.0
- )
- sound? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- vpx? ( media-libs/libvpx media-video/ffmpeg )
- webp? ( media-libs/libwebp )
-"
-RDEPEND="
- ${DEPEND}
- ${TDEPEND}
- $(python_gen_cond_dep '
- 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}] )
- )
- webcam? (
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pyinotify[${PYTHON_USEDEP}]
- media-libs/opencv[${PYTHON_USEDEP},python]
- )
- ')
- acct-group/xpra
- virtual/ssh
- x11-apps/xauth
- x11-apps/xmodmap
- ibus? ( app-i18n/ibus )
- pinentry? ( app-crypt/pinentry )
-"
-DEPEND+="
- test? ( ${TDEPEND} )
-"
-BDEPEND="
- $(python_gen_cond_dep '
- >=dev-python/cython-0.16[${PYTHON_USEDEP}]
- ')
- virtual/pkgconfig
- doc? ( app-text/pandoc )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
- "${FILESDIR}"/${PN}-4.2.2-ldconfig.patch
- "${FILESDIR}"/${PN}-4.2-suid-warning.patch
- "${FILESDIR}"/${PN}-4.2.2-true-false-bin-path.patch
- "${FILESDIR}"/${PN}-4.2.2-dup-ip.patch
- "${FILESDIR}"/${PN}-4.2.2-bad-tests.patch
-)
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
-
- # FIXME: There are hardcoded paths all over the place but the following
- # double-prefixes some files under /etc. Looks tricky to fix. :(
- #hprefixify $(find -type f \( -name "*.py" -o -name "*.conf" \))
-
- sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \
- -i setup.py || die
-
- if use minimal; then
- sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \
- -i setup.py || die
- fi
-
- # Upstream says these tests are currently broken.
- rm tests/unittests/unit/net/subprocess_wrapper_test.py tests/unittests/unit/net/protocol_test.py || die
-}
-
-python_configure_all() {
- sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
- -i setup.py || die
-
- mydistutilsargs=(
- --without-PIC
- --without-Xdummy
- $(use_with client)
- $(use_with clipboard)
- $(use_with csc csc_swscale)
- --without-csc_libyuv
- --without-cuda_rebuild
- --without-cuda_kernels
- $(use_with cups printing)
- --without-debug
- $(use_with dbus)
- $(use_with doc docs)
- $(use_with ffmpeg dec_avcodec2)
- $(use_with ffmpeg enc_ffmpeg)
- $(use_with ffmpeg enc_x264)
- $(use_with ffmpeg enc_x265)
- --with-gtk3
- $(use_with jpeg jpeg_encoder)
- $(use_with jpeg jpeg_decoder)
- --without-mdns
- $(use_with opengl)
- $(use_with server shadow)
- $(use_with server)
- $(use_with sound)
- --with-strict
- $(use_with vpx)
- --with-warn
- $(use_with webcam)
- $(use_with webp)
- --with-x11
- )
-
- export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
-}
-
-python_test() {
- export XAUTHORITY=${HOME}/.Xauthority
- touch "${XAUTHORITY}" || die
-
- distutils_install_for_testing
- xdg_environment_reset
-
- PYTHONPATH=${S}/tests/unittests:${BUILD_DIR}/test/lib \
- XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \
- "${PYTHON}" tests/unittests/unit/run.py || die
-}
-
-python_install_all() {
- distutils-r1_python_prepare_all
-
- # Move udev dir to the right place.
- local dir=$(get_udevdir)
- dodir "${dir%/*}"
- mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
-}
-
-pkg_postinst() {
- tmpfiles_process xpra.conf
- xdg_pkg_postinst
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/, x11-wm/xpra/files/
@ 2022-02-28 23:05 James Le Cuirot
0 siblings, 0 replies; 17+ messages in thread
From: James Le Cuirot @ 2022-02-28 23:05 UTC (permalink / raw
To: gentoo-commits
commit: 476fe322e0793d7671738ee0350de3b872b60d97
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 23:04:43 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 23:05:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=476fe322
x11-wm/xpra: Don't install service files by patching instead
Auto-detection is used to determine what files to install, and where, which can
be unpredictable, hence my earlier fix broke.
Closes: https://bugs.gentoo.org/834336
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
x11-wm/xpra/files/xpra-4.2-no-service.patch | 19 +++++++++++++++++++
x11-wm/xpra/files/xpra-4.3-no-service.patch | 19 +++++++++++++++++++
x11-wm/xpra/xpra-4.2.ebuild | 4 +---
x11-wm/xpra/xpra-4.3.2.ebuild | 4 +---
4 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/x11-wm/xpra/files/xpra-4.2-no-service.patch b/x11-wm/xpra/files/xpra-4.2-no-service.patch
new file mode 100644
index 000000000000..dd85370968ba
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.2-no-service.patch
@@ -0,0 +1,19 @@
+Don't install the service files. Auto-detection is used to determine what files
+to install, and where, which can be unpredictable on Gentoo. The init.d script
+is also not suitable for Gentoo.
+
+diff --git a/setup.py b/setup.py
+index 1718b06a9..b24a5bd1e 100755
+--- a/setup.py
++++ b/setup.py
+@@ -139,8 +139,8 @@ from xpra.platform.features import LOCAL_SERVERS_SUPPORTED, SHADOW_SUPPORTED
+ shadow_ENABLED = SHADOW_SUPPORTED and DEFAULT
+ server_ENABLED = (LOCAL_SERVERS_SUPPORTED or shadow_ENABLED) and DEFAULT
+ rfb_ENABLED = server_ENABLED
+-service_ENABLED = LINUX and server_ENABLED
+-sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd")
++service_ENABLED = False
++sd_listen_ENABLED = False
+ proxy_ENABLED = DEFAULT
+ client_ENABLED = DEFAULT
+ scripts_ENABLED = not WIN32
diff --git a/x11-wm/xpra/files/xpra-4.3-no-service.patch b/x11-wm/xpra/files/xpra-4.3-no-service.patch
new file mode 100644
index 000000000000..b336db581953
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.3-no-service.patch
@@ -0,0 +1,19 @@
+Don't install the service files. Auto-detection is used to determine what files
+to install, and where, which can be unpredictable on Gentoo. The init.d script
+is also not suitable for Gentoo.
+
+diff --git a/setup.py b/setup.py
+index fc67abb50..a11dc0d97 100755
+--- a/setup.py
++++ b/setup.py
+@@ -145,8 +145,8 @@ from xpra.platform.features import LOCAL_SERVERS_SUPPORTED, SHADOW_SUPPORTED
+ shadow_ENABLED = SHADOW_SUPPORTED and DEFAULT
+ server_ENABLED = (LOCAL_SERVERS_SUPPORTED or shadow_ENABLED) and DEFAULT
+ rfb_ENABLED = DEFAULT
+-service_ENABLED = LINUX and server_ENABLED
+-sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd")
++service_ENABLED = False
++sd_listen_ENABLED = False
+ proxy_ENABLED = DEFAULT
+ client_ENABLED = DEFAULT
+ scripts_ENABLED = not WIN32
diff --git a/x11-wm/xpra/xpra-4.2.ebuild b/x11-wm/xpra/xpra-4.2.ebuild
index 681a6c97aab5..c42097bb561a 100644
--- a/x11-wm/xpra/xpra-4.2.ebuild
+++ b/x11-wm/xpra/xpra-4.2.ebuild
@@ -96,6 +96,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
"${FILESDIR}"/${PN}-3.0.2-ldconfig.patch
"${FILESDIR}"/${PN}-4.2-suid-warning.patch
+ "${FILESDIR}"/${PN}-4.2-no-service.patch
)
python_prepare_all() {
@@ -161,9 +162,6 @@ python_install_all() {
local dir=$(get_udevdir)
dodir "${dir%/*}"
mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
-
- # TODO: Write a Gentoo init script.
- rm -r "${ED}"/etc/{init.d,sysconfig}/ || die
}
pkg_postinst() {
diff --git a/x11-wm/xpra/xpra-4.3.2.ebuild b/x11-wm/xpra/xpra-4.3.2.ebuild
index 84c10467c081..071992dfdb79 100644
--- a/x11-wm/xpra/xpra-4.3.2.ebuild
+++ b/x11-wm/xpra/xpra-4.3.2.ebuild
@@ -110,6 +110,7 @@ RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
"${FILESDIR}"/${PN}-4.2-suid-warning.patch
+ "${FILESDIR}"/${PN}-4.3-no-service.patch
"${DISTDIR}"/${PN}-4.3.1-tests.patch
)
@@ -188,9 +189,6 @@ python_install_all() {
local dir=$(get_udevdir)
dodir "${dir%/*}"
mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
-
- # TODO: Write a Gentoo init script.
- rm -r "${ED}"/etc/{init.d,sysconfig}/ || die
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/, x11-wm/xpra/files/
@ 2022-08-29 14:06 James Le Cuirot
0 siblings, 0 replies; 17+ messages in thread
From: James Le Cuirot @ 2022-08-29 14:06 UTC (permalink / raw
To: gentoo-commits
commit: db75ee79722700299a45b254c89007270d24689b
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 29 14:05:49 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 29 14:05:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db75ee79
x11-wm/xpra: Drop old 4.2
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
x11-wm/xpra/Manifest | 1 -
x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch | 33 ------
x11-wm/xpra/files/xpra-4.2-no-service.patch | 19 ----
x11-wm/xpra/xpra-4.2.ebuild | 170 ----------------------------
4 files changed, 223 deletions(-)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 310851c94a31..1b68b101e872 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,4 +1,3 @@
-DIST xpra-4.2.tar.gz 4057304 BLAKE2B 17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10 SHA512 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353
DIST xpra-4.3.1-tests.patch 51444 BLAKE2B c645aa52bb06c3872f6c1c7aace099c10a6fd46dd4c386ec1a13f6326e3fc8860a71767510ce9b44375cc8b30cef563e4405b2834670a9d2c555d3359d16e99f SHA512 0c70c33e24980db31e904c91f987a73693bd2349958ea8392138987e1dc1852ea42a4ee7e3b238f01c92adc57dbe196e57f4c4accf27aade6c4ea55c1ff9b40c
DIST xpra-4.3.3.tar.gz 4180278 BLAKE2B 2fceab6c95efd0bd0390b7965aea588f39e43f86094c1f9921e1f75022f569808e27d7d85adcccfd64ac28889d0f6d2d6afdf4365f8c919bac8b1a14f3919f23 SHA512 c470e892b4b6379b6c9447731ab174e85c26de15fdc9541a199a2f49e45d07942ae8638f8ddf040a22c73422c6e6b262a9066cd8990f182b75163f7d449d91e2
DIST xpra-4.3.4.tar.gz 4184031 BLAKE2B e01e338398f86c80a1092ea3155126ed26eb959ca97790add4cfcdb0ec8a1c6391937ff101c889ec78bb00bbf38ac0c42c5b85d60e72804ffccbbe5f446aaa3e SHA512 93855ff248f135c70a2144a0afbc66e4830b8d214c9c2017dff1d3e3c7902dac15b1cb03670cde8018b40d5c404bd7c243625faeaba712130f5d0082f562c60c
diff --git a/x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch b/x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch
deleted file mode 100644
index 8475d47b8b3c..000000000000
--- a/x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ruN xpra-3.0.2.orig/xpra/x11/fakeXinerama.py xpra-3.0.2/xpra/x11/fakeXinerama.py
---- xpra-3.0.2.orig/xpra/x11/fakeXinerama.py 2019-09-24 15:54:02.000000000 +0200
-+++ xpra-3.0.2/xpra/x11/fakeXinerama.py 2020-01-16 12:20:22.620519078 +0100
-@@ -23,29 +23,6 @@
-
- def find_libfakeXinerama():
- libname = "fakeXinerama"
-- try:
-- from ctypes.util import find_library
-- flibname = find_library("fakeXinerama")
-- if flibname:
-- libname = flibname
-- except Exception:
-- pass
-- if POSIX:
-- for lib_dir in os.environ.get("LD_LIBRARY_PATH", "/usr/lib").split(os.pathsep):
-- lib_path = os.path.join(lib_dir, libname)
-- if not os.path.exists(lib_dir):
-- continue
-- if os.path.exists(lib_path) and os.path.isfile(lib_path):
-- return lib_path
-- if LINUX:
-- try:
-- libpath = find_lib_ldconfig("fakeXinerama")
-- if libpath:
-- return libpath
-- except Exception as e:
-- log("find_libfakeXinerama()", exc_info=True)
-- log.error("Error: cannot launch ldconfig -p to locate libfakeXinerama:")
-- log.error(" %s", e)
- return find_lib(libname)
-
- current_xinerama_config = None
diff --git a/x11-wm/xpra/files/xpra-4.2-no-service.patch b/x11-wm/xpra/files/xpra-4.2-no-service.patch
deleted file mode 100644
index dd85370968ba..000000000000
--- a/x11-wm/xpra/files/xpra-4.2-no-service.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Don't install the service files. Auto-detection is used to determine what files
-to install, and where, which can be unpredictable on Gentoo. The init.d script
-is also not suitable for Gentoo.
-
-diff --git a/setup.py b/setup.py
-index 1718b06a9..b24a5bd1e 100755
---- a/setup.py
-+++ b/setup.py
-@@ -139,8 +139,8 @@ from xpra.platform.features import LOCAL_SERVERS_SUPPORTED, SHADOW_SUPPORTED
- shadow_ENABLED = SHADOW_SUPPORTED and DEFAULT
- server_ENABLED = (LOCAL_SERVERS_SUPPORTED or shadow_ENABLED) and DEFAULT
- rfb_ENABLED = server_ENABLED
--service_ENABLED = LINUX and server_ENABLED
--sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd")
-+service_ENABLED = False
-+sd_listen_ENABLED = False
- proxy_ENABLED = DEFAULT
- client_ENABLED = DEFAULT
- scripts_ENABLED = not WIN32
diff --git a/x11-wm/xpra/xpra-4.2.ebuild b/x11-wm/xpra/xpra-4.2.ebuild
deleted file mode 100644
index c42097bb561a..000000000000
--- a/x11-wm/xpra/xpra-4.2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg distutils-r1 tmpfiles prefix udev
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="https://xpra.org/"
-SRC_URI="https://xpra.org/src/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio server sound test vpx webcam webp"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- || ( client server )
- cups? ( dbus )
- opengl? ( client )
-"
-
-DEPEND="
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
- opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
- sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
- ')
- x11-libs/gtk+:3[introspection]
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXtst
- x11-libs/libxkbfile
- brotli? ( app-arch/brotli )
- csc? ( >=media-video/ffmpeg-1.2.2:0= )
- ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
- jpeg? ( media-libs/libjpeg-turbo )
- pulseaudio? (
- media-sound/pulseaudio
- media-plugins/gst-plugins-pulse:1.0
- )
- sound? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- vpx? ( media-libs/libvpx media-video/ffmpeg )
- webp? ( media-libs/libwebp )
-"
-RDEPEND="
- ${DEPEND}
- $(python_gen_cond_dep '
- dev-python/netifaces[${PYTHON_USEDEP}]
- dev-python/rencode[${PYTHON_USEDEP}]
- dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
- cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
- dbus? ( dev-python/dbus-python[${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}] )
- )
- webcam? (
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pyinotify[${PYTHON_USEDEP}]
- media-libs/opencv[${PYTHON_USEDEP},python]
- )
- ')
- acct-group/xpra
- virtual/ssh
- x11-apps/xmodmap
- ibus? ( app-i18n/ibus )
- pinentry? ( app-crypt/pinentry )
- server? (
- x11-base/xorg-server[-minimal,xvfb]
- x11-drivers/xf86-input-void
- )
-"
-BDEPEND="
- virtual/pkgconfig
- $(python_gen_cond_dep '
- >=dev-python/cython-0.16[${PYTHON_USEDEP}]
- ')
- doc? ( app-text/pandoc )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
- "${FILESDIR}"/${PN}-3.0.2-ldconfig.patch
- "${FILESDIR}"/${PN}-4.2-suid-warning.patch
- "${FILESDIR}"/${PN}-4.2-no-service.patch
-)
-
-python_prepare_all() {
- hprefixify -w '/os.path/' setup.py
- hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
- xpra/platform{/xposix,}/paths.py xpra/scripts/server.py
-
- sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \
- -i setup.py || die
-
- if use minimal; then
- sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \
- -i setup.py || die
- fi
-
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
- -i setup.py || die
-
- mydistutilsargs=(
- --without-PIC
- --without-Xdummy
- $(use_with client)
- $(use_with clipboard)
- $(use_with csc csc_swscale)
- --without-csc_libyuv
- --without-cuda_rebuild
- --without-cuda_kernels
- $(use_with cups printing)
- --without-debug
- $(use_with dbus)
- $(use_with doc docs)
- $(use_with ffmpeg dec_avcodec2)
- $(use_with ffmpeg enc_ffmpeg)
- $(use_with ffmpeg enc_x264)
- $(use_with ffmpeg enc_x265)
- --with-gtk3
- $(use_with jpeg jpeg_encoder)
- $(use_with jpeg jpeg_decoder)
- --without-mdns
- $(use_with opengl)
- $(use_with server shadow)
- $(use_with server)
- $(use_with sound)
- --with-strict
- $(use_with vpx)
- --with-warn
- $(use_with webcam)
- $(use_with webp)
- --with-x11
- )
-
- export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
-}
-
-python_install_all() {
- distutils-r1_python_prepare_all
-
- # Move udev dir to the right place.
- local dir=$(get_udevdir)
- dodir "${dir%/*}"
- mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
-}
-
-pkg_postinst() {
- tmpfiles_process xpra.conf
- xdg_pkg_postinst
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/, x11-wm/xpra/files/
@ 2023-05-01 7:51 James Le Cuirot
0 siblings, 0 replies; 17+ messages in thread
From: James Le Cuirot @ 2023-05-01 7:51 UTC (permalink / raw
To: gentoo-commits
commit: f4faeb20b18dda9a216e0f582c7e8ba668bfde1f
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon May 1 07:50:47 2023 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon May 1 07:50:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4faeb20
x11-wm/xpra: Drop old 4.3.3
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
x11-wm/xpra/Manifest | 1 -
x11-wm/xpra/files/xpra-4.2-suid-warning.patch | 12 --
x11-wm/xpra/files/xpra-4.3-cpp.patch | 34 ----
x11-wm/xpra/xpra-4.3.3.ebuild | 216 --------------------------
4 files changed, 263 deletions(-)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 1b68b101e872..92b946c95af1 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1,2 @@
DIST xpra-4.3.1-tests.patch 51444 BLAKE2B c645aa52bb06c3872f6c1c7aace099c10a6fd46dd4c386ec1a13f6326e3fc8860a71767510ce9b44375cc8b30cef563e4405b2834670a9d2c555d3359d16e99f SHA512 0c70c33e24980db31e904c91f987a73693bd2349958ea8392138987e1dc1852ea42a4ee7e3b238f01c92adc57dbe196e57f4c4accf27aade6c4ea55c1ff9b40c
-DIST xpra-4.3.3.tar.gz 4180278 BLAKE2B 2fceab6c95efd0bd0390b7965aea588f39e43f86094c1f9921e1f75022f569808e27d7d85adcccfd64ac28889d0f6d2d6afdf4365f8c919bac8b1a14f3919f23 SHA512 c470e892b4b6379b6c9447731ab174e85c26de15fdc9541a199a2f49e45d07942ae8638f8ddf040a22c73422c6e6b262a9066cd8990f182b75163f7d449d91e2
DIST xpra-4.3.4.tar.gz 4184031 BLAKE2B e01e338398f86c80a1092ea3155126ed26eb959ca97790add4cfcdb0ec8a1c6391937ff101c889ec78bb00bbf38ac0c42c5b85d60e72804ffccbbe5f446aaa3e SHA512 93855ff248f135c70a2144a0afbc66e4830b8d214c9c2017dff1d3e3c7902dac15b1cb03670cde8018b40d5c404bd7c243625faeaba712130f5d0082f562c60c
diff --git a/x11-wm/xpra/files/xpra-4.2-suid-warning.patch b/x11-wm/xpra/files/xpra-4.2-suid-warning.patch
deleted file mode 100644
index b1b2afb4e18b..000000000000
--- a/x11-wm/xpra/files/xpra-4.2-suid-warning.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --color -Naur a/xpra/scripts/config.py b/xpra/scripts/config.py
---- a/xpra/scripts/config.py 2021-05-19 16:18:30.475153200 +0100
-+++ b/xpra/scripts/config.py 2021-05-30 08:50:42.326953006 +0100
-@@ -159,7 +159,7 @@
- if (xorg_stat.st_mode & stat.S_ISUID)!=0:
- if (xorg_stat.st_mode & stat.S_IROTH)==0:
- if warn_fn:
-- warn_fn("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
-+ debug("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
- return get_Xvfb_command()
- debug("%s is suid and readable, using the xpra_Xdummy wrapper" % xorg_bin)
- use_wrapper = True
diff --git a/x11-wm/xpra/files/xpra-4.3-cpp.patch b/x11-wm/xpra/files/xpra-4.3-cpp.patch
deleted file mode 100644
index 41f1263e3465..000000000000
--- a/x11-wm/xpra/files/xpra-4.3-cpp.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c80d18b41701082e60ce6bfa5bd6a274affaff96 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 22 May 2022 12:00:01 +0100
-Subject: [PATCH] Most build systems respect the CPP env var instead of just
- calling cpp
-
----
- setup.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index f84d56c6d..7f0db3b69 100755
---- a/setup.py
-+++ b/setup.py
-@@ -149,6 +149,7 @@ ARM = ARCH.startswith("arm") or ARCH.startswith("aarch")
- print("ARCH=%s" % (ARCH,))
-
- INCLUDE_DIRS = os.environ.get("INCLUDE_DIRS", os.path.join(sys.prefix, "include")).split(os.pathsep)
-+CPP = os.environ.get("CPP", "cpp")
-
- from xpra.platform.features import LOCAL_SERVERS_SUPPORTED, SHADOW_SUPPORTED
- shadow_ENABLED = SHADOW_SUPPORTED and DEFAULT
-@@ -2423,7 +2424,7 @@ if v4l2_ENABLED:
- ENABLE_DEVICE_CAPS = 0
- if os.path.exists(videodev2_h):
- try:
-- with subprocess.Popen("cpp -fpreprocessed %s | grep -q device_caps" % videodev2_h,
-+ with subprocess.Popen("%s -fpreprocessed %s | grep -q device_caps" % (CPP, videodev2_h),
- shell=True) as proc:
- ENABLE_DEVICE_CAPS = proc.wait()==0
- except OSError:
---
-2.35.1
-
diff --git a/x11-wm/xpra/xpra-4.3.3.ebuild b/x11-wm/xpra/xpra-4.3.3.ebuild
deleted file mode 100644
index 2bc1844bb041..000000000000
--- a/x11-wm/xpra/xpra-4.3.3.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = 9999* ]]; then
- EGIT_REPO_URI="https://github.com/Xpra-org/xpra.git"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
- https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch"
- KEYWORDS="amd64 x86"
-fi
-
-PYTHON_COMPAT=( python3_{9,10} )
-DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit xdg xdg-utils distutils-r1 tmpfiles udev
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="https://xpra.org/"
-LICENSE="GPL-2 BSD"
-SLOT="0"
-IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test udev vpx webcam webp xdg xinerama"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- || ( client server )
- cups? ( dbus )
- opengl? ( client )
- test? ( client clipboard dbus html server sound xdg xinerama )
-"
-
-TDEPEND="
- $(python_gen_cond_dep '
- dev-python/netifaces[${PYTHON_USEDEP}]
- dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
- dev-python/rencode[${PYTHON_USEDEP}]
- dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
- xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] )
- ')
- html? ( www-apps/xpra-html5 )
- server? (
- x11-base/xorg-server[-minimal,xvfb]
- x11-drivers/xf86-input-void
- )
- xinerama? ( x11-libs/libfakeXinerama )
-"
-DEPEND="
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
- opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
- sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
- ')
- x11-libs/gtk+:3[introspection]
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXres
- x11-libs/libXtst
- x11-libs/libxkbfile
- brotli? ( app-arch/brotli )
- csc? ( >=media-video/ffmpeg-1.2.2:0= )
- ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
- jpeg? ( media-libs/libjpeg-turbo )
- pulseaudio? (
- media-sound/pulseaudio
- media-plugins/gst-plugins-pulse:1.0
- )
- sound? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- vpx? ( media-libs/libvpx media-video/ffmpeg )
- webp? ( media-libs/libwebp )
-"
-RDEPEND="
- ${DEPEND}
- ${TDEPEND}
- $(python_gen_cond_dep '
- 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}] )
- )
- webcam? (
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pyinotify[${PYTHON_USEDEP}]
- media-libs/opencv[${PYTHON_USEDEP},python]
- )
- ')
- acct-group/xpra
- virtual/ssh
- x11-apps/xauth
- x11-apps/xmodmap
- ibus? ( app-i18n/ibus )
- pinentry? ( app-crypt/pinentry )
- udev? ( virtual/udev )
-"
-DEPEND+="
- test? ( ${TDEPEND} )
-"
-BDEPEND="
- $(python_gen_cond_dep '
- >=dev-python/cython-0.16[${PYTHON_USEDEP}]
- ')
- virtual/pkgconfig
- doc? ( app-text/pandoc )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
- "${FILESDIR}"/${PN}-4.2-suid-warning.patch
- "${FILESDIR}"/${PN}-4.3-no-service.patch
- "${FILESDIR}"/${PN}-4.3-cpp.patch
- "${DISTDIR}"/${PN}-4.3.1-tests.patch
-)
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
-
- # FIXME: There are hardcoded paths all over the place but the following
- # double-prefixes some files under /etc. Looks tricky to fix. :(
- #hprefixify $(find -type f \( -name "*.py" -o -name "*.conf" \))
-
- sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \
- -i setup.py || die
-
- if use minimal; then
- sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \
- -i setup.py || die
- fi
-}
-
-python_configure_all() {
- sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
- -i setup.py || die
-
- DISTUTILS_ARGS=(
- --without-PIC
- --without-Xdummy
- $(use_with client)
- $(use_with clipboard)
- $(use_with csc csc_swscale)
- --without-csc_libyuv
- --without-cuda_rebuild
- --without-cuda_kernels
- $(use_with cups printing)
- --without-debug
- $(use_with dbus)
- $(use_with doc docs)
- $(use_with ffmpeg dec_avcodec2)
- $(use_with ffmpeg enc_ffmpeg)
- $(use_with ffmpeg enc_x264)
- $(use_with ffmpeg enc_x265)
- --with-gtk3
- $(use_with jpeg jpeg_encoder)
- $(use_with jpeg jpeg_decoder)
- --without-mdns
- $(use_with opengl)
- $(use_with server shadow)
- $(use_with server)
- $(use_with sound)
- --with-strict
- $(use_with vpx)
- --with-warn
- $(use_with webcam)
- $(use_with webp)
- --with-x11
- )
-
- export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
-}
-
-python_test() {
- export XAUTHORITY=${HOME}/.Xauthority
- touch "${XAUTHORITY}" || die
-
- distutils_install_for_testing
- xdg_environment_reset
-
- env -u WAYLAND_DISPLAY -u XDG_SESSION_TYPE \
- PYTHONPATH="${S}/tests/unittests:${BUILD_DIR}/test/lib" \
- XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \
- "${PYTHON}" "${S}"/tests/unittests/unit/run.py || die
-}
-
-python_install_all() {
- distutils-r1_python_prepare_all
-
- # Move udev dir to the right place.
- if use udev; then
- local dir=$(get_udevdir)
- dodir "${dir%/*}"
- mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
- else
- rm -vr "${ED}"/usr/lib/udev || die
- fi
-}
-
-pkg_postinst() {
- tmpfiles_process xpra.conf
- xdg_pkg_postinst
- use udev && udev_reload
-}
-
-pkg_postrm() {
- xdg_pkg_postinst
- use udev && udev_reload
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/, x11-wm/xpra/files/
@ 2023-09-02 9:19 Benda XU
0 siblings, 0 replies; 17+ messages in thread
From: Benda XU @ 2023-09-02 9:19 UTC (permalink / raw
To: gentoo-commits
commit: 7a72d0773f343ce9ef358c54926e26ff182613a3
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 2 09:17:49 2023 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sat Sep 2 09:18:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a72d077
x11-wm/xpra: drop systemd-run call for USE=minimal.
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
x11-wm/xpra/files/xpra-4.4.6_minimal-features.patch | 18 ++++++++++++++++++
.../{xpra-4.4.6-r1.ebuild => xpra-4.4.6-r2.ebuild} | 13 +++++++------
2 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/x11-wm/xpra/files/xpra-4.4.6_minimal-features.patch b/x11-wm/xpra/files/xpra-4.4.6_minimal-features.patch
new file mode 100644
index 000000000000..78a4cccb3684
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.4.6_minimal-features.patch
@@ -0,0 +1,18 @@
+Xpra is a good piece of software except that some features are not
+useful only to introduce unnecessary dependencies.
+
+Forwarded: no need.
+
+Index: xpra-4.4.6/xpra/scripts/main.py
+===================================================================
+--- xpra-4.4.6.orig/xpra/scripts/main.py
++++ xpra-4.4.6/xpra/scripts/main.py
+@@ -64,7 +64,7 @@ CLIPBOARD_CLASS = os.environ.get("XPRA_C
+ WAIT_SERVER_TIMEOUT = envint("WAIT_SERVER_TIMEOUT", 90)
+ CONNECT_TIMEOUT = envint("XPRA_CONNECT_TIMEOUT", 20)
+ OPENGL_PROBE_TIMEOUT = envint("XPRA_OPENGL_PROBE_TIMEOUT", 5)
+-SYSTEMD_RUN = envbool("XPRA_SYSTEMD_RUN", True)
++SYSTEMD_RUN = False
+ VERIFY_X11_SOCKET_TIMEOUT = envint("XPRA_VERIFY_X11_SOCKET_TIMEOUT", 1)
+ LIST_REPROBE_TIMEOUT = envint("XPRA_LIST_REPROBE_TIMEOUT", 10)
+
diff --git a/x11-wm/xpra/xpra-4.4.6-r1.ebuild b/x11-wm/xpra/xpra-4.4.6-r2.ebuild
similarity index 98%
rename from x11-wm/xpra/xpra-4.4.6-r1.ebuild
rename to x11-wm/xpra/xpra-4.4.6-r2.ebuild
index b9dcf632b0fc..5ec14d265625 100644
--- a/x11-wm/xpra/xpra-4.4.6-r1.ebuild
+++ b/x11-wm/xpra/xpra-4.4.6-r2.ebuild
@@ -121,18 +121,19 @@ PATCHES=(
)
python_prepare_all() {
+ if use minimal; then
+ sed -r -e '/pam_ENABLED/s/DEFAULT/False/' \
+ -e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \
+ -i setup.py || die
+ PATCHES+=( "${FILESDIR}"/${PN}-4.4.6_xpra-4.4.6_minimal-features.patch )
+ fi
+
distutils-r1_python_prepare_all
hprefixify xpra/scripts/config.py
sed -r -e "/\bdoc_dir =/s:/${PN}/\":/${PF}/html\":" \
-i setup.py || die
-
- if use minimal; then
- sed -r -e '/pam_ENABLED/s/DEFAULT/False/' \
- -e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \
- -i setup.py || die
- fi
}
python_configure_all() {
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/, x11-wm/xpra/files/
@ 2024-06-10 19:18 Alexey Shvetsov
0 siblings, 0 replies; 17+ messages in thread
From: Alexey Shvetsov @ 2024-06-10 19:18 UTC (permalink / raw
To: gentoo-commits
commit: dcc3756596141e0080544618e18f1152bf0be774
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Tue Jun 4 17:58:47 2024 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 19:18:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcc37565
x11-wm/xpra: add 6.0.1, 6.9999, update 9999
- Python 3.12 support
- PEP517 support
- re-enabled tests
- general rework of the ebuild
Closes: https://bugs.gentoo.org/912679
Closes: https://bugs.gentoo.org/929898
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37042
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>
x11-wm/xpra/Manifest | 1 +
x11-wm/xpra/files/xpra-9999-pep517.patch | 12 +
x11-wm/xpra/metadata.xml | 4 +
x11-wm/xpra/xpra-4.4.5-r2.ebuild | 7 +-
x11-wm/xpra/xpra-4.4.6-r2.ebuild | 7 +-
x11-wm/xpra/xpra-6.0.1.ebuild | 376 +++++++++++++++++++++++++++++++
x11-wm/xpra/xpra-6.9999.ebuild | 376 +++++++++++++++++++++++++++++++
x11-wm/xpra/xpra-9999.ebuild | 296 ++++++++++++++++++------
8 files changed, 999 insertions(+), 80 deletions(-)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index b2881c697f2b..fb6136d149d3 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,2 +1,3 @@
DIST xpra-4.4.5.tar.gz 4332287 BLAKE2B 64165a18d0f204247f984f616438252e82922447441376e6e46a15509486e67f699e852562cd632591fd2831a86592d5029c5905932fc9d267b16a7e6edd1b5a SHA512 6fb28328efc020969fff17bf747a1e0bf5b21869c9532a8c482e12f979d1dec7989e10e5bf3a9ae7dbfaa9e48c670255b196fdb819200a74dfbdec3ba5ae744f
DIST xpra-4.4.6.tar.gz 4334932 BLAKE2B 0518c6807be85777bb67b0a3283a610c06a97813671bff6edc701533aaa8f26b96e423e56ba56491ede120697277f6935ee26976b49550dfd2d52bbcd2daebd8 SHA512 273ee959647c1281f18c7b1b24d3a5179c4b6ce81515cc34618c698e55bdc2a8e94f0e236d7ab41c7bf29fa7fde0b1a2a1432445b8aaaa0a75cd5a90f4858419
+DIST xpra-6.0.1.tar.gz 17214848 BLAKE2B 81a26cd9aa9a61241ba47bc6712cd225499a82a8743c4f5655f4529d525788789452daaa0894a2cb9292caa7fd9aa64f82ce5b347c9c168815198e18145629b9 SHA512 3520dec19bb6999fc19ffcd3c385545f4a61f7cf50d4d6930eb39dec1341c79f6c4c8c45d526f43b33ed78d5359524103fcf1608dc705b40e330a7eb53de2475
diff --git a/x11-wm/xpra/files/xpra-9999-pep517.patch b/x11-wm/xpra/files/xpra-9999-pep517.patch
new file mode 100644
index 000000000000..48e355913b27
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-9999-pep517.patch
@@ -0,0 +1,12 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 501829c18..842a2b962 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,6 +1,7 @@
+ [build-system]
+ requires = ["setuptools", "cython"]
+ build-backend = "setuptools.build_meta"
++backend-path = [ "" ]
+
+ [project]
+ name = "xpra"
diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index 2f4961963d03..9b78c23e894e 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -23,9 +23,13 @@
<flag name="clipboard">Enable clipboard support</flag>
<flag name="csc">Enable csc softscaler support</flag>
<flag name="html">Install the HTML5 client</flag>
+ <flag name="gtk3">Enable the GTK3 client</flag>
<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
+ <flag name="mdns">Enable Multicast DNS via <pkg>dev-libs/mdns</pkg></flag>
<flag name="oauth">Enable OAuth2 authentication in the server</flag>
+ <flag name="openh264">Enable H.264 support using <pkg>media-libs/openh264</pkg></flag>
<flag name="pinentry">Use <pkg>app-crypt/pinentry</pkg> for password entry</flag>
+ <flag name="qrcode">Enable generating QRCodes for server URL via <pkg>media-gfx/qrencode</pkg></flag>
<flag name="trayicon">Enable system tray icon</flag>
<flag name="server">Build server-side code</flag>
<flag name="vpx">Enable vpx image format support</flag>
diff --git a/x11-wm/xpra/xpra-4.4.5-r2.ebuild b/x11-wm/xpra/xpra-4.4.5-r2.ebuild
index 64f6dfde2400..2069b11904d4 100644
--- a/x11-wm/xpra/xpra-4.4.5-r2.ebuild
+++ b/x11-wm/xpra/xpra-4.4.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,18 +11,19 @@ else
KEYWORDS="amd64 x86"
fi
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
DISTUTILS_SINGLE_IMPL=yes
DISTUTILS_USE_SETUPTOOLS=no
DISTUTILS_EXT=1
-inherit xdg xdg-utils distutils-r1 tmpfiles udev
+inherit xdg distutils-r1 tmpfiles udev
DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
HOMEPAGE="https://xpra.org/"
LICENSE="GPL-2 BSD"
SLOT="0"
IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal oauth opengl pinentry pulseaudio +server sound systemd test +trayicon udev vpx webcam webp xdg xinerama"
+IUSE+=" +python_single_target_python3_11"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
|| ( client server )
diff --git a/x11-wm/xpra/xpra-4.4.6-r2.ebuild b/x11-wm/xpra/xpra-4.4.6-r2.ebuild
index b4c34890cee3..9c4083c34137 100644
--- a/x11-wm/xpra/xpra-4.4.6-r2.ebuild
+++ b/x11-wm/xpra/xpra-4.4.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,18 +11,19 @@ else
KEYWORDS="~amd64 ~x86"
fi
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
DISTUTILS_USE_PEP517=setuptools
DISTUTILS_SINGLE_IMPL=yes
DISTUTILS_EXT=1
-inherit xdg xdg-utils distutils-r1 multibuild prefix tmpfiles udev
+inherit xdg distutils-r1 prefix tmpfiles udev
DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
HOMEPAGE="https://xpra.org/"
LICENSE="GPL-2 BSD"
SLOT="0"
IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal oauth opengl pinentry pulseaudio +server sound systemd test +trayicon udev vpx webcam webp xdg xinerama"
+IUSE+=" +python_single_target_python3_11"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
|| ( client server )
diff --git a/x11-wm/xpra/xpra-6.0.1.ebuild b/x11-wm/xpra/xpra-6.0.1.ebuild
new file mode 100644
index 000000000000..bfe892db2a2a
--- /dev/null
+++ b/x11-wm/xpra/xpra-6.0.1.ebuild
@@ -0,0 +1,376 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/Xpra-org/xpra.git"
+ if [[ ${PV} = 6.9999* ]]; then
+ EGIT_BRANCH="v6.x"
+ fi
+ inherit git-r3
+else
+ inherit pypi
+ KEYWORDS="~amd64 ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_EXT=1
+
+inherit cuda xdg distutils-r1 prefix tmpfiles udev
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
+HOMEPAGE="https://xpra.org/"
+LICENSE="GPL-2 BSD"
+SLOT="0"
+IUSE="+X avif brotli +client +clipboard crypt csc cuda cups dbus debug doc examples gstreamer +gtk3 html ibus jpeg +lz4 lzo mdns minimal oauth opengl openh264 pinentry pulseaudio qrcode +server sound systemd test +trayicon udev vpx webcam webp x264 xdg xinerama "
+IUSE+=" video_cards_nvidia"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ || ( client gtk3 server )
+ cups? ( dbus )
+ oauth? ( server )
+ opengl? ( client )
+ clipboard? ( gtk3 )
+ gtk3? ( client )
+ test? ( client clipboard crypt dbus gstreamer html server sound xdg xinerama )
+"
+
+TEST_DEPEND="
+ $(python_gen_cond_dep '
+ dev-python/netifaces[${PYTHON_USEDEP}]
+ dev-python/pillow[jpeg?,webp?,${PYTHON_USEDEP}]
+ dev-python/rencode[${PYTHON_USEDEP}]
+ dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+ xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] )
+ ')
+ html? ( www-apps/xpra-html5 )
+ server? (
+ x11-base/xorg-server[-minimal,xvfb]
+ x11-drivers/xf86-input-void
+ )
+ webcam? ( media-video/v4l2loopback )
+ xinerama? ( x11-libs/libfakeXinerama )
+"
+DEPEND="
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+ sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+ gtk3? (
+ dev-python/pygobject:3[cairo]
+ )
+ ')
+ dev-libs/xxhash
+ avif? ( media-libs/libavif )
+ brotli? ( app-arch/brotli )
+ client? (
+ x11-libs/gtk+:3[X?,introspection]
+ )
+ jpeg? ( media-libs/libjpeg-turbo )
+ mdns? ( dev-libs/mdns )
+ openh264? ( media-libs/openh264:= )
+ pulseaudio? (
+ media-plugins/gst-plugins-pulse:1.0
+ media-plugins/gst-plugins-opus
+ )
+ qrcode? ( media-gfx/qrencode )
+ sound? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ vpx? ( media-libs/libvpx )
+ webp? ( media-libs/libwebp )
+ X? (
+ x11-apps/xrandr
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXres
+ x11-libs/libXtst
+ x11-libs/libxkbfile
+ )
+ x264? ( media-libs/x264 )
+"
+# nvenc? ( amd64? ( media-libs/nv-codec-headers ) )
+RDEPEND="
+ ${DEPEND}
+ ${TEST_DEPEND}
+ $(python_gen_cond_dep '
+ crypt? ( dev-python/cryptography[${PYTHON_USEDEP}] )
+ cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+ lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+ lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+ oauth? ( dev-python/oauthlib[${PYTHON_USEDEP}] )
+ opengl? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+ webcam? (
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pyinotify[${PYTHON_USEDEP}]
+ media-libs/opencv[${PYTHON_USEDEP},python]
+ )
+ ')
+ acct-group/xpra
+ virtual/ssh
+ x11-apps/xauth
+ x11-apps/xmodmap
+ ibus? ( app-i18n/ibus )
+ pinentry? ( app-crypt/pinentry )
+ trayicon? ( dev-libs/libayatana-appindicator )
+ udev? ( virtual/udev )
+"
+DEPEND+="
+ test? (
+ ${TEST_DEPEND}
+ $(python_gen_cond_dep '
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ ')
+ )
+"
+BDEPEND="
+ $(python_gen_cond_dep '
+ dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/pip[${PYTHON_USEDEP}]
+ ')
+ virtual/pkgconfig
+ doc? ( virtual/pandoc )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-9999-pep517.patch"
+)
+
+src_prepare() {
+ default
+
+ sed \
+ -e 's#UNITTESTS_DIR=`dirname $(readlink -f $0)`#: "${UNITTESTS_DIR:=`dirname $(readlink -f $0)`}"#' \
+ -e 's#INSTALL_ROOT="$SRC_DIR/dist/python${PYTHON_VERSION}"#: "${INSTALL_ROOT:=$SRC_DIR/dist/python${PYTHON_VERSION}}"#' \
+ -e '/setup.py install/d' \
+ -i "${S}/tests/unittests/run" || die
+}
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ hprefixify xpra/scripts/config.py
+
+ sed -r -e "/\bdoc_dir =/s:/${PN}/\":/${PF}/html\":" \
+ -i setup.py || die
+
+ if use minimal; then
+ sed -r -e '/pam_ENABLED/s/DEFAULT/False/' \
+ -e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \
+ -i setup.py || die
+ fi
+}
+
+python_configure_all() {
+ sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
+ -i setup.py || die
+
+ DISTUTILS_ARGS=(
+ --with-PIC
+ "$(use_with avif)"
+ "$(use_with brotli)"
+ "$(use_with sound audio)"
+ "$(use_with client)"
+ "$(use_with clipboard)"
+ "$(use_with csc csc_cython)"
+ --without-csc_libyuv
+ # "$(use_with csc csc_libyuv)" # https://chromium.googlesource.com/libyuv/libyuv
+ "$(use_with cuda cuda_rebuild)"
+ "$(use_with cuda cuda_kernels)"
+ "$(use_with dbus)"
+ "$(use_with debug)"
+ "$(use_with doc docs)"
+ --without-evdi
+ # "$(use_with evdi)" x11-drivers/evdi::guru
+ "$(use_with examples example)"
+ "$(use_with gstreamer)"
+ "$(use_with gstreamer gstreamer_audio)"
+ "$(use_with gstreamer gstreamer_video)"
+ "$(use_with gtk3)"
+ "$(use_with html http)"
+ "$(use_with mdns)"
+ "$(use_with video_cards_nvidia nvidia)"
+ --without-nvdec
+ --without-nvenc
+ --without-nvfbc
+ # "$(use_with nvenc nvdec)" # NVIDIA Video Codec SDK
+ # "$(use_with nvenc nvenc)" # NVIDIA Video Codec SDK
+ # "$(use_with nvenc nvfbc)" # NVIDIA Capture SDK
+ "$(use_with opengl)"
+ "$(use_with openh264)"
+ "$(use_with cups printing)"
+ --without-pandoc_lua
+ "$(use_with qrcode qrencode)"
+ --without-quic
+ # "$(use_with quic)" # https://github.com/aiortc/aioquic
+ "$(use_with systemd sd_listen)"
+ "$(use_with server)"
+ "$(use_with systemd service)"
+ "$(use_with server shadow)"
+ "$(use_with vpx)"
+ "$(use_with webcam)"
+ "$(use_with webp)"
+ "$(use_with X x11)"
+ "$(use_with X Xdummy)"
+
+ "$(use_with test tests)"
+ --with-strict
+ # --with-verbose
+ # --with-warn
+ # --with-cythonize_more
+
+ --pkg-config-path="${S}/fs/lib/pkgconfig"
+ )
+
+ if use server; then
+ DISTUTILS_ARGS+=(
+ "$(use_with jpeg jpeg_encoder)"
+ "$(use_with vpx vpx_encoder)"
+ "$(use_with openh264 openh264_encoder)"
+ "$(use_with cuda nvjpeg_encoder)"
+ "$(use_with avif avif_encoder)"
+ "$(use_with webp webp_encoder)"
+ --without-spng_encoder
+ # "$(use_with spng spng_encoder)" # https://github.com/randy408/libspng
+ )
+ else
+ DISTUTILS_ARGS+=(
+ --without-jpeg_encoder
+ --without-vpx_encoder
+ --without-openh264_encoder
+ --without-nvjpeg_encoder
+ --without-avif_encoder
+ --without-webp_encoder
+ --without-spng_encoder
+ )
+ fi
+
+ if use client || use gtk3; then
+ DISTUTILS_ARGS+=(
+ "$(use_with vpx vpx_decoder)"
+ "$(use_with openh264 openh264_decoder)"
+ "$(use_with cuda nvjpeg_decoder)"
+ "$(use_with jpeg jpeg_decoder)"
+ "$(use_with avif avif_decoder)"
+ "$(use_with webp webp_decoder)"
+ --without-spng_decoder
+ # "$(use_with spng spng_decoder)" # https://github.com/randy408/libspng
+ )
+ else
+ DISTUTILS_ARGS+=(
+ --without-jpeg_decoder
+ --without-vpx_decoder
+ --without-openh264_decoder
+ --without-nvjpeg_decoder
+ --without-avif_decoder
+ --without-webp_decoder
+ --without-spng_decoder
+ )
+ fi
+
+ DISTUTILS_ARGS+=(
+ # Arguments from user
+ "${MYDISTUTILS_ARGS[@]}"
+ )
+
+ export XPRA_SOCKET_DIRS="${EPREFIX}/var/run/xpra"
+}
+
+python_compile() {
+ if use cuda; then
+ export NVCC_PREPEND_FLAGS="-ccbin $(cuda_gccdir)/g++"
+ fi
+
+ PYTHONPATH="${S}" distutils-r1_python_compile
+}
+
+python_test() {
+ einfo "${BUILD_DIR}/install/$(python_get_sitedir)"
+
+ use cuda && cuda_add_sandbox -w
+ addwrite /dev/dri/renderD128
+
+ addpredict /dev/dri/card0
+ addpredict /dev/fuse
+ addpredict /dev/tty0
+ addpredict /dev/vga_arbiter
+ addpredict /proc/mtrr
+ addpredict /var/run/utmp
+
+ addpredict "$(python_get_sitedir)"
+
+ if [[ -d "/sys/devices/virtual/video4linux" ]]; then
+ local devices
+ readarray -t devices <<<"$(find /sys/devices/virtual/video4linux -mindepth 1 -maxdepth 1 -type d -name 'video*' )"
+ for device in "${devices[@]}"; do
+ addwrite "/dev/$(basename "${device}" || die )"
+ done
+ fi
+
+ xdg_environment_reset
+
+ export XAUTHORITY=${T}/.Xauthority
+ touch "${XAUTHORITY}" || die
+
+ local -x XPRA_TEST_COVERAGE=0 INSTALL_ROOT="${BUILD_DIR}/install" UNITTESTS_DIR="${S}/tests/unittests"
+
+ tests/unittests/run \
+ --skip-fail unit.client.mixins.audioclient_test \
+ --skip-fail unit.client.x11_client_test \
+ --skip-fail unit.net.net_util_test \
+ --skip-fail unit.notifications.common_test \
+ --skip-fail unit.server.mixins.shadow_option_test \
+ --skip-fail unit.server.mixins.start_option_test \
+ --skip-fail unit.server.mixins.startdesktop_option_test \
+ --skip-fail unit.server.server_auth_test \
+ --skip-fail unit.server.shadow_server_test \
+ --skip-fail unit.x11.x11_server_test \
+ --skip-slow unit.client.mixins.webcam_test \
+ --skip-slow unit.server.server_sockets_test \
+ --skip-slow unit.server.source.source_mixins_test \
+ || die -n
+
+ # remove test file
+ rm "${INSTALL_ROOT}/usr/share/xpra/www" -r || die
+}
+
+python_install_all() {
+ distutils-r1_python_prepare_all
+
+ mv -v "${ED}"/usr/etc "${ED}"/ || die
+
+ sed -e "s#/.*data/etc#/etc#g" \
+ -i "${ED}/etc/xpra/conf.d/"* || die
+
+ # Move udev dir to the right place if necessary.
+ if use udev; then
+ local dir
+ dir=$(get_udevdir)
+ if [[ ! ${ED}/usr/lib/udev -ef ${ED}${dir} ]]; then
+ dodir "${dir%/*}"
+ mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+ fi
+ else
+ rm -vr "${ED}"/usr/lib/udev || die
+ rm -v "${ED}"/usr/libexec/xpra/xpra_udev_product_version || die
+ fi
+}
+
+pkg_postinst() {
+ tmpfiles_process xpra.conf
+ xdg_pkg_postinst
+ use udev && udev_reload
+}
+
+pkg_postrm() {
+ xdg_pkg_postinst
+ use udev && udev_reload
+}
diff --git a/x11-wm/xpra/xpra-6.9999.ebuild b/x11-wm/xpra/xpra-6.9999.ebuild
new file mode 100644
index 000000000000..bfe892db2a2a
--- /dev/null
+++ b/x11-wm/xpra/xpra-6.9999.ebuild
@@ -0,0 +1,376 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/Xpra-org/xpra.git"
+ if [[ ${PV} = 6.9999* ]]; then
+ EGIT_BRANCH="v6.x"
+ fi
+ inherit git-r3
+else
+ inherit pypi
+ KEYWORDS="~amd64 ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=yes
+DISTUTILS_EXT=1
+
+inherit cuda xdg distutils-r1 prefix tmpfiles udev
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
+HOMEPAGE="https://xpra.org/"
+LICENSE="GPL-2 BSD"
+SLOT="0"
+IUSE="+X avif brotli +client +clipboard crypt csc cuda cups dbus debug doc examples gstreamer +gtk3 html ibus jpeg +lz4 lzo mdns minimal oauth opengl openh264 pinentry pulseaudio qrcode +server sound systemd test +trayicon udev vpx webcam webp x264 xdg xinerama "
+IUSE+=" video_cards_nvidia"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ || ( client gtk3 server )
+ cups? ( dbus )
+ oauth? ( server )
+ opengl? ( client )
+ clipboard? ( gtk3 )
+ gtk3? ( client )
+ test? ( client clipboard crypt dbus gstreamer html server sound xdg xinerama )
+"
+
+TEST_DEPEND="
+ $(python_gen_cond_dep '
+ dev-python/netifaces[${PYTHON_USEDEP}]
+ dev-python/pillow[jpeg?,webp?,${PYTHON_USEDEP}]
+ dev-python/rencode[${PYTHON_USEDEP}]
+ dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+ xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] )
+ ')
+ html? ( www-apps/xpra-html5 )
+ server? (
+ x11-base/xorg-server[-minimal,xvfb]
+ x11-drivers/xf86-input-void
+ )
+ webcam? ( media-video/v4l2loopback )
+ xinerama? ( x11-libs/libfakeXinerama )
+"
+DEPEND="
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+ sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+ gtk3? (
+ dev-python/pygobject:3[cairo]
+ )
+ ')
+ dev-libs/xxhash
+ avif? ( media-libs/libavif )
+ brotli? ( app-arch/brotli )
+ client? (
+ x11-libs/gtk+:3[X?,introspection]
+ )
+ jpeg? ( media-libs/libjpeg-turbo )
+ mdns? ( dev-libs/mdns )
+ openh264? ( media-libs/openh264:= )
+ pulseaudio? (
+ media-plugins/gst-plugins-pulse:1.0
+ media-plugins/gst-plugins-opus
+ )
+ qrcode? ( media-gfx/qrencode )
+ sound? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ vpx? ( media-libs/libvpx )
+ webp? ( media-libs/libwebp )
+ X? (
+ x11-apps/xrandr
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXres
+ x11-libs/libXtst
+ x11-libs/libxkbfile
+ )
+ x264? ( media-libs/x264 )
+"
+# nvenc? ( amd64? ( media-libs/nv-codec-headers ) )
+RDEPEND="
+ ${DEPEND}
+ ${TEST_DEPEND}
+ $(python_gen_cond_dep '
+ crypt? ( dev-python/cryptography[${PYTHON_USEDEP}] )
+ cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
+ lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
+ lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
+ oauth? ( dev-python/oauthlib[${PYTHON_USEDEP}] )
+ opengl? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
+ webcam? (
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pyinotify[${PYTHON_USEDEP}]
+ media-libs/opencv[${PYTHON_USEDEP},python]
+ )
+ ')
+ acct-group/xpra
+ virtual/ssh
+ x11-apps/xauth
+ x11-apps/xmodmap
+ ibus? ( app-i18n/ibus )
+ pinentry? ( app-crypt/pinentry )
+ trayicon? ( dev-libs/libayatana-appindicator )
+ udev? ( virtual/udev )
+"
+DEPEND+="
+ test? (
+ ${TEST_DEPEND}
+ $(python_gen_cond_dep '
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ ')
+ )
+"
+BDEPEND="
+ $(python_gen_cond_dep '
+ dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/pip[${PYTHON_USEDEP}]
+ ')
+ virtual/pkgconfig
+ doc? ( virtual/pandoc )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-9999-pep517.patch"
+)
+
+src_prepare() {
+ default
+
+ sed \
+ -e 's#UNITTESTS_DIR=`dirname $(readlink -f $0)`#: "${UNITTESTS_DIR:=`dirname $(readlink -f $0)`}"#' \
+ -e 's#INSTALL_ROOT="$SRC_DIR/dist/python${PYTHON_VERSION}"#: "${INSTALL_ROOT:=$SRC_DIR/dist/python${PYTHON_VERSION}}"#' \
+ -e '/setup.py install/d' \
+ -i "${S}/tests/unittests/run" || die
+}
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ hprefixify xpra/scripts/config.py
+
+ sed -r -e "/\bdoc_dir =/s:/${PN}/\":/${PF}/html\":" \
+ -i setup.py || die
+
+ if use minimal; then
+ sed -r -e '/pam_ENABLED/s/DEFAULT/False/' \
+ -e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \
+ -i setup.py || die
+ fi
+}
+
+python_configure_all() {
+ sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
+ -i setup.py || die
+
+ DISTUTILS_ARGS=(
+ --with-PIC
+ "$(use_with avif)"
+ "$(use_with brotli)"
+ "$(use_with sound audio)"
+ "$(use_with client)"
+ "$(use_with clipboard)"
+ "$(use_with csc csc_cython)"
+ --without-csc_libyuv
+ # "$(use_with csc csc_libyuv)" # https://chromium.googlesource.com/libyuv/libyuv
+ "$(use_with cuda cuda_rebuild)"
+ "$(use_with cuda cuda_kernels)"
+ "$(use_with dbus)"
+ "$(use_with debug)"
+ "$(use_with doc docs)"
+ --without-evdi
+ # "$(use_with evdi)" x11-drivers/evdi::guru
+ "$(use_with examples example)"
+ "$(use_with gstreamer)"
+ "$(use_with gstreamer gstreamer_audio)"
+ "$(use_with gstreamer gstreamer_video)"
+ "$(use_with gtk3)"
+ "$(use_with html http)"
+ "$(use_with mdns)"
+ "$(use_with video_cards_nvidia nvidia)"
+ --without-nvdec
+ --without-nvenc
+ --without-nvfbc
+ # "$(use_with nvenc nvdec)" # NVIDIA Video Codec SDK
+ # "$(use_with nvenc nvenc)" # NVIDIA Video Codec SDK
+ # "$(use_with nvenc nvfbc)" # NVIDIA Capture SDK
+ "$(use_with opengl)"
+ "$(use_with openh264)"
+ "$(use_with cups printing)"
+ --without-pandoc_lua
+ "$(use_with qrcode qrencode)"
+ --without-quic
+ # "$(use_with quic)" # https://github.com/aiortc/aioquic
+ "$(use_with systemd sd_listen)"
+ "$(use_with server)"
+ "$(use_with systemd service)"
+ "$(use_with server shadow)"
+ "$(use_with vpx)"
+ "$(use_with webcam)"
+ "$(use_with webp)"
+ "$(use_with X x11)"
+ "$(use_with X Xdummy)"
+
+ "$(use_with test tests)"
+ --with-strict
+ # --with-verbose
+ # --with-warn
+ # --with-cythonize_more
+
+ --pkg-config-path="${S}/fs/lib/pkgconfig"
+ )
+
+ if use server; then
+ DISTUTILS_ARGS+=(
+ "$(use_with jpeg jpeg_encoder)"
+ "$(use_with vpx vpx_encoder)"
+ "$(use_with openh264 openh264_encoder)"
+ "$(use_with cuda nvjpeg_encoder)"
+ "$(use_with avif avif_encoder)"
+ "$(use_with webp webp_encoder)"
+ --without-spng_encoder
+ # "$(use_with spng spng_encoder)" # https://github.com/randy408/libspng
+ )
+ else
+ DISTUTILS_ARGS+=(
+ --without-jpeg_encoder
+ --without-vpx_encoder
+ --without-openh264_encoder
+ --without-nvjpeg_encoder
+ --without-avif_encoder
+ --without-webp_encoder
+ --without-spng_encoder
+ )
+ fi
+
+ if use client || use gtk3; then
+ DISTUTILS_ARGS+=(
+ "$(use_with vpx vpx_decoder)"
+ "$(use_with openh264 openh264_decoder)"
+ "$(use_with cuda nvjpeg_decoder)"
+ "$(use_with jpeg jpeg_decoder)"
+ "$(use_with avif avif_decoder)"
+ "$(use_with webp webp_decoder)"
+ --without-spng_decoder
+ # "$(use_with spng spng_decoder)" # https://github.com/randy408/libspng
+ )
+ else
+ DISTUTILS_ARGS+=(
+ --without-jpeg_decoder
+ --without-vpx_decoder
+ --without-openh264_decoder
+ --without-nvjpeg_decoder
+ --without-avif_decoder
+ --without-webp_decoder
+ --without-spng_decoder
+ )
+ fi
+
+ DISTUTILS_ARGS+=(
+ # Arguments from user
+ "${MYDISTUTILS_ARGS[@]}"
+ )
+
+ export XPRA_SOCKET_DIRS="${EPREFIX}/var/run/xpra"
+}
+
+python_compile() {
+ if use cuda; then
+ export NVCC_PREPEND_FLAGS="-ccbin $(cuda_gccdir)/g++"
+ fi
+
+ PYTHONPATH="${S}" distutils-r1_python_compile
+}
+
+python_test() {
+ einfo "${BUILD_DIR}/install/$(python_get_sitedir)"
+
+ use cuda && cuda_add_sandbox -w
+ addwrite /dev/dri/renderD128
+
+ addpredict /dev/dri/card0
+ addpredict /dev/fuse
+ addpredict /dev/tty0
+ addpredict /dev/vga_arbiter
+ addpredict /proc/mtrr
+ addpredict /var/run/utmp
+
+ addpredict "$(python_get_sitedir)"
+
+ if [[ -d "/sys/devices/virtual/video4linux" ]]; then
+ local devices
+ readarray -t devices <<<"$(find /sys/devices/virtual/video4linux -mindepth 1 -maxdepth 1 -type d -name 'video*' )"
+ for device in "${devices[@]}"; do
+ addwrite "/dev/$(basename "${device}" || die )"
+ done
+ fi
+
+ xdg_environment_reset
+
+ export XAUTHORITY=${T}/.Xauthority
+ touch "${XAUTHORITY}" || die
+
+ local -x XPRA_TEST_COVERAGE=0 INSTALL_ROOT="${BUILD_DIR}/install" UNITTESTS_DIR="${S}/tests/unittests"
+
+ tests/unittests/run \
+ --skip-fail unit.client.mixins.audioclient_test \
+ --skip-fail unit.client.x11_client_test \
+ --skip-fail unit.net.net_util_test \
+ --skip-fail unit.notifications.common_test \
+ --skip-fail unit.server.mixins.shadow_option_test \
+ --skip-fail unit.server.mixins.start_option_test \
+ --skip-fail unit.server.mixins.startdesktop_option_test \
+ --skip-fail unit.server.server_auth_test \
+ --skip-fail unit.server.shadow_server_test \
+ --skip-fail unit.x11.x11_server_test \
+ --skip-slow unit.client.mixins.webcam_test \
+ --skip-slow unit.server.server_sockets_test \
+ --skip-slow unit.server.source.source_mixins_test \
+ || die -n
+
+ # remove test file
+ rm "${INSTALL_ROOT}/usr/share/xpra/www" -r || die
+}
+
+python_install_all() {
+ distutils-r1_python_prepare_all
+
+ mv -v "${ED}"/usr/etc "${ED}"/ || die
+
+ sed -e "s#/.*data/etc#/etc#g" \
+ -i "${ED}/etc/xpra/conf.d/"* || die
+
+ # Move udev dir to the right place if necessary.
+ if use udev; then
+ local dir
+ dir=$(get_udevdir)
+ if [[ ! ${ED}/usr/lib/udev -ef ${ED}${dir} ]]; then
+ dodir "${dir%/*}"
+ mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
+ fi
+ else
+ rm -vr "${ED}"/usr/lib/udev || die
+ rm -v "${ED}"/usr/libexec/xpra/xpra_udev_product_version || die
+ fi
+}
+
+pkg_postinst() {
+ tmpfiles_process xpra.conf
+ xdg_pkg_postinst
+ use udev && udev_reload
+}
+
+pkg_postrm() {
+ xdg_pkg_postinst
+ use udev && udev_reload
+}
diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild
index b2531fd6fa85..bfe892db2a2a 100644
--- a/x11-wm/xpra/xpra-9999.ebuild
+++ b/x11-wm/xpra/xpra-9999.ebuild
@@ -1,35 +1,42 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-if [[ ${PV} = 9999* ]]; then
+if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/Xpra-org/xpra.git"
+ if [[ ${PV} = 6.9999* ]]; then
+ EGIT_BRANCH="v6.x"
+ fi
inherit git-r3
else
inherit pypi
KEYWORDS="~amd64 ~x86"
fi
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
DISTUTILS_USE_PEP517=setuptools
DISTUTILS_SINGLE_IMPL=yes
DISTUTILS_EXT=1
-inherit xdg xdg-utils distutils-r1 multibuild prefix tmpfiles udev
+inherit cuda xdg distutils-r1 prefix tmpfiles udev
DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
HOMEPAGE="https://xpra.org/"
LICENSE="GPL-2 BSD"
SLOT="0"
-IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal oauth opengl pinentry pulseaudio +server sound systemd test +trayicon udev vpx webcam webp xdg xinerama"
+IUSE="+X avif brotli +client +clipboard crypt csc cuda cups dbus debug doc examples gstreamer +gtk3 html ibus jpeg +lz4 lzo mdns minimal oauth opengl openh264 pinentry pulseaudio qrcode +server sound systemd test +trayicon udev vpx webcam webp x264 xdg xinerama "
+IUSE+=" video_cards_nvidia"
+RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
- || ( client server )
+ || ( client gtk3 server )
cups? ( dbus )
oauth? ( server )
opengl? ( client )
- test? ( client clipboard crypt dbus html server sound xdg xinerama )
+ clipboard? ( gtk3 )
+ gtk3? ( client )
+ test? ( client clipboard crypt dbus gstreamer html server sound xdg xinerama )
"
TEST_DEPEND="
@@ -45,39 +52,52 @@ TEST_DEPEND="
x11-base/xorg-server[-minimal,xvfb]
x11-drivers/xf86-input-void
)
+ webcam? ( media-video/v4l2loopback )
xinerama? ( x11-libs/libfakeXinerama )
"
DEPEND="
${PYTHON_DEPS}
$(python_gen_cond_dep '
- dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
+ gtk3? (
+ dev-python/pygobject:3[cairo]
+ )
')
- x11-libs/gtk+:3[introspection]
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXres
- x11-libs/libXtst
- x11-libs/libxkbfile
+ dev-libs/xxhash
+ avif? ( media-libs/libavif )
brotli? ( app-arch/brotli )
- csc? ( >=media-video/ffmpeg-1.2.2:0= )
- ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264] )
+ client? (
+ x11-libs/gtk+:3[X?,introspection]
+ )
jpeg? ( media-libs/libjpeg-turbo )
+ mdns? ( dev-libs/mdns )
+ openh264? ( media-libs/openh264:= )
pulseaudio? (
- media-libs/libpulse
media-plugins/gst-plugins-pulse:1.0
+ media-plugins/gst-plugins-opus
)
+ qrcode? ( media-gfx/qrencode )
sound? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
)
- vpx? ( media-libs/libvpx media-video/ffmpeg )
+ vpx? ( media-libs/libvpx )
webp? ( media-libs/libwebp )
+ X? (
+ x11-apps/xrandr
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXres
+ x11-libs/libXtst
+ x11-libs/libxkbfile
+ )
+ x264? ( media-libs/x264 )
"
+# nvenc? ( amd64? ( media-libs/nv-codec-headers ) )
RDEPEND="
${DEPEND}
${TEST_DEPEND}
@@ -104,24 +124,36 @@ RDEPEND="
udev? ( virtual/udev )
"
DEPEND+="
- test? ( ${TEST_DEPEND} )
+ test? (
+ ${TEST_DEPEND}
+ $(python_gen_cond_dep '
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ ')
+ )
"
BDEPEND="
$(python_gen_cond_dep '
- >=dev-python/cython-0.16[${PYTHON_USEDEP}]
+ dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/pip[${PYTHON_USEDEP}]
')
virtual/pkgconfig
doc? ( virtual/pandoc )
"
-# Broken by PEP517 migration and some tests failed for a while before that for
-# unknown reasons.
-RESTRICT="test"
-
PATCHES=(
- "${FILESDIR}"/${PN}-9999-xdummy.patch
+ "${FILESDIR}/${PN}-9999-pep517.patch"
)
+src_prepare() {
+ default
+
+ sed \
+ -e 's#UNITTESTS_DIR=`dirname $(readlink -f $0)`#: "${UNITTESTS_DIR:=`dirname $(readlink -f $0)`}"#' \
+ -e 's#INSTALL_ROOT="$SRC_DIR/dist/python${PYTHON_VERSION}"#: "${INSTALL_ROOT:=$SRC_DIR/dist/python${PYTHON_VERSION}}"#' \
+ -e '/setup.py install/d' \
+ -i "${S}/tests/unittests/run" || die
+}
+
python_prepare_all() {
distutils-r1_python_prepare_all
@@ -142,70 +174,186 @@ python_configure_all() {
-i setup.py || die
DISTUTILS_ARGS=(
- --without-PIC
- --without-Xdummy
- $(use_with sound audio)
- $(use_with client)
- $(use_with clipboard)
- $(use_with csc csc_swscale)
+ --with-PIC
+ "$(use_with avif)"
+ "$(use_with brotli)"
+ "$(use_with sound audio)"
+ "$(use_with client)"
+ "$(use_with clipboard)"
+ "$(use_with csc csc_cython)"
--without-csc_libyuv
- --without-cuda_rebuild
- --without-cuda_kernels
- $(use_with cups printing)
- --without-debug
- $(use_with dbus)
- $(use_with doc docs)
- $(use_with ffmpeg dec_avcodec2)
- $(use_with ffmpeg enc_ffmpeg)
- $(use_with ffmpeg enc_x264)
- --without-enc_x265
- --with-gtk3
- $(use_with jpeg jpeg_encoder)
- $(use_with jpeg jpeg_decoder)
- --without-mdns
- --without-sd_listen
- --without-service
- $(use_with opengl)
- $(use_with server shadow)
- $(use_with server)
- --without-strict
- $(use_with vpx)
- --with-warn
- $(use_with webcam)
- $(use_with webp)
- --with-x11
+ # "$(use_with csc csc_libyuv)" # https://chromium.googlesource.com/libyuv/libyuv
+ "$(use_with cuda cuda_rebuild)"
+ "$(use_with cuda cuda_kernels)"
+ "$(use_with dbus)"
+ "$(use_with debug)"
+ "$(use_with doc docs)"
+ --without-evdi
+ # "$(use_with evdi)" x11-drivers/evdi::guru
+ "$(use_with examples example)"
+ "$(use_with gstreamer)"
+ "$(use_with gstreamer gstreamer_audio)"
+ "$(use_with gstreamer gstreamer_video)"
+ "$(use_with gtk3)"
+ "$(use_with html http)"
+ "$(use_with mdns)"
+ "$(use_with video_cards_nvidia nvidia)"
+ --without-nvdec
+ --without-nvenc
+ --without-nvfbc
+ # "$(use_with nvenc nvdec)" # NVIDIA Video Codec SDK
+ # "$(use_with nvenc nvenc)" # NVIDIA Video Codec SDK
+ # "$(use_with nvenc nvfbc)" # NVIDIA Capture SDK
+ "$(use_with opengl)"
+ "$(use_with openh264)"
+ "$(use_with cups printing)"
+ --without-pandoc_lua
+ "$(use_with qrcode qrencode)"
+ --without-quic
+ # "$(use_with quic)" # https://github.com/aiortc/aioquic
+ "$(use_with systemd sd_listen)"
+ "$(use_with server)"
+ "$(use_with systemd service)"
+ "$(use_with server shadow)"
+ "$(use_with vpx)"
+ "$(use_with webcam)"
+ "$(use_with webp)"
+ "$(use_with X x11)"
+ "$(use_with X Xdummy)"
+
+ "$(use_with test tests)"
+ --with-strict
+ # --with-verbose
+ # --with-warn
+ # --with-cythonize_more
+
+ --pkg-config-path="${S}/fs/lib/pkgconfig"
)
- export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
+ if use server; then
+ DISTUTILS_ARGS+=(
+ "$(use_with jpeg jpeg_encoder)"
+ "$(use_with vpx vpx_encoder)"
+ "$(use_with openh264 openh264_encoder)"
+ "$(use_with cuda nvjpeg_encoder)"
+ "$(use_with avif avif_encoder)"
+ "$(use_with webp webp_encoder)"
+ --without-spng_encoder
+ # "$(use_with spng spng_encoder)" # https://github.com/randy408/libspng
+ )
+ else
+ DISTUTILS_ARGS+=(
+ --without-jpeg_encoder
+ --without-vpx_encoder
+ --without-openh264_encoder
+ --without-nvjpeg_encoder
+ --without-avif_encoder
+ --without-webp_encoder
+ --without-spng_encoder
+ )
+ fi
+
+ if use client || use gtk3; then
+ DISTUTILS_ARGS+=(
+ "$(use_with vpx vpx_decoder)"
+ "$(use_with openh264 openh264_decoder)"
+ "$(use_with cuda nvjpeg_decoder)"
+ "$(use_with jpeg jpeg_decoder)"
+ "$(use_with avif avif_decoder)"
+ "$(use_with webp webp_decoder)"
+ --without-spng_decoder
+ # "$(use_with spng spng_decoder)" # https://github.com/randy408/libspng
+ )
+ else
+ DISTUTILS_ARGS+=(
+ --without-jpeg_decoder
+ --without-vpx_decoder
+ --without-openh264_decoder
+ --without-nvjpeg_decoder
+ --without-avif_decoder
+ --without-webp_decoder
+ --without-spng_decoder
+ )
+ fi
+
+ DISTUTILS_ARGS+=(
+ # Arguments from user
+ "${MYDISTUTILS_ARGS[@]}"
+ )
+
+ export XPRA_SOCKET_DIRS="${EPREFIX}/var/run/xpra"
+}
+
+python_compile() {
+ if use cuda; then
+ export NVCC_PREPEND_FLAGS="-ccbin $(cuda_gccdir)/g++"
+ fi
+
+ PYTHONPATH="${S}" distutils-r1_python_compile
}
python_test() {
- export XAUTHORITY=${HOME}/.Xauthority
- touch "${XAUTHORITY}" || die
+ einfo "${BUILD_DIR}/install/$(python_get_sitedir)"
+
+ use cuda && cuda_add_sandbox -w
+ addwrite /dev/dri/renderD128
+
+ addpredict /dev/dri/card0
+ addpredict /dev/fuse
+ addpredict /dev/tty0
+ addpredict /dev/vga_arbiter
+ addpredict /proc/mtrr
+ addpredict /var/run/utmp
+
+ addpredict "$(python_get_sitedir)"
+
+ if [[ -d "/sys/devices/virtual/video4linux" ]]; then
+ local devices
+ readarray -t devices <<<"$(find /sys/devices/virtual/video4linux -mindepth 1 -maxdepth 1 -type d -name 'video*' )"
+ for device in "${devices[@]}"; do
+ addwrite "/dev/$(basename "${device}" || die )"
+ done
+ fi
- distutils_install_for_testing
xdg_environment_reset
- env -u WAYLAND_DISPLAY -u XDG_SESSION_TYPE \
- PYTHONPATH="${S}/tests/unittests:${BUILD_DIR}/test/lib" \
- XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \
- "${PYTHON}" "${S}"/tests/unittests/unit/run.py || die
+ export XAUTHORITY=${T}/.Xauthority
+ touch "${XAUTHORITY}" || die
+
+ local -x XPRA_TEST_COVERAGE=0 INSTALL_ROOT="${BUILD_DIR}/install" UNITTESTS_DIR="${S}/tests/unittests"
+
+ tests/unittests/run \
+ --skip-fail unit.client.mixins.audioclient_test \
+ --skip-fail unit.client.x11_client_test \
+ --skip-fail unit.net.net_util_test \
+ --skip-fail unit.notifications.common_test \
+ --skip-fail unit.server.mixins.shadow_option_test \
+ --skip-fail unit.server.mixins.start_option_test \
+ --skip-fail unit.server.mixins.startdesktop_option_test \
+ --skip-fail unit.server.server_auth_test \
+ --skip-fail unit.server.shadow_server_test \
+ --skip-fail unit.x11.x11_server_test \
+ --skip-slow unit.client.mixins.webcam_test \
+ --skip-slow unit.server.server_sockets_test \
+ --skip-slow unit.server.source.source_mixins_test \
+ || die -n
+
+ # remove test file
+ rm "${INSTALL_ROOT}/usr/share/xpra/www" -r || die
}
python_install_all() {
distutils-r1_python_prepare_all
- # Switching to PEP517 gives /usr/etc. Previously, setup.py hardcodes
- # if root_prefix.endswith("/usr"):
- # root_prefix = root_prefix[:-4]
- # But now setuptools uses data/* to represent out-of-sitedir files.
- # The upstream hack no longer works. We are on our own.
-
mv -v "${ED}"/usr/etc "${ED}"/ || die
+ sed -e "s#/.*data/etc#/etc#g" \
+ -i "${ED}/etc/xpra/conf.d/"* || die
+
# Move udev dir to the right place if necessary.
if use udev; then
- local dir=$(get_udevdir)
+ local dir
+ dir=$(get_udevdir)
if [[ ! ${ED}/usr/lib/udev -ef ${ED}${dir} ]]; then
dodir "${dir%/*}"
mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die
^ permalink raw reply related [flat|nested] 17+ messages in thread
end of thread, other threads:[~2024-06-10 19:18 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-01 7:51 [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/, x11-wm/xpra/files/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2024-06-10 19:18 Alexey Shvetsov
2023-09-02 9:19 Benda XU
2022-08-29 14:06 James Le Cuirot
2022-02-28 23:05 James Le Cuirot
2022-01-15 23:31 James Le Cuirot
2021-10-06 12:08 James Le Cuirot
2021-09-04 10:18 James Le Cuirot
2021-07-18 10:43 Conrad Kostecki
2021-05-30 7:56 James Le Cuirot
2020-10-29 22:24 Andreas K. Hüttel
2020-01-16 11:31 Andreas K. Hüttel
2019-12-16 14:11 Benda XU
2019-11-29 4:41 Benda XU
2018-12-02 22:39 Andreas K. Hüttel
2017-03-10 12:17 Michael Weber
2016-02-22 13:37 Michael Weber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox