Skip to content

Commit 1f93ca3

Browse files
committed
Fix the Qt gif dependency on the mac build server. The build server has 2 competing libraries with different SO compatibilities. The invalid one needs to be ignored.
1 parent eb46f54 commit 1f93ca3

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

freeze.py

+1-7
Original file line numberDiff line numberDiff line change
@@ -112,20 +112,15 @@
112112
print("Loaded modules from openshot_qt directory: %s" % os.path.join(PATH, "openshot_qt"))
113113

114114
# Append possible build server paths
115-
116115
sys.path.insert(0, os.path.join(PATH, "build", "install-x86", "lib"))
117116
sys.path.insert(0, os.path.join(PATH, "build", "install-x86", "bin"))
118-
119117
sys.path.insert(0, os.path.join(PATH, "build", "install-x64", "lib"))
120118
sys.path.insert(0, os.path.join(PATH, "build", "install-x64", "bin"))
121119

122-
123120
from classes import info
124121
from classes.logger import log
125-
126122
log.info("Execution path: %s" % os.path.abspath(__file__))
127123

128-
129124
# Find files matching patterns
130125
def find_files(directory, patterns):
131126
""" Recursively find all files in a folder tree """
@@ -397,8 +392,7 @@ def find_files(directory, patterns):
397392
src_files.append((filename, os.path.join("lib", os.path.relpath(filename, start=os.path.join(PATH, "openshot_qt")))))
398393

399394
# Exclude gif library which crashes on Mac
400-
build_exe_options["bin_excludes"] = ["/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libGIF.dylib",
401-
"/usr/local/opt/giflib/lib/libgif.dylib"]
395+
build_exe_options["bin_excludes"] = ["/usr/local/opt/giflib/lib/libgif.dylib"]
402396

403397
# Dependencies are automatically detected, but it might need fine tuning.
404398
build_exe_options["packages"] = python_packages

0 commit comments

Comments
 (0)