JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #78735 from wamserma/xpra-bump-3.0.5

Browse Source 
xpra: 2.5.3 -> 3.0.5
This commit is contained in:
Linus Heckemann 2020-02-01 19:36:51 +01:00 committed by GitHub
commit 7218c68f31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/X11/xpra/default.nix
View File

@ -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 = [

24
pkgs/tools/X11/xpra/fix-paths.patch
View File

@ -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