pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

py-xpra: update to 1.0.

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon Dec 12 15:43:22 2016 +0100
Changeset:	be3a066a6cbe343cd08d6dd457b32e74450494f4

Modified Files:
	TODO
	py-xpra/Makefile
	py-xpra/PLIST
	py-xpra/distinfo
Added Files:
	py-xpra/patches/patch-service_xpra
Removed Files:
	py-xpra/patches/patch-setup.py
	py-xpra/patches/patch-xpra_codecs_v4l2_pusher.pyx
	py-xpra/patches/patch-xpra_codecs_v4l2_video.h

Log Message:
py-xpra: update to 1.0.

v1.0 (2016-09-21)
======================
	-- support all current versions of Ubuntu and Debian using a private ffmpeg library
	-- proxy server can start new sessions on demand
	-- SSH start server support on OSX < 10.11
	-- support SSH password in connection dialog on all platforms
	-- desktop mode for forwarding a full desktop (similar to VNC)
	-- multi-monitor geometry fixes
	-- increased webcam framerate, better UI integration
	-- drag and drop support within applications
	-- SSL support
	-- built-in support for websocket transport, both client and server
	-- keyboard and mouse grabbing support
	-- window focus fixes
	-- html improvements: bell support, num lock, cursors, window icons, osx shadow server, etc.
	-- clipboard direction restrictions: to client, to server, both or disabled
	-- client-side emulation for X11 window move and resize requests messages
	-- 30-bit colour modes with patched Xdummy
	-- automatic video encoder tuning, support for B-frames with x264
	-- chunking for file transfers, higher file size limits
	-- more efficient sound subprocess communication channel
	-- new sound stream compression options, including aac and mpeg4 audio container
	-- more dynamic video encoding automatic selection
	-- much faster forwarding of scrolling content
	-- more picture codecs and sound information shown on session info
	-- support for arbitrary mmap file locations
	-- split configuration file in /etc/xpra/conf.d/
	-- support pam sessions
	-- try harder to exit cleanly
	-- build cleanups

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=be3a066a6cbe343cd08d6dd457b32e74450494f4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 TODO                                              |   1 -
 py-xpra/Makefile                                  |   3 +-
 py-xpra/PLIST                                     | 145 +++++++++++++++-------
 py-xpra/distinfo                                  |  12 +-
 py-xpra/patches/patch-service_xpra                |  13 ++
 py-xpra/patches/patch-setup.py                    |  12 --
 py-xpra/patches/patch-xpra_codecs_v4l2_pusher.pyx |  13 --
 py-xpra/patches/patch-xpra_codecs_v4l2_video.h    |  16 ---
 8 files changed, 119 insertions(+), 96 deletions(-)

diffs:
diff --git a/TODO b/TODO
index 7902f89..5a3a4b0 100644
--- a/TODO
+++ b/TODO
@@ -104,7 +104,6 @@ Suggested package updates
 	o py-scrapy-1.2.1
 	o py-smmap-2.0.1
 	o py-smop-0.29
-	o py-xpra-1.0
 	o py-zeitgeist-0.9.16
 	o qmc2-0.59
 	o qtcreator-4.1
diff --git a/py-xpra/Makefile b/py-xpra/Makefile
index aa76012..0c5e804 100644
--- a/py-xpra/Makefile
+++ b/py-xpra/Makefile
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.21 2015/09/07 13:10:43 thomasklausner Exp $
 
-DISTNAME=	xpra-0.17.6
+DISTNAME=	xpra-1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://xpra.org/src/
 EXTRACT_SUFX=	.tar.xz
diff --git a/py-xpra/PLIST b/py-xpra/PLIST
index d6c7666..d59cb1f 100644
--- a/py-xpra/PLIST
+++ b/py-xpra/PLIST
@@ -1,7 +1,22 @@
 @comment $NetBSD$
 bin/xpra
-bin/xpra_Xdummy
 bin/xpra_launcher
+etc/xpra/conf.d/05_features.conf
+etc/xpra/conf.d/10_network.conf
+etc/xpra/conf.d/12_ssl.conf
+etc/xpra/conf.d/15_file_transfers.conf
+etc/xpra/conf.d/16_printing.conf
+etc/xpra/conf.d/20_sound.conf
+etc/xpra/conf.d/30_picture.conf
+etc/xpra/conf.d/35_webcam.conf
+etc/xpra/conf.d/40_client.conf
+etc/xpra/conf.d/42_client_keyboard.conf
+etc/xpra/conf.d/50_server_network.conf
+etc/xpra/conf.d/55_server_x11.conf
+etc/xpra/conf.d/60_server.conf
+etc/xpra/conf.d/65_proxy.conf
+etc/xpra/cuda.conf
+etc/xpra/nvenc.keys
 lib/cups/backend/xpraforwarder
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/xpra/__init__.py
@@ -73,9 +88,6 @@ ${PYSITELIB}/xpra/client/gtk2/client.pyo
 ${PYSITELIB}/xpra/client/gtk2/client_window.py
 ${PYSITELIB}/xpra/client/gtk2/client_window.pyc
 ${PYSITELIB}/xpra/client/gtk2/client_window.pyo
-${PYSITELIB}/xpra/client/gtk2/debuginfo_client_window.py
-${PYSITELIB}/xpra/client/gtk2/debuginfo_client_window.pyc
-${PYSITELIB}/xpra/client/gtk2/debuginfo_client_window.pyo
 ${PYSITELIB}/xpra/client/gtk2/gtk2_notifier.py
 ${PYSITELIB}/xpra/client/gtk2/gtk2_notifier.pyc
 ${PYSITELIB}/xpra/client/gtk2/gtk2_notifier.pyo
@@ -197,6 +209,10 @@ ${PYSITELIB}/xpra/codecs/dec_avcodec2/__init__.py
 ${PYSITELIB}/xpra/codecs/dec_avcodec2/__init__.pyc
 ${PYSITELIB}/xpra/codecs/dec_avcodec2/__init__.pyo
 ${PYSITELIB}/xpra/codecs/dec_avcodec2/decoder.so
+${PYSITELIB}/xpra/codecs/enc_ffmpeg/__init__.py
+${PYSITELIB}/xpra/codecs/enc_ffmpeg/__init__.pyc
+${PYSITELIB}/xpra/codecs/enc_ffmpeg/__init__.pyo
+${PYSITELIB}/xpra/codecs/enc_ffmpeg/encoder.so
 ${PYSITELIB}/xpra/codecs/enc_proxy/__init__.py
 ${PYSITELIB}/xpra/codecs/enc_proxy/__init__.pyc
 ${PYSITELIB}/xpra/codecs/enc_proxy/__init__.pyo
@@ -260,6 +276,9 @@ ${PYSITELIB}/xpra/dbus/helper.pyo
 ${PYSITELIB}/xpra/dbus/notifications_forwarder.py
 ${PYSITELIB}/xpra/dbus/notifications_forwarder.pyc
 ${PYSITELIB}/xpra/dbus/notifications_forwarder.pyo
+${PYSITELIB}/xpra/exit_codes.py
+${PYSITELIB}/xpra/exit_codes.pyc
+${PYSITELIB}/xpra/exit_codes.pyo
 ${PYSITELIB}/xpra/gtk_common/__init__.py
 ${PYSITELIB}/xpra/gtk_common/__init__.pyc
 ${PYSITELIB}/xpra/gtk_common/__init__.pyo
@@ -324,9 +343,6 @@ ${PYSITELIB}/xpra/make_thread.pyo
 ${PYSITELIB}/xpra/net/__init__.py
 ${PYSITELIB}/xpra/net/__init__.pyc
 ${PYSITELIB}/xpra/net/__init__.pyo
-${PYSITELIB}/xpra/net/avahi_publisher.py
-${PYSITELIB}/xpra/net/avahi_publisher.pyc
-${PYSITELIB}/xpra/net/avahi_publisher.pyo
 ${PYSITELIB}/xpra/net/bencode/__init__.py
 ${PYSITELIB}/xpra/net/bencode/__init__.pyc
 ${PYSITELIB}/xpra/net/bencode/__init__.pyo
