git: d66b2debb909 - main - x11/xpra: Update to 4.4

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Sat, 15 Oct 2022 15:49:19 UTC
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d66b2debb909e0355b96a7b89c05d716e899d2e3

commit d66b2debb909e0355b96a7b89c05d716e899d2e3
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2022-10-15 08:57:04 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2022-10-15 15:48:57 +0000

    x11/xpra: Update to 4.4
    
    Reported by:    portscout!
---
 x11/xpra/Makefile  | 24 ++++++++---------
 x11/xpra/distinfo  |  6 ++---
 x11/xpra/pkg-plist | 78 ++++++++++++++++++++++++++++++++++++++++++++----------
 3 files changed, 78 insertions(+), 30 deletions(-)

diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile
index 8c71dbee7926..23f546aece8a 100644
--- a/x11/xpra/Makefile
+++ b/x11/xpra/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	xpra
-PORTVERSION=	4.3.4
-PORTREVISION=	2
+PORTVERSION=	4.4
 CATEGORIES=	x11
 MASTER_SITES=	https://xpra.org/src/
 
@@ -10,10 +9,11 @@ WWW=		https://xpra.org/
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	brotli:archivers/brotli \
-		pandoc:textproc/hs-pandoc
-LIB_DEPENDS=	libwebp.so:graphics/webp \
-		libharfbuzz.so:print/harfbuzz
+BUILD_DEPENDS=	pandoc:textproc/hs-pandoc
+LIB_DEPENDS=	libbrotlidec.so:archivers/brotli \
+		libharfbuzz.so:print/harfbuzz \
+		liblz4.so:archivers/liblz4 \
+		libwebp.so:graphics/webp
 RUN_DEPENDS=	${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}bencode.py>1:converters/py-bencode.py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}brotli>1:archivers/py-brotli@${PY_FLAVOR} \
@@ -33,7 +33,7 @@ RUN_DEPENDS=	${PY_PILLOW} \
 		xkbcomp:x11/xkbcomp \
 		Xvfb:x11-servers/xorg-server@xvfb
 
-USES=		desktop-file-utils gettext-runtime gnome pkgconfig \
+USES=		desktop-file-utils gettext-runtime gnome localbase pkgconfig \
 		python:3.6+ shared-mime-info shebangfix tar:xz xorg
 
 USE_GNOME=	cairo gdkpixbuf2 gtk30 pygobject3
@@ -42,9 +42,9 @@ USE_XORG=	x11 xcomposite xdamage xext xfixes xi xkbfile xrandr xres xtst
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
 		PYTHON_SUFFIX=${PYTHON_SUFFIX} \
 		PYTHON_VER=${PYTHON_VER}
-SHEBANG_FILES=	fs/lib/cups/xpraforwarder fs/bin/auth_dialog fs/bin/xdg-open \
-		fs/bin/xpra_udev_product_version fs/bin/gnome-open \
-		fs/bin/gvfs-open
+SHEBANG_FILES=	fs/lib/cups/backend/xpraforwarder fs/libexec/xpra/auth_dialog \
+		fs/libexec/xpra/xdg-open fs/libexec/xpra/xpra_signal_listener \
+		fs/libexec/xpra/xpra_udev_product_version
 
 OPTIONS_DEFINE=		AVAHI AVCODEC CUPS DOCS FFMPEG GSTREAMER LIBYUV SWSCALE \
 			WEBCAM X265
@@ -94,7 +94,7 @@ PYDISTUTILS_PKGNAME=	xpra_all
 XPRA_OPTIONS_ALL+=	${XPRA_OPTIONS_DISABLED} csc_libyuv csc_swscale \
 			dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 \
 			mdns printing sound vpx webcam
-XPRA_OPTIONS_DISABLED=	uinput Xdummy Xdummy_wrapper
+XPRA_OPTIONS_DISABLED=	strict uinput Xdummy Xdummy_wrapper
 
 .include <bsd.port.options.mk>
 
