Attachment #169605 for bug #205864




# $FreeBSD$

PORTNAME=	xpra
PORTVERSION=	0.16.3
PORTREVISION=	2
CATEGORIES=	x11
MASTER_SITES=	http://xpra.org/src/


LICENSE=	GPLv2

BUILD_DEPENDS=	cython:lang/cython \
		${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1 \
		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lz4>=0.7.0_1:archivers/py-lz4 \
		${PYTHON_SITELIBDIR}/rencode/__init__.py:converters/py-rencode \
		${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus \
		${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-opengl \
		${PYTHON_SITELIBDIR}/OpenGL_accelerate/__init__.py:graphics/py-opengl-accelerate \
		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
		${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1 \
		${PYTHON_SITELIBDIR}/netifaces.so:net/py-netifaces \
		ssh-askpass:security/openssh-askpass \
		setxkbmap:x11/setxkbmap \

		${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gtkgl/__init__.py:x11-toolkits/py-gtkglext

USES=		desktop-file-utils pkgconfig python shared-mime-info tar:xz
USE_GSTREAMER1=	good #python
USE_PYTHON=	distutils
USE_XORG=	x11 xcomposite xdamage xfixes xkbfile xrandr xtst
PLIST_SUB+=	PORTVERSION=${PORTVERSION} PYTHON_VER=${PYTHON_VER}

XPRA_OPTIONS_ALL+=	enc_x264 enc_x265 vpx webp
XPRA_OPTIONS_ALL+=	${XPRA_OPTIONS_DISABLED}
XPRA_OPTIONS_DISABLED=	Xdummy Xdummy_wrapper
XPRA_OPTIONS_DISABLED+=	nvenc4 nvenc5

.include <bsd.port.options.mk>


Lines 1-2 Link Here

(-)x11/xpra/distinfo (-2 / +2 lines)
1	SHA256 (xpra-0.15.10.tar.xz) = 1403aaf571c486bb4a67bc9e9d431e5f863c9b7912bd65e6aec62fcea2d9d4e0	1	SHA256 (xpra-0.16.3.tar.xz) = 1516ab10eb348092077ffb698bce234d06a234a5748e422fdf92f34922fb39ea
2	SIZE (xpra-0.15.10.tar.xz) = 1200040	2	SIZE (xpra-0.16.3.tar.xz) = 1343392




--- setup.py.orig	2015-12-27 17:19:18 UTC
+++ setup.py
@@ -165,7 +165,7 @@ else:
     nvenc4_ENABLED          = pkg_config_ok("--exists", "nvenc4")
     nvenc5_ENABLED          = pkg_config_ok("--exists", "nvenc5")
 
-csc_opencl_ENABLED      = pkg_config_ok("--exists", "OpenCL") and check_pyopencl_AMD()
+csc_opencl_ENABLED      = pkg_config_ok("--exists", "OpenCL")
 memoryview_ENABLED      = sys.version>='2.7'
 
 annotate_ENABLED        = True
@@ -1649,12 +1649,12 @@ if WIN32:
 else:
     #OSX and *nix:
     scripts += ["scripts/xpra", "scripts/xpra_launcher"]

     add_data_files("share/appdata",       ["xdg/xpra.appdata.xml"])
     html5_dir = "share/xpra/www"
 
@@ -1707,7 +1707,7 @@ else:
         #(we remove it during the 'install' step below if it isn't actually needed)
         scripts.append("scripts/xpra_Xdummy")
         #not supported by all distros, but doesn't hurt to install it anyway:
-        add_data_files("lib/tmpfiles.d", ["tmpfiles.d/xpra.conf"])
+        #add_data_files("lib/tmpfiles.d", ["tmpfiles.d/xpra.conf"])
 
     #gentoo does weird things, calls --no-compile with build *and* install
     #then expects to find the cython modules!? ie:
@@ -1781,7 +1781,7 @@ if html5_ENABLED:
 
 if printing_ENABLED and os.name=="posix":
     #"/usr/lib/cups/backend":
-    cups_backend_dir = os.path.join(sys.prefix, "lib", "cups", "backend")

+    cups_backend_dir = os.path.join(sys.prefix, "libexec", "cups", "backend")
     add_data_files(cups_backend_dir, ["cups/xpraforwarder"])
 
 if annotate_ENABLED:

Lines 1-11 Link Here

(-)x11/xpra/files/patch-xpra_codecs_buffers_memalign.c (-11 lines)
1	--- xpra/codecs/buffers/memalign.c.orig 2015-04-30 15:00:04 UTC
2	+++ xpra/codecs/buffers/memalign.c
3	@@ -13,7 +13,7 @@
4	#ifdef _WIN32
5	#define _STDINT_H
6	#endif
7	-#if !defined(__APPLE__) && !defined(__FreeBSD__)
8	+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__)
9	#include <malloc.h>
10	#endif
11

Lines 1-11 Link Here

(-)x11/xpra/files/patch-xpra_net_net__util.py (-11 lines)
1	--- xpra/net/net_util.py.orig 2015-04-30 14:59:58 UTC
2	+++ xpra/net/net_util.py
3	@@ -127,7 +127,7 @@ if not sys.platform.startswith("win"):
4	elif sys.platform.startswith("sunos"):
5	library = "libsocket.so.1"
6	elif sys.platform.startswith("freebsd"):
7	- library = "/usr/lib/libc.so"
8	+ library = "/lib/libc.so.7"
9	elif sys.platform.startswith("openbsd"):
10	library = "libc.so"
11	try:

Lines 3-8 Link Here

(-)x11/xpra/pkg-plist (-79 / +186 lines)
3	bin/xpra_launcher	3	bin/xpra_launcher
4	%%ETCDIR%%/xorg.conf	4	%%ETCDIR%%/xorg.conf
5	@sample %%ETCDIR%%/xpra.conf.sample	5	@sample %%ETCDIR%%/xpra.conf.sample
		6	%%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
		7	%%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
		8	%%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
		9	%%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/top_level.txt
6	%%PYTHON_SITELIBDIR%%/xpra/__init__.py	10	%%PYTHON_SITELIBDIR%%/xpra/__init__.py
7	%%PYTHON_SITELIBDIR%%/xpra/__init__.pyc	11	%%PYTHON_SITELIBDIR%%/xpra/__init__.pyc
8	%%PYTHON_SITELIBDIR%%/xpra/__init__.pyo	12	%%PYTHON_SITELIBDIR%%/xpra/__init__.pyo
Lines 72-80 Link Here
72	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/client_window.py	76	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/client_window.py
73	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/client_window.pyc	77	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/client_window.pyc
74	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/client_window.pyo	78	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/client_window.pyo
75	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/custom_client_window.py
76	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/custom_client_window.pyc
77	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/custom_client_window.pyo
78	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/debuginfo_client_window.py	79	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/debuginfo_client_window.py
79	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/debuginfo_client_window.pyc	80	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/debuginfo_client_window.pyc
80	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/debuginfo_client_window.pyo	81	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/debuginfo_client_window.pyo
Lines 87-95 Link Here
87	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/pixmap_backing.py	88	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/pixmap_backing.py
88	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/pixmap_backing.pyc	89	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/pixmap_backing.pyc
89	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/pixmap_backing.pyo	90	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/pixmap_backing.pyo
90	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/topbar_client_window.py
91	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/topbar_client_window.pyc
92	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/topbar_client_window.pyo
93	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/tray_menu.py	91	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/tray_menu.py
94	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/tray_menu.pyc	92	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/tray_menu.pyc
95	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/tray_menu.pyo	93	%%PYTHON_SITELIBDIR%%/xpra/client/gtk2/tray_menu.pyo
Lines 181-186 Link Here
181	%%PYTHON_SITELIBDIR%%/xpra/codecs/argb/__init__.pyc	179	%%PYTHON_SITELIBDIR%%/xpra/codecs/argb/__init__.pyc
182	%%PYTHON_SITELIBDIR%%/xpra/codecs/argb/__init__.pyo	180	%%PYTHON_SITELIBDIR%%/xpra/codecs/argb/__init__.pyo
183	%%PYTHON_SITELIBDIR%%/xpra/codecs/argb/argb.so	181	%%PYTHON_SITELIBDIR%%/xpra/codecs/argb/argb.so
		182	%%PYTHON_SITELIBDIR%%/xpra/codecs/codec_checks.py
		183	%%PYTHON_SITELIBDIR%%/xpra/codecs/codec_checks.pyc
		184	%%PYTHON_SITELIBDIR%%/xpra/codecs/codec_checks.pyo
184	%%PYTHON_SITELIBDIR%%/xpra/codecs/codec_constants.py	185	%%PYTHON_SITELIBDIR%%/xpra/codecs/codec_constants.py
185	%%PYTHON_SITELIBDIR%%/xpra/codecs/codec_constants.pyc	186	%%PYTHON_SITELIBDIR%%/xpra/codecs/codec_constants.pyc
186	%%PYTHON_SITELIBDIR%%/xpra/codecs/codec_constants.pyo	187	%%PYTHON_SITELIBDIR%%/xpra/codecs/codec_constants.pyo
Lines 222-233 Link Here
222	%%PYTHON_SITELIBDIR%%/xpra/codecs/image_wrapper.py	223	%%PYTHON_SITELIBDIR%%/xpra/codecs/image_wrapper.py
223	%%PYTHON_SITELIBDIR%%/xpra/codecs/image_wrapper.pyc	224	%%PYTHON_SITELIBDIR%%/xpra/codecs/image_wrapper.pyc
224	%%PYTHON_SITELIBDIR%%/xpra/codecs/image_wrapper.pyo	225	%%PYTHON_SITELIBDIR%%/xpra/codecs/image_wrapper.pyo
		226	%%PYTHON_SITELIBDIR%%/xpra/codecs/libav_common/__init__.py
		227	%%PYTHON_SITELIBDIR%%/xpra/codecs/libav_common/__init__.pyc
		228	%%PYTHON_SITELIBDIR%%/xpra/codecs/libav_common/__init__.pyo
		229	%%PYTHON_SITELIBDIR%%/xpra/codecs/libav_common/av_log.so
225	%%PYTHON_SITELIBDIR%%/xpra/codecs/loader.py	230	%%PYTHON_SITELIBDIR%%/xpra/codecs/loader.py
226	%%PYTHON_SITELIBDIR%%/xpra/codecs/loader.pyc	231	%%PYTHON_SITELIBDIR%%/xpra/codecs/loader.pyc
227	%%PYTHON_SITELIBDIR%%/xpra/codecs/loader.pyo	232	%%PYTHON_SITELIBDIR%%/xpra/codecs/loader.pyo
228	%%PYTHON_SITELIBDIR%%/xpra/codecs/nv_util.py	233	%%PYTHON_SITELIBDIR%%/xpra/codecs/pillow/__init__.py
229	%%PYTHON_SITELIBDIR%%/xpra/codecs/nv_util.pyc	234	%%PYTHON_SITELIBDIR%%/xpra/codecs/pillow/__init__.pyc
230	%%PYTHON_SITELIBDIR%%/xpra/codecs/nv_util.pyo	235	%%PYTHON_SITELIBDIR%%/xpra/codecs/pillow/__init__.pyo
		236	%%PYTHON_SITELIBDIR%%/xpra/codecs/pillow/decode.py
		237	%%PYTHON_SITELIBDIR%%/xpra/codecs/pillow/decode.pyc
		238	%%PYTHON_SITELIBDIR%%/xpra/codecs/pillow/decode.pyo
		239	%%PYTHON_SITELIBDIR%%/xpra/codecs/pillow/encode.py
		240	%%PYTHON_SITELIBDIR%%/xpra/codecs/pillow/encode.pyc
		241	%%PYTHON_SITELIBDIR%%/xpra/codecs/pillow/encode.pyo
231	%%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.py	242	%%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.py
232	%%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.pyc	243	%%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.pyc
233	%%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.pyo	244	%%PYTHON_SITELIBDIR%%/xpra/codecs/video_helper.pyo
Lines 245-253 Link Here
245	%%PYTHON_SITELIBDIR%%/xpra/codecs/xor/__init__.pyc	256	%%PYTHON_SITELIBDIR%%/xpra/codecs/xor/__init__.pyc
246	%%PYTHON_SITELIBDIR%%/xpra/codecs/xor/__init__.pyo	257	%%PYTHON_SITELIBDIR%%/xpra/codecs/xor/__init__.pyo
247	%%PYTHON_SITELIBDIR%%/xpra/codecs/xor/cyxor.so	258	%%PYTHON_SITELIBDIR%%/xpra/codecs/xor/cyxor.so
248	%%PYTHON_SITELIBDIR%%/xpra/daemon_thread.py	259	%%PYTHON_SITELIBDIR%%/xpra/colorstreamhandler.py
249	%%PYTHON_SITELIBDIR%%/xpra/daemon_thread.pyc	260	%%PYTHON_SITELIBDIR%%/xpra/colorstreamhandler.pyc
250	%%PYTHON_SITELIBDIR%%/xpra/daemon_thread.pyo	261	%%PYTHON_SITELIBDIR%%/xpra/colorstreamhandler.pyo
		262	%%PYTHON_SITELIBDIR%%/xpra/dbus/__init__.py
		263	%%PYTHON_SITELIBDIR%%/xpra/dbus/__init__.pyc
		264	%%PYTHON_SITELIBDIR%%/xpra/dbus/__init__.pyo
		265	%%PYTHON_SITELIBDIR%%/xpra/dbus/common.py
		266	%%PYTHON_SITELIBDIR%%/xpra/dbus/common.pyc
		267	%%PYTHON_SITELIBDIR%%/xpra/dbus/common.pyo
		268	%%PYTHON_SITELIBDIR%%/xpra/dbus/gtk_menuactions.py
		269	%%PYTHON_SITELIBDIR%%/xpra/dbus/gtk_menuactions.pyc
		270	%%PYTHON_SITELIBDIR%%/xpra/dbus/gtk_menuactions.pyo
		271	%%PYTHON_SITELIBDIR%%/xpra/dbus/helper.py
		272	%%PYTHON_SITELIBDIR%%/xpra/dbus/helper.pyc
		273	%%PYTHON_SITELIBDIR%%/xpra/dbus/helper.pyo
		274	%%PYTHON_SITELIBDIR%%/xpra/dbus/notifications_forwarder.py
		275	%%PYTHON_SITELIBDIR%%/xpra/dbus/notifications_forwarder.pyc
		276	%%PYTHON_SITELIBDIR%%/xpra/dbus/notifications_forwarder.pyo
251	%%PYTHON_SITELIBDIR%%/xpra/dotxpra.py	277	%%PYTHON_SITELIBDIR%%/xpra/dotxpra.py
252	%%PYTHON_SITELIBDIR%%/xpra/dotxpra.pyc	278	%%PYTHON_SITELIBDIR%%/xpra/dotxpra.pyc
253	%%PYTHON_SITELIBDIR%%/xpra/dotxpra.pyo	279	%%PYTHON_SITELIBDIR%%/xpra/dotxpra.pyo
Lines 306-311 Link Here
306	%%PYTHON_SITELIBDIR%%/xpra/log.py	332	%%PYTHON_SITELIBDIR%%/xpra/log.py
307	%%PYTHON_SITELIBDIR%%/xpra/log.pyc	333	%%PYTHON_SITELIBDIR%%/xpra/log.pyc
308	%%PYTHON_SITELIBDIR%%/xpra/log.pyo	334	%%PYTHON_SITELIBDIR%%/xpra/log.pyo
		335	%%PYTHON_SITELIBDIR%%/xpra/make_thread.py
		336	%%PYTHON_SITELIBDIR%%/xpra/make_thread.pyc
		337	%%PYTHON_SITELIBDIR%%/xpra/make_thread.pyo
309	%%PYTHON_SITELIBDIR%%/xpra/net/__init__.py	338	%%PYTHON_SITELIBDIR%%/xpra/net/__init__.py
310	%%PYTHON_SITELIBDIR%%/xpra/net/__init__.pyc	339	%%PYTHON_SITELIBDIR%%/xpra/net/__init__.pyc
311	%%PYTHON_SITELIBDIR%%/xpra/net/__init__.pyo	340	%%PYTHON_SITELIBDIR%%/xpra/net/__init__.pyo
Lines 331-336 Link Here
331	%%PYTHON_SITELIBDIR%%/xpra/net/fake_jitter.py	360	%%PYTHON_SITELIBDIR%%/xpra/net/fake_jitter.py
332	%%PYTHON_SITELIBDIR%%/xpra/net/fake_jitter.pyc	361	%%PYTHON_SITELIBDIR%%/xpra/net/fake_jitter.pyc
333	%%PYTHON_SITELIBDIR%%/xpra/net/fake_jitter.pyo	362	%%PYTHON_SITELIBDIR%%/xpra/net/fake_jitter.pyo
		363	%%PYTHON_SITELIBDIR%%/xpra/net/file_transfer.py
		364	%%PYTHON_SITELIBDIR%%/xpra/net/file_transfer.pyc
		365	%%PYTHON_SITELIBDIR%%/xpra/net/file_transfer.pyo
334	%%PYTHON_SITELIBDIR%%/xpra/net/header.py	366	%%PYTHON_SITELIBDIR%%/xpra/net/header.py
335	%%PYTHON_SITELIBDIR%%/xpra/net/header.pyc	367	%%PYTHON_SITELIBDIR%%/xpra/net/header.pyc
336	%%PYTHON_SITELIBDIR%%/xpra/net/header.pyo	368	%%PYTHON_SITELIBDIR%%/xpra/net/header.pyo
Lines 400-405 Link Here
400	%%PYTHON_SITELIBDIR%%/xpra/platform/xposix/features.py	432	%%PYTHON_SITELIBDIR%%/xpra/platform/xposix/features.py
401	%%PYTHON_SITELIBDIR%%/xpra/platform/xposix/features.pyc	433	%%PYTHON_SITELIBDIR%%/xpra/platform/xposix/features.pyc
402	%%PYTHON_SITELIBDIR%%/xpra/platform/xposix/features.pyo	434	%%PYTHON_SITELIBDIR%%/xpra/platform/xposix/features.pyo
		435	%%PYTHON_SITELIBDIR%%/xpra/platform/xposix/gtkmenu_tray.py
		436	%%PYTHON_SITELIBDIR%%/xpra/platform/xposix/gtkmenu_tray.pyc
		437	%%PYTHON_SITELIBDIR%%/xpra/platform/xposix/gtkmenu_tray.pyo
403	%%PYTHON_SITELIBDIR%%/xpra/platform/xposix/gui.py	438	%%PYTHON_SITELIBDIR%%/xpra/platform/xposix/gui.py
404	%%PYTHON_SITELIBDIR%%/xpra/platform/xposix/gui.pyc	439	%%PYTHON_SITELIBDIR%%/xpra/platform/xposix/gui.pyc
405	%%PYTHON_SITELIBDIR%%/xpra/platform/xposix/gui.pyo	440	%%PYTHON_SITELIBDIR%%/xpra/platform/xposix/gui.pyo
Lines 433-438 Link Here
433	%%PYTHON_SITELIBDIR%%/xpra/scripts/exec_util.py	468	%%PYTHON_SITELIBDIR%%/xpra/scripts/exec_util.py
434	%%PYTHON_SITELIBDIR%%/xpra/scripts/exec_util.pyc	469	%%PYTHON_SITELIBDIR%%/xpra/scripts/exec_util.pyc
435	%%PYTHON_SITELIBDIR%%/xpra/scripts/exec_util.pyo	470	%%PYTHON_SITELIBDIR%%/xpra/scripts/exec_util.pyo
		471	%%PYTHON_SITELIBDIR%%/xpra/scripts/fdproxy.py
		472	%%PYTHON_SITELIBDIR%%/xpra/scripts/fdproxy.pyc
		473	%%PYTHON_SITELIBDIR%%/xpra/scripts/fdproxy.pyo
		474	%%PYTHON_SITELIBDIR%%/xpra/scripts/gtk_info.py
		475	%%PYTHON_SITELIBDIR%%/xpra/scripts/gtk_info.pyc
		476	%%PYTHON_SITELIBDIR%%/xpra/scripts/gtk_info.pyo
436	%%PYTHON_SITELIBDIR%%/xpra/scripts/main.py	477	%%PYTHON_SITELIBDIR%%/xpra/scripts/main.py
437	%%PYTHON_SITELIBDIR%%/xpra/scripts/main.pyc	478	%%PYTHON_SITELIBDIR%%/xpra/scripts/main.pyc
438	%%PYTHON_SITELIBDIR%%/xpra/scripts/main.pyo	479	%%PYTHON_SITELIBDIR%%/xpra/scripts/main.pyo
Lines 478-493 Link Here
478	%%PYTHON_SITELIBDIR%%/xpra/server/background_worker.py	519	%%PYTHON_SITELIBDIR%%/xpra/server/background_worker.py
479	%%PYTHON_SITELIBDIR%%/xpra/server/background_worker.pyc	520	%%PYTHON_SITELIBDIR%%/xpra/server/background_worker.pyc
480	%%PYTHON_SITELIBDIR%%/xpra/server/background_worker.pyo	521	%%PYTHON_SITELIBDIR%%/xpra/server/background_worker.pyo
481	%%PYTHON_SITELIBDIR%%/xpra/server/batch_config.py	522	%%PYTHON_SITELIBDIR%%/xpra/server/control_command.py
482	%%PYTHON_SITELIBDIR%%/xpra/server/batch_config.pyc	523	%%PYTHON_SITELIBDIR%%/xpra/server/control_command.pyc
483	%%PYTHON_SITELIBDIR%%/xpra/server/batch_config.pyo	524	%%PYTHON_SITELIBDIR%%/xpra/server/control_command.pyo
484	%%PYTHON_SITELIBDIR%%/xpra/server/batch_delay_calculator.py
485	%%PYTHON_SITELIBDIR%%/xpra/server/batch_delay_calculator.pyc
486	%%PYTHON_SITELIBDIR%%/xpra/server/batch_delay_calculator.pyo
487	%%PYTHON_SITELIBDIR%%/xpra/server/cystats.so	525	%%PYTHON_SITELIBDIR%%/xpra/server/cystats.so
488	%%PYTHON_SITELIBDIR%%/xpra/server/gtk_root_window_model.py	526	%%PYTHON_SITELIBDIR%%/xpra/server/dbus/__init__.py
489	%%PYTHON_SITELIBDIR%%/xpra/server/gtk_root_window_model.pyc	527	%%PYTHON_SITELIBDIR%%/xpra/server/dbus/__init__.pyc
490	%%PYTHON_SITELIBDIR%%/xpra/server/gtk_root_window_model.pyo	528	%%PYTHON_SITELIBDIR%%/xpra/server/dbus/__init__.pyo
		529	%%PYTHON_SITELIBDIR%%/xpra/server/dbus/dbus_server.py
		530	%%PYTHON_SITELIBDIR%%/xpra/server/dbus/dbus_server.pyc
		531	%%PYTHON_SITELIBDIR%%/xpra/server/dbus/dbus_server.pyo
		532	%%PYTHON_SITELIBDIR%%/xpra/server/dbus/dbus_source.py
		533	%%PYTHON_SITELIBDIR%%/xpra/server/dbus/dbus_source.pyc
		534	%%PYTHON_SITELIBDIR%%/xpra/server/dbus/dbus_source.pyo
491	%%PYTHON_SITELIBDIR%%/xpra/server/gtk_server_base.py	535	%%PYTHON_SITELIBDIR%%/xpra/server/gtk_server_base.py
492	%%PYTHON_SITELIBDIR%%/xpra/server/gtk_server_base.pyc	536	%%PYTHON_SITELIBDIR%%/xpra/server/gtk_server_base.pyc
493	%%PYTHON_SITELIBDIR%%/xpra/server/gtk_server_base.pyo	537	%%PYTHON_SITELIBDIR%%/xpra/server/gtk_server_base.pyo
Lines 497-512 Link Here
497	%%PYTHON_SITELIBDIR%%/xpra/server/picture_encode.py	541	%%PYTHON_SITELIBDIR%%/xpra/server/picture_encode.py
498	%%PYTHON_SITELIBDIR%%/xpra/server/picture_encode.pyc	542	%%PYTHON_SITELIBDIR%%/xpra/server/picture_encode.pyc
499	%%PYTHON_SITELIBDIR%%/xpra/server/picture_encode.pyo	543	%%PYTHON_SITELIBDIR%%/xpra/server/picture_encode.pyo
500	%%PYTHON_SITELIBDIR%%/xpra/server/proxy.py	544	%%PYTHON_SITELIBDIR%%/xpra/server/proxy/__init__.py
501	%%PYTHON_SITELIBDIR%%/xpra/server/proxy.pyc	545	%%PYTHON_SITELIBDIR%%/xpra/server/proxy/__init__.pyc
502	%%PYTHON_SITELIBDIR%%/xpra/server/proxy.pyo	546	%%PYTHON_SITELIBDIR%%/xpra/server/proxy/__init__.pyo
503	%%PYTHON_SITELIBDIR%%/xpra/server/proxy_instance_process.py	547	%%PYTHON_SITELIBDIR%%/xpra/server/proxy/proxy_instance_process.py
504	%%PYTHON_SITELIBDIR%%/xpra/server/proxy_instance_process.pyc	548	%%PYTHON_SITELIBDIR%%/xpra/server/proxy/proxy_instance_process.pyc
505	%%PYTHON_SITELIBDIR%%/xpra/server/proxy_instance_process.pyo	549	%%PYTHON_SITELIBDIR%%/xpra/server/proxy/proxy_instance_process.pyo
506	%%PYTHON_SITELIBDIR%%/xpra/server/proxy_server.py	550	%%PYTHON_SITELIBDIR%%/xpra/server/proxy/proxy_server.py
507	%%PYTHON_SITELIBDIR%%/xpra/server/proxy_server.pyc	551	%%PYTHON_SITELIBDIR%%/xpra/server/proxy/proxy_server.pyc
508	%%PYTHON_SITELIBDIR%%/xpra/server/proxy_server.pyo	552	%%PYTHON_SITELIBDIR%%/xpra/server/proxy/proxy_server.pyo
509	%%PYTHON_SITELIBDIR%%/xpra/server/region.so
510	%%PYTHON_SITELIBDIR%%/xpra/server/server_base.py	553	%%PYTHON_SITELIBDIR%%/xpra/server/server_base.py
511	%%PYTHON_SITELIBDIR%%/xpra/server/server_base.pyc	554	%%PYTHON_SITELIBDIR%%/xpra/server/server_base.pyc
512	%%PYTHON_SITELIBDIR%%/xpra/server/server_base.pyo	555	%%PYTHON_SITELIBDIR%%/xpra/server/server_base.pyo
Lines 516-524 Link Here
516	%%PYTHON_SITELIBDIR%%/xpra/server/server_uuid.py	559	%%PYTHON_SITELIBDIR%%/xpra/server/server_uuid.py
517	%%PYTHON_SITELIBDIR%%/xpra/server/server_uuid.pyc	560	%%PYTHON_SITELIBDIR%%/xpra/server/server_uuid.pyc
518	%%PYTHON_SITELIBDIR%%/xpra/server/server_uuid.pyo	561	%%PYTHON_SITELIBDIR%%/xpra/server/server_uuid.pyo
519	%%PYTHON_SITELIBDIR%%/xpra/server/shadow_server_base.py	562	%%PYTHON_SITELIBDIR%%/xpra/server/shadow/__init__.py
520	%%PYTHON_SITELIBDIR%%/xpra/server/shadow_server_base.pyc	563	%%PYTHON_SITELIBDIR%%/xpra/server/shadow/__init__.pyc
521	%%PYTHON_SITELIBDIR%%/xpra/server/shadow_server_base.pyo	564	%%PYTHON_SITELIBDIR%%/xpra/server/shadow/__init__.pyo
		565	%%PYTHON_SITELIBDIR%%/xpra/server/shadow/gtk_root_window_model.py
		566	%%PYTHON_SITELIBDIR%%/xpra/server/shadow/gtk_root_window_model.pyc
		567	%%PYTHON_SITELIBDIR%%/xpra/server/shadow/gtk_root_window_model.pyo
		568	%%PYTHON_SITELIBDIR%%/xpra/server/shadow/root_window_model.py
		569	%%PYTHON_SITELIBDIR%%/xpra/server/shadow/root_window_model.pyc
		570	%%PYTHON_SITELIBDIR%%/xpra/server/shadow/root_window_model.pyo
		571	%%PYTHON_SITELIBDIR%%/xpra/server/shadow/shadow_dbus_server.py
		572	%%PYTHON_SITELIBDIR%%/xpra/server/shadow/shadow_dbus_server.pyc
		573	%%PYTHON_SITELIBDIR%%/xpra/server/shadow/shadow_dbus_server.pyo
		574	%%PYTHON_SITELIBDIR%%/xpra/server/shadow/shadow_server_base.py
		575	%%PYTHON_SITELIBDIR%%/xpra/server/shadow/shadow_server_base.pyc
		576	%%PYTHON_SITELIBDIR%%/xpra/server/shadow/shadow_server_base.pyo
522	%%PYTHON_SITELIBDIR%%/xpra/server/source.py	577	%%PYTHON_SITELIBDIR%%/xpra/server/source.py
523	%%PYTHON_SITELIBDIR%%/xpra/server/source.pyc	578	%%PYTHON_SITELIBDIR%%/xpra/server/source.pyc
524	%%PYTHON_SITELIBDIR%%/xpra/server/source.pyo	579	%%PYTHON_SITELIBDIR%%/xpra/server/source.pyo
Lines 525-542 Link Here
525	%%PYTHON_SITELIBDIR%%/xpra/server/source_stats.py	580	%%PYTHON_SITELIBDIR%%/xpra/server/source_stats.py
526	%%PYTHON_SITELIBDIR%%/xpra/server/source_stats.pyc	581	%%PYTHON_SITELIBDIR%%/xpra/server/source_stats.pyc
527	%%PYTHON_SITELIBDIR%%/xpra/server/source_stats.pyo	582	%%PYTHON_SITELIBDIR%%/xpra/server/source_stats.pyo
528	%%PYTHON_SITELIBDIR%%/xpra/server/video_subregion.py	583	%%PYTHON_SITELIBDIR%%/xpra/server/window/__init__.py
529	%%PYTHON_SITELIBDIR%%/xpra/server/video_subregion.pyc	584	%%PYTHON_SITELIBDIR%%/xpra/server/window/__init__.pyc
530	%%PYTHON_SITELIBDIR%%/xpra/server/video_subregion.pyo	585	%%PYTHON_SITELIBDIR%%/xpra/server/window/__init__.pyo
531	%%PYTHON_SITELIBDIR%%/xpra/server/window_source.py	586	%%PYTHON_SITELIBDIR%%/xpra/server/window/batch_config.py
532	%%PYTHON_SITELIBDIR%%/xpra/server/window_source.pyc	587	%%PYTHON_SITELIBDIR%%/xpra/server/window/batch_config.pyc
533	%%PYTHON_SITELIBDIR%%/xpra/server/window_source.pyo	588	%%PYTHON_SITELIBDIR%%/xpra/server/window/batch_config.pyo
534	%%PYTHON_SITELIBDIR%%/xpra/server/window_stats.py	589	%%PYTHON_SITELIBDIR%%/xpra/server/window/batch_delay_calculator.py
535	%%PYTHON_SITELIBDIR%%/xpra/server/window_stats.pyc	590	%%PYTHON_SITELIBDIR%%/xpra/server/window/batch_delay_calculator.pyc
536	%%PYTHON_SITELIBDIR%%/xpra/server/window_stats.pyo	591	%%PYTHON_SITELIBDIR%%/xpra/server/window/batch_delay_calculator.pyo
537	%%PYTHON_SITELIBDIR%%/xpra/server/window_video_source.py	592	%%PYTHON_SITELIBDIR%%/xpra/server/window/region.so
538	%%PYTHON_SITELIBDIR%%/xpra/server/window_video_source.pyc	593	%%PYTHON_SITELIBDIR%%/xpra/server/window/video_subregion.py
539	%%PYTHON_SITELIBDIR%%/xpra/server/window_video_source.pyo	594	%%PYTHON_SITELIBDIR%%/xpra/server/window/video_subregion.pyc
		595	%%PYTHON_SITELIBDIR%%/xpra/server/window/video_subregion.pyo
		596	%%PYTHON_SITELIBDIR%%/xpra/server/window/window_source.py
		597	%%PYTHON_SITELIBDIR%%/xpra/server/window/window_source.pyc
		598	%%PYTHON_SITELIBDIR%%/xpra/server/window/window_source.pyo
		599	%%PYTHON_SITELIBDIR%%/xpra/server/window/window_stats.py
		600	%%PYTHON_SITELIBDIR%%/xpra/server/window/window_stats.pyc
		601	%%PYTHON_SITELIBDIR%%/xpra/server/window/window_stats.pyo
		602	%%PYTHON_SITELIBDIR%%/xpra/server/window/window_video_source.py
		603	%%PYTHON_SITELIBDIR%%/xpra/server/window/window_video_source.pyc
		604	%%PYTHON_SITELIBDIR%%/xpra/server/window/window_video_source.pyo
540	%%PYTHON_SITELIBDIR%%/xpra/simple_stats.py	605	%%PYTHON_SITELIBDIR%%/xpra/simple_stats.py
541	%%PYTHON_SITELIBDIR%%/xpra/simple_stats.pyc	606	%%PYTHON_SITELIBDIR%%/xpra/simple_stats.pyc
542	%%PYTHON_SITELIBDIR%%/xpra/simple_stats.pyo	607	%%PYTHON_SITELIBDIR%%/xpra/simple_stats.pyo
Lines 546-551 Link Here
546	%%PYTHON_SITELIBDIR%%/xpra/sound/gstreamer_util.py	611	%%PYTHON_SITELIBDIR%%/xpra/sound/gstreamer_util.py
547	%%PYTHON_SITELIBDIR%%/xpra/sound/gstreamer_util.pyc	612	%%PYTHON_SITELIBDIR%%/xpra/sound/gstreamer_util.pyc
548	%%PYTHON_SITELIBDIR%%/xpra/sound/gstreamer_util.pyo	613	%%PYTHON_SITELIBDIR%%/xpra/sound/gstreamer_util.pyo
		614	%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_common_util.py
		615	%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_common_util.pyc
		616	%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_common_util.pyo
		617	%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_none_util.py
		618	%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_none_util.pyc
		619	%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_none_util.pyo
		620	%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_pactl_util.py
		621	%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_pactl_util.pyc
		622	%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_pactl_util.pyo
		623	%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_palib_util.py
		624	%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_palib_util.pyc
		625	%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_palib_util.pyo
549	%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_util.py	626	%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_util.py
550	%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_util.pyc	627	%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_util.pyc
551	%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_util.pyo	628	%%PYTHON_SITELIBDIR%%/xpra/sound/pulseaudio_util.pyo
Lines 584-606 Link Here
584	%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/wait_for_x_server.so	661	%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/wait_for_x_server.so
585	%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/window_bindings.so	662	%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/window_bindings.so
586	%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/ximage.so	663	%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/ximage.so
587	%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_common.py	664	%%PYTHON_SITELIBDIR%%/xpra/x11/dbus/__init__.py
588	%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_common.pyc	665	%%PYTHON_SITELIBDIR%%/xpra/x11/dbus/__init__.pyc
589	%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_common.pyo	666	%%PYTHON_SITELIBDIR%%/xpra/x11/dbus/__init__.pyo
590	%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_helper.py	667	%%PYTHON_SITELIBDIR%%/xpra/x11/dbus/menu.py
591	%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_helper.pyc	668	%%PYTHON_SITELIBDIR%%/xpra/x11/dbus/menu.pyc
592	%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_helper.pyo	669	%%PYTHON_SITELIBDIR%%/xpra/x11/dbus/menu.pyo
593	%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_notifications_forwarder.py	670	%%PYTHON_SITELIBDIR%%/xpra/x11/dbus/x11_dbus_server.py
594	%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_notifications_forwarder.pyc	671	%%PYTHON_SITELIBDIR%%/xpra/x11/dbus/x11_dbus_server.pyc
595	%%PYTHON_SITELIBDIR%%/xpra/x11/dbus_notifications_forwarder.pyo	672	%%PYTHON_SITELIBDIR%%/xpra/x11/dbus/x11_dbus_server.pyo
		673	%%PYTHON_SITELIBDIR%%/xpra/x11/fakeXinerama.py
		674	%%PYTHON_SITELIBDIR%%/xpra/x11/fakeXinerama.pyc
		675	%%PYTHON_SITELIBDIR%%/xpra/x11/fakeXinerama.pyo
		676	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/__init__.py
		677	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/__init__.pyc
		678	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/__init__.pyo
		679	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/composite.py
		680	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/composite.pyc
		681	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/composite.pyo
		682	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/gdk_bindings.so
		683	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/gdk_display_source.so
		684	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/__init__.py
		685	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/__init__.pyc
		686	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/__init__.pyo
		687	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/base.py
		688	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/base.pyc
		689	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/base.pyo
		690	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/core.py
		691	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/core.pyc
		692	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/core.pyo
		693	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/or_window.py
		694	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/or_window.pyc
		695	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/or_window.pyo
		696	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/size_hints_util.py
		697	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/size_hints_util.pyc
		698	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/size_hints_util.pyo
		699	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/systray.py
		700	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/systray.pyc
		701	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/systray.pyo
		702	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/window.py
		703	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/window.pyc
		704	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/window.pyo
		705	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/selection.py
		706	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/selection.pyc
		707	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/selection.pyo
		708	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/tray.py
		709	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/tray.pyc
		710	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/tray.pyo
		711	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/window.py
		712	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/window.pyc
		713	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/window.pyo
		714	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/wm.py
		715	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/wm.pyc
		716	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/wm.pyo
		717	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/world_window.py
		718	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/world_window.pyc
		719	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/world_window.pyo
596	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/__init__.py	720	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/__init__.py
597	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/__init__.pyc	721	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/__init__.pyc
598	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/__init__.pyo	722	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/__init__.pyo
599	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/composite.py
600	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/composite.pyc
601	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/composite.pyo
602	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/gdk_bindings.so
603	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/gdk_display_source.so
604	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/keys.py	723	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/keys.py
605	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/keys.pyc	724	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/keys.pyc
606	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/keys.pyo	725	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/keys.pyo
Lines 607-630 Link Here
607	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/prop.py	726	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/prop.py
608	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/prop.pyc	727	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/prop.pyc
609	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/prop.pyo	728	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/prop.pyo
610	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/selection.py
611	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/selection.pyc
612	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/selection.pyo
613	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/send_wm.py	729	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/send_wm.py
614	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/send_wm.pyc	730	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/send_wm.pyc
615	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/send_wm.pyo	731	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/send_wm.pyo
616	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/tray.py
617	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/tray.pyc
618	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/tray.pyo
619	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/window.py
620	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/window.pyc
621	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/window.pyo
622	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/wm.py
623	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/wm.pyc
624	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/wm.pyo
625	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/world_window.py
626	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/world_window.pyc
627	%%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/world_window.pyo
628	%%PYTHON_SITELIBDIR%%/xpra/x11/server.py	732	%%PYTHON_SITELIBDIR%%/xpra/x11/server.py
629	%%PYTHON_SITELIBDIR%%/xpra/x11/server.pyc	733	%%PYTHON_SITELIBDIR%%/xpra/x11/server.pyc
630	%%PYTHON_SITELIBDIR%%/xpra/x11/server.pyo	734	%%PYTHON_SITELIBDIR%%/xpra/x11/server.pyo
Lines 637-642 Link Here
637	%%PYTHON_SITELIBDIR%%/xpra/x11/x11_server_base.py	741	%%PYTHON_SITELIBDIR%%/xpra/x11/x11_server_base.py
638	%%PYTHON_SITELIBDIR%%/xpra/x11/x11_server_base.pyc	742	%%PYTHON_SITELIBDIR%%/xpra/x11/x11_server_base.pyc
639	%%PYTHON_SITELIBDIR%%/xpra/x11/x11_server_base.pyo	743	%%PYTHON_SITELIBDIR%%/xpra/x11/x11_server_base.pyo
		744	%%PYTHON_SITELIBDIR%%/xpra/x11/x11_source.py
		745	%%PYTHON_SITELIBDIR%%/xpra/x11/x11_source.pyc
		746	%%PYTHON_SITELIBDIR%%/xpra/x11/x11_source.pyo
640	%%PYTHON_SITELIBDIR%%/xpra/x11/xkbhelper.py	747	%%PYTHON_SITELIBDIR%%/xpra/x11/xkbhelper.py
641	%%PYTHON_SITELIBDIR%%/xpra/x11/xkbhelper.pyc	748	%%PYTHON_SITELIBDIR%%/xpra/x11/xkbhelper.pyc
642	%%PYTHON_SITELIBDIR%%/xpra/x11/xkbhelper.pyo	749	%%PYTHON_SITELIBDIR%%/xpra/x11/xkbhelper.pyo
Lines 649-658 Link Here
649	%%PYTHON_SITELIBDIR%%/xpra/x11/xsettings_prop.py	756	%%PYTHON_SITELIBDIR%%/xpra/x11/xsettings_prop.py
650	%%PYTHON_SITELIBDIR%%/xpra/x11/xsettings_prop.pyc	757	%%PYTHON_SITELIBDIR%%/xpra/x11/xsettings_prop.pyc
651	%%PYTHON_SITELIBDIR%%/xpra/x11/xsettings_prop.pyo	758	%%PYTHON_SITELIBDIR%%/xpra/x11/xsettings_prop.pyo
652	%%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
653	%%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
654	%%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
655	%%PYTHON_SITELIBDIR%%/xpra-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/top_level.txt
656	libexec/cups/backend/xpraforwarder	759	libexec/cups/backend/xpraforwarder
657	man/man1/xpra.1.gz	760	man/man1/xpra.1.gz
658	man/man1/xpra_launcher.1.gz	761	man/man1/xpra_launcher.1.gz
Lines 685-690 Link Here
685	%%DATADIR%%/icons/quit.png	788	%%DATADIR%%/icons/quit.png
686	%%DATADIR%%/icons/raise.png	789	%%DATADIR%%/icons/raise.png
687	%%DATADIR%%/icons/retry.png	790	%%DATADIR%%/icons/retry.png
		791	%%DATADIR%%/icons/scaling.png
688	%%DATADIR%%/icons/slider.png	792	%%DATADIR%%/icons/slider.png
689	%%DATADIR%%/icons/speaker.png	793	%%DATADIR%%/icons/speaker.png
690	%%DATADIR%%/icons/speed.png	794	%%DATADIR%%/icons/speed.png
Lines 691-696 Link Here
691	%%DATADIR%%/icons/statistics.png	795	%%DATADIR%%/icons/statistics.png
692	%%DATADIR%%/icons/ticked-small.png	796	%%DATADIR%%/icons/ticked-small.png
693	%%DATADIR%%/icons/unticked-small.png	797	%%DATADIR%%/icons/unticked-small.png
		798	%%DATADIR%%/icons/upload.png
694	%%DATADIR%%/icons/win32.png	799	%%DATADIR%%/icons/win32.png
695	%%DATADIR%%/icons/xpra.png	800	%%DATADIR%%/icons/xpra.png
696	%%DATADIR%%/www/connect.html	801	%%DATADIR%%/www/connect.html
Lines 707-712 Link Here
707	%%DATADIR%%/www/include/broadway/LICENSE	812	%%DATADIR%%/www/include/broadway/LICENSE
708	%%DATADIR%%/www/include/close.png	813	%%DATADIR%%/www/include/close.png
709	%%DATADIR%%/www/include/deflate.min.js	814	%%DATADIR%%/www/include/deflate.min.js
		815	%%DATADIR%%/www/include/forge.min.js
710	%%DATADIR%%/www/include/inflate.min.js	816	%%DATADIR%%/www/include/inflate.min.js
711	%%DATADIR%%/www/include/jquery.min.js	817	%%DATADIR%%/www/include/jquery.min.js
712	%%DATADIR%%/www/include/jquery.throttle-debounce.min.js	818	%%DATADIR%%/www/include/jquery.throttle-debounce.min.js
Lines 715-720 Link Here
715	%%DATADIR%%/www/include/lz4.min.js	821	%%DATADIR%%/www/include/lz4.min.js
716	%%DATADIR%%/www/include/maximize.png	822	%%DATADIR%%/www/include/maximize.png
717	%%DATADIR%%/www/include/minimize.png	823	%%DATADIR%%/www/include/minimize.png
		824	%%DATADIR%%/www/include/spinner.css
718	%%DATADIR%%/www/include/websock.js	825	%%DATADIR%%/www/include/websock.js
719	%%DATADIR%%/www/include/wsworker_check.js	826	%%DATADIR%%/www/include/wsworker_check.js
720	%%DATADIR%%/www/include/xpra-logo.png	827	%%DATADIR%%/www/include/xpra-logo.png

Return to bug 205864

Lines 2-9 Link Here

(-)x11/xpra/Makefile (-5 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= xpra	4	PORTNAME= xpra
5	PORTVERSION= 0.15.10	5	PORTVERSION= 0.16.3
6	PORTREVISION= 2
7	CATEGORIES= x11	6	CATEGORIES= x11
8	MASTER_SITES= http://xpra.org/src/	7	MASTER_SITES= http://xpra.org/src/
9		8
Lines 13-25 Link Here
13	LICENSE= GPLv2	12	LICENSE= GPLv2
14		13
15	BUILD_DEPENDS= cython:lang/cython \	14	BUILD_DEPENDS= cython:lang/cython \
		15	${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1 \
16	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2	16	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2
17	RUN_DEPENDS= py${PYTHON_SUFFIX}-lz4>=0.7.0_1:archivers/py-lz4 \	17	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lz4>=0.7.0_1:archivers/py-lz4 \
18	${PYTHON_SITELIBDIR}/rencode/__init__.py:converters/py-rencode \	18	${PYTHON_SITELIBDIR}/rencode/__init__.py:converters/py-rencode \
19	${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus \	19	${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus \
20	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-opengl \	20	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-opengl \
21	${PYTHON_SITELIBDIR}/OpenGL_accelerate/__init__.py:graphics/py-opengl-accelerate \	21	${PYTHON_SITELIBDIR}/OpenGL_accelerate/__init__.py:graphics/py-opengl-accelerate \
22	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \	22	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
		23	${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1 \
23	${PYTHON_SITELIBDIR}/netifaces.so:net/py-netifaces \	24	${PYTHON_SITELIBDIR}/netifaces.so:net/py-netifaces \
24	ssh-askpass:security/openssh-askpass \	25	ssh-askpass:security/openssh-askpass \
25	setxkbmap:x11/setxkbmap \	26	setxkbmap:x11/setxkbmap \
Lines 31-37 Link Here
31	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gtkgl/__init__.py:x11-toolkits/py-gtkglext	32	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gtkgl/__init__.py:x11-toolkits/py-gtkglext
32		33
33	USES= desktop-file-utils pkgconfig python shared-mime-info tar:xz	34	USES= desktop-file-utils pkgconfig python shared-mime-info tar:xz
34	USE_GSTREAMER= good python	35	USE_GSTREAMER1= good #python
35	USE_PYTHON= distutils	36	USE_PYTHON= distutils
36	USE_XORG= x11 xcomposite xdamage xfixes xkbfile xrandr xtst	37	USE_XORG= x11 xcomposite xdamage xfixes xkbfile xrandr xtst
37	PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHON_VER=${PYTHON_VER}	38	PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHON_VER=${PYTHON_VER}
Lines 69-75 Link Here
69	XPRA_OPTIONS_ALL+= enc_x264 enc_x265 vpx webp	70	XPRA_OPTIONS_ALL+= enc_x264 enc_x265 vpx webp
70	XPRA_OPTIONS_ALL+= ${XPRA_OPTIONS_DISABLED}	71	XPRA_OPTIONS_ALL+= ${XPRA_OPTIONS_DISABLED}
71	XPRA_OPTIONS_DISABLED= Xdummy Xdummy_wrapper	72	XPRA_OPTIONS_DISABLED= Xdummy Xdummy_wrapper
72	XPRA_OPTIONS_DISABLED+= nvenc3 nvenc4 nvenc5	73	XPRA_OPTIONS_DISABLED+= nvenc4 nvenc5
73		74
74	.include <bsd.port.options.mk>	75	.include <bsd.port.options.mk>
75		76

Lines 1-15 Link Here

(-)x11/xpra/files/patch-setup.py (-10 / +19 lines)
1	--- setup.py.orig 2015-09-10 14:42:44 UTC	1	--- setup.py.orig 2015-12-27 17:19:18 UTC
2	+++ setup.py	2	+++ setup.py
3	@@ -147,7 +147,7 @@ nvenc4_ENABLED = pkg_config_ok(	3	@@ -165,7 +165,7 @@ else:
4	nvenc5_ENABLED = pkg_config_ok("--exists", "nvenc5")	4	nvenc4_ENABLED = pkg_config_ok("--exists", "nvenc4")
5	#elif os.path.exists("C:\\nvenc_3.0_windows_sdk")	5	nvenc5_ENABLED = pkg_config_ok("--exists", "nvenc5")
6	#...	6
7	-csc_opencl_ENABLED = pkg_config_ok("--exists", "OpenCL") and check_pyopencl_AMD()	7	-csc_opencl_ENABLED = pkg_config_ok("--exists", "OpenCL") and check_pyopencl_AMD()
8	+csc_opencl_ENABLED = pkg_config_ok("--exists", "OpenCL")	8	+csc_opencl_ENABLED = pkg_config_ok("--exists", "OpenCL")
9	memoryview_ENABLED = PYTHON3	9	memoryview_ENABLED = sys.version>='2.7'
10		10
11	warn_ENABLED = True	11	annotate_ENABLED = True
12	@@ -1560,12 +1560,12 @@ if WIN32:	12	@@ -1649,12 +1649,12 @@ if WIN32:
13	else:	13	else:
14	#OSX and *nix:	14	#OSX and *nix:
15	scripts += ["scripts/xpra", "scripts/xpra_launcher"]	15	scripts += ["scripts/xpra", "scripts/xpra_launcher"]
Lines 24-31 Link Here
24	add_data_files("share/appdata", ["xdg/xpra.appdata.xml"])	24	add_data_files("share/appdata", ["xdg/xpra.appdata.xml"])
25	html5_dir = "share/xpra/www"	25	html5_dir = "share/xpra/www"
26		26
27	@@ -1688,7 +1688,7 @@ if html5_ENABLED:	27	@@ -1707,7 +1707,7 @@ else:
		28	#(we remove it during the 'install' step below if it isn't actually needed)
		29	scripts.append("scripts/xpra_Xdummy")
		30	#not supported by all distros, but doesn't hurt to install it anyway:
		31	- add_data_files("lib/tmpfiles.d", ["tmpfiles.d/xpra.conf"])
		32	+ #add_data_files("lib/tmpfiles.d", ["tmpfiles.d/xpra.conf"])
28		33
		34	#gentoo does weird things, calls --no-compile with build and install
		35	#then expects to find the cython modules!? ie:
		36	@@ -1781,7 +1781,7 @@ if html5_ENABLED:
		37
29	if printing_ENABLED and os.name=="posix":	38	if printing_ENABLED and os.name=="posix":
30	#"/usr/lib/cups/backend":	39	#"/usr/lib/cups/backend":
31	- cups_backend_dir = os.path.join(sys.prefix, "lib", "cups", "backend")	40	- cups_backend_dir = os.path.join(sys.prefix, "lib", "cups", "backend")
Lines 32-35 Link Here
32	+ cups_backend_dir = os.path.join(sys.prefix, "libexec", "cups", "backend")	41	+ cups_backend_dir = os.path.join(sys.prefix, "libexec", "cups", "backend")
33	add_data_files(cups_backend_dir, ["cups/xpraforwarder"])	42	add_data_files(cups_backend_dir, ["cups/xpraforwarder"])
34		43
35		44	if annotate_ENABLED: