pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
py-xpra: update py-xpra to 0.17.3
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Wed Jun 8 19:14:55 2016 +0200
Changeset: 35dcafeef2cb369c9b2747a76d987159b89a1d7d
Modified Files:
TODO
py-xpra/Makefile
py-xpra/PLIST
py-xpra/distinfo
Added 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 py-xpra to 0.17.3
v0.17.3 (2016-06-03)
======================
-- fix logging errors with libyuv module (hiding real errors)
-- fix memory handling in error cases with x264 encoder
-- fix video encoder and colourspace converter leak
-- fix rate delta encoding errors
-- fix dbus x11 dependency in RPM packaging
-- fix dependencies for RHEL 7.0
-- fix DPI option miscalculation when used from the client
-- fix window aspect ratio hints handling
-- fix stripping of temporary build paths
-- fix sound subprocess stuck in paused state after an early error
-- fix H264 decoding in HTML5 client (disabled for now)
-- fix AES padding errors with HTML5 client
-- fix spurious import statements in NVENC codecs
-- fix crashes in X11 keyboard handling
-- fix compatibility with newer GCC versions
-- fix OSX and win32 shadow server key mappings
-- fix OSX shadow server disconnections with invalid RGB packet data
-- fix OSX shadow server crashes with webp
-- fix OSX shadow server errors with opus sound codec (disable it)
-- fix RGB compression algorithm reported in logging
v0.17.2 (2016-05-14)
======================
-- fix suse leap builds (no python3 because os missing dependencies)
-- fix aspect-ratio hint handling
-- fix sound queue state not getting updated
-- fix socket protocol and family information reported
-- fix scratchy sound with GStreamer 0.10 (ie: CentOS 6.x)
-- fix handling of DPI command line switch client side
-- fix printer requests wrongly honoured when printing is disabled
-- fix error in websockify error handler
-- fix missing matroska container on OSX
-- fix Webcam and GTK info scripts on OSX
v0.17.1 (2016-05-02)
======================
-- fix SSH error handler
-- fix SSH connections with tcsh
-- fix launcher GUI with SSH mode
-- fix RPM packaging for automatic system installation
-- fix / workaround bug in Xorg server 1.18.1 and later
-- fix unhelpful systray GDK warning with some desktop environments
-- fix duplicate socket paths listed
-- fix clipboard issues: timeouts and re-enabling from systray
-- fix frame extents warning message to blame the culprit
-- fix installation alert message format on Windows XP
v0.17.0 (2015-04-18)
======================
-- GStreamer 1.6.x on MS Windows and OSX
-- opus is now the default sound codec
-- microphone and speaker forwarding no longer cause sound loops
-- new sound container formats: matroska, gdp
-- much improved shadow servers, especially for OSX and MS Windows
-- use newer Plink SSH with Windows Vista onwards
-- OSX PKG installer, with file association
-- libyuv codec for faster colourspace conversion
-- NVENC v6, HEVC hardware encoding
-- xvid mpeg4 codec
-- shadow servers now expose a tray icon and menu
-- improved tablet input device support on MS Windows
-- improved window geometry handling
-- OSX dock clicks now restore existing windows
-- OSX clipboard synchronization menu
-- new encryption backend: python-cryptography, hardware accelerated AES
-- the dbus server can now be started automatically
-- support for using /var/run on Linux and multiple sockets
-- support for AF_VSOCK virtual networking
-- broadcast sessions via mDNS on MS Windows and OSX
-- window geometry fixes
-- window close event is now configurable, automatically disconnects
-- webcam forwarding (limited scope)
-- SELinux policy improvements (still incomplete)
-- new event based start commands: after connection / on connection
-- split file authentication module
-- debug logging and message improvements
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=35dcafeef2cb369c9b2747a76d987159b89a1d7d
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 | 2 +-
py-xpra/PLIST | 97 ++++++++++++++++-------
py-xpra/distinfo | 11 ++-
py-xpra/patches/patch-setup.py | 12 +++
py-xpra/patches/patch-xpra_codecs_v4l2_pusher.pyx | 43 ++++++++++
py-xpra/patches/patch-xpra_codecs_v4l2_video.h | 16 ++++
7 files changed, 149 insertions(+), 33 deletions(-)
diffs:
diff --git a/TODO b/TODO
index 9f30059..375da31 100644
--- a/TODO
+++ b/TODO
@@ -102,7 +102,6 @@ Suggested package updates
o py-PyPE-2.9
o py-bitstring-3.1.3
o py-rpyc-3.2.1
- o py-xpra-0.17.3
o py-zeitgeist-0.9.16
o qmc2-0.59
o qtcreator-4.0.0
diff --git a/py-xpra/Makefile b/py-xpra/Makefile
index 8212316..abc33dd 100644
--- a/py-xpra/Makefile
+++ b/py-xpra/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.21 2015/09/07 13:10:43 thomasklausner Exp $
-DISTNAME= xpra-0.16.3
+DISTNAME= xpra-0.17.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= x11
MASTER_SITES= http://xpra.org/src/
diff --git a/py-xpra/PLIST b/py-xpra/PLIST
index ce5fed3..8e1c22e 100644
--- a/py-xpra/PLIST
+++ b/py-xpra/PLIST
@@ -94,9 +94,6 @@ ${PYSITELIB}/xpra/client/gtk2/window_backing.pyo
${PYSITELIB}/xpra/client/gtk_base/__init__.py
${PYSITELIB}/xpra/client/gtk_base/__init__.pyc
${PYSITELIB}/xpra/client/gtk_base/__init__.pyo
-${PYSITELIB}/xpra/client/gtk_base/about.py
-${PYSITELIB}/xpra/client/gtk_base/about.pyc
-${PYSITELIB}/xpra/client/gtk_base/about.pyo
${PYSITELIB}/xpra/client/gtk_base/bug_report.py
${PYSITELIB}/xpra/client/gtk_base/bug_report.pyc
${PYSITELIB}/xpra/client/gtk_base/bug_report.pyo
@@ -186,6 +183,12 @@ ${PYSITELIB}/xpra/codecs/csc_cython/__init__.py
${PYSITELIB}/xpra/codecs/csc_cython/__init__.pyc
${PYSITELIB}/xpra/codecs/csc_cython/__init__.pyo
${PYSITELIB}/xpra/codecs/csc_cython/colorspace_converter.so
+${PYSITELIB}/xpra/codecs/csc_opencv/__init__.py
+${PYSITELIB}/xpra/codecs/csc_opencv/__init__.pyc
+${PYSITELIB}/xpra/codecs/csc_opencv/__init__.pyo
+${PYSITELIB}/xpra/codecs/csc_opencv/colorspace_converter.py
+${PYSITELIB}/xpra/codecs/csc_opencv/colorspace_converter.pyc
+${PYSITELIB}/xpra/codecs/csc_opencv/colorspace_converter.pyo
${PYSITELIB}/xpra/codecs/csc_swscale/__init__.py
${PYSITELIB}/xpra/codecs/csc_swscale/__init__.pyc
${PYSITELIB}/xpra/codecs/csc_swscale/__init__.pyo
@@ -219,6 +222,10 @@ ${PYSITELIB}/xpra/codecs/pillow/decode.pyo
${PYSITELIB}/xpra/codecs/pillow/encode.py
${PYSITELIB}/xpra/codecs/pillow/encode.pyc
${PYSITELIB}/xpra/codecs/pillow/encode.pyo
+${PYSITELIB}/xpra/codecs/v4l2/__init__.py
+${PYSITELIB}/xpra/codecs/v4l2/__init__.pyc
+${PYSITELIB}/xpra/codecs/v4l2/__init__.pyo
+${PYSITELIB}/xpra/codecs/v4l2/pusher.so
${PYSITELIB}/xpra/codecs/video_helper.py
${PYSITELIB}/xpra/codecs/video_helper.pyc
${PYSITELIB}/xpra/codecs/video_helper.pyo
@@ -249,12 +256,12 @@ ${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/dotxpra.py
-${PYSITELIB}/xpra/dotxpra.pyc
-${PYSITELIB}/xpra/dotxpra.pyo
${PYSITELIB}/xpra/gtk_common/__init__.py
${PYSITELIB}/xpra/gtk_common/__init__.pyc
${PYSITELIB}/xpra/gtk_common/__init__.pyo
+${PYSITELIB}/xpra/gtk_common/about.py
+${PYSITELIB}/xpra/gtk_common/about.pyc
+${PYSITELIB}/xpra/gtk_common/about.pyo
${PYSITELIB}/xpra/gtk_common/cursor_names.py
${PYSITELIB}/xpra/gtk_common/cursor_names.pyc
${PYSITELIB}/xpra/gtk_common/cursor_names.pyo
@@ -353,6 +360,18 @@ ${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
+${PYSITELIB}/xpra/net/pycryptography_backend.py
+${PYSITELIB}/xpra/net/pycryptography_backend.pyc
+${PYSITELIB}/xpra/net/pycryptography_backend.pyo
${PYSITELIB}/xpra/net/subprocess_wrapper.py
${PYSITELIB}/xpra/net/subprocess_wrapper.pyc
${PYSITELIB}/xpra/net/subprocess_wrapper.pyo
@@ -362,6 +381,12 @@ ${PYSITELIB}/xpra/os_util.pyo
${PYSITELIB}/xpra/platform/__init__.py
${PYSITELIB}/xpra/platform/__init__.pyc
${PYSITELIB}/xpra/platform/__init__.pyo
+${PYSITELIB}/xpra/platform/dotxpra.py
+${PYSITELIB}/xpra/platform/dotxpra.pyc
+${PYSITELIB}/xpra/platform/dotxpra.pyo
+${PYSITELIB}/xpra/platform/dotxpra_common.py
+${PYSITELIB}/xpra/platform/dotxpra_common.pyc
+${PYSITELIB}/xpra/platform/dotxpra_common.pyo
${PYSITELIB}/xpra/platform/features.py
${PYSITELIB}/xpra/platform/features.pyc
${PYSITELIB}/xpra/platform/features.pyo
@@ -404,6 +429,9 @@ ${PYSITELIB}/xpra/platform/xposix/__init__.pyo
${PYSITELIB}/xpra/platform/xposix/appindicator_tray.py
${PYSITELIB}/xpra/platform/xposix/appindicator_tray.pyc
${PYSITELIB}/xpra/platform/xposix/appindicator_tray.pyo
+${PYSITELIB}/xpra/platform/xposix/dotxpra.py
+${PYSITELIB}/xpra/platform/xposix/dotxpra.pyc
+${PYSITELIB}/xpra/platform/xposix/dotxpra.pyo
${PYSITELIB}/xpra/platform/xposix/features.py
${PYSITELIB}/xpra/platform/xposix/features.pyc
${PYSITELIB}/xpra/platform/xposix/features.pyo
@@ -431,12 +459,12 @@ ${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/scripts/__init__.py
${PYSITELIB}/xpra/scripts/__init__.pyc
${PYSITELIB}/xpra/scripts/__init__.pyo
-${PYSITELIB}/xpra/scripts/bug_report.py
-${PYSITELIB}/xpra/scripts/bug_report.pyc
-${PYSITELIB}/xpra/scripts/bug_report.pyo
${PYSITELIB}/xpra/scripts/config.py
${PYSITELIB}/xpra/scripts/config.pyc
${PYSITELIB}/xpra/scripts/config.pyo
@@ -446,9 +474,6 @@ ${PYSITELIB}/xpra/scripts/exec_util.pyo
${PYSITELIB}/xpra/scripts/fdproxy.py
${PYSITELIB}/xpra/scripts/fdproxy.pyc
${PYSITELIB}/xpra/scripts/fdproxy.pyo
-${PYSITELIB}/xpra/scripts/gtk_info.py
-${PYSITELIB}/xpra/scripts/gtk_info.pyc
-${PYSITELIB}/xpra/scripts/gtk_info.pyo
${PYSITELIB}/xpra/scripts/main.py
${PYSITELIB}/xpra/scripts/main.pyc
${PYSITELIB}/xpra/scripts/main.pyo
@@ -467,12 +492,21 @@ ${PYSITELIB}/xpra/server/auth/__init__.pyo
${PYSITELIB}/xpra/server/auth/allow_auth.py
${PYSITELIB}/xpra/server/auth/allow_auth.pyc
${PYSITELIB}/xpra/server/auth/allow_auth.pyo
+${PYSITELIB}/xpra/server/auth/env_auth.py
+${PYSITELIB}/xpra/server/auth/env_auth.pyc
+${PYSITELIB}/xpra/server/auth/env_auth.pyo
${PYSITELIB}/xpra/server/auth/fail_auth.py
${PYSITELIB}/xpra/server/auth/fail_auth.pyc
${PYSITELIB}/xpra/server/auth/fail_auth.pyo
${PYSITELIB}/xpra/server/auth/file_auth.py
${PYSITELIB}/xpra/server/auth/file_auth.pyc
${PYSITELIB}/xpra/server/auth/file_auth.pyo
+${PYSITELIB}/xpra/server/auth/file_auth_base.py
+${PYSITELIB}/xpra/server/auth/file_auth_base.pyc
+${PYSITELIB}/xpra/server/auth/file_auth_base.pyo
+${PYSITELIB}/xpra/server/auth/multifile_auth.py
+${PYSITELIB}/xpra/server/auth/multifile_auth.pyc
+${PYSITELIB}/xpra/server/auth/multifile_auth.pyo
${PYSITELIB}/xpra/server/auth/none_auth.py
${PYSITELIB}/xpra/server/auth/none_auth.pyc
${PYSITELIB}/xpra/server/auth/none_auth.pyo
@@ -482,6 +516,9 @@ ${PYSITELIB}/xpra/server/auth/pam.pyo
${PYSITELIB}/xpra/server/auth/pam_auth.py
${PYSITELIB}/xpra/server/auth/pam_auth.pyc
${PYSITELIB}/xpra/server/auth/pam_auth.pyo
+${PYSITELIB}/xpra/server/auth/password_auth.py
+${PYSITELIB}/xpra/server/auth/password_auth.pyc
+${PYSITELIB}/xpra/server/auth/password_auth.pyo
${PYSITELIB}/xpra/server/auth/reject_auth.py
${PYSITELIB}/xpra/server/auth/reject_auth.pyc
${PYSITELIB}/xpra/server/auth/reject_auth.pyo
@@ -540,6 +577,9 @@ ${PYSITELIB}/xpra/server/shadow/__init__.pyo
${PYSITELIB}/xpra/server/shadow/gtk_root_window_model.py
${PYSITELIB}/xpra/server/shadow/gtk_root_window_model.pyc
${PYSITELIB}/xpra/server/shadow/gtk_root_window_model.pyo
+${PYSITELIB}/xpra/server/shadow/gtk_shadow_server_base.py
+${PYSITELIB}/xpra/server/shadow/gtk_shadow_server_base.pyc
+${PYSITELIB}/xpra/server/shadow/gtk_shadow_server_base.pyo
${PYSITELIB}/xpra/server/shadow/root_window_model.py
${PYSITELIB}/xpra/server/shadow/root_window_model.pyc
${PYSITELIB}/xpra/server/shadow/root_window_model.pyo
@@ -589,21 +629,21 @@ ${PYSITELIB}/xpra/sound/gst_hacks.pyo
${PYSITELIB}/xpra/sound/gstreamer_util.py
${PYSITELIB}/xpra/sound/gstreamer_util.pyc
${PYSITELIB}/xpra/sound/gstreamer_util.pyo
-${PYSITELIB}/xpra/sound/pulseaudio_common_util.py
-${PYSITELIB}/xpra/sound/pulseaudio_common_util.pyc
-${PYSITELIB}/xpra/sound/pulseaudio_common_util.pyo
-${PYSITELIB}/xpra/sound/pulseaudio_none_util.py
-${PYSITELIB}/xpra/sound/pulseaudio_none_util.pyc
-${PYSITELIB}/xpra/sound/pulseaudio_none_util.pyo
-${PYSITELIB}/xpra/sound/pulseaudio_pactl_util.py
-${PYSITELIB}/xpra/sound/pulseaudio_pactl_util.pyc
-${PYSITELIB}/xpra/sound/pulseaudio_pactl_util.pyo
-${PYSITELIB}/xpra/sound/pulseaudio_palib_util.py
-${PYSITELIB}/xpra/sound/pulseaudio_palib_util.pyc
-${PYSITELIB}/xpra/sound/pulseaudio_palib_util.pyo
-${PYSITELIB}/xpra/sound/pulseaudio_util.py
-${PYSITELIB}/xpra/sound/pulseaudio_util.pyc
-${PYSITELIB}/xpra/sound/pulseaudio_util.pyo
+${PYSITELIB}/xpra/sound/pulseaudio/__init__.py
+${PYSITELIB}/xpra/sound/pulseaudio/__init__.pyc
+${PYSITELIB}/xpra/sound/pulseaudio/__init__.pyo
+${PYSITELIB}/xpra/sound/pulseaudio/pulseaudio_common_util.py
+${PYSITELIB}/xpra/sound/pulseaudio/pulseaudio_common_util.pyc
+${PYSITELIB}/xpra/sound/pulseaudio/pulseaudio_common_util.pyo
+${PYSITELIB}/xpra/sound/pulseaudio/pulseaudio_none_util.py
+${PYSITELIB}/xpra/sound/pulseaudio/pulseaudio_none_util.pyc
+${PYSITELIB}/xpra/sound/pulseaudio/pulseaudio_none_util.pyo
+${PYSITELIB}/xpra/sound/pulseaudio/pulseaudio_pactl_util.py
+${PYSITELIB}/xpra/sound/pulseaudio/pulseaudio_pactl_util.pyc
+${PYSITELIB}/xpra/sound/pulseaudio/pulseaudio_pactl_util.pyo
+${PYSITELIB}/xpra/sound/pulseaudio/pulseaudio_util.py
+${PYSITELIB}/xpra/sound/pulseaudio/pulseaudio_util.pyc
+${PYSITELIB}/xpra/sound/pulseaudio/pulseaudio_util.pyo
${PYSITELIB}/xpra/sound/sink.py
${PYSITELIB}/xpra/sound/sink.pyc
${PYSITELIB}/xpra/sound/sink.pyo
@@ -769,6 +809,8 @@ share/xpra/icons/quit.png
share/xpra/icons/raise.png
share/xpra/icons/retry.png
share/xpra/icons/scaling.png
+share/xpra/icons/server-connected.png
+share/xpra/icons/server-notconnected.png
share/xpra/icons/slider.png
share/xpra/icons/speaker.png
share/xpra/icons/speed.png
@@ -776,6 +818,7 @@ share/xpra/icons/statistics.png
share/xpra/icons/ticked-small.png
share/xpra/icons/unticked-small.png
share/xpra/icons/upload.png
+share/xpra/icons/webcam.png
share/xpra/icons/win32.png
share/xpra/icons/xpra.png
share/xpra/www/connect.html
diff --git a/py-xpra/distinfo b/py-xpra/distinfo
index 414f02e..af3b23b 100644
--- a/py-xpra/distinfo
+++ b/py-xpra/distinfo
@@ -1,8 +1,11 @@
$NetBSD: distinfo,v 1.21 2015/09/07 13:10:43 thomasklausner Exp $
-SHA1 (xpra-0.16.3.tar.xz) = 99f73650dd483d16641833e524aaf06b1d922583
-RMD160 (xpra-0.16.3.tar.xz) = 96c4dca59392bd6514217aa7fc5341a7973309ed
-SHA512 (xpra-0.16.3.tar.xz) = 1a6bbd01837e702e98ffcaffe12a2e5320108ef50f0fcc64a80735fb53a2b41e4cdda0e0a2d1a3b5f2159a81da4a7c2cac458ab4c2eed4de17adb4e963218590
-Size (xpra-0.16.3.tar.xz) = 1343392 bytes
+SHA1 (xpra-0.17.3.tar.xz) = d4c4eea6765dd008177ba23a08964805b80e218d
+RMD160 (xpra-0.17.3.tar.xz) = 28b9f15a25eee205e418b74003923191b591dd89
+SHA512 (xpra-0.17.3.tar.xz) = d3a62c4c6c6f63d165fb605bacaf8f50e773dac09a92cbfdf521a91e085245cff287e6c534eb86fa5987c7d1ed04d4e55c1a812ca5e599311cb314e65b4d14dd
+Size (xpra-0.17.3.tar.xz) = 1416376 bytes
+SHA1 (patch-setup.py) = d60fe0a9b6e2eafa222fa232783bd009ccca85a2
+SHA1 (patch-xpra_codecs_v4l2_pusher.pyx) = 1cfaf9404e6dea08762956d72502eec79605e7aa
+SHA1 (patch-xpra_codecs_v4l2_video.h) = 001cc17b7549c2ec62c503dc86d33489fae3cd88
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-setup.py b/py-xpra/patches/patch-setup.py
new file mode 100644
index 0000000..502ddca
--- /dev/null
+++ b/py-xpra/patches/patch-setup.py
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- setup.py.orig 2016-06-04 03:39:58.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
new file mode 100644
index 0000000..6c33d46
--- /dev/null
+++ b/py-xpra/patches/patch-xpra_codecs_v4l2_pusher.pyx
@@ -0,0 +1,43 @@
+$NetBSD$
+
+--- xpra/codecs/v4l2/pusher.pyx.orig 2016-06-03 05:35:44.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)
+@@ -55,10 +55,10 @@ cdef extern from "linux/videodev2.h":
+ int V4L2_FIELD_BOTTOM
+ int V4L2_FIELD_INTERLACED
+ int V4L2_FIELD_SEQ_TB
+- int V4L2_FIELD_SEQ_BT
+- int V4L2_FIELD_ALTERNATE
+- int V4L2_FIELD_INTERLACED_TB
+- int V4L2_FIELD_INTERLACED_BT
++ #int V4L2_FIELD_SEQ_BT
++ #int V4L2_FIELD_ALTERNATE
++ #int V4L2_FIELD_INTERLACED_TB
++ #int V4L2_FIELD_INTERLACED_BT
+ #formats:
+ int V4L2_PIX_FMT_GREY
+ int V4L2_PIX_FMT_YUV422P
+@@ -159,10 +159,10 @@ FIELD_STR = {
+ V4L2_FIELD_BOTTOM : "Bottom",
+ V4L2_FIELD_INTERLACED : "Interlaced",
+ V4L2_FIELD_SEQ_TB : "SEQ TB",
+- V4L2_FIELD_SEQ_BT : "SEQ BT",
+- V4L2_FIELD_ALTERNATE : "ALTERNATE",
+- V4L2_FIELD_INTERLACED_TB : "INTERLACED TB",
+- V4L2_FIELD_INTERLACED_BT : "INTERLACED BT",
++ #V4L2_FIELD_SEQ_BT : "SEQ BT",
++ #V4L2_FIELD_ALTERNATE : "ALTERNATE",
++ #V4L2_FIELD_INTERLACED_TB : "INTERLACED TB",
++ #V4L2_FIELD_INTERLACED_BT : "INTERLACED BT",
+ }
+ COLORSPACE_STR = {
+ V4L2_COLORSPACE_SRGB : "SRGB",
diff --git a/py-xpra/patches/patch-xpra_codecs_v4l2_video.h b/py-xpra/patches/patch-xpra_codecs_v4l2_video.h
new file mode 100644
index 0000000..470920f
--- /dev/null
+++ b/py-xpra/patches/patch-xpra_codecs_v4l2_video.h
@@ -0,0 +1,16 @@
+$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