@@ -352,6 +368,21 @@ ${PYSITELIB}/xpra/net/file_transfer.pyo
 ${PYSITELIB}/xpra/net/header.py
 ${PYSITELIB}/xpra/net/header.pyc
 ${PYSITELIB}/xpra/net/header.pyo
+${PYSITELIB}/xpra/net/mdns/__init__.py
+${PYSITELIB}/xpra/net/mdns/__init__.pyc
+${PYSITELIB}/xpra/net/mdns/__init__.pyo
+${PYSITELIB}/xpra/net/mdns/avahi_listener.py
+${PYSITELIB}/xpra/net/mdns/avahi_listener.pyc
+${PYSITELIB}/xpra/net/mdns/avahi_listener.pyo
+${PYSITELIB}/xpra/net/mdns/avahi_publisher.py
+${PYSITELIB}/xpra/net/mdns/avahi_publisher.pyc
+${PYSITELIB}/xpra/net/mdns/avahi_publisher.pyo
+${PYSITELIB}/xpra/net/mdns/pybonjour.py
+${PYSITELIB}/xpra/net/mdns/pybonjour.pyc
+${PYSITELIB}/xpra/net/mdns/pybonjour.pyo
+${PYSITELIB}/xpra/net/mdns/pybonjour_publisher.py
+${PYSITELIB}/xpra/net/mdns/pybonjour_publisher.pyc
+${PYSITELIB}/xpra/net/mdns/pybonjour_publisher.pyo
 ${PYSITELIB}/xpra/net/mmap_pipe.py
 ${PYSITELIB}/xpra/net/mmap_pipe.pyc
 ${PYSITELIB}/xpra/net/mmap_pipe.pyo
@@ -364,12 +395,6 @@ ${PYSITELIB}/xpra/net/packet_encoding.pyo
 ${PYSITELIB}/xpra/net/protocol.py
 ${PYSITELIB}/xpra/net/protocol.pyc
 ${PYSITELIB}/xpra/net/protocol.pyo
-${PYSITELIB}/xpra/net/pybonjour.py
-${PYSITELIB}/xpra/net/pybonjour.pyc
-${PYSITELIB}/xpra/net/pybonjour.pyo
-${PYSITELIB}/xpra/net/pybonjour_publisher.py
-${PYSITELIB}/xpra/net/pybonjour_publisher.pyc
-${PYSITELIB}/xpra/net/pybonjour_publisher.pyo
 ${PYSITELIB}/xpra/net/pycrypto_backend.py
 ${PYSITELIB}/xpra/net/pycrypto_backend.pyc
 ${PYSITELIB}/xpra/net/pycrypto_backend.pyo
@@ -379,6 +404,9 @@ ${PYSITELIB}/xpra/net/pycryptography_backend.pyo
 ${PYSITELIB}/xpra/net/subprocess_wrapper.py
 ${PYSITELIB}/xpra/net/subprocess_wrapper.pyc
 ${PYSITELIB}/xpra/net/subprocess_wrapper.pyo
+${PYSITELIB}/xpra/net/websocket.py
+${PYSITELIB}/xpra/net/websocket.pyc
+${PYSITELIB}/xpra/net/websocket.pyo
 ${PYSITELIB}/xpra/os_util.py
 ${PYSITELIB}/xpra/os_util.pyc
 ${PYSITELIB}/xpra/os_util.pyo
@@ -427,6 +455,9 @@ ${PYSITELIB}/xpra/platform/shadow_server.pyo
 ${PYSITELIB}/xpra/platform/ui_thread_watcher.py
 ${PYSITELIB}/xpra/platform/ui_thread_watcher.pyc
 ${PYSITELIB}/xpra/platform/ui_thread_watcher.pyo
+${PYSITELIB}/xpra/platform/webcam.py
+${PYSITELIB}/xpra/platform/webcam.pyc
+${PYSITELIB}/xpra/platform/webcam.pyo
 ${PYSITELIB}/xpra/platform/xposix/__init__.py
 ${PYSITELIB}/xpra/platform/xposix/__init__.pyc
 ${PYSITELIB}/xpra/platform/xposix/__init__.pyo