@@ -117,8 +117,6 @@ post-patch:
 	    ${WRKSRC}/xpra/platform/pycups_printing.py
 	@${REINPLACE_CMD} -e 's|/usr/sbin|${LOCALBASE}/sbin|' \
 	    ${WRKSRC}/fs/etc/xpra/conf.d/16_printing.conf.in
-	@${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' \
-	    ${WRKSRC}/xpra/server/server_util.py
 
 post-install:
 	@${MV} ${STAGEDIR}${ETCDIR}/xorg.conf \
diff --git a/x11/xpra/distinfo b/x11/xpra/distinfo
index 3b3cc010b338..c89bd3fa151b 100644
--- a/x11/xpra/distinfo
+++ b/x11/xpra/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1660117365
-SHA256 (xpra-4.3.4.tar.xz) = 947512a281dac8d8aac351a9714bddf3353f392889e7de3a93fd08a748e704e6
-SIZE (xpra-4.3.4.tar.xz) = 2951628
+TIMESTAMP = 1665600179
+SHA256 (xpra-4.4.tar.xz) = 39f70151029a0c183bbe0c8100a8ca55b2353ea2bdd1ab8dbefa6cb95dad8a5b
+SIZE (xpra-4.4.tar.xz) = 3033312
diff --git a/x11/xpra/pkg-plist b/x11/xpra/pkg-plist
index a340ec44ad7e..d2a2899b092f 100644
--- a/x11/xpra/pkg-plist
+++ b/x11/xpra/pkg-plist
@@ -1,8 +1,6 @@
 bin/run_scaled
 bin/xpra
 bin/xpra_launcher
-bin/xpra_signal_listener
-bin/xpra_udev_product_version
 etc/X11/xorg.conf.d/90-xpra-virtual.conf
 etc/dbus-1/system.d/xpra.conf
 %%ETCDIR%%/conf.d/05_features.conf
@@ -20,6 +18,7 @@ etc/dbus-1/system.d/xpra.conf
 %%ETCDIR%%/conf.d/60_server.conf
 %%ETCDIR%%/conf.d/65_proxy.conf
 %%ETCDIR%%/content-categories/10_default.conf
+%%ETCDIR%%/content-parent/10_default.conf
 %%ETCDIR%%/content-type/10_role.conf
 %%ETCDIR%%/content-type/30_title.conf
 %%ETCDIR%%/content-type/50_class.conf
@@ -425,6 +424,8 @@ etc/dbus-1/system.d/xpra.conf
 %%PYTHON_SITELIBDIR%%/xpra/codecs/__pycache__/codec_checks%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/__pycache__/codec_constants%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/__pycache__/codec_constants%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xpra/codecs/__pycache__/codec_debug%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xpra/codecs/__pycache__/codec_debug%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/__pycache__/icon_util%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/__pycache__/icon_util%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/__pycache__/image_wrapper%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -447,6 +448,7 @@ etc/dbus-1/system.d/xpra.conf
 %%PYTHON_SITELIBDIR%%/xpra/codecs/argb/scale.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/codec_checks.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/codec_constants.py
+%%PYTHON_SITELIBDIR%%/xpra/codecs/codec_debug.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/csc_cython/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/csc_cython/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/csc_cython/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
@@ -463,10 +465,6 @@ etc/dbus-1/system.d/xpra.conf
 %%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/decoder%%PYTHON_EXT_SUFFIX%%.so
-%%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/libav_common/__init__.py
-%%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/libav_common/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/libav_common/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/libav_common/av_log%%PYTHON_EXT_SUFFIX%%.so
 %%FFMPEG%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_ffmpeg/__init__.py
 %%FFMPEG%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_ffmpeg/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%FFMPEG%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_ffmpeg/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
@@ -487,6 +485,10 @@ etc/dbus-1/system.d/xpra.conf
 %%X265%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/encoder%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/codecs/icon_util.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/image_wrapper.py
+%%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/libav_common/__init__.py
+%%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/libav_common/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/libav_common/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/libav_common/av_log%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/codecs/loader.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/pillow/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/pillow/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -499,6 +501,11 @@ etc/dbus-1/system.d/xpra.conf
 %%PYTHON_SITELIBDIR%%/xpra/codecs/pillow/encoder.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/rgb_transform.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.py
+%%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__init__.py
+%%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/decoder%%PYTHON_EXT_SUFFIX%%.so
+%%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/encoder%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/codecs/webp/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/webp/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/webp/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
@@ -609,6 +616,8 @@ etc/dbus-1/system.d/xpra.conf
 %%PYTHON_SITELIBDIR%%/xpra/net/__pycache__/header%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/__pycache__/http_handler%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/__pycache__/http_handler%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xpra/net/__pycache__/libproxy%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xpra/net/__pycache__/libproxy%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/__pycache__/mmap_pipe%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/__pycache__/mmap_pipe%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/__pycache__/net_util%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -640,6 +649,11 @@ etc/dbus-1/system.d/xpra.conf
 %%PYTHON_SITELIBDIR%%/xpra/net/bencode/__pycache__/bencode%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/bencode/bencode.py
 %%PYTHON_SITELIBDIR%%/xpra/net/bencode/cython_bencode%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/xpra/net/brotli/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/net/brotli/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xpra/net/brotli/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xpra/net/brotli/compressor%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/xpra/net/brotli/decompressor%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/net/bytestreams.py
 %%PYTHON_SITELIBDIR%%/xpra/net/common.py
 %%PYTHON_SITELIBDIR%%/xpra/net/compression.py
@@ -650,6 +664,8 @@ etc/dbus-1/system.d/xpra.conf
 %%PYTHON_SITELIBDIR%%/xpra/net/file_transfer.py
 %%PYTHON_SITELIBDIR%%/xpra/net/header.py
 %%PYTHON_SITELIBDIR%%/xpra/net/http_handler.py
+%%PYTHON_SITELIBDIR%%/xpra/net/libproxy.py
+%%PYTHON_SITELIBDIR%%/xpra/net/lz4%%PYTHON_EXT_SUFFIX%%.so
 %%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__init__.py
 %%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
@@ -903,6 +919,8 @@ etc/dbus-1/system.d/xpra.conf
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/allow_auth%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/auth_helper%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/auth_helper%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/capability_auth%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/capability_auth%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/env_auth%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/env_auth%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/exec_auth%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -921,6 +939,8 @@ etc/dbus-1/system.d/xpra.conf
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/kerberos_password_auth%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/kerberos_token_auth%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/kerberos_token_auth%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/keycloak_auth%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/keycloak_auth%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/ldap3_auth%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/ldap3_auth%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/ldap_auth%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -931,6 +951,8 @@ etc/dbus-1/system.d/xpra.conf
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/mysql_auth%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/none_auth%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/none_auth%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/otp_auth%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/otp_auth%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/pam_auth%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/pam_auth%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/password_auth%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -953,6 +975,7 @@ etc/dbus-1/system.d/xpra.conf
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/__pycache__/win32_auth%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/allow_auth.py
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/auth_helper.py
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/capability_auth.py
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/env_auth.py
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/exec_auth.py
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/fail_auth.py
@@ -962,11 +985,13 @@ etc/dbus-1/system.d/xpra.conf
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/hosts_auth.py
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/kerberos_password_auth.py
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/kerberos_token_auth.py
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/keycloak_auth.py
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/ldap3_auth.py
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/ldap_auth.py
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/multifile_auth.py
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/mysql_auth.py
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/none_auth.py
+%%PYTHON_SITELIBDIR%%/xpra/server/auth/otp_auth.py
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/pam_auth.py
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/password_auth.py
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/peercred_auth.py
@@ -1254,8 +1279,8 @@ etc/dbus-1/system.d/xpra.conf
 %%PYTHON_SITELIBDIR%%/xpra/x11/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/__pycache__/common%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/__pycache__/common%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/__pycache__/desktop_server%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/__pycache__/desktop_server%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/__pycache__/expand_server%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/__pycache__/expand_server%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/__pycache__/fakeXinerama%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/__pycache__/fakeXinerama%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/__pycache__/prop_conv%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -1289,16 +1314,20 @@ etc/dbus-1/system.d/xpra.conf
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/__pycache__/randr_info%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/__pycache__/randr_info%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/core_bindings%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/display_source%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/keyboard_bindings%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/posix_display_source%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/randr_bindings%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/randr_info.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/res_bindings%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/wait_for_x_server%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/window_bindings%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/xi2_bindings%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/ximage%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/xwait%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/common.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/dbus/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/dbus/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -1306,7 +1335,28 @@ etc/dbus-1/system.d/xpra.conf
 %%PYTHON_SITELIBDIR%%/xpra/x11/dbus/__pycache__/x11_dbus_server%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/dbus/__pycache__/x11_dbus_server%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/dbus/x11_dbus_server.py
-%%PYTHON_SITELIBDIR%%/xpra/x11/desktop_server.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/desktop/__init__.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/desktop/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/desktop/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/desktop/__pycache__/desktop_model%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/desktop/__pycache__/desktop_model%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/desktop/__pycache__/desktop_server%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/desktop/__pycache__/desktop_server%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/desktop/__pycache__/desktop_server_base%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/desktop/__pycache__/desktop_server_base%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/desktop/__pycache__/model_base%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/desktop/__pycache__/model_base%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/desktop/__pycache__/monitor_model%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/desktop/__pycache__/monitor_model%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/desktop/__pycache__/monitor_server%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/desktop/__pycache__/monitor_server%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xpra/x11/desktop/desktop_model.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/desktop/desktop_server.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/desktop/desktop_server_base.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/desktop/model_base.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/desktop/monitor_model.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/desktop/monitor_server.py
+%%PYTHON_SITELIBDIR%%/xpra/x11/expand_server.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/fakeXinerama.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk3/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk3/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -1401,6 +1451,8 @@ libexec/xpra/auth_dialog
 libexec/xpra/gnome-open
 libexec/xpra/gvfs-open
 libexec/xpra/xdg-open
+libexec/xpra/xpra_signal_listener
+libexec/xpra/xpra_udev_product_version
 man/man1/run_scaled.1.gz
 man/man1/xpra.1.gz
 man/man1/xpra_launcher.1.gz
@@ -1435,8 +1487,10 @@ share/applications/xpra.desktop
 %%PORTDOCS%%%%DOCSDIR%%/Network/SSH.html
 %%PORTDOCS%%%%DOCSDIR%%/Network/SSL.html
 %%PORTDOCS%%%%DOCSDIR%%/Network/index.html
+%%PORTDOCS%%%%DOCSDIR%%/Usage/Apache-Proxy.html
 %%PORTDOCS%%%%DOCSDIR%%/Usage/Authentication.html
 %%PORTDOCS%%%%DOCSDIR%%/Usage/Client-OpenGL.html
+%%PORTDOCS%%%%DOCSDIR%%/Usage/Client.html
 %%PORTDOCS%%%%DOCSDIR%%/Usage/Configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/Usage/Encodings.html
 %%PORTDOCS%%%%DOCSDIR%%/Usage/Logging.html
@@ -1444,6 +1498,7 @@ share/applications/xpra.desktop
 %%PORTDOCS%%%%DOCSDIR%%/Usage/OpenGL.html
 %%PORTDOCS%%%%DOCSDIR%%/Usage/Proxy-Server.html
 %%PORTDOCS%%%%DOCSDIR%%/Usage/Seamless.html
+%%PORTDOCS%%%%DOCSDIR%%/Usage/Security.html
 %%PORTDOCS%%%%DOCSDIR%%/Usage/Service.html
 %%PORTDOCS%%%%DOCSDIR%%/Usage/Shadow-Server.html
 %%PORTDOCS%%%%DOCSDIR%%/Usage/Start-Desktop.html
@@ -1576,8 +1631,3 @@ share/pixmaps/xpra.png
 %%DATADIR%%/icons/windows.png
 %%DATADIR%%/icons/xpra.png
 %%DATADIR%%/icons/xterm.png
-%%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__init__.py
-%%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
-%%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/decoder%%PYTHON_EXT_SUFFIX%%.so
-%%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/encoder%%PYTHON_EXT_SUFFIX%%.so