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
|
2020-01-28 22:18:19 +00:00
|
|
|
-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)
|
2019-03-22 19:27:55 +00:00
|
|
|
cython_add(Extension("xpra.codecs.v4l2.pusher",
|
2020-01-28 22:18:19 +00:00
|
|
|
|
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
|
