1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
--- a/setup.py
+++ b/setup.py
@@ -1885,7 +1885,7 @@
if OSX:
pycairo = "py3cairo"
else:
- pycairo = "pycairo"
+ pycairo = "py3cairo"
cython_add(Extension("xpra.client.gtk3.cairo_workaround",
["xpra/client/gtk3/cairo_workaround.pyx"],
**pkgconfig(pycairo)
@@ -2363,10 +2363,7 @@
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",
--- a/xpra/x11/bindings/keyboard_bindings.pyx
+++ b/xpra/x11/bindings/keyboard_bindings.pyx
@@ -19,7 +19,7 @@
DEF PATH_MAX = 1024
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"
###################################
# Headers, python magic
|