diff options
| author | Matthew Rezny <rezny@FreeBSD.org> | 2017-02-14 00:06:09 +0000 |
|---|---|---|
| committer | Matthew Rezny <rezny@FreeBSD.org> | 2017-02-14 00:06:09 +0000 |
| commit | de0ba2723ac677eb2bb248f54961d4fc71377122 (patch) | |
| tree | 925d83dec964401403f7c0f5679dec4fc95921be /x11/xpra/files/patch-setup.py | |
| parent | Update 2.071.1 --> 2.073.0 (diff) | |
Update to 1.0.3
Approved by: swills (mentor)
Differential Revision: https://reviews.freebsd.org/D9566
Notes
Notes:
svn path=/head/; revision=434061
Diffstat (limited to 'x11/xpra/files/patch-setup.py')
| -rw-r--r-- | x11/xpra/files/patch-setup.py | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/x11/xpra/files/patch-setup.py b/x11/xpra/files/patch-setup.py index 23223beb6ba8..c10d06b97dd8 100644 --- a/x11/xpra/files/patch-setup.py +++ b/x11/xpra/files/patch-setup.py @@ -1,4 +1,4 @@ ---- setup.py.orig 2017-02-01 05:52:14 UTC +--- setup.py.orig 2017-02-06 09:47:42 UTC +++ setup.py @@ -218,7 +218,7 @@ else: nvenc7_ENABLED = DEFAULT and pkg_config_ok("--exists", "nvenc7") @@ -9,17 +9,6 @@ csc_libyuv_ENABLED = DEFAULT and memoryview_ENABLED and pkg_config_ok("--exists", "libyuv", fallback=WIN32) #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: else: #OSX and *nix: |