Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 3c4db7e

Browse filesBrowse files
committed
forgot to enable the patch
1 parent c048e37 commit 3c4db7e
Copy full SHA for 3c4db7e

File tree

Expand file treeCollapse file tree

1 file changed

+6
-9
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+6
-9
lines changed

‎setup.py

Copy file name to clipboardExpand all lines: setup.py
+6-9Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -155,14 +155,9 @@ def main():
155155
]
156156

157157
if sys.platform.startswith("linux") and not build_headless:
158-
if x64:
159-
rearrange_cmake_output_data["cv2.qt.plugins.platforms"] = [
160-
(r"/usr/lib64/qt5/plugins/platforms/libqxcb\.so")
161-
]
162-
else:
163-
rearrange_cmake_output_data["cv2.qt.plugins.platforms"] = [
164-
(r"/usr/lib/qt5/plugins/platforms/libqxcb\.so")
165-
]
158+
rearrange_cmake_output_data["cv2.qt.plugins.platforms"] = [
159+
(r"lib/qt/plugins/platforms/libqxcb\.so")
160+
]
166161

167162
if build_headless:
168163
# it seems that cocoa cannot be disabled so on macOS the package is not truly headless
@@ -180,10 +175,12 @@ def main():
180175
if sys.platform.startswith("linux") and not x64:
181176
subprocess.check_call("patch -p0 < patches/patchOpenEXR", shell=True)
182177

178+
if sys.platform.startswith("linux") or sys.platform == "darwin":
179+
subprocess.check_call("patch -p1 < patches/patchQtPlugins", shell=True)
180+
183181
# Fixes for macOS builds
184182
if sys.platform == "darwin":
185183
cmake_args.append("-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.9")
186-
subprocess.check_call("patch -p1 < patches/patchQtPlugins", shell=True)
187184

188185
if "CMAKE_ARGS" in os.environ:
189186
import shlex

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.