@@ -463,18 +494,15 @@ ${PYSITELIB}/xpra/platform/xposix/printing.pyo
 ${PYSITELIB}/xpra/platform/xposix/shadow_server.py
 ${PYSITELIB}/xpra/platform/xposix/shadow_server.pyc
 ${PYSITELIB}/xpra/platform/xposix/shadow_server.pyo
-${PYSITELIB}/xpra/platform/xposix/webcam_util.py
-${PYSITELIB}/xpra/platform/xposix/webcam_util.pyc
-${PYSITELIB}/xpra/platform/xposix/webcam_util.pyo
+${PYSITELIB}/xpra/platform/xposix/webcam.py
+${PYSITELIB}/xpra/platform/xposix/webcam.pyc
+${PYSITELIB}/xpra/platform/xposix/webcam.pyo
 ${PYSITELIB}/xpra/scripts/__init__.py
 ${PYSITELIB}/xpra/scripts/__init__.pyc
 ${PYSITELIB}/xpra/scripts/__init__.pyo
 ${PYSITELIB}/xpra/scripts/config.py
 ${PYSITELIB}/xpra/scripts/config.pyc
 ${PYSITELIB}/xpra/scripts/config.pyo
-${PYSITELIB}/xpra/scripts/exec_util.py
-${PYSITELIB}/xpra/scripts/exec_util.pyc
-${PYSITELIB}/xpra/scripts/exec_util.pyo
 ${PYSITELIB}/xpra/scripts/fdproxy.py
 ${PYSITELIB}/xpra/scripts/fdproxy.pyc
 ${PYSITELIB}/xpra/scripts/fdproxy.pyo
@@ -542,6 +570,9 @@ ${PYSITELIB}/xpra/server/cystats.so
 ${PYSITELIB}/xpra/server/dbus/__init__.py
 ${PYSITELIB}/xpra/server/dbus/__init__.pyc
 ${PYSITELIB}/xpra/server/dbus/__init__.pyo
+${PYSITELIB}/xpra/server/dbus/dbus_common.py
+${PYSITELIB}/xpra/server/dbus/dbus_common.pyc
+${PYSITELIB}/xpra/server/dbus/dbus_common.pyo
 ${PYSITELIB}/xpra/server/dbus/dbus_server.py
 ${PYSITELIB}/xpra/server/dbus/dbus_server.pyc
 ${PYSITELIB}/xpra/server/dbus/dbus_server.pyo
@@ -608,7 +639,11 @@ ${PYSITELIB}/xpra/server/window/batch_config.pyo
 ${PYSITELIB}/xpra/server/window/batch_delay_calculator.py
 ${PYSITELIB}/xpra/server/window/batch_delay_calculator.pyc
 ${PYSITELIB}/xpra/server/window/batch_delay_calculator.pyo
+${PYSITELIB}/xpra/server/window/motion.so
 ${PYSITELIB}/xpra/server/window/region.so
+${PYSITELIB}/xpra/server/window/video_scoring.py
+${PYSITELIB}/xpra/server/window/video_scoring.pyc
+${PYSITELIB}/xpra/server/window/video_scoring.pyo
 ${PYSITELIB}/xpra/server/window/video_subregion.py
 ${PYSITELIB}/xpra/server/window/video_subregion.pyc
 ${PYSITELIB}/xpra/server/window/video_subregion.pyo
@@ -627,6 +662,9 @@ ${PYSITELIB}/xpra/simple_stats.pyo
 ${PYSITELIB}/xpra/sound/__init__.py
 ${PYSITELIB}/xpra/sound/__init__.pyc
 ${PYSITELIB}/xpra/sound/__init__.pyo
+${PYSITELIB}/xpra/sound/common.py
+${PYSITELIB}/xpra/sound/common.pyc
+${PYSITELIB}/xpra/sound/common.pyo
 ${PYSITELIB}/xpra/sound/gst_hacks.py
 ${PYSITELIB}/xpra/sound/gst_hacks.pyc
 ${PYSITELIB}/xpra/sound/gst_hacks.pyo
