* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/files/, x11-wm/xpra/
@ 2015-09-20 21:28 Michael Weber
0 siblings, 0 replies; 17+ messages in thread
From: Michael Weber @ 2015-09-20 21:28 UTC (permalink / raw
To: gentoo-commits
commit: d0509b7aa104fb67fd388f6f8d1e432d11005ca2
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 21:26:57 2015 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 21:28:27 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0509b7a
x11-wm/xpra: drop old version.
Package-Manager: portage-2.2.20.1
x11-wm/xpra/Manifest | 3 -
x11-wm/xpra/files/xpra-0.10.1-prefix.patch | 30 ------
x11-wm/xpra/files/xpra-0.10.12-launcher.patch | 10 --
x11-wm/xpra/files/xpra-0.12.0-prefix.patch | 27 ------
.../xpra-0.7.1-ignore-gentoo-no-compile.patch | 11 ---
x11-wm/xpra/xpra-0.11.6.ebuild | 105 --------------------
x11-wm/xpra/xpra-0.12.7.ebuild | 105 --------------------
x11-wm/xpra/xpra-0.13.9.ebuild | 106 ---------------------
8 files changed, 397 deletions(-)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 59194e9..a4ff7f3 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,6 +1,3 @@
-DIST xpra-0.11.6.tar.xz 928652 SHA256 8e67681bd6313049e2b452734459d65b16e8c08c6273abfccade91d868ce0aea SHA512 4d276d99bdb1c3f9c95e44720552e401d251511f6d90f7cc86cc655b0fd841b7a3fbc919dd091f67e50e2530abb5943c7af9b36477347b013efe58d55b87da30 WHIRLPOOL 5f44b2e850bf0a6d8ae4a25284d7b2adba3e0c50b1211e248472b1fa715ec907cf7e16724a2c89f7bed0e29cb7fd85e219d7aaf0e0b0a6b7daa160a6a1ab570a
-DIST xpra-0.12.7.tar.xz 982888 SHA256 906265da543d4346bfe5c17ea0848368e481c391fbb9583aefb37cafc3db6c32 SHA512 c144df93ba9ef004b8f2966fe7fdaa695342e91b5788e980860b82edd8f624c0dd2df6ad99860fc05e1b586db9223f59d3a04e338aea3bbec111b8abf17f70b1 WHIRLPOOL 139d9ffed14bda69ad3fd2eaf6d99c5d9d769740a5301d25959f192b36ac817cbb57295d03559f5fc7ea82f6613945c9bff19caf4fb63af0aaf910f1e421f172
-DIST xpra-0.13.9.tar.xz 1539976 SHA256 0d9a02c07bb500ad32e9c82d168d1b71d0f77ee070ca18fab0dc6cc2fc970104 SHA512 32d28df224ed6cc0cd4c0e51f58d81ce0a07de4cd09b142b7f09a9d023632e42ba1589f215d57d7e75e8922d0a1c023e0495b07f09aee3899f3cd6ae8de51ca0 WHIRLPOOL a401fa77e3404c6c1d748a02214c060df2078c199de1141c331251d7364028520f3408d99366c063a1fd64f8375037bfcbb89b0bced34477365512acfe69bb7b
DIST xpra-0.14.27.tar.xz 1123504 SHA256 9d51d6e656a9afc6559ec4b671a706ba134257c8e6d909d2514a3ca653502efb SHA512 5f195b211b8e78091ba42661c08f367d66e2a34ebcea9e5df57f0408cf1c4232294d38692171abbfe7396a1da28b2cc4100252dc034872a278530c48282db5cf WHIRLPOOL b14d58cddd03093a598e99d69fb145a5a04347f48fc0ec0b0311efa7bc75f5a51be5db93a361032ead2e021d2c8ead13986a3bd7434108506bbc4b601556141b
DIST xpra-0.15.4.tar.xz 1194484 SHA256 29be80b8987dd131058aab0a1c8d456a7ac67ad56c54d2b5e72472ff003799a2 SHA512 3c0c3f9f5658fdb02d8c80efd5367c91cf771adf96d42f286e2079cb36b4446610e4e388bb7b241fa7704db4f621aac14959b04fe3466cf61b6a73d542971eb4 WHIRLPOOL 6646e889ea6a5e2eb1b6d0480b78f2ff3cf9c0ba5ccdca4531aa3b31e3f650f463a0da0d0013592586b2fc0c56d4a54385f4a38e921c7e62a4c706f6ad8b9d42
DIST xpra-0.15.6.tar.xz 1196700 SHA256 cebd8d22d4173610258c835f175ad3781cf49bf91b3d6d3c36c35a825228fa32 SHA512 750b24d06b6af93757e54651c0e5e55192280715c4439e56881824da90dcea25460631c993bf239c6f9023e74dce5063e32688e31c616d036da16fa3da8c304a WHIRLPOOL 66cdc20662ba4251506e03a969332996870e37fe6f60becd3f2feed7b24e1410bc793f5f4679a0dc58940bda52d26563f9db10f8ae3fd83fb60cb89988be38a0
diff --git a/x11-wm/xpra/files/xpra-0.10.1-prefix.patch b/x11-wm/xpra/files/xpra-0.10.1-prefix.patch
deleted file mode 100644
index 1e8e759..0000000
--- a/x11-wm/xpra/files/xpra-0.10.1-prefix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: xpra-0.10.1/setup.py
-===================================================================
---- xpra-0.10.1.orig/setup.py
-+++ xpra-0.10.1/setup.py
-@@ -896,8 +896,8 @@ else:
- return {}
- if "install" in sys.argv:
- #prepare default [/usr/local]/etc configuration files:
-- if sys.prefix == '/usr':
-- etc_prefix = '/etc/xpra'
-+ if sys.prefix[-4:] == '/usr':
-+ etc_prefix = sys.prefix[:-4] + '/etc/xpra'
- else:
- etc_prefix = sys.prefix + '/etc/xpra'
-
-Index: xpra-0.10.1/xpra/scripts/config.py
-===================================================================
---- xpra-0.10.1.orig/xpra/scripts/config.py
-+++ xpra-0.10.1/xpra/scripts/config.py
-@@ -344,8 +344,8 @@ def read_xpra_defaults():
- #first, read the global defaults:
- if sys.platform.startswith("win"):
- conf_dir = os.path.dirname(os.path.abspath(sys.executable))
-- elif sys.prefix == '/usr':
-- conf_dir = '/etc/xpra'
-+ elif sys.prefix[-4:] == '/usr':
-+ conf_dir = sys.prefix[:-4] + '/etc/xpra'
- else:
- conf_dir = sys.prefix + '/etc/xpra/'
- defaults = read_xpra_conf(conf_dir)
diff --git a/x11-wm/xpra/files/xpra-0.10.12-launcher.patch b/x11-wm/xpra/files/xpra-0.10.12-launcher.patch
deleted file mode 100644
index edd42a8..0000000
--- a/x11-wm/xpra/files/xpra-0.10.12-launcher.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/xpra/client/gtk_base/client_launcher.py
-+++ src/xpra/client/gtk_base/client_launcher.py
-@@ -18,5 +18,6 @@
- import pygtk
- pygtk.require('2.0')
--import gtk.gdk
-+import gtk
-+from gtk import gdk
- import gobject
- gobject.threads_init()
diff --git a/x11-wm/xpra/files/xpra-0.12.0-prefix.patch b/x11-wm/xpra/files/xpra-0.12.0-prefix.patch
deleted file mode 100644
index cce5e9d..0000000
--- a/x11-wm/xpra/files/xpra-0.12.0-prefix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- xpra-0.12.0/xpra/scripts/config.py
-+++ xpra-0.12.0/xpra/scripts/config.py
-@@ -188,9 +188,9 @@
- #OSX and win32 use binary installers,
- #we must look for the default config in the bundled resource location:
- conf_dir = get_resources_dir()
-- elif sys.prefix == '/usr':
-+ elif sys.prefix[-4:] == '/usr':
- #default posix config location:
-- conf_dir = '/etc/xpra'
-+ conf_dir = sys.prefix[:-4] + '/etc/xpra'
- else:
- #hope the prefix is something like "/usr/local":
- conf_dir = sys.prefix + '/etc/xpra/'
---- xpra-0.12.0/setup.py
-+++ xpra-0.12.0/setup.py
-@@ -990,8 +990,8 @@
- return {}
- if "install" in sys.argv:
- #prepare default [/usr/local]/etc configuration files:
-- if sys.prefix == '/usr':
-- etc_prefix = '/etc/xpra'
-+ if 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-0.7.1-ignore-gentoo-no-compile.patch b/x11-wm/xpra/files/xpra-0.7.1-ignore-gentoo-no-compile.patch
deleted file mode 100644
index 31d619d..0000000
--- a/x11-wm/xpra/files/xpra-0.7.1-ignore-gentoo-no-compile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpra-0.7.1/setup.py
-+++ xpra-0.7.1/setup.py
-@@ -135,7 +135,7 @@
- #then expects to find the cython modules!? ie:
- #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
- global ext_modules, cmdclass
- cython_version_check(min_version)
- from Cython.Distutils import build_ext
diff --git a/x11-wm/xpra/xpra-0.11.6.ebuild b/x11-wm/xpra/xpra-0.11.6.ebuild
deleted file mode 100644
index 47ecf97..0000000
--- a/x11-wm/xpra/xpra-0.11.6.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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 opengl pulseaudio +rencode server sound vpx webp x264"
-
-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? ( || ( >=media-video/ffmpeg-1.2.2 media-video/libav ) )
- dec_av? ( || ( >=media-video/ffmpeg-1.2.2 media-video/libav ) )
- 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
- || ( >=media-video/ffmpeg-1.0.4:0 media-video/libav ) )"
-
-RDEPEND="${COMMON_DEPEND}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- virtual/python-imaging[${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.7.1-ignore-gentoo-no-compile.patch \
- "${FILESDIR}"/${PN}-0.10.1-prefix.patch
-
- #assuming ffmpeg and libav mutual exclusive installs
- if has_version "media-video/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)
- --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.12.7.ebuild b/x11-wm/xpra/xpra-0.12.7.ebuild
deleted file mode 100644
index 80f5ca7..0000000
--- a/x11-wm/xpra/xpra-0.12.7.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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 opengl pulseaudio +rencode server sound vpx webp x264"
-
-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? ( || ( >=media-video/ffmpeg-1.2.2 media-video/libav ) )
- dec_av? ( || ( >=media-video/ffmpeg-1.2.2 media-video/libav ) )
- 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
- || ( >=media-video/ffmpeg-1.0.4:0 media-video/libav ) )"
-
-RDEPEND="${COMMON_DEPEND}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- virtual/python-imaging[${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.7.1-ignore-gentoo-no-compile.patch \
- "${FILESDIR}"/${PN}-0.12.0-prefix.patch
-
- #assuming ffmpeg and libav mutual exclusive installs
- if has_version "media-video/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)
- --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.13.9.ebuild b/x11-wm/xpra/xpra-0.13.9.ebuild
deleted file mode 100644
index 950e825..0000000
--- a/x11-wm/xpra/xpra-0.13.9.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2014 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 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 opengl pulseaudio +rencode server sound vpx webp x264"
-
-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? ( || ( >=media-video/ffmpeg-1.2.2 media-video/libav ) )
- dec_av? ( || ( >=media-video/ffmpeg-1.2.2 media-video/libav ) )
- 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
- || ( >=media-video/ffmpeg-1.0.4:0 media-video/libav ) )"
-
-RDEPEND="${COMMON_DEPEND}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- virtual/python-imaging[${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.12.0-prefix.patch
-
- #assuming ffmpeg and libav mutual exclusive installs
- if has_version "media-video/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)
- --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/files/, x11-wm/xpra/
@ 2016-07-05 9:41 Michael Weber
0 siblings, 0 replies; 17+ messages in thread
From: Michael Weber @ 2016-07-05 9:41 UTC (permalink / raw
To: gentoo-commits
commit: bf326b70f735d9599e39b75415245ea784227e80
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 5 09:40:14 2016 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Jul 5 09:40:51 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf326b70
x11-wm/xpra: Make deprecated avcodec_decode_video2 non-fatal (see bug 588006).
Package-Manager: portage-2.2.28
x11-wm/xpra/files/xpra-0.17.4-deprecated-avcodec.patch | 11 +++++++++++
x11-wm/xpra/xpra-0.17.4.ebuild | 3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
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
new file mode 100644
index 0000000..13bd4be
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-0.17.4-deprecated-avcodec.patch
@@ -0,0 +1,11 @@
+--- 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/xpra-0.17.4.ebuild b/x11-wm/xpra/xpra-0.17.4.ebuild
index 4b4e709..9484fcc 100644
--- a/x11-wm/xpra/xpra-0.17.4.ebuild
+++ b/x11-wm/xpra/xpra-0.17.4.ebuild
@@ -88,7 +88,8 @@ python_prepare_all() {
epatch \
"${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
- "${FILESDIR}"/${PN}-0.16.2-prefix.patch
+ "${FILESDIR}"/${PN}-0.16.2-prefix.patch \
+ "${FILESDIR}"/${PN}-0.17.4-deprecated-avcodec.patch
if use libav ; then
if ! has_version ">=media-video/libav-9" ; then
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/files/, x11-wm/xpra/
@ 2017-01-22 23:23 Michael Weber
0 siblings, 0 replies; 17+ messages in thread
From: Michael Weber @ 2017-01-22 23:23 UTC (permalink / raw
To: gentoo-commits
commit: 7e4e71fb2c037154ecb1b32feb0d9da2949505bd
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 23:23:01 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 23:23:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e4e71fb
x11-wm/xpra: Drop old versions (bug 604956).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
x11-wm/xpra/Manifest | 6 --
x11-wm/xpra/files/xpra-0.15.0-prefix.patch | 27 ------
x11-wm/xpra/files/xpra-0.16.2-prefix.patch | 27 ------
x11-wm/xpra/xpra-0.14.34.ebuild | 126 ----------------------------
x11-wm/xpra/xpra-0.15.10-r1.ebuild | 121 ---------------------------
x11-wm/xpra/xpra-0.16.3.ebuild | 128 ----------------------------
x11-wm/xpra/xpra-0.17.4.ebuild | 130 -----------------------------
x11-wm/xpra/xpra-0.17.5.ebuild | 130 -----------------------------
x11-wm/xpra/xpra-0.17.6.ebuild | 130 -----------------------------
9 files changed, 825 deletions(-)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 05095ea..0fc3db4 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,9 +1,3 @@
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.14.36.tar.xz 1128276 SHA256 f929a9d05e2bc95cd7316efb839b8b1bcb88917ea513aa0c17adac4674702142 SHA512 bec07df063e72c42d2d2b4fff74ec01a6db8d97dae8c8f38ef0c994988ebcb8ee38363028eb7b64b562a540574f084e00a84f1c6e9e03bdbc47bfcd4d38a29aa WHIRLPOOL 650aa8d0c11114141c3ae44ccf8216a06812986fdf923334c025126c4341e686cdf65a00789d1b24895bc056b47b113c2c9474b60ed2e041a0b5b6619f6f7cda
-DIST xpra-0.15.10.tar.xz 1200040 SHA256 1403aaf571c486bb4a67bc9e9d431e5f863c9b7912bd65e6aec62fcea2d9d4e0 SHA512 add1e63da75b7e29163a7e0957e3f841019c557ba42b15f437ed385de99905cb28a3760386570b72c5d2ba305c5b7779a85ca39d4452ccd6133c26f0a7983d9a WHIRLPOOL a5c50b68b39786aad6c50332340bf421ac17f38948880acb49d55769e8a9b4fb48b068a0fea0e5e660e9621b460eb60d19131600173b826b54a4f7d2e623fb5f
-DIST xpra-0.16.3.tar.xz 1343392 SHA256 1516ab10eb348092077ffb698bce234d06a234a5748e422fdf92f34922fb39ea SHA512 1a6bbd01837e702e98ffcaffe12a2e5320108ef50f0fcc64a80735fb53a2b41e4cdda0e0a2d1a3b5f2159a81da4a7c2cac458ab4c2eed4de17adb4e963218590 WHIRLPOOL 621604bdfa2790d98e67b33b6703662f611cbbd81c23a40a96c6ae7f987a188826304caaf6fc8b08da78edba28b0129ee108234e13daa4fa46313b9cec6a5afe
-DIST xpra-0.17.4.tar.xz 1416960 SHA256 92a7854b8ddad6a28efddf226bcbe8e79b051dff859246fcb5f2c7d0828f3d6d SHA512 5463d3ca659fe6d1617e69eee0b115f9df2f488c8c390a02e9eb31e04c29d262679a5463fdd13472cdd2328d01c52fde6ad9a87686fe95cb8adcbff97af6e324 WHIRLPOOL b3d3f6c4ed96dc3388059872cd194726bc4f27c2afd619dcaf25c50f6752dbadfbbf8df0bdc7274d2a3bc5434545d661a890ffcc3e89658e139fe863b5d58542
-DIST xpra-0.17.5.tar.xz 1418192 SHA256 716c655d2acf8dfe040957d6a9ee639407e570462f36e5e8ba402041ba8a6506 SHA512 90e70ba556c1ddc63b15945739b9b006968e3b168dffebf1ab5ef46d8345c0823c2cb33cc2800fbb36fa7195a85d4a03cf74a0f68f93db9b9f1add986bd657a1 WHIRLPOOL eb3ccc3529f2d1470788496758e414b0a1990e0f8526792bdaa502ca87f8f503bc5eecafe7db4b1c0d6f55673d7c55423193b5a8f39f18954dee2470c7c6e3dc
-DIST xpra-0.17.6.tar.xz 1402560 SHA256 f266df26c866699ec71fe7e33e71d38e397563230f0bb12f8b20bc422a2afbfc SHA512 9a553e446390792907ec90038b680e5e63a4b91b0dd1e741b65e4dc6e4c899ea550a2e5728057104419686339a3aa557585437d38913f82fa59be013afa2d8f2 WHIRLPOOL 290fae7b345a19a394b626c5191d970f2ea607af3650bb917dc9729c49d7a913fe0b29618dd667539e525de456cef1ed4140b6506887862fa351386c61dbcf20
DIST xpra-1.0.1.tar.xz 1887552 SHA256 415eea94dc7efabb1fd2e4eaa8a7665fefe65ed91be1cf31605394fb6d48ec17 SHA512 00b512c4a468043846f2f867fdf02d589069634302fda0a3da2df54cd3b49f592902c951edd0f367e32b372ee542f66330c4c254156337e1da0b36841199dcd3 WHIRLPOOL c789d153bbd4a0a78b3a691d406d9a0646faef08ae10a400e5c66928b2d11965da4e8605502633f65572e4fdb0370150c31103b13ac59d087a73b0aeddacda26
diff --git a/x11-wm/xpra/files/xpra-0.15.0-prefix.patch b/x11-wm/xpra/files/xpra-0.15.0-prefix.patch
deleted file mode 100644
index 32e8be8..00000000
--- a/x11-wm/xpra/files/xpra-0.15.0-prefix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- xpra-0.15.0/setup.py
-+++ xpra-0.15.0/setup.py
-@@ -1612,8 +1612,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.15.0/xpra/platform/paths.py
-+++ xpra-0.15.0/xpra/platform/paths.py
-@@ -30,9 +30,9 @@
- return env_conf_dir
- prefix = get_install_prefix()
- #the system wide configuration directory
-- if prefix == '/usr':
-+ if sys.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/files/xpra-0.16.2-prefix.patch b/x11-wm/xpra/files/xpra-0.16.2-prefix.patch
deleted file mode 100644
index 4559578..00000000
--- a/x11-wm/xpra/files/xpra-0.16.2-prefix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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.14.34.ebuild b/x11-wm/xpra/xpra-0.14.34.ebuild
deleted file mode 100644
index d917a67..00000000
--- a/x11-wm/xpra/xpra-0.14.34.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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 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 )
-}
diff --git a/x11-wm/xpra/xpra-0.15.10-r1.ebuild b/x11-wm/xpra/xpra-0.15.10-r1.ebuild
deleted file mode 100644
index 6a19d6e..00000000
--- a/x11-wm/xpra/xpra-0.15.10-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# 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 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 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: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}]
- dev-python/rencode[${PYTHON_USEDEP}]
- virtual/ssh
- x11-apps/setxkbmap
- x11-apps/xmodmap
- cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
- lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
- lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
- opengl? (
- client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
- )
- server? ( x11-base/xorg-server[-minimal,xvfb]
- x11-drivers/xf86-input-void
- x11-drivers/xf86-video-dummy
- )"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- >=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
- rm -rf rencode || die
-
- epatch \
- "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
- "${FILESDIR}"/${PN}-0.15.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 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 )
-}
diff --git a/x11-wm/xpra/xpra-0.16.3.ebuild b/x11-wm/xpra/xpra-0.16.3.ebuild
deleted file mode 100644
index 85b7b25..00000000
--- a/x11-wm/xpra/xpra-0.16.3.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 compat
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils flag-o-matic user
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc cups dec_av2 libav lz4 lzo opengl pulseaudio server sound vpx webp x264 x265"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- clipboard? ( || ( server client ) )
- opengl? ( client )
- || ( client server )"
-
-# x264/old-libav.path situation see bug 459218
-COMMON_DEPEND=""${PYTHON_DEPS}"
- dev-python/pygobject:2[${PYTHON_USEDEP}]
- dev-python/pygtk:2[${PYTHON_USEDEP}]
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXtst
- csc? (
- !libav? ( >=media-video/ffmpeg-1.2.2:0= )
- libav? ( media-video/libav:0= )
- )
- dec_av2? (
- !libav? ( >=media-video/ffmpeg-2:0= )
- libav? ( media-video/libav:0= )
- )
- opengl? ( dev-python/pygtkglext )
- pulseaudio? ( media-sound/pulseaudio )
- sound? ( media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- dev-python/gst-python:1.0 )
- vpx? ( media-libs/libvpx virtual/ffmpeg )
- webp? ( media-libs/libwebp )
- x264? ( media-libs/x264
- !libav? ( >=media-video/ffmpeg-1.0.4:0= )
- libav? ( media-video/libav:0= )
- )
- x265? ( media-libs/x265
- !libav? ( >=media-video/ffmpeg-2:0= )
- libav? ( media-video/libav:0= )
- )"
-
-RDEPEND="${COMMON_DEPEND}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/rencode[${PYTHON_USEDEP}]
- virtual/ssh
- x11-apps/xmodmap
- cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
- lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
- lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
- opengl? (
- client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
- )
- server? ( x11-base/xorg-server[-minimal,xvfb]
- x11-drivers/xf86-input-void
- x11-drivers/xf86-video-dummy
- )"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- >=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-pkg_postinst() {
- enewgroup ${PN}
-}
-
-python_prepare_all() {
- rm -rf rencode || die
-
- epatch \
- "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
- "${FILESDIR}"/${PN}-0.16.2-prefix.patch
-
- if use libav ; then
- if ! has_version ">=media-video/libav-9" ; then
- epatch patches/old-libav.patch
- fi
- fi
-
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- mydistutilsargs=(
- $(use_with client)
- $(use_with clipboard)
- $(use_with csc csc_swscale)
- $(use_with cups printing)
- $(use_with dec_av2 dec_avcodec2)
- $(use_with opengl)
- $(use_with server shadow)
- $(use_with server)
- $(use_with sound)
- $(use_with vpx)
- $(use_with webp)
- $(use_with x264 enc_x264)
- $(use_with x265 enc_x265)
- --with-Xdummy
- --with-gtk2
- --without-gtk3
- --with-strict
- --with-warn
- --with-x11
- --without-PIC
- --without-debug )
-
- # see https://www.xpra.org/trac/ticket/1080
- # and http://trac.cython.org/ticket/395
- append-cflags -fno-strict-aliasing
-}
diff --git a/x11-wm/xpra/xpra-0.17.4.ebuild b/x11-wm/xpra/xpra-0.17.4.ebuild
deleted file mode 100644
index 9484fcc..00000000
--- a/x11-wm/xpra/xpra-0.17.4.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 compat
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils flag-o-matic user
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc cups dec_av2 libav lz4 lzo opengl pulseaudio server sound vpx webp x264 x265"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- clipboard? ( || ( server client ) )
- opengl? ( client )
- || ( client server )
- client? ( x264? ( dec_av2 ) x265? ( dec_av2 ) )"
-
-# x264/old-libav.path situation see bug 459218
-COMMON_DEPEND=""${PYTHON_DEPS}"
- dev-python/pygobject:2[${PYTHON_USEDEP}]
- dev-python/pygtk:2[${PYTHON_USEDEP}]
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXtst
- csc? (
- !libav? ( >=media-video/ffmpeg-1.2.2:0= )
- libav? ( media-video/libav:0= )
- )
- dec_av2? (
- !libav? ( >=media-video/ffmpeg-2:0= )
- libav? ( media-video/libav:0= )
- )
- opengl? ( dev-python/pygtkglext )
- pulseaudio? ( media-sound/pulseaudio )
- sound? ( media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- dev-python/gst-python:1.0 )
- vpx? ( media-libs/libvpx virtual/ffmpeg )
- webp? ( media-libs/libwebp )
- x264? ( media-libs/x264
- !libav? ( >=media-video/ffmpeg-1.0.4:0= )
- libav? ( media-video/libav:0= )
- )
- x265? ( media-libs/x265
- !libav? ( >=media-video/ffmpeg-2:0= )
- libav? ( media-video/libav:0= )
- )"
-
-RDEPEND="${COMMON_DEPEND}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/rencode[${PYTHON_USEDEP}]
- virtual/ssh
- x11-apps/xmodmap
- cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
- lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
- lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
- opengl? (
- client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
- )
- server? ( x11-base/xorg-server[-minimal,xvfb]
- x11-drivers/xf86-input-void
- x11-drivers/xf86-video-dummy
- )"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- >=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-pkg_postinst() {
- enewgroup ${PN}
-}
-
-python_prepare_all() {
- rm -rf rencode || die
-
- epatch \
- "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
- "${FILESDIR}"/${PN}-0.16.2-prefix.patch \
- "${FILESDIR}"/${PN}-0.17.4-deprecated-avcodec.patch
-
- if use libav ; then
- if ! has_version ">=media-video/libav-9" ; then
- epatch patches/old-libav.patch
- fi
- fi
-
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- mydistutilsargs=(
- $(use_with client)
- $(use_with clipboard)
- $(use_with csc csc_swscale)
- $(use_with cups printing)
- $(use_with dec_av2 dec_avcodec2)
- $(use_with opengl)
- $(use_with server shadow)
- $(use_with server)
- $(use_with sound)
- $(use_with vpx)
- $(use_with webp)
- $(use_with x264 enc_x264)
- $(use_with x265 enc_x265)
- --with-Xdummy
- --with-gtk2
- --without-gtk3
- --with-strict
- --with-warn
- --with-x11
- --without-PIC
- --without-debug )
-
- # see https://www.xpra.org/trac/ticket/1080
- # and http://trac.cython.org/ticket/395
- append-cflags -fno-strict-aliasing
-}
diff --git a/x11-wm/xpra/xpra-0.17.5.ebuild b/x11-wm/xpra/xpra-0.17.5.ebuild
deleted file mode 100644
index 9484fcc..00000000
--- a/x11-wm/xpra/xpra-0.17.5.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 compat
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils flag-o-matic user
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc cups dec_av2 libav lz4 lzo opengl pulseaudio server sound vpx webp x264 x265"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- clipboard? ( || ( server client ) )
- opengl? ( client )
- || ( client server )
- client? ( x264? ( dec_av2 ) x265? ( dec_av2 ) )"
-
-# x264/old-libav.path situation see bug 459218
-COMMON_DEPEND=""${PYTHON_DEPS}"
- dev-python/pygobject:2[${PYTHON_USEDEP}]
- dev-python/pygtk:2[${PYTHON_USEDEP}]
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXtst
- csc? (
- !libav? ( >=media-video/ffmpeg-1.2.2:0= )
- libav? ( media-video/libav:0= )
- )
- dec_av2? (
- !libav? ( >=media-video/ffmpeg-2:0= )
- libav? ( media-video/libav:0= )
- )
- opengl? ( dev-python/pygtkglext )
- pulseaudio? ( media-sound/pulseaudio )
- sound? ( media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- dev-python/gst-python:1.0 )
- vpx? ( media-libs/libvpx virtual/ffmpeg )
- webp? ( media-libs/libwebp )
- x264? ( media-libs/x264
- !libav? ( >=media-video/ffmpeg-1.0.4:0= )
- libav? ( media-video/libav:0= )
- )
- x265? ( media-libs/x265
- !libav? ( >=media-video/ffmpeg-2:0= )
- libav? ( media-video/libav:0= )
- )"
-
-RDEPEND="${COMMON_DEPEND}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/rencode[${PYTHON_USEDEP}]
- virtual/ssh
- x11-apps/xmodmap
- cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
- lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
- lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
- opengl? (
- client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
- )
- server? ( x11-base/xorg-server[-minimal,xvfb]
- x11-drivers/xf86-input-void
- x11-drivers/xf86-video-dummy
- )"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- >=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-pkg_postinst() {
- enewgroup ${PN}
-}
-
-python_prepare_all() {
- rm -rf rencode || die
-
- epatch \
- "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
- "${FILESDIR}"/${PN}-0.16.2-prefix.patch \
- "${FILESDIR}"/${PN}-0.17.4-deprecated-avcodec.patch
-
- if use libav ; then
- if ! has_version ">=media-video/libav-9" ; then
- epatch patches/old-libav.patch
- fi
- fi
-
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- mydistutilsargs=(
- $(use_with client)
- $(use_with clipboard)
- $(use_with csc csc_swscale)
- $(use_with cups printing)
- $(use_with dec_av2 dec_avcodec2)
- $(use_with opengl)
- $(use_with server shadow)
- $(use_with server)
- $(use_with sound)
- $(use_with vpx)
- $(use_with webp)
- $(use_with x264 enc_x264)
- $(use_with x265 enc_x265)
- --with-Xdummy
- --with-gtk2
- --without-gtk3
- --with-strict
- --with-warn
- --with-x11
- --without-PIC
- --without-debug )
-
- # see https://www.xpra.org/trac/ticket/1080
- # and http://trac.cython.org/ticket/395
- append-cflags -fno-strict-aliasing
-}
diff --git a/x11-wm/xpra/xpra-0.17.6.ebuild b/x11-wm/xpra/xpra-0.17.6.ebuild
deleted file mode 100644
index 9484fcc..00000000
--- a/x11-wm/xpra/xpra-0.17.6.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 compat
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils flag-o-matic user
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc cups dec_av2 libav lz4 lzo opengl pulseaudio server sound vpx webp x264 x265"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- clipboard? ( || ( server client ) )
- opengl? ( client )
- || ( client server )
- client? ( x264? ( dec_av2 ) x265? ( dec_av2 ) )"
-
-# x264/old-libav.path situation see bug 459218
-COMMON_DEPEND=""${PYTHON_DEPS}"
- dev-python/pygobject:2[${PYTHON_USEDEP}]
- dev-python/pygtk:2[${PYTHON_USEDEP}]
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXtst
- csc? (
- !libav? ( >=media-video/ffmpeg-1.2.2:0= )
- libav? ( media-video/libav:0= )
- )
- dec_av2? (
- !libav? ( >=media-video/ffmpeg-2:0= )
- libav? ( media-video/libav:0= )
- )
- opengl? ( dev-python/pygtkglext )
- pulseaudio? ( media-sound/pulseaudio )
- sound? ( media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- dev-python/gst-python:1.0 )
- vpx? ( media-libs/libvpx virtual/ffmpeg )
- webp? ( media-libs/libwebp )
- x264? ( media-libs/x264
- !libav? ( >=media-video/ffmpeg-1.0.4:0= )
- libav? ( media-video/libav:0= )
- )
- x265? ( media-libs/x265
- !libav? ( >=media-video/ffmpeg-2:0= )
- libav? ( media-video/libav:0= )
- )"
-
-RDEPEND="${COMMON_DEPEND}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/rencode[${PYTHON_USEDEP}]
- virtual/ssh
- x11-apps/xmodmap
- cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
- lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
- lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] )
- opengl? (
- client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
- )
- server? ( x11-base/xorg-server[-minimal,xvfb]
- x11-drivers/xf86-input-void
- x11-drivers/xf86-video-dummy
- )"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- >=dev-python/cython-0.16[${PYTHON_USEDEP}]"
-
-pkg_postinst() {
- enewgroup ${PN}
-}
-
-python_prepare_all() {
- rm -rf rencode || die
-
- epatch \
- "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
- "${FILESDIR}"/${PN}-0.16.2-prefix.patch \
- "${FILESDIR}"/${PN}-0.17.4-deprecated-avcodec.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/files/, x11-wm/xpra/
@ 2017-02-01 17:33 Michael Weber
0 siblings, 0 replies; 17+ messages in thread
From: Michael Weber @ 2017-02-01 17:33 UTC (permalink / raw
To: gentoo-commits
commit: 64be6ff3b3f656796f82582e39c7dbd164094c49
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 1 17:32:46 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Feb 1 17:33:01 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64be6ff3
x11-wm/xpra: do not interfere with '--param key=value' gcc args (bug 607776, thanks Fabian Henze and Hendrik v. Raven).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
x11-wm/xpra/files/xpra-1.0.1-cflags-param.patch | 17 +++++++++++++++++
x11-wm/xpra/xpra-1.0.1.ebuild | 3 ++-
2 files changed, 19 insertions(+), 1 deletion(-)
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
new file mode 100644
index 00000000..11dbb81
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-1.0.1-cflags-param.patch
@@ -0,0 +1,17 @@
+--- 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/xpra-1.0.1.ebuild b/x11-wm/xpra/xpra-1.0.1.ebuild
index 6d66ba3..9ec4c53 100644
--- a/x11-wm/xpra/xpra-1.0.1.ebuild
+++ b/x11-wm/xpra/xpra-1.0.1.ebuild
@@ -91,7 +91,8 @@ python_prepare_all() {
epatch \
"${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch \
- "${FILESDIR}"/${PN}-0.17.4-deprecated-avcodec.patch
+ "${FILESDIR}"/${PN}-0.17.4-deprecated-avcodec.patch \
+ "${FILESDIR}"/${PN}-1.0.1-cflags-param.patch
if use libav ; then
if ! has_version ">=media-video/libav-9" ; then
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/files/, x11-wm/xpra/
@ 2017-03-19 14:41 Michael Weber
0 siblings, 0 replies; 17+ messages in thread
From: Michael Weber @ 2017-03-19 14:41 UTC (permalink / raw
To: gentoo-commits
commit: 178b40ba7e7998de7f87c13616d3188996e84790
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 19 14:38:40 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sun Mar 19 14:39:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=178b40ba
x11-wm/xpra: Version bump (bug 612946), backport fixes/cleanups to 1.0.4 as revbump.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
x11-wm/xpra/Manifest | 1 +
x11-wm/xpra/files/xpra-1.0.4-suid-warning.patch | 11 ++
x11-wm/xpra/files/xpra-2.0-suid-warning.patch | 11 ++
x11-wm/xpra/metadata.xml | 6 +-
x11-wm/xpra/xpra-1.0.4-r1.ebuild | 143 +++++++++++++++++++++++
x11-wm/xpra/xpra-2.0.ebuild | 144 ++++++++++++++++++++++++
6 files changed, 315 insertions(+), 1 deletion(-)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 3dc0b5cfb50..36ca3a59cc3 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,2 +1,3 @@
DIST xpra-1.0.3.tar.xz 1888908 SHA256 f83c5946f67fe26eee8b44fba0fa30bca9fbc7aa58ee66b903b7385c2d332166 SHA512 3b6371d478147a5d932df1c8428e9132831fcbf17e51f48fb384c30548efee9758c94a6781c255b5fe211c5040993f30b054aa33f3fced85484fcc9d2ca009a1 WHIRLPOOL 989db8ac2caa3a5a0e1294754cabe6bc8cadb087a6ffa24de3039c674126886a41ecab930c46700dccdf3adc738572e04652123c9523512c050ffdff3d295b02
DIST xpra-1.0.4.tar.xz 1890404 SHA256 c841940957761e60454eac44c955d174b3d864c853f28b387e784a6d85fc9924 SHA512 85dad598a167a7c9cbf2d0e7d4cde0b7c0fd75b5e1cc515ea78261f4a33d6d864863f98746f7537b202a08c7f225f002d9abbbb5c2773acd63e3a1b37c4d68d9 WHIRLPOOL e426a258b70dcb1dff9f39980fd74221ab5793ea4f8cea2b838dfcd40b152785ef7028219f0024ef4650bb9e6fae10e9d26c1b1e58f0b4efb481a7562f6ee4eb
+DIST xpra-2.0.tar.xz 1925080 SHA256 ca9e9622a9d435f9591bf60baec50ea02ebad4e0c0017e1df43dfddd6616e807 SHA512 1f95ecf27c1ef37989c2152a1b2b838f5246a6e3711feaa2150d55b040a41ee0de1d475eb68900b974ee9f7b3f3cf143d53802420f31de60980658cd6da132c6 WHIRLPOOL 3f72416011e35513a0acd62980f49af286d2411446452a4a336746a94c813f7f0b316061fcb854efe377d7bc77152e5eb7930d7b3afb863ea30f9e01186e4efe
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
new file mode 100644
index 00000000000..9af267cb450
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-1.0.4-suid-warning.patch
@@ -0,0 +1,11 @@
+--- 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/files/xpra-2.0-suid-warning.patch b/x11-wm/xpra/files/xpra-2.0-suid-warning.patch
new file mode 100644
index 00000000000..806694f2431
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-2.0-suid-warning.patch
@@ -0,0 +1,11 @@
+--- 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/metadata.xml b/x11-wm/xpra/metadata.xml
index 3ac00fd3656..c12842a0b59 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -13,12 +13,16 @@
<flag name="clipboard">Enable clipboard support</flag>
<flag name="csc">Enable csc softscaler support</flag>
<flag name="dec_av2">Enable dec_avcodec2 support</flag>
+ <flag name="dec_avcodec2">Enable avcodec2 decoder support</flag>
<flag name="enc_ffmpeg">Enable advanced ffmpeg/libav encoder support</flag>
+ <flag name="enc_x264">Enable x264 encoder support</flag>
+ <flag name="enc_x265">Enable x265 encoder support</flag>
<flag name="lz4">Enable support for lz4 compression</flag>
+ <flag name="pillow">Enable pillow 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>
- <flag name="x265">Enable x265 support</flag>
<flag name="webcam">Enable webcam support via opencv</flag>
+ <flag name="x265">Enable x265 encoder support</flag>
</use>
</pkgmetadata>
diff --git a/x11-wm/xpra/xpra-1.0.4-r1.ebuild b/x11-wm/xpra/xpra-1.0.4-r1.ebuild
new file mode 100644
index 00000000000..2aa260c03d6
--- /dev/null
+++ b/x11-wm/xpra/xpra-1.0.4-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2017 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
+
+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
+ 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
+}
+
+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.0.ebuild b/x11-wm/xpra/xpra-2.0.ebuild
new file mode 100644
index 00000000000..44f38c25618
--- /dev/null
+++ b/x11-wm/xpra/xpra-2.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 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
+
+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
+ 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}-0.17.4-deprecated-avcodec.patch
+ "${FILESDIR}"/${PN}-2.0-suid-warning.patch )
+
+pkg_postinst() {
+ enewgroup ${PN}
+ tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
+}
+
+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"
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/files/, x11-wm/xpra/
@ 2020-01-27 12:18 Andreas K. Hüttel
0 siblings, 0 replies; 17+ messages in thread
From: Andreas K. Hüttel @ 2020-01-27 12:18 UTC (permalink / raw
To: gentoo-commits
commit: b3bfa2fb37faaaa35bb427be1875a950631cff90
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 27 12:17:38 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 12:17:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3bfa2fb
x11-wm/xpra: Remove old
Closes: https://bugs.gentoo.org/694244
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
x11-wm/xpra/Manifest | 3 -
.../xpra-0.13.1-ignore-gentoo-no-compile.patch | 11 --
x11-wm/xpra/xpra-2.2.2-r1.ebuild | 148 --------------------
x11-wm/xpra/xpra-2.2.6-r2.ebuild | 148 --------------------
x11-wm/xpra/xpra-2.4.3.ebuild | 149 ---------------------
5 files changed, 459 deletions(-)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index fe93a815ba3..a6c194f8b9e 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,5 +1,2 @@
-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
DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647 SHA512 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
diff --git a/x11-wm/xpra/files/xpra-0.13.1-ignore-gentoo-no-compile.patch b/x11-wm/xpra/files/xpra-0.13.1-ignore-gentoo-no-compile.patch
deleted file mode 100644
index 9c580a51355..00000000000
--- a/x11-wm/xpra/files/xpra-0.13.1-ignore-gentoo-no-compile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpra-0.13.1/setup.py
-+++ xpra-0.13.1/setup.py
-@@ -395,7 +395,7 @@
- #then expects to find the cython modules!? ie:
- #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
- cython_version_check(min_version)
- from Cython.Distutils import build_ext
- ext_modules.append(extension)
diff --git a/x11-wm/xpra/xpra-2.2.2-r1.ebuild b/x11-wm/xpra/xpra-2.2.2-r1.ebuild
deleted file mode 100644
index 31e44b5473b..00000000000
--- a/x11-wm/xpra/xpra-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# 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=( 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"
-RESTRICT="!test? ( test )"
-
-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/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"
-}
diff --git a/x11-wm/xpra/xpra-2.2.6-r2.ebuild b/x11-wm/xpra/xpra-2.2.6-r2.ebuild
deleted file mode 100644
index d8009b90ad3..00000000000
--- a/x11-wm/xpra/xpra-2.2.6-r2.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# 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=( 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"
-RESTRICT="!test? ( test )"
-
-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=[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}]
- 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"
-}
diff --git a/x11-wm/xpra/xpra-2.4.3.ebuild b/x11-wm/xpra/xpra-2.4.3.ebuild
deleted file mode 100644
index f74fe5051c8..00000000000
--- a/x11-wm/xpra/xpra-2.4.3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# 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=( 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"
-RESTRICT="!test? ( test )"
-
-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=[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}-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 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/files/, x11-wm/xpra/
@ 2021-01-19 22:38 James Le Cuirot
0 siblings, 0 replies; 17+ messages in thread
From: James Le Cuirot @ 2021-01-19 22:38 UTC (permalink / raw
To: gentoo-commits
commit: 31776efc4ea73f03c05e368548e74d720ade0872
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 22:37:19 2021 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 22:38:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31776efc
x11-wm/xpra: Drop old 3.0.2-r1 and 4.0.4
Package-Manager: Portage-3.0.14, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
x11-wm/xpra/Manifest | 2 -
x11-wm/xpra/files/xpra-3.0.2-dbus.patch | 29 -------
x11-wm/xpra/metadata.xml | 4 -
x11-wm/xpra/xpra-3.0.2-r1.ebuild | 144 --------------------------------
x11-wm/xpra/xpra-4.0.4.ebuild | 139 ------------------------------
5 files changed, 318 deletions(-)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 836f937897f..50c37163f42 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,5 +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
DIST xpra-4.0.5.tar.xz 2795828 BLAKE2B fed6514d75dbb08f386325e30e375fd2077db1dad91602e575e3955a622a52ade2fc8e0c6c823d8a495684afb3a2f55f27e28abdf8734d0eca25275a3d358193 SHA512 d2aa2b70b6ec702bca5b0c2b06378107d45c4cad79f83ee2a1ed27fd5f66474e2d8e1d28d5111e60417ed089f91bab0b1566b0c9b3dcf6f0cb5e204ff5c42c92
DIST xpra-4.0.6.tar.xz 2797752 BLAKE2B 3f2d4108fec1f1b5c0cd38a26f1a2c41af253fd234427e8e54104ff3742b9f7ae3e1863db837addd76acc6856b6f3cfcbde97edc2bc75314b215d4ca46a816f8 SHA512 e3dc66040898ed40ef12b8cdb89e5f42c2f36edc071afb435334389e727f376ddc116dbee47018468bff24f2cdd7be35750b58bc108ba73c5558bd9eccbd04ea
diff --git a/x11-wm/xpra/files/xpra-3.0.2-dbus.patch b/x11-wm/xpra/files/xpra-3.0.2-dbus.patch
deleted file mode 100644
index e0f14b8ba59..00000000000
--- a/x11-wm/xpra/files/xpra-3.0.2-dbus.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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/metadata.xml b/x11-wm/xpra/metadata.xml
index 4f4e62d12f5..ce472786e3a 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -25,10 +25,6 @@
<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_avcodec2">Enable avcodec2 decoder support</flag>
- <flag name="enc_ffmpeg">Enable advanced ffmpeg/libav encoder support</flag>
- <flag name="enc_x264">Enable x264 encoder support</flag>
- <flag name="enc_x265">Enable x265 encoder support</flag>
<flag name="pillow">Enable pillow support</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-3.0.2-r1.ebuild b/x11-wm/xpra/xpra-3.0.2-r1.ebuild
deleted file mode 100644
index f518280f02d..00000000000
--- a/x11-wm/xpra/xpra-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2020 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,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"
-IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg +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/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= )
- dec_avcodec2? ( >=media-video/ffmpeg-2:0=[x264,x265] )
- enc_ffmpeg? ( >=media-video/ffmpeg-3.2.2:0= )
- enc_x264? ( media-libs/x264
- >=media-video/ffmpeg-1.0.4:0=[x264] )
- enc_x265? ( media-libs/x265
- >=media-video/ffmpeg-2:0=[x264] )
- jpeg? ( media-libs/libjpeg-turbo )
- opengl? ( dev-python/pyopengl )
- 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 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
-)
-
-pkg_postinst() {
- enewgroup ${PN}
- tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
-
- xdg_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
-
- 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"
-}
diff --git a/x11-wm/xpra/xpra-4.0.4.ebuild b/x11-wm/xpra/xpra-4.0.4.ebuild
deleted file mode 100644
index ff3e6b93213..00000000000
--- a/x11-wm/xpra/xpra-4.0.4.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# 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/files/, x11-wm/xpra/
@ 2021-01-19 22:38 James Le Cuirot
0 siblings, 0 replies; 17+ messages in thread
From: James Le Cuirot @ 2021-01-19 22:38 UTC (permalink / raw
To: gentoo-commits
commit: b0de3418e9b17db2f09fc2acdb60668f65c013fd
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 22:25:23 2021 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 22:38:24 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0de3418
x11-wm/xpra: Version bump to 4.0.6_p28363
4.0.6 has some nice fixes but also a bad bug. This revision has a few
subsequent fixes.
Package-Manager: Portage-3.0.14, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
x11-wm/xpra/Manifest | 1 +
x11-wm/xpra/files/xpra-4.0.6-r28363.patch | 238 ++++++++++++++++++++++++++++++
x11-wm/xpra/xpra-4.0.6_p28363.ebuild | 148 +++++++++++++++++++
3 files changed, 387 insertions(+)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 8a4b5fa5d88..836f937897f 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -2,3 +2,4 @@ DIST xpra-3.0.2.tar.xz 2749196 BLAKE2B 3c8745657a12637704fb88ac7b867ab387ef7ed22
DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647 SHA512 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
DIST xpra-4.0.4.tar.xz 2792512 BLAKE2B e16c47e82cf9f8712521c8f9c436b7bb819d9469fc0135ade1f2c9fc6f2a8a0fecf417caae87a1eca9c4b6daec1a82add5d6547208caee1a1d681ebc7b3d3d3b SHA512 91a90cdab775ec2501ef1601188b97ca4aa741e541f8d941add8d509767790a144b67f094177dda7539eff305710f2c834b90a93e9441437dac615677963094c
DIST xpra-4.0.5.tar.xz 2795828 BLAKE2B fed6514d75dbb08f386325e30e375fd2077db1dad91602e575e3955a622a52ade2fc8e0c6c823d8a495684afb3a2f55f27e28abdf8734d0eca25275a3d358193 SHA512 d2aa2b70b6ec702bca5b0c2b06378107d45c4cad79f83ee2a1ed27fd5f66474e2d8e1d28d5111e60417ed089f91bab0b1566b0c9b3dcf6f0cb5e204ff5c42c92
+DIST xpra-4.0.6.tar.xz 2797752 BLAKE2B 3f2d4108fec1f1b5c0cd38a26f1a2c41af253fd234427e8e54104ff3742b9f7ae3e1863db837addd76acc6856b6f3cfcbde97edc2bc75314b215d4ca46a816f8 SHA512 e3dc66040898ed40ef12b8cdb89e5f42c2f36edc071afb435334389e727f376ddc116dbee47018468bff24f2cdd7be35750b58bc108ba73c5558bd9eccbd04ea
diff --git a/x11-wm/xpra/files/xpra-4.0.6-r28363.patch b/x11-wm/xpra/files/xpra-4.0.6-r28363.patch
new file mode 100644
index 00000000000..5187b700c0d
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.0.6-r28363.patch
@@ -0,0 +1,238 @@
+Index: selinux/xpra_socketactivation/xpra_socketactivation.te
+===================================================================
+--- a/selinux/xpra_socketactivation/xpra_socketactivation.te (revision 28285)
++++ b/selinux/xpra_socketactivation/xpra_socketactivation.te (revision 28363)
+@@ -27,6 +27,7 @@
+ type unconfined_t;
+ type bin_t;
+ type avahi_t;
++ type config_home_t;
+
+ attribute can_read_shadow_passwords;
+ }
+@@ -55,6 +56,9 @@
+ allow xpra_t xpra_conf_t:dir { getattr open read search };
+ files_search_etc(xpra_t)
+
++allow xpra_t config_home_t:dir { getattr search };
++allow xpra_t config_home_t:file { getattr ioctl open read };
++
+ type xpra_socket_t;
+ files_type(xpra_socket_t)
+
+Index: setup.py
+===================================================================
+--- a/setup.py (revision 28285)
++++ b/setup.py (revision 28363)
+@@ -1533,8 +1533,9 @@
+ for k,v in subs.items():
+ data = data.replace(k, v)
+ with open(dst_file, "wb") as f:
+- return f.write(data)
++ f.write(data)
+ if chmod:
++ print("chmod(%s, %s)" % (dst_file, oct(chmod)))
+ os.chmod(dst_file, chmod)
+
+ if printing_ENABLED and POSIX:
+Index: unittests/unit/net/crypto_test.py
+===================================================================
+--- a/unittests/unit/net/crypto_test.py (revision 28285)
++++ b/unittests/unit/net/crypto_test.py (revision 28363)
+@@ -88,7 +88,7 @@
+ start = monotonic_time()
+ self.do_test_backend(data, enc_iterations, dec_iterations)
+ end = monotonic_time()
+- elapsed = end-start
++ elapsed = max(0.0001, end-start)
+ speed = (asize*16) * (enc_iterations + dec_iterations) / elapsed
+ iter_time = elapsed*1000/(enc_iterations + dec_iterations)
+ print("%10iKB: %5.1fms: %16iMB/s" % (asize*16//1024, iter_time, speed//1024//1024))
+Index: win32/MINGW_BUILD.sh
+===================================================================
+--- a/win32/MINGW_BUILD.sh (revision 28285)
++++ b/win32/MINGW_BUILD.sh (revision 28363)
+@@ -286,6 +286,8 @@
+ #why is it shipping those files??
+ find lib/ -name "*dll.a" -exec rm {} \;
+ #only keep the actual loaders, not all the other crap cx_Freeze put there:
++#but keep librsvg
++mv lib/gdk-pixbuf-2.0/2.10.0/loaders/librsvg* ./
+ mkdir lib/gdk-pixbuf-2.0/2.10.0/loaders.tmp
+ mv lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*.dll lib/gdk-pixbuf-2.0/2.10.0/loaders.tmp/
+ rm -fr lib/gdk-pixbuf-2.0/2.10.0/loaders
+@@ -326,6 +328,9 @@
+ #and keep pdfium:
+ mv lib/*pdfium*.dll ./
+ pushd lib > /dev/null
++#cx_Freeze forgets these two!?
++cp $MINGW_PREFIX/bin/libatk-*dll ./
++cp $MINGW_PREFIX/bin/libgtk-*dll ./
+ #remove all the pointless duplication:
+ for x in `ls *dll`; do
+ find ./ -mindepth 2 -name "${x}" -exec rm {} \;
+Index: xpra/client/gtk_base/gtk_client_window_base.py
+===================================================================
+--- a/xpra/client/gtk_base/gtk_client_window_base.py (revision 28285)
++++ b/xpra/client/gtk_base/gtk_client_window_base.py (revision 28363)
+@@ -1806,10 +1806,16 @@
+
+ def _set_backing_size(self, ww, wh):
+ b = self._backing
++ bw = self._client.cx(ww)
++ bh = self._client.cy(wh)
++ if max(ww, wh)>=32000 or min(ww, wh)<0:
++ raise Exception("invalid window size %ix%i" % (ww, wh))
++ if max(bw, bh)>=32000:
++ raise Exception("invalid window backing size %ix%i" % (bw, bh))
+ if b:
+- b.init(ww, wh, self._client.cx(ww), self._client.cy(wh))
++ b.init(ww, wh, bw, bh)
+ else:
+- self.new_backing(self._client.cx(ww), self._client.cy(wh))
++ self.new_backing(bw, bh)
+
+ def resize(self, w, h, resize_counter=0):
+ ww, wh = self.get_size()
+Index: xpra/net/file_transfer.py
+===================================================================
+--- a/xpra/net/file_transfer.py (revision 28285)
++++ b/xpra/net/file_transfer.py (revision 28363)
+@@ -580,6 +580,10 @@
+
+ def _process_open_url(self, packet):
+ url, send_id = packet[1:3]
++ try:
++ url = strtobytes(url).decode("utf8")
++ except UnicodeDecodeError:
++ url = bytestostr(url)
+ if not self.open_url:
+ filelog.warn("Warning: received a request to open URL '%s'", url)
+ filelog.warn(" but opening of URLs is disabled")
+@@ -670,12 +674,12 @@
+ filelog("process send-data-request: send_id=%s, url=%s, printit=%s, openit=%s", s(send_id), url, printit, openit)
+ def cb_answer(accept):
+ filelog("accept%s=%s", (url, printit, openit), accept)
++ self.send("send-data-response", send_id, accept)
+ #filenames and url are always sent encoded as utf8:
+ try:
+ url = strtobytes(url).decode("utf8")
+ except:
+ url = bytestostr(url)
+- self.send("send-data-response", send_id, accept)
+ if dtype==b"file":
+ if not self.file_transfer:
+ cb_answer(False)
+Index: xpra/net/socket_util.py
+===================================================================
+--- a/xpra/net/socket_util.py (revision 28285)
++++ b/xpra/net/socket_util.py (revision 28363)
+@@ -622,7 +622,7 @@
+ log.info(" %s does not exist", dirname)
+ #only show extra information if the socket permissions
+ #would have been accessible by the group:
+- if POSIX and (sperms & 0o40):
++ elif POSIX and (sperms & 0o40):
+ uid = getuid()
+ username = get_username_for_uid(uid)
+ groups = get_groups(username)
+Index: xpra/platform/xposix/paths.py
+===================================================================
+--- a/xpra/platform/xposix/paths.py (revision 28285)
++++ b/xpra/platform/xposix/paths.py (revision 28363)
+@@ -102,12 +102,12 @@
+
+ def do_get_user_conf_dirs(uid):
+ #per-user configuration location:
+- #(but never use /root/.xpra)
++ #(but never use /root/.xpra or /root/.config/xpra)
+ if uid is None:
+ uid = os.getuid()
+ dirs = []
+- dirs += [os.path.join(os.environ.get("XDG_CONFIG_HOME", "~/.config"), "xpra")]
+ if uid>0:
++ dirs += [os.path.join(os.environ.get("XDG_CONFIG_HOME", "~/.config"), "xpra")]
+ dirs.append("~/.xpra")
+ return dirs
+
+Index: xpra/platform/xposix/sd_listen.pyx
+===================================================================
+--- a/xpra/platform/xposix/sd_listen.pyx (revision 28285)
++++ b/xpra/platform/xposix/sd_listen.pyx (revision 28363)
+@@ -52,7 +52,7 @@
+ return sockets
+
+ def get_sd_socket_type(fd):
+- from xpra.net.common import TCP_SOCKTYPES
++ from xpra.net.bytestreams import TCP_SOCKTYPES
+ socktype = os.environ.get("XPRA_SD%i_SOCKET_TYPE" % fd)
+ if not socktype:
+ socktype = os.environ.get("XPRA_SD_SOCKET_TYPE", "tcp")
+Index: xpra/server/mixins/audio_server.py
+===================================================================
+--- a/xpra/server/mixins/audio_server.py (revision 28285)
++++ b/xpra/server/mixins/audio_server.py (revision 28363)
+@@ -121,7 +121,7 @@
+ from xpra.platform.xposix.paths import _get_xpra_runtime_dir, get_runtime_dir
+ rd = osexpand(get_runtime_dir())
+ if not os.path.exists(rd) or not os.path.isdir(rd):
+- log.warn("Warning: the runtime directory '%s' does not exist,")
++ log.warn("Warning: the runtime directory '%s' does not exist,", rd)
+ log.warn(" cannot start a private pulseaudio server")
+ else:
+ xpra_rd = _get_xpra_runtime_dir()
+Index: xpra/server/window/motion.pyx
+===================================================================
+--- a/xpra/server/window/motion.pyx (revision 28285)
++++ b/xpra/server/window/motion.pyx (revision 28363)
+@@ -79,7 +79,7 @@
+ for i,v in enumerate(arr):
+ self.a2[i] = <uint64_t> abs(v)
+
+- def update(self, pixels, int16_t x, int16_t y, uint16_t width, uint16_t height, uint16_t rowstride, uint8_t bpp=4):
++ def update(self, pixels, int16_t x, int16_t y, uint16_t width, uint16_t height, uint32_t rowstride, uint8_t bpp=4):
+ """
+ Add a new image to compare with,
+ checksum its rows into a2,
+Index: xpra/server/window/window_video_source.py
+===================================================================
+--- a/xpra/server/window/window_video_source.py (revision 28285)
++++ b/xpra/server/window/window_video_source.py (revision 28363)
+@@ -1785,6 +1785,13 @@
+ scrolllog("no scrolling: detection has already been used on this image")
+ #we've already checked
+ return False
++ x = image.get_target_x()
++ y = image.get_target_y()
++ w = image.get_width()
++ h = image.get_height()
++ if w>=32000 or h>=32000:
++ scrolllog("no scrolling: the image is too large, %ix%i", w, h)
++ return False
+ #don't download the pixels if we have a GPU buffer,
+ #since that means we're likely to be able to compress on the GPU too with NVENC:
+ if not image.has_pixels():
+@@ -1792,10 +1799,6 @@
+ if self.content_type=="video" or not self.non_video_encodings:
+ scrolllog("no scrolling: content is video")
+ return False
+- x = image.get_target_x()
+- y = image.get_target_y()
+- w = image.get_width()
+- h = image.get_height()
+ if w<MIN_SCROLL_IMAGE_SIZE or h<MIN_SCROLL_IMAGE_SIZE:
+ scrolllog("no scrolling: image size %ix%i is too small, minimum is %ix%i",
+ w, h, MIN_SCROLL_IMAGE_SIZE, MIN_SCROLL_IMAGE_SIZE)
+Index: xpra/x11/x11_server_core.py
+===================================================================
+--- a/xpra/x11/x11_server_core.py (revision 28285)
++++ b/xpra/x11/x11_server_core.py (revision 28363)
+@@ -687,7 +687,7 @@
+ #we can use XRRSetScreenSize:
+ try:
+ with xsync:
+- RandR.xrr_set_screen_size(w, h, self.xdpi or self.dpi, self.ydpi or self.dpi)
++ RandR.xrr_set_screen_size(w, h, self.xdpi or self.dpi or 96, self.ydpi or self.dpi or 96)
+ except XError:
+ screenlog("XRRSetScreenSize failed", exc_info=True)
+ screenlog("calling RandR.get_screen_size()")
diff --git a/x11-wm/xpra/xpra-4.0.6_p28363.ebuild b/x11-wm/xpra/xpra-4.0.6_p28363.ebuild
new file mode 100644
index 00000000000..55099a674a1
--- /dev/null
+++ b/x11-wm/xpra/xpra-4.0.6_p28363.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2021 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
+
+MY_P="${PN}-${PV%_p*}"
+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/${MY_P}.tar.xz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="brotli +client +clipboard csc cups dbus 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 )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ dev-python/pygobject:3[cairo,${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
+ "${FILESDIR}"/${PN}-4.0.6-r28363.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+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
+
+ 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 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/files/, x11-wm/xpra/
@ 2021-04-07 23:05 James Le Cuirot
0 siblings, 0 replies; 17+ messages in thread
From: James Le Cuirot @ 2021-04-07 23:05 UTC (permalink / raw
To: gentoo-commits
commit: 6514301e0a2ddc6a629c1f41a0e6c7bb8f1faa87
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 7 23:04:47 2021 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Apr 7 23:04:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6514301e
x11-wm/xpra: Drop old 4.0.6-r28363
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
x11-wm/xpra/Manifest | 1 -
x11-wm/xpra/files/xpra-4.0.6-r28363.patch | 238 ------------------------------
x11-wm/xpra/xpra-4.0.6_p28363.ebuild | 160 --------------------
3 files changed, 399 deletions(-)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 0103f4ad8be..32cb2c66399 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,4 +1,3 @@
DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647 SHA512 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
-DIST xpra-4.0.6.tar.xz 2797752 BLAKE2B 3f2d4108fec1f1b5c0cd38a26f1a2c41af253fd234427e8e54104ff3742b9f7ae3e1863db837addd76acc6856b6f3cfcbde97edc2bc75314b215d4ca46a816f8 SHA512 e3dc66040898ed40ef12b8cdb89e5f42c2f36edc071afb435334389e727f376ddc116dbee47018468bff24f2cdd7be35750b58bc108ba73c5558bd9eccbd04ea
DIST xpra-4.1.1.tar.xz 2674236 BLAKE2B 388306b33d99e97e07eb4a0f14ad33a08f9b367fa8e8b6d0553b0815ceb1b99540d027d2bdf8b6ef0a8ad3dda5a92861acf6c429034b7dd7e061eaefe86ade89 SHA512 b6312fb40849446ad88181664256610fcc673c5263449f610dd3fe40d0f331b1493efdee0560b78ef217ebc168d81a020b3bc97d369f9c1810a73e62e8e02873
DIST xpra-4.1.2.tar.xz 2676588 BLAKE2B db3694fdd9f7e20ba93099ecde50d712de41bb64a2d317b9f10e349b7f501015d083c212250206c0f3e25e154311a096ce4c17972131af68584be666bbf7e067 SHA512 860533c4173b92ee110e65849110870a3b129b993d8a2a2308142474164e4f1c45984669e7e3963540290192310de5d2de0e0713b80f4cb8c6ae7f9c3bb0814e
diff --git a/x11-wm/xpra/files/xpra-4.0.6-r28363.patch b/x11-wm/xpra/files/xpra-4.0.6-r28363.patch
deleted file mode 100644
index 5187b700c0d..00000000000
--- a/x11-wm/xpra/files/xpra-4.0.6-r28363.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-Index: selinux/xpra_socketactivation/xpra_socketactivation.te
-===================================================================
---- a/selinux/xpra_socketactivation/xpra_socketactivation.te (revision 28285)
-+++ b/selinux/xpra_socketactivation/xpra_socketactivation.te (revision 28363)
-@@ -27,6 +27,7 @@
- type unconfined_t;
- type bin_t;
- type avahi_t;
-+ type config_home_t;
-
- attribute can_read_shadow_passwords;
- }
-@@ -55,6 +56,9 @@
- allow xpra_t xpra_conf_t:dir { getattr open read search };
- files_search_etc(xpra_t)
-
-+allow xpra_t config_home_t:dir { getattr search };
-+allow xpra_t config_home_t:file { getattr ioctl open read };
-+
- type xpra_socket_t;
- files_type(xpra_socket_t)
-
-Index: setup.py
-===================================================================
---- a/setup.py (revision 28285)
-+++ b/setup.py (revision 28363)
-@@ -1533,8 +1533,9 @@
- for k,v in subs.items():
- data = data.replace(k, v)
- with open(dst_file, "wb") as f:
-- return f.write(data)
-+ f.write(data)
- if chmod:
-+ print("chmod(%s, %s)" % (dst_file, oct(chmod)))
- os.chmod(dst_file, chmod)
-
- if printing_ENABLED and POSIX:
-Index: unittests/unit/net/crypto_test.py
-===================================================================
---- a/unittests/unit/net/crypto_test.py (revision 28285)
-+++ b/unittests/unit/net/crypto_test.py (revision 28363)
-@@ -88,7 +88,7 @@
- start = monotonic_time()
- self.do_test_backend(data, enc_iterations, dec_iterations)
- end = monotonic_time()
-- elapsed = end-start
-+ elapsed = max(0.0001, end-start)
- speed = (asize*16) * (enc_iterations + dec_iterations) / elapsed
- iter_time = elapsed*1000/(enc_iterations + dec_iterations)
- print("%10iKB: %5.1fms: %16iMB/s" % (asize*16//1024, iter_time, speed//1024//1024))
-Index: win32/MINGW_BUILD.sh
-===================================================================
---- a/win32/MINGW_BUILD.sh (revision 28285)
-+++ b/win32/MINGW_BUILD.sh (revision 28363)
-@@ -286,6 +286,8 @@
- #why is it shipping those files??
- find lib/ -name "*dll.a" -exec rm {} \;
- #only keep the actual loaders, not all the other crap cx_Freeze put there:
-+#but keep librsvg
-+mv lib/gdk-pixbuf-2.0/2.10.0/loaders/librsvg* ./
- mkdir lib/gdk-pixbuf-2.0/2.10.0/loaders.tmp
- mv lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-*.dll lib/gdk-pixbuf-2.0/2.10.0/loaders.tmp/
- rm -fr lib/gdk-pixbuf-2.0/2.10.0/loaders
-@@ -326,6 +328,9 @@
- #and keep pdfium:
- mv lib/*pdfium*.dll ./
- pushd lib > /dev/null
-+#cx_Freeze forgets these two!?
-+cp $MINGW_PREFIX/bin/libatk-*dll ./
-+cp $MINGW_PREFIX/bin/libgtk-*dll ./
- #remove all the pointless duplication:
- for x in `ls *dll`; do
- find ./ -mindepth 2 -name "${x}" -exec rm {} \;
-Index: xpra/client/gtk_base/gtk_client_window_base.py
-===================================================================
---- a/xpra/client/gtk_base/gtk_client_window_base.py (revision 28285)
-+++ b/xpra/client/gtk_base/gtk_client_window_base.py (revision 28363)
-@@ -1806,10 +1806,16 @@
-
- def _set_backing_size(self, ww, wh):
- b = self._backing
-+ bw = self._client.cx(ww)
-+ bh = self._client.cy(wh)
-+ if max(ww, wh)>=32000 or min(ww, wh)<0:
-+ raise Exception("invalid window size %ix%i" % (ww, wh))
-+ if max(bw, bh)>=32000:
-+ raise Exception("invalid window backing size %ix%i" % (bw, bh))
- if b:
-- b.init(ww, wh, self._client.cx(ww), self._client.cy(wh))
-+ b.init(ww, wh, bw, bh)
- else:
-- self.new_backing(self._client.cx(ww), self._client.cy(wh))
-+ self.new_backing(bw, bh)
-
- def resize(self, w, h, resize_counter=0):
- ww, wh = self.get_size()
-Index: xpra/net/file_transfer.py
-===================================================================
---- a/xpra/net/file_transfer.py (revision 28285)
-+++ b/xpra/net/file_transfer.py (revision 28363)
-@@ -580,6 +580,10 @@
-
- def _process_open_url(self, packet):
- url, send_id = packet[1:3]
-+ try:
-+ url = strtobytes(url).decode("utf8")
-+ except UnicodeDecodeError:
-+ url = bytestostr(url)
- if not self.open_url:
- filelog.warn("Warning: received a request to open URL '%s'", url)
- filelog.warn(" but opening of URLs is disabled")
-@@ -670,12 +674,12 @@
- filelog("process send-data-request: send_id=%s, url=%s, printit=%s, openit=%s", s(send_id), url, printit, openit)
- def cb_answer(accept):
- filelog("accept%s=%s", (url, printit, openit), accept)
-+ self.send("send-data-response", send_id, accept)
- #filenames and url are always sent encoded as utf8:
- try:
- url = strtobytes(url).decode("utf8")
- except:
- url = bytestostr(url)
-- self.send("send-data-response", send_id, accept)
- if dtype==b"file":
- if not self.file_transfer:
- cb_answer(False)
-Index: xpra/net/socket_util.py
-===================================================================
---- a/xpra/net/socket_util.py (revision 28285)
-+++ b/xpra/net/socket_util.py (revision 28363)
-@@ -622,7 +622,7 @@
- log.info(" %s does not exist", dirname)
- #only show extra information if the socket permissions
- #would have been accessible by the group:
-- if POSIX and (sperms & 0o40):
-+ elif POSIX and (sperms & 0o40):
- uid = getuid()
- username = get_username_for_uid(uid)
- groups = get_groups(username)
-Index: xpra/platform/xposix/paths.py
-===================================================================
---- a/xpra/platform/xposix/paths.py (revision 28285)
-+++ b/xpra/platform/xposix/paths.py (revision 28363)
-@@ -102,12 +102,12 @@
-
- def do_get_user_conf_dirs(uid):
- #per-user configuration location:
-- #(but never use /root/.xpra)
-+ #(but never use /root/.xpra or /root/.config/xpra)
- if uid is None:
- uid = os.getuid()
- dirs = []
-- dirs += [os.path.join(os.environ.get("XDG_CONFIG_HOME", "~/.config"), "xpra")]
- if uid>0:
-+ dirs += [os.path.join(os.environ.get("XDG_CONFIG_HOME", "~/.config"), "xpra")]
- dirs.append("~/.xpra")
- return dirs
-
-Index: xpra/platform/xposix/sd_listen.pyx
-===================================================================
---- a/xpra/platform/xposix/sd_listen.pyx (revision 28285)
-+++ b/xpra/platform/xposix/sd_listen.pyx (revision 28363)
-@@ -52,7 +52,7 @@
- return sockets
-
- def get_sd_socket_type(fd):
-- from xpra.net.common import TCP_SOCKTYPES
-+ from xpra.net.bytestreams import TCP_SOCKTYPES
- socktype = os.environ.get("XPRA_SD%i_SOCKET_TYPE" % fd)
- if not socktype:
- socktype = os.environ.get("XPRA_SD_SOCKET_TYPE", "tcp")
-Index: xpra/server/mixins/audio_server.py
-===================================================================
---- a/xpra/server/mixins/audio_server.py (revision 28285)
-+++ b/xpra/server/mixins/audio_server.py (revision 28363)
-@@ -121,7 +121,7 @@
- from xpra.platform.xposix.paths import _get_xpra_runtime_dir, get_runtime_dir
- rd = osexpand(get_runtime_dir())
- if not os.path.exists(rd) or not os.path.isdir(rd):
-- log.warn("Warning: the runtime directory '%s' does not exist,")
-+ log.warn("Warning: the runtime directory '%s' does not exist,", rd)
- log.warn(" cannot start a private pulseaudio server")
- else:
- xpra_rd = _get_xpra_runtime_dir()
-Index: xpra/server/window/motion.pyx
-===================================================================
---- a/xpra/server/window/motion.pyx (revision 28285)
-+++ b/xpra/server/window/motion.pyx (revision 28363)
-@@ -79,7 +79,7 @@
- for i,v in enumerate(arr):
- self.a2[i] = <uint64_t> abs(v)
-
-- def update(self, pixels, int16_t x, int16_t y, uint16_t width, uint16_t height, uint16_t rowstride, uint8_t bpp=4):
-+ def update(self, pixels, int16_t x, int16_t y, uint16_t width, uint16_t height, uint32_t rowstride, uint8_t bpp=4):
- """
- Add a new image to compare with,
- checksum its rows into a2,
-Index: xpra/server/window/window_video_source.py
-===================================================================
---- a/xpra/server/window/window_video_source.py (revision 28285)
-+++ b/xpra/server/window/window_video_source.py (revision 28363)
-@@ -1785,6 +1785,13 @@
- scrolllog("no scrolling: detection has already been used on this image")
- #we've already checked
- return False
-+ x = image.get_target_x()
-+ y = image.get_target_y()
-+ w = image.get_width()
-+ h = image.get_height()
-+ if w>=32000 or h>=32000:
-+ scrolllog("no scrolling: the image is too large, %ix%i", w, h)
-+ return False
- #don't download the pixels if we have a GPU buffer,
- #since that means we're likely to be able to compress on the GPU too with NVENC:
- if not image.has_pixels():
-@@ -1792,10 +1799,6 @@
- if self.content_type=="video" or not self.non_video_encodings:
- scrolllog("no scrolling: content is video")
- return False
-- x = image.get_target_x()
-- y = image.get_target_y()
-- w = image.get_width()
-- h = image.get_height()
- if w<MIN_SCROLL_IMAGE_SIZE or h<MIN_SCROLL_IMAGE_SIZE:
- scrolllog("no scrolling: image size %ix%i is too small, minimum is %ix%i",
- w, h, MIN_SCROLL_IMAGE_SIZE, MIN_SCROLL_IMAGE_SIZE)
-Index: xpra/x11/x11_server_core.py
-===================================================================
---- a/xpra/x11/x11_server_core.py (revision 28285)
-+++ b/xpra/x11/x11_server_core.py (revision 28363)
-@@ -687,7 +687,7 @@
- #we can use XRRSetScreenSize:
- try:
- with xsync:
-- RandR.xrr_set_screen_size(w, h, self.xdpi or self.dpi, self.ydpi or self.dpi)
-+ RandR.xrr_set_screen_size(w, h, self.xdpi or self.dpi or 96, self.ydpi or self.dpi or 96)
- except XError:
- screenlog("XRRSetScreenSize failed", exc_info=True)
- screenlog("calling RandR.get_screen_size()")
diff --git a/x11-wm/xpra/xpra-4.0.6_p28363.ebuild b/x11-wm/xpra/xpra-4.0.6_p28363.ebuild
deleted file mode 100644
index 5a306498e82..00000000000
--- a/x11-wm/xpra/xpra-4.0.6_p28363.ebuild
+++ /dev/null
@@ -1,160 +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
-
-MY_P="${PN}-${PV%_p*}"
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="https://xpra.org/"
-SRC_URI="https://xpra.org/src/${MY_P}.tar.xz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="brotli +client +clipboard csc cups dbus 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}]
- ')
-"
-
-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
- "${FILESDIR}"/${PN}-4.0.6-r28363.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-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
-
- 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 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
- )
-
- 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/files/, x11-wm/xpra/
@ 2022-01-28 13:44 James Le Cuirot
0 siblings, 0 replies; 17+ messages in thread
From: James Le Cuirot @ 2022-01-28 13:44 UTC (permalink / raw
To: gentoo-commits
commit: 3c2f164da33dc769f29e3587ab891d78b50957dd
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 28 13:44:06 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Jan 28 13:44:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c2f164d
x11-wm/xpra: Drop old 4.2.3
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch | 36 ----
.../files/xpra-4.2.2-true-false-bin-path.patch | 38 ----
x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch | 30 ----
x11-wm/xpra/xpra-4.2.3.ebuild | 199 ---------------------
4 files changed, 303 deletions(-)
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
deleted file mode 100644
index 0d34ab0ef2fa..000000000000
--- a/x11-wm/xpra/files/xpra-4.2.2-bad-tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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-true-false-bin-path.patch b/x11-wm/xpra/files/xpra-4.2.2-true-false-bin-path.patch
deleted file mode 100644
index 255e80738616..000000000000
--- a/x11-wm/xpra/files/xpra-4.2.2-true-false-bin-path.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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/files/xpra-4.2.3-dup-ip.patch b/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch
deleted file mode 100644
index 337527305ecc..000000000000
--- a/x11-wm/xpra/files/xpra-4.2.3-dup-ip.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index 6280862e546a..000000000000
--- a/x11-wm/xpra/xpra-4.2.3.ebuild
+++ /dev/null
@@ -1,199 +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="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/files/, x11-wm/xpra/
@ 2022-04-17 12:52 James Le Cuirot
0 siblings, 0 replies; 17+ messages in thread
From: James Le Cuirot @ 2022-04-17 12:52 UTC (permalink / raw
To: gentoo-commits
commit: e1c4f0626f5ab94414b9f35185a71fe33a198a22
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 12:52:00 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 12:52:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1c4f062
x11-wm/xpra: Add live ebuild
Strangely, the unit tests often get fixed up after each release, so it helps to
catch and fix these early.
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
x11-wm/xpra/files/xpra-9999-xdummy.patch | 24 ++++
x11-wm/xpra/xpra-9999.ebuild | 202 +++++++++++++++++++++++++++++++
2 files changed, 226 insertions(+)
diff --git a/x11-wm/xpra/files/xpra-9999-xdummy.patch b/x11-wm/xpra/files/xpra-9999-xdummy.patch
new file mode 100644
index 000000000000..2326e63498ce
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-9999-xdummy.patch
@@ -0,0 +1,24 @@
+From 7c384b517fb391065b84b60fa8f1ec3338ed4fce Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sat, 16 Apr 2022 22:30:11 +0100
+Subject: [PATCH] Avoid Xdummy version detection, assume 0.4.0
+
+---
+ setup.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/setup.py b/setup.py
+index 40bfba61c..e4636cb46 100755
+--- a/setup.py
++++ b/setup.py
+@@ -657,6 +657,7 @@ def get_gcc_version():
+ return GCC_VERSION
+
+ def get_dummy_driver_version():
++ return (0, 4)
+ def vernum(s):
+ return tuple(int(v) for v in s.split("-", 1)[0].split("."))
+ #try various rpm names:
+--
+2.34.1
+
diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild
new file mode 100644
index 000000000000..59f1f56b88b3
--- /dev/null
+++ b/x11-wm/xpra/xpra-9999.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2022 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"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{7,8,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 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 )
+"
+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}-9999-xdummy.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
+
+ 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.
+ 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/files/, x11-wm/xpra/
@ 2022-05-22 12:41 James Le Cuirot
0 siblings, 0 replies; 17+ messages in thread
From: James Le Cuirot @ 2022-05-22 12:41 UTC (permalink / raw
To: gentoo-commits
commit: 9c3f62cd0d98ca76908cc3d661159cfc6c119d12
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 12:41:34 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun May 22 12:41:34 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c3f62cd
x11-wm/xpra: Patch around setup.py hardcoded call to cpp
This has been merged upstream.
Closes: https://bugs.gentoo.org/831337
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
x11-wm/xpra/files/xpra-4.3-cpp.patch | 34 ++++++++++++++++++++++++++++++++++
x11-wm/xpra/xpra-4.3.3.ebuild | 1 +
2 files changed, 35 insertions(+)
diff --git a/x11-wm/xpra/files/xpra-4.3-cpp.patch b/x11-wm/xpra/files/xpra-4.3-cpp.patch
new file mode 100644
index 000000000000..41f1263e3465
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.3-cpp.patch
@@ -0,0 +1,34 @@
+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
index 337531a3c0f3..a6855e815cf0 100644
--- a/x11-wm/xpra/xpra-4.3.3.ebuild
+++ b/x11-wm/xpra/xpra-4.3.3.ebuild
@@ -117,6 +117,7 @@ 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
)
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/files/, x11-wm/xpra/
@ 2023-05-14 14:54 James Le Cuirot
0 siblings, 0 replies; 17+ messages in thread
From: James Le Cuirot @ 2023-05-14 14:54 UTC (permalink / raw
To: gentoo-commits
commit: 15bcf35582bb7ad431835dbea82c2aada2ec32a3
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 14:41:38 2023 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun May 14 14:53:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15bcf355
x11-wm/xpra: Update 9999 for latest changes
Some tests are failing, but I can't figure out why.
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
x11-wm/xpra/files/xpra-4.5-no-service.patch | 19 ++++++++++++++++
x11-wm/xpra/files/xpra-9999-tests.patch | 34 +++++++++++++++++++++++++++++
x11-wm/xpra/files/xpra-9999-xdummy.patch | 26 +++++++---------------
x11-wm/xpra/metadata.xml | 1 +
x11-wm/xpra/xpra-9999.ebuild | 14 ++++++------
5 files changed, 69 insertions(+), 25 deletions(-)
diff --git a/x11-wm/xpra/files/xpra-4.5-no-service.patch b/x11-wm/xpra/files/xpra-4.5-no-service.patch
new file mode 100644
index 000000000000..329c492784ac
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.5-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 529b591b1..ad23d6ecc 100755
+--- a/setup.py
++++ b/setup.py
+@@ -187,8 +187,8 @@ rfb_ENABLED = DEFAULT
+ quic_ENABLED = DEFAULT
+ ssh_ENABLED = DEFAULT
+ http_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/files/xpra-9999-tests.patch b/x11-wm/xpra/files/xpra-9999-tests.patch
new file mode 100644
index 000000000000..746966577dcd
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-9999-tests.patch
@@ -0,0 +1,34 @@
+From 79573c7f1241225922bee992f2caaf730cfbe3ac Mon Sep 17 00:00:00 2001
+From: totaam <antoine@xpra.org>
+Date: Sun, 9 Oct 2022 21:37:39 +0700
+Subject: [PATCH 3/3] Revert "don't use GLib directly"
+
+This reverts commit bc8bf26c44d1b151d709232460483f5432f79f5b.
+---
+ xpra/server/mixins/child_command_server.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/xpra/server/mixins/child_command_server.py b/xpra/server/mixins/child_command_server.py
+index 8dea3c1f7..1c2a60e27 100644
+--- a/xpra/server/mixins/child_command_server.py
++++ b/xpra/server/mixins/child_command_server.py
+@@ -11,6 +11,8 @@ import os.path
+ from time import monotonic
+ from subprocess import Popen
+
++from gi.repository import GLib
++
+ from xpra.platform.features import COMMAND_SIGNALS
+ from xpra.child_reaper import getChildReaper, reaper_cleanup
+ from xpra.os_util import (
+@@ -72,7 +74,7 @@ class ChildCommandServer(StubServerMixin):
+ #even if __init__ is called multiple times:
+ if not getattr(self, "late_start_requested", False):
+ self.late_start_requested = True
+- self.idle_add(self.late_start)
++ GLib.idle_add(self.late_start)
+
+ def late_start(self):
+ def do_late_start():
+--
+2.38.0
diff --git a/x11-wm/xpra/files/xpra-9999-xdummy.patch b/x11-wm/xpra/files/xpra-9999-xdummy.patch
index 2326e63498ce..b86f0dda45fe 100644
--- a/x11-wm/xpra/files/xpra-9999-xdummy.patch
+++ b/x11-wm/xpra/files/xpra-9999-xdummy.patch
@@ -1,24 +1,14 @@
-From 7c384b517fb391065b84b60fa8f1ec3338ed4fce Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sat, 16 Apr 2022 22:30:11 +0100
-Subject: [PATCH] Avoid Xdummy version detection, assume 0.4.0
-
----
- setup.py | 1 +
- 1 file changed, 1 insertion(+)
+Avoid Xdummy version detection, assume 0.4.1.
diff --git a/setup.py b/setup.py
-index 40bfba61c..e4636cb46 100755
+index 529b591b1..b9431fea8 100755
--- a/setup.py
+++ b/setup.py
-@@ -657,6 +657,7 @@ def get_gcc_version():
- return GCC_VERSION
-
+@@ -793,6 +793,7 @@ def vernum(s):
+ return tuple(int(v) for v in s.split("-", 1)[0].split("."))
+
def get_dummy_driver_version():
-+ return (0, 4)
- def vernum(s):
- return tuple(int(v) for v in s.split("-", 1)[0].split("."))
++ return "0.4.1"
#try various rpm names:
---
-2.34.1
-
+ for rpm_name in ("xorg-x11-drv-dummy", "xf86-video-dummy"):
+ r, out, err = get_status_output(["rpm", "-q", "--queryformat", "%{VERSION}", rpm_name])
diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index 230b35b55f48..308083d50825 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -24,6 +24,7 @@
<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="oauth">Enable OAuth2 authentication in the server</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>
diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild
index 2d2f17c05900..c4e11b241ef1 100644
--- a/x11-wm/xpra/xpra-9999.ebuild
+++ b/x11-wm/xpra/xpra-9999.ebuild
@@ -21,11 +21,12 @@ DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based o
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 opengl pillow pinentry pulseaudio +server sound systemd test udev vpx webcam webp xdg xinerama"
+IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal oauth opengl pillow pinentry pulseaudio +server sound systemd test udev vpx webcam webp xdg xinerama"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
|| ( client server )
cups? ( dbus )
+ oauth? ( server )
opengl? ( client )
test? ( client clipboard crypt dbus html server sound xdg xinerama )
"
@@ -84,9 +85,8 @@ RDEPEND="
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}] )
- )
+ oauth? ( dev-python/oauthlib[${PYTHON_USEDEP}] )
+ opengl? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] )
webcam? (
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/pyinotify[${PYTHON_USEDEP}]
@@ -115,9 +115,9 @@ BDEPEND="
RESTRICT="!test? ( test )"
PATCHES=(
- "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
- "${FILESDIR}"/${PN}-4.3-no-service.patch
+ "${FILESDIR}"/${PN}-4.5-no-service.patch
"${FILESDIR}"/${PN}-9999-xdummy.patch
+ "${FILESDIR}"/${PN}-9999-tests.patch
)
python_prepare_all() {
@@ -144,6 +144,7 @@ python_configure_all() {
DISTUTILS_ARGS=(
--without-PIC
--without-Xdummy
+ $(use_with sound audio)
$(use_with client)
$(use_with clipboard)
$(use_with csc csc_swscale)
@@ -165,7 +166,6 @@ python_configure_all() {
$(use_with opengl)
$(use_with server shadow)
$(use_with server)
- $(use_with sound)
--with-strict
$(use_with vpx)
--with-warn
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/files/, x11-wm/xpra/
@ 2023-05-14 14:54 James Le Cuirot
0 siblings, 0 replies; 17+ messages in thread
From: James Le Cuirot @ 2023-05-14 14:54 UTC (permalink / raw
To: gentoo-commits
commit: 00aeecac09183fae1050b7282abc1623b33be6b8
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 14:47:58 2023 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun May 14 14:53:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00aeecac
x11-wm/xpra: Version bump to 4.4.4
Some tests are failing, but I can't figure out why.
Closes: https://bugs.gentoo.org/882613
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
x11-wm/xpra/Manifest | 1 +
x11-wm/xpra/files/xpra-4.4-tests.patch | 100 +++++++++++++++
x11-wm/xpra/files/xpra-4.4-xdummy.patch | 24 ++++
x11-wm/xpra/xpra-4.4.4.ebuild | 215 ++++++++++++++++++++++++++++++++
4 files changed, 340 insertions(+)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 92b946c95af1..8670ac3604fd 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,2 +1,3 @@
DIST xpra-4.3.1-tests.patch 51444 BLAKE2B c645aa52bb06c3872f6c1c7aace099c10a6fd46dd4c386ec1a13f6326e3fc8860a71767510ce9b44375cc8b30cef563e4405b2834670a9d2c555d3359d16e99f SHA512 0c70c33e24980db31e904c91f987a73693bd2349958ea8392138987e1dc1852ea42a4ee7e3b238f01c92adc57dbe196e57f4c4accf27aade6c4ea55c1ff9b40c
DIST xpra-4.3.4.tar.gz 4184031 BLAKE2B e01e338398f86c80a1092ea3155126ed26eb959ca97790add4cfcdb0ec8a1c6391937ff101c889ec78bb00bbf38ac0c42c5b85d60e72804ffccbbe5f446aaa3e SHA512 93855ff248f135c70a2144a0afbc66e4830b8d214c9c2017dff1d3e3c7902dac15b1cb03670cde8018b40d5c404bd7c243625faeaba712130f5d0082f562c60c
+DIST xpra-4.4.4.tar.gz 4324840 BLAKE2B d39f83b5f6ea960f12170bcc55d3c46d290682bb26424dc57a3ab62f01a4dad513466883287e6197231c96ac81872403d27ff1b65c7c0e520adcda8846766e02 SHA512 807fb3b12b5ecc8dbf73aef9dddf509c3397c97d04db4f397d4672b6f097ff977ce71f6ba00fb585ea7dfaf047a4c68e5cca099436da28bc20f4bc2c229c98c9
diff --git a/x11-wm/xpra/files/xpra-4.4-tests.patch b/x11-wm/xpra/files/xpra-4.4-tests.patch
new file mode 100644
index 000000000000..28691606304d
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.4-tests.patch
@@ -0,0 +1,100 @@
+From 5e657b3fbed2f8495272d6b207d1b3c0a660a72f Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 2 Oct 2022 22:59:17 +0100
+Subject: [PATCH 1/3] Fix test_root_window_model by formatting geometry string
+ correctly
+
+You can't use `{geometry:24}` style formatting on a list or tuple. It
+must be converted to a string first.
+---
+ xpra/server/shadow/root_window_model.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xpra/server/shadow/root_window_model.py b/xpra/server/shadow/root_window_model.py
+index cb89466ef..e69949e7d 100644
+--- a/xpra/server/shadow/root_window_model.py
++++ b/xpra/server/shadow/root_window_model.py
+@@ -65,7 +65,7 @@ class RootWindowModel:
+ self.signal_listeners = {}
+
+ def __repr__(self):
+- return f"RootWindowModel({self.capture} : {self.geometry:24})"
++ return f"RootWindowModel({self.capture} : {str(self.geometry):24})"
+
+ def get_info(self) -> dict:
+ info = {}
+--
+2.38.0
+
+
+From 3fe12855383831f10442a1f4451d206dfee2cb92 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 2 Oct 2022 21:51:01 +0100
+Subject: [PATCH 2/3] Fix test_get_version_info when the revision is 0
+
+The 4.4 tarball has revision 0, which causes it to not be included in
+the version info dict. Check for `not None` instead of truthiness.
+---
+ xpra/version_util.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xpra/version_util.py b/xpra/version_util.py
+index 17c0ec27a..5dd38fd3e 100755
+--- a/xpra/version_util.py
++++ b/xpra/version_util.py
+@@ -158,7 +158,7 @@ def get_version_info(full=1) -> dict:
+ "branch" : BRANCH,
+ "commit" : COMMIT,
+ }.items():
+- if v and v!="unknown":
++ if v is not None and v!="unknown":
+ props[k] = v
+ except ImportError as e:
+ warn("missing some source information: %s", e)
+@@ -181,7 +181,7 @@ def get_version_info_full() -> dict:
+ "cython" : "CYTHON_VERSION",
+ }.items():
+ v = getattr(build_info, bk, None)
+- if v:
++ if v is not None:
+ props[k] = v
+ #record library versions:
+ d = dict((k.lstrip("lib_"), getattr(build_info, k)) for k in dir(build_info) if k.startswith("lib_"))
+--
+2.38.0
+
+
+From 79573c7f1241225922bee992f2caaf730cfbe3ac Mon Sep 17 00:00:00 2001
+From: totaam <antoine@xpra.org>
+Date: Sun, 9 Oct 2022 21:37:39 +0700
+Subject: [PATCH 3/3] Revert "don't use GLib directly"
+
+This reverts commit bc8bf26c44d1b151d709232460483f5432f79f5b.
+---
+ xpra/server/mixins/child_command_server.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/xpra/server/mixins/child_command_server.py b/xpra/server/mixins/child_command_server.py
+index 8dea3c1f7..1c2a60e27 100644
+--- a/xpra/server/mixins/child_command_server.py
++++ b/xpra/server/mixins/child_command_server.py
+@@ -11,6 +11,8 @@ import os.path
+ from time import monotonic
+ from subprocess import Popen
+
++from gi.repository import GLib
++
+ from xpra.platform.features import COMMAND_SIGNALS
+ from xpra.child_reaper import getChildReaper, reaper_cleanup
+ from xpra.os_util import (
+@@ -72,7 +74,7 @@ class ChildCommandServer(StubServerMixin):
+ #even if __init__ is called multiple times:
+ if not getattr(self, "late_start_requested", False):
+ self.late_start_requested = True
+- self.idle_add(self.late_start)
++ GLib.idle_add(self.late_start)
+
+ def late_start(self):
+ def do_late_start():
+--
+2.38.0
diff --git a/x11-wm/xpra/files/xpra-4.4-xdummy.patch b/x11-wm/xpra/files/xpra-4.4-xdummy.patch
new file mode 100644
index 000000000000..2326e63498ce
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-4.4-xdummy.patch
@@ -0,0 +1,24 @@
+From 7c384b517fb391065b84b60fa8f1ec3338ed4fce Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sat, 16 Apr 2022 22:30:11 +0100
+Subject: [PATCH] Avoid Xdummy version detection, assume 0.4.0
+
+---
+ setup.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/setup.py b/setup.py
+index 40bfba61c..e4636cb46 100755
+--- a/setup.py
++++ b/setup.py
+@@ -657,6 +657,7 @@ def get_gcc_version():
+ return GCC_VERSION
+
+ def get_dummy_driver_version():
++ return (0, 4)
+ def vernum(s):
+ return tuple(int(v) for v in s.split("-", 1)[0].split("."))
+ #try various rpm names:
+--
+2.34.1
+
diff --git a/x11-wm/xpra/xpra-4.4.4.ebuild b/x11-wm/xpra/xpra-4.4.4.ebuild
new file mode 100644
index 000000000000..5683ea5b33ce
--- /dev/null
+++ b/x11-wm/xpra/xpra-4.4.4.ebuild
@@ -0,0 +1,215 @@
+# 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
+ inherit pypi
+ KEYWORDS="~amd64 ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{9..11} )
+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 crypt csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal oauth opengl pillow pinentry pulseaudio +server sound systemd test udev vpx webcam webp xdg xinerama"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ || ( client server )
+ cups? ( dbus )
+ oauth? ( server )
+ opengl? ( client )
+ test? ( client clipboard crypt dbus html server sound xdg xinerama )
+"
+
+TEST_DEPEND="
+ $(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] )
+ 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}
+ ${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 )
+ udev? ( virtual/udev )
+"
+DEPEND+="
+ test? ( ${TEST_DEPEND} )
+"
+BDEPEND="
+ $(python_gen_cond_dep '
+ >=dev-python/cython-0.16[${PYTHON_USEDEP}]
+ ')
+ virtual/pkgconfig
+ doc? ( app-text/pandoc )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.3-no-service.patch
+ "${FILESDIR}"/${PN}-4.4-xdummy.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 '/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=(
+ --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)
+ --without-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
+ rm -v "${ED}"/usr/bin/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
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/files/, x11-wm/xpra/
@ 2023-05-16 22:16 James Le Cuirot
0 siblings, 0 replies; 17+ messages in thread
From: James Le Cuirot @ 2023-05-16 22:16 UTC (permalink / raw
To: gentoo-commits
commit: 3102cd8d6d3e1e22e1f1f2820fef94a0965c7166
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue May 16 22:12:08 2023 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue May 16 22:12:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3102cd8d
x11-wm/xpra: Use setup.py args to avoid sd_listen/service files
I didn't realise I could have done this without a patch.
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
x11-wm/xpra/files/xpra-4.5-no-service.patch | 19 -------------------
x11-wm/xpra/xpra-4.4.4.ebuild | 3 ++-
x11-wm/xpra/xpra-9999.ebuild | 3 ++-
3 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/x11-wm/xpra/files/xpra-4.5-no-service.patch b/x11-wm/xpra/files/xpra-4.5-no-service.patch
deleted file mode 100644
index 329c492784ac..000000000000
--- a/x11-wm/xpra/files/xpra-4.5-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 529b591b1..ad23d6ecc 100755
---- a/setup.py
-+++ b/setup.py
-@@ -187,8 +187,8 @@ rfb_ENABLED = DEFAULT
- quic_ENABLED = DEFAULT
- ssh_ENABLED = DEFAULT
- http_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.4.4.ebuild b/x11-wm/xpra/xpra-4.4.4.ebuild
index e458911550a1..1111ef2fc4e3 100644
--- a/x11-wm/xpra/xpra-4.4.4.ebuild
+++ b/x11-wm/xpra/xpra-4.4.4.ebuild
@@ -115,7 +115,6 @@ BDEPEND="
RESTRICT="!test? ( test )"
PATCHES=(
- "${FILESDIR}"/${PN}-4.3-no-service.patch
"${FILESDIR}"/${PN}-4.4-xdummy.patch
)
@@ -161,6 +160,8 @@ python_configure_all() {
$(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)
diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild
index b2d368301a68..23c923b710aa 100644
--- a/x11-wm/xpra/xpra-9999.ebuild
+++ b/x11-wm/xpra/xpra-9999.ebuild
@@ -115,7 +115,6 @@ BDEPEND="
RESTRICT="!test? ( test )"
PATCHES=(
- "${FILESDIR}"/${PN}-4.5-no-service.patch
"${FILESDIR}"/${PN}-9999-xdummy.patch
"${FILESDIR}"/${PN}-9999-tests.patch
)
@@ -163,6 +162,8 @@ python_configure_all() {
$(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)
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/files/, x11-wm/xpra/
@ 2023-06-12 17:45 Andreas Sturmlechner
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Sturmlechner @ 2023-06-12 17:45 UTC (permalink / raw
To: gentoo-commits
commit: 9c15a7239ec2589e1225b465f3688731c473d071
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 12 16:30:26 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 12 17:44:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c15a723
x11-wm/xpra: drop 4.3.4-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
x11-wm/xpra/Manifest | 2 -
.../xpra-3.0.2_ignore-gentoo-no-compile.patch | 13 --
x11-wm/xpra/files/xpra-4.3-no-service.patch | 19 --
x11-wm/xpra/xpra-4.3.4-r1.ebuild | 219 ---------------------
4 files changed, 253 deletions(-)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 9e1c819b017b..3e29e19a6741 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1 @@
-DIST xpra-4.3.1-tests.patch 51444 BLAKE2B c645aa52bb06c3872f6c1c7aace099c10a6fd46dd4c386ec1a13f6326e3fc8860a71767510ce9b44375cc8b30cef563e4405b2834670a9d2c555d3359d16e99f SHA512 0c70c33e24980db31e904c91f987a73693bd2349958ea8392138987e1dc1852ea42a4ee7e3b238f01c92adc57dbe196e57f4c4accf27aade6c4ea55c1ff9b40c
-DIST xpra-4.3.4.tar.gz 4184031 BLAKE2B e01e338398f86c80a1092ea3155126ed26eb959ca97790add4cfcdb0ec8a1c6391937ff101c889ec78bb00bbf38ac0c42c5b85d60e72804ffccbbe5f446aaa3e SHA512 93855ff248f135c70a2144a0afbc66e4830b8d214c9c2017dff1d3e3c7902dac15b1cb03670cde8018b40d5c404bd7c243625faeaba712130f5d0082f562c60c
DIST xpra-4.4.5.tar.gz 4332287 BLAKE2B 64165a18d0f204247f984f616438252e82922447441376e6e46a15509486e67f699e852562cd632591fd2831a86592d5029c5905932fc9d267b16a7e6edd1b5a SHA512 6fb28328efc020969fff17bf747a1e0bf5b21869c9532a8c482e12f979d1dec7989e10e5bf3a9ae7dbfaa9e48c670255b196fdb819200a74dfbdec3ba5ae744f
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
deleted file mode 100644
index 5823ac8c167e..000000000000
--- a/x11-wm/xpra/files/xpra-3.0.2_ignore-gentoo-no-compile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/files/xpra-4.3-no-service.patch b/x11-wm/xpra/files/xpra-4.3-no-service.patch
deleted file mode 100644
index b336db581953..000000000000
--- a/x11-wm/xpra/files/xpra-4.3-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 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.3.4-r1.ebuild b/x11-wm/xpra/xpra-4.3.4-r1.ebuild
deleted file mode 100644
index af4ceff68269..000000000000
--- a/x11-wm/xpra/xpra-4.3.4-r1.ebuild
+++ /dev/null
@@ -1,219 +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
- inherit pypi
- SRC_URI+="
- https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch
- "
- KEYWORDS="amd64 x86"
-fi
-
-PYTHON_COMPAT=( python3_{9..11} )
-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 crypt 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 crypt dbus html server sound xdg xinerama )
-"
-
-TEST_DEPEND="
- $(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] )
- 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}
- ${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}] )
- 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? ( ${TEST_DEPEND} )
-"
-BDEPEND="
- $(python_gen_cond_dep '
- >=dev-python/cython-0.16[${PYTHON_USEDEP}]
- ')
- virtual/pkgconfig
- doc? ( virtual/pandoc )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
- "${FILESDIR}"/${PN}-4.3-no-service.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 '/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=(
- --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)
- --without-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)
- --without-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
- rm -v "${ED}"/usr/bin/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
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/files/, x11-wm/xpra/
@ 2023-06-27 13:38 Benda XU
0 siblings, 0 replies; 17+ messages in thread
From: Benda XU @ 2023-06-27 13:38 UTC (permalink / raw
To: gentoo-commits
commit: 68e45f8e359cda963c67c7e2755effcbb72c1242
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 26 15:10:17 2023 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 13:38:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68e45f8e
x11-wm/xpra: sync the live ebuild with 4.4.6-r1.
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
x11-wm/xpra/files/xpra-9999-tests.patch | 34 ---------------------------------
x11-wm/xpra/xpra-9999.ebuild | 17 +++++++++++------
2 files changed, 11 insertions(+), 40 deletions(-)
diff --git a/x11-wm/xpra/files/xpra-9999-tests.patch b/x11-wm/xpra/files/xpra-9999-tests.patch
deleted file mode 100644
index 746966577dcd..000000000000
--- a/x11-wm/xpra/files/xpra-9999-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 79573c7f1241225922bee992f2caaf730cfbe3ac Mon Sep 17 00:00:00 2001
-From: totaam <antoine@xpra.org>
-Date: Sun, 9 Oct 2022 21:37:39 +0700
-Subject: [PATCH 3/3] Revert "don't use GLib directly"
-
-This reverts commit bc8bf26c44d1b151d709232460483f5432f79f5b.
----
- xpra/server/mixins/child_command_server.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/xpra/server/mixins/child_command_server.py b/xpra/server/mixins/child_command_server.py
-index 8dea3c1f7..1c2a60e27 100644
---- a/xpra/server/mixins/child_command_server.py
-+++ b/xpra/server/mixins/child_command_server.py
-@@ -11,6 +11,8 @@ import os.path
- from time import monotonic
- from subprocess import Popen
-
-+from gi.repository import GLib
-+
- from xpra.platform.features import COMMAND_SIGNALS
- from xpra.child_reaper import getChildReaper, reaper_cleanup
- from xpra.os_util import (
-@@ -72,7 +74,7 @@ class ChildCommandServer(StubServerMixin):
- #even if __init__ is called multiple times:
- if not getattr(self, "late_start_requested", False):
- self.late_start_requested = True
-- self.idle_add(self.late_start)
-+ GLib.idle_add(self.late_start)
-
- def late_start(self):
- def do_late_start():
---
-2.38.0
diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild
index bc63326e1601..09e2d5b2a699 100644
--- a/x11-wm/xpra/xpra-9999.ebuild
+++ b/x11-wm/xpra/xpra-9999.ebuild
@@ -12,11 +12,11 @@ else
fi
PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_SETUPTOOLS=no
DISTUTILS_EXT=1
-inherit xdg xdg-utils distutils-r1 tmpfiles udev
+inherit xdg xdg-utils distutils-r1 multibuild prefix tmpfiles udev
DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
HOMEPAGE="https://xpra.org/"
@@ -118,15 +118,12 @@ RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}"/${PN}-9999-xdummy.patch
- "${FILESDIR}"/${PN}-9999-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" \))
+ hprefixify xpra/scripts/config.py
sed -r -e "/\bdoc_dir =/s:/${PN}/\":/${PF}/html\":" \
-i setup.py || die
@@ -196,6 +193,14 @@ python_test() {
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
+
# Move udev dir to the right place if necessary.
if use udev; then
local dir=$(get_udevdir)
^ permalink raw reply related [flat|nested] 17+ messages in thread
end of thread, other threads:[~2023-06-27 13:38 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-27 12:18 [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/files/, x11-wm/xpra/ Andreas K. Hüttel
-- strict thread matches above, loose matches on Subject: below --
2023-06-27 13:38 Benda XU
2023-06-12 17:45 Andreas Sturmlechner
2023-05-16 22:16 James Le Cuirot
2023-05-14 14:54 James Le Cuirot
2023-05-14 14:54 James Le Cuirot
2022-05-22 12:41 James Le Cuirot
2022-04-17 12:52 James Le Cuirot
2022-01-28 13:44 James Le Cuirot
2021-04-07 23:05 James Le Cuirot
2021-01-19 22:38 James Le Cuirot
2021-01-19 22:38 James Le Cuirot
2017-03-19 14:41 Michael Weber
2017-02-01 17:33 Michael Weber
2017-01-22 23:23 Michael Weber
2016-07-05 9:41 Michael Weber
2015-09-20 21:28 Michael Weber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox