diff options
| author | Linus Heckemann <git@sphalerite.org> | 2020-02-01 19:36:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-01 19:36:51 +0100 |
| commit | 7218c68f314a28d1cdf4d1531415fbd9cde82f30 (patch) | |
| tree | c4adb4d9fcb29c3f98c2ddf4f1b7ab194c2716d5 /pkgs/tools | |
| parent | 9bc90bff3d9152c6b16589cf20fcc00e0bc99a6c (diff) | |
| parent | 55d3b6b1b1e60c1708b4a69bc1e477f4171a0c85 (diff) | |
| download | nixlib-7218c68f314a28d1cdf4d1531415fbd9cde82f30.tar nixlib-7218c68f314a28d1cdf4d1531415fbd9cde82f30.tar.gz nixlib-7218c68f314a28d1cdf4d1531415fbd9cde82f30.tar.bz2 nixlib-7218c68f314a28d1cdf4d1531415fbd9cde82f30.tar.lz nixlib-7218c68f314a28d1cdf4d1531415fbd9cde82f30.tar.xz nixlib-7218c68f314a28d1cdf4d1531415fbd9cde82f30.tar.zst nixlib-7218c68f314a28d1cdf4d1531415fbd9cde82f30.zip | |
Merge pull request #78735 from wamserma/xpra-bump-3.0.5
xpra: 2.5.3 -> 3.0.5
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/X11/xpra/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/X11/xpra/fix-paths.patch | 24 |
2 files changed, 15 insertions, 13 deletions
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index da7bfb445a97..e6d1d7c64245 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -14,11 +14,11 @@ let xf86videodummy = callPackage ./xf86videodummy { }; in buildPythonApplication rec { pname = "xpra"; - version = "2.5.3"; + version = "3.0.5"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - sha256 = "1ys35lj28903alccks9p055psy1fsk1nxi8ncchvw8bfxkkkvbys"; + sha256 = "1zy4q8sq0j00ybxw3v8ylaj2aj10x2gb0a05aqbcnrwp3hf983vz"; }; patches = [ diff --git a/pkgs/tools/X11/xpra/fix-paths.patch b/pkgs/tools/X11/xpra/fix-paths.patch index eb982682586b..a934e5e4cc33 100644 --- a/pkgs/tools/X11/xpra/fix-paths.patch +++ b/pkgs/tools/X11/xpra/fix-paths.patch @@ -2,18 +2,20 @@ gdiff --git a/setup.py b/setup.py index 8d3df15..6156206 100755 --- a/setup.py +++ b/setup.py -@@ -2359,10 +2359,7 @@ if v4l2_ENABLED: - v4l2_pkgconfig = pkgconfig() - #fuly warning: cython makes this difficult, - #we have to figure out if "device_caps" exists in the headers: -- ENABLE_DEVICE_CAPS = False -- if os.path.exists("/usr/include/linux/videodev2.h"): -- hdata = open("/usr/include/linux/videodev2.h").read() -- ENABLE_DEVICE_CAPS = hdata.find("device_caps")>=0 -+ ENABLE_DEVICE_CAPS = True - kwargs = {"ENABLE_DEVICE_CAPS" : ENABLE_DEVICE_CAPS} - make_constants("xpra", "codecs", "v4l2", "constants", **kwargs) + -2322,11 +2322,7 @@ if v4l2_ENABLED: + videodev2_h = "/usr/include/linux/videodev2.h" + constants_pxi = "xpra/codecs/v4l2/constants.pxi" + if not os.path.exists(videodev2_h) or should_rebuild(videodev2_h, constants_pxi): +- ENABLE_DEVICE_CAPS = 0 +- if os.path.exists(videodev2_h): +- with open(videodev2_h) as f: +- hdata = f.read() +- ENABLE_DEVICE_CAPS = int(hdata.find("device_caps")>=0) ++ ENABLE_DEVICE_CAPS = 1 + with open(constants_pxi, "wb") as f: + f.write(b"DEF ENABLE_DEVICE_CAPS=%i" % ENABLE_DEVICE_CAPS) cython_add(Extension("xpra.codecs.v4l2.pusher", + diff --git a/xpra/x11/bindings/keyboard_bindings.pyx b/xpra/x11/bindings/keyboard_bindings.pyx index bd7023d..064c6b5 100644 --- a/xpra/x11/bindings/keyboard_bindings.pyx |