@@ -692,6 +730,9 @@ ${PYSITELIB}/xpra/x11/dbus/menu.pyo
 ${PYSITELIB}/xpra/x11/dbus/x11_dbus_server.py
 ${PYSITELIB}/xpra/x11/dbus/x11_dbus_server.pyc
 ${PYSITELIB}/xpra/x11/dbus/x11_dbus_server.pyo
+${PYSITELIB}/xpra/x11/desktop_server.py
+${PYSITELIB}/xpra/x11/desktop_server.pyc
+${PYSITELIB}/xpra/x11/desktop_server.pyo
 ${PYSITELIB}/xpra/x11/fakeXinerama.py
 ${PYSITELIB}/xpra/x11/fakeXinerama.pyc
 ${PYSITELIB}/xpra/x11/fakeXinerama.pyo
@@ -712,6 +753,9 @@ ${PYSITELIB}/xpra/x11/gtk2/models/base.pyo
 ${PYSITELIB}/xpra/x11/gtk2/models/core.py
 ${PYSITELIB}/xpra/x11/gtk2/models/core.pyc
 ${PYSITELIB}/xpra/x11/gtk2/models/core.pyo
+${PYSITELIB}/xpra/x11/gtk2/models/model_stub.py
+${PYSITELIB}/xpra/x11/gtk2/models/model_stub.pyc
+${PYSITELIB}/xpra/x11/gtk2/models/model_stub.pyo
 ${PYSITELIB}/xpra/x11/gtk2/models/or_window.py
 ${PYSITELIB}/xpra/x11/gtk2/models/or_window.pyc
 ${PYSITELIB}/xpra/x11/gtk2/models/or_window.pyo
@@ -733,6 +777,9 @@ ${PYSITELIB}/xpra/x11/gtk2/tray.pyo
 ${PYSITELIB}/xpra/x11/gtk2/window.py
 ${PYSITELIB}/xpra/x11/gtk2/window.pyc
 ${PYSITELIB}/xpra/x11/gtk2/window.pyo
+${PYSITELIB}/xpra/x11/gtk2/window_damage.py
+${PYSITELIB}/xpra/x11/gtk2/window_damage.pyc
+${PYSITELIB}/xpra/x11/gtk2/window_damage.pyo
 ${PYSITELIB}/xpra/x11/gtk2/wm.py
 ${PYSITELIB}/xpra/x11/gtk2/wm.pyc
 ${PYSITELIB}/xpra/x11/gtk2/wm.pyo
@@ -826,33 +873,41 @@ share/xpra/icons/webcam.png
 share/xpra/icons/win32.png
 share/xpra/icons/xpra.png
 share/xpra/www/connect.html
-share/xpra/www/css/bootstrap.min.css
+share/xpra/www/css/bootstrap.css
+share/xpra/www/css/bootstrap.css.map
+share/xpra/www/css/client.css
 share/xpra/www/css/signin.css
+share/xpra/www/css/spinner.css
 share/xpra/www/favicon.ico
 share/xpra/www/favicon.png
-share/xpra/www/include/aurora/aurora-xpra.js
-share/xpra/www/include/aurora/aurora.js
-share/xpra/www/include/aurora/mp3.js
-share/xpra/www/include/bencode.js
-share/xpra/www/include/broadway/AUTHORS
-share/xpra/www/include/broadway/Decoder.js
-share/xpra/www/include/broadway/LICENSE
-share/xpra/www/include/close.png
-share/xpra/www/include/deflate.min.js
-share/xpra/www/include/forge.min.js
-share/xpra/www/include/inflate.min.js
-share/xpra/www/include/jquery.min.js
-share/xpra/www/include/jquery.throttle-debounce.min.js
-share/xpra/www/include/jqueryui.min.js
-share/xpra/www/include/keycodes.js
-share/xpra/www/include/lz4.min.js
-share/xpra/www/include/maximize.png
-share/xpra/www/include/minimize.png
-share/xpra/www/include/spinner.css
-share/xpra/www/include/websock.js
-share/xpra/www/include/wsworker_check.js
-share/xpra/www/include/xpra-logo.png
-share/xpra/www/include/xpra_client.js
-share/xpra/www/include/xpra_protocol.js
-share/xpra/www/include/xpra_window.js
+share/xpra/www/icons/close.png
+share/xpra/www/icons/maximize.png
+share/xpra/www/icons/minimize.png
+share/xpra/www/icons/noicon.png
+share/xpra/www/icons/xpra-logo.png
 share/xpra/www/index.html
+share/xpra/www/js/Client.js
+share/xpra/www/js/Keycodes.js
+share/xpra/www/js/MediaSourceUtil.js
+share/xpra/www/js/Notifications.js
+share/xpra/www/js/Protocol.js
+share/xpra/www/js/Utilities.js
+share/xpra/www/js/Window.js
+share/xpra/www/js/lib/aurora/aurora-xpra.js
+share/xpra/www/js/lib/aurora/aurora.js
+share/xpra/www/js/lib/aurora/flac.js
+share/xpra/www/js/lib/aurora/flac.js.map
+share/xpra/www/js/lib/aurora/mp3.js
+share/xpra/www/js/lib/aurora/mp3.js.map
+share/xpra/www/js/lib/bencode.js
+share/xpra/www/js/lib/broadway/AUTHORS
+share/xpra/www/js/lib/broadway/Decoder.js
+share/xpra/www/js/lib/broadway/LICENSE
+share/xpra/www/js/lib/forge.js
+share/xpra/www/js/lib/jquery-ui.js
+share/xpra/www/js/lib/jquery.ba-throttle-debounce.js
+share/xpra/www/js/lib/jquery.js
+share/xpra/www/js/lib/lz4.js
+share/xpra/www/js/lib/wsworker_check.js
+share/xpra/www/js/lib/zlib.js
+share/xpra/www/js/lib/zlib.pretty.js.map
diff --git a/py-xpra/distinfo b/py-xpra/distinfo
index da93ac7..d3c85af 100644
--- a/py-xpra/distinfo
+++ b/py-xpra/distinfo
@@ -1,11 +1,9 @@
 $NetBSD: distinfo,v 1.21 2015/09/07 13:10:43 thomasklausner Exp $
 
-SHA1 (xpra-0.17.6.tar.xz) = 9559c384531aaba051182b9a9c50dde82435fa17
-RMD160 (xpra-0.17.6.tar.xz) = 05de32c262b0f2fed970e09cc2e703e7c27465d9
-SHA512 (xpra-0.17.6.tar.xz) = 9a553e446390792907ec90038b680e5e63a4b91b0dd1e741b65e4dc6e4c899ea550a2e5728057104419686339a3aa557585437d38913f82fa59be013afa2d8f2
-Size (xpra-0.17.6.tar.xz) = 1402560 bytes
-SHA1 (patch-setup.py) = 19d6834e3e62361e230b250383e5ef56dbe84dd1
-SHA1 (patch-xpra_codecs_v4l2_pusher.pyx) = c45fb604c635a9d57478755f178ae16b6d166368
-SHA1 (patch-xpra_codecs_v4l2_video.h) = 001cc17b7549c2ec62c503dc86d33489fae3cd88
+SHA1 (xpra-1.0.tar.xz) = 455c0d93b07abd9678d3412d5c7a800cf66972e0
+RMD160 (xpra-1.0.tar.xz) = 9572a47fae0b4e75efaf6eb38faa6188eba66709
+SHA512 (xpra-1.0.tar.xz) = 5e762363e190a1657687e6bf3198e4df1409a428bd9f3bc7286ce9efb83720126ad4bb64066caf1ad75d458179dce1be75255bf1a11ef28aa7426a7180ff0014
+Size (xpra-1.0.tar.xz) = 1886636 bytes
+SHA1 (patch-service_xpra) = 12a2fff551582a8f8ddb88b950aeed3f13ca2c3f
 SHA1 (patch-xpra_x11_gtk2_gdk__bindings.pyx) = 66e9688758e777de440ab047e9444309d543aac1
 SHA1 (patch-xpra_x11_gtk2_gdk__display__source.pyx) = 22184d73ed547373762070a550a5379eb6b4561b
diff --git a/py-xpra/patches/patch-service_xpra b/py-xpra/patches/patch-service_xpra
new file mode 100644
index 0000000..af6aaba
--- /dev/null
+++ b/py-xpra/patches/patch-service_xpra
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- service/xpra.orig	2016-12-06 10:56:26.000000000 +0000
++++ service/xpra
+@@ -28,7 +28,7 @@ start() {
+ 	--bind-tcp=0.0.0.0:$PORT --auth=$AUTH --tcp-auth=$TCP_AUTH --ssl-cert=/etc/xpra/ssl-cert.pem \
+ 	--socket-permissions=666 --debug=$DEBUG \
+ 	--daemon=yes --log-file=$LOGFILE --log-dir=$LOGDIR --pidfile=$PIDFILE
+-  if [ "$?" == "0" ];then
++  if [ "$?" = "0" ];then
+ 	echo 'Service started' >&2
+   else
+   	echo 'Service failed to start' >&2
diff --git a/py-xpra/patches/patch-setup.py b/py-xpra/patches/patch-setup.py
deleted file mode 100644
index b88cb83..0000000
--- a/py-xpra/patches/patch-setup.py
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- setup.py.orig	2016-08-22 12:50:38.000000000 +0000
-+++ setup.py
-@@ -992,7 +992,6 @@ if 'clean' in sys.argv or 'sdist' in sys
-                    "xpra/codecs/v4l2/pusher.c",
-                    "xpra/codecs/xvid/encoder.c",
-                    "xpra/codecs/libav_common/av_log.c",
--                   "xpra/codecs/v4l/pusher.c",
-                    "xpra/codecs/webp/encode.c",
-                    "xpra/codecs/webp/decode.c",
-                    "xpra/codecs/dec_avcodec2/decoder.c",
diff --git a/py-xpra/patches/patch-xpra_codecs_v4l2_pusher.pyx b/py-xpra/patches/patch-xpra_codecs_v4l2_pusher.pyx
deleted file mode 100644
index 46e7f4b..0000000
--- a/py-xpra/patches/patch-xpra_codecs_v4l2_pusher.pyx
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- xpra/codecs/v4l2/pusher.pyx.orig	2016-07-29 03:08:34.000000000 +0000
-+++ xpra/codecs/v4l2/pusher.pyx
-@@ -41,7 +41,7 @@ cdef extern from *:
- cdef extern from "sys/ioctl.h":
-     int ioctl(int fd, unsigned long request, ...)
- 
--cdef extern from "linux/videodev2.h":
-+cdef extern from "./video.h":
-     #define v4l2_fourcc(a,b,c,d)\
-     #    (((__u32)(a)<<0)|((__u32)(b)<<8)|((__u32)(c)<<16)|((__u32)(d)<<24))
-     int v4l2_fourcc(unsigned char a, unsigned char b, unsigned char c, unsigned char d)
diff --git a/py-xpra/patches/patch-xpra_codecs_v4l2_video.h b/py-xpra/patches/patch-xpra_codecs_v4l2_video.h
deleted file mode 100644
index 470920f..0000000
--- a/py-xpra/patches/patch-xpra_codecs_v4l2_video.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
---- xpra/codecs/v4l2/video.h.orig	2016-06-08 17:06:27.652547681 +0000
-+++ xpra/codecs/v4l2/video.h
-@@ -0,0 +1,11 @@
-+// This file is part of Xpra.
-+// Copyright (C) 2016 Antoine Martin <antoine%devloop.org.uk@localhost>
-+// Xpra is released under the terms of the GNU GPL v2, or, at your option, any
-+// later version. See the file COPYING for details.
-+
-+#ifdef __NetBSD__
-+#include <sys/videoio.h>
-+#endif
-+#ifdef __linux__
-+#include "linux/videodev2.h"
-+#endif
Home | Main Index | Thread Index | Old Index