Changeset View
Changeset View
Standalone View
Standalone View
x11/xpra/files/patch-setup.py
| --- setup.py.orig 2017-02-01 05:52:14 UTC | --- setup.py.orig 2017-02-06 09:47:42 UTC | ||||
| +++ setup.py | +++ setup.py | ||||
| @@ -218,7 +218,7 @@ else: | @@ -218,7 +218,7 @@ else: | ||||
| nvenc7_ENABLED = DEFAULT and pkg_config_ok("--exists", "nvenc7") | nvenc7_ENABLED = DEFAULT and pkg_config_ok("--exists", "nvenc7") | ||||
| memoryview_ENABLED = sys.version>='2.7' | memoryview_ENABLED = sys.version>='2.7' | ||||
| -csc_opencl_ENABLED = DEFAULT and pkg_config_ok("--exists", "OpenCL") and check_pyopencl_AMD() | -csc_opencl_ENABLED = DEFAULT and pkg_config_ok("--exists", "OpenCL") and check_pyopencl_AMD() | ||||
| +csc_opencl_ENABLED = DEFAULT and pkg_config_ok("--exists", "OpenCL") | +csc_opencl_ENABLED = DEFAULT and pkg_config_ok("--exists", "OpenCL") | ||||
| csc_libyuv_ENABLED = DEFAULT and memoryview_ENABLED and pkg_config_ok("--exists", "libyuv", fallback=WIN32) | csc_libyuv_ENABLED = DEFAULT and memoryview_ENABLED and pkg_config_ok("--exists", "libyuv", fallback=WIN32) | ||||
| #Cython / gcc / packaging build options: | #Cython / gcc / packaging build options: | ||||
| @@ -798,8 +798,8 @@ def get_base_conf_dir(install_dir, strip | |||||
| elif "usr" in dirs: | |||||
| #ie: ["some", "path", "to", "usr"] -> ["usr"] | |||||
| #assume "/usr" or "/usr/local" is the build root | |||||
| - while "usr" in dirs and dirs.index("usr")>0: | |||||
| - dirs = dirs[dirs.index("usr"):] | |||||
| + while "usr" in dirs[1:]: | |||||
| + dirs = dirs[dirs[1:].index("usr")+1:] | |||||
| elif "image" in dirs: | |||||
| # Gentoo's "${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PF}/image/_python2.7" -> "" | |||||
| while "image" in dirs: | |||||
| @@ -1839,12 +1839,12 @@ if WIN32: | @@ -1839,12 +1839,12 @@ if WIN32: | ||||
| else: | else: | ||||
| #OSX and *nix: | #OSX and *nix: | ||||
| scripts += ["scripts/xpra", "scripts/xpra_launcher"] | scripts += ["scripts/xpra", "scripts/xpra_launcher"] | ||||
| - add_data_files("share/man/man1", ["man/xpra.1", "man/xpra_launcher.1"]) | - add_data_files("share/man/man1", ["man/xpra.1", "man/xpra_launcher.1"]) | ||||
| + add_data_files("man/man1", ["man/xpra.1", "man/xpra_launcher.1"]) | + add_data_files("man/man1", ["man/xpra.1", "man/xpra_launcher.1"]) | ||||
| add_data_files("share/xpra", ["README", "COPYING"]) | add_data_files("share/xpra", ["README", "COPYING"]) | ||||
| add_data_files("share/xpra/icons", glob.glob("icons/*")) | add_data_files("share/xpra/icons", glob.glob("icons/*")) | ||||
| ▲ Show 20 Lines • Show All 47 Lines • Show Last 20 Lines | |||||