2019-08-24 14:14:00 +01:00
|
|
|
gdiff --git a/setup.py b/setup.py
|
|
|
|
|
index 8d3df15..6156206 100755
|
2018-09-13 16:43:31 +01:00
|
|
|
--- a/setup.py
|
|
|
|
|
+++ b/setup.py
|
2019-08-24 14:14:00 +01:00
|
|
|
@@ -2359,10 +2359,7 @@ if v4l2_ENABLED:
|
2019-03-22 19:27:55 +00:00
|
|
|
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)
|
|
|
|
|
cython_add(Extension("xpra.codecs.v4l2.pusher",
|
2019-08-24 14:14:00 +01:00
|
|
|
diff --git a/xpra/x11/bindings/keyboard_bindings.pyx b/xpra/x11/bindings/keyboard_bindings.pyx
|
|
|
|
|
index bd7023d..064c6b5 100644
|
2018-09-13 16:43:31 +01:00
|
|
|
--- a/xpra/x11/bindings/keyboard_bindings.pyx
|
|
|
|
|
+++ b/xpra/x11/bindings/keyboard_bindings.pyx
|
2019-08-24 14:14:00 +01:00
|
|
|
@@ -21,7 +21,7 @@ from libc.stdlib cimport free, malloc
|
|
|
|
|
|
2018-09-13 16:43:31 +01:00
|
|
|
DEF PATH_MAX = 1024
|
2019-03-22 19:27:55 +00:00
|
|
|
DEF DFLT_XKB_RULES_FILE = b"base"
|
|
|
|
|
-DEF DFLT_XKB_CONFIG_ROOT = b"/usr/share/X11/xkb"
|
|
|
|
|
+DEF DFLT_XKB_CONFIG_ROOT = b"@xkeyboardconfig@/share/X11/xkb"
|
2019-08-24 14:14:00 +01:00
|
|
|
|
2018-09-13 16:43:31 +01:00
|
|
|
###################################
|
|
|
|
|
# Headers, python magic
|
