Skip to content

Commit

Permalink
Fix the Qt gif dependency on the mac build server. The build server h…
Browse files Browse the repository at this point in the history
…as 2 competing libraries with different SO compatibilities. The invalid one needs to be ignored.
  • Loading branch information
jonoomph committed Jan 25, 2021
1 parent eb46f54 commit 1f93ca3
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions freeze.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,20 +112,15 @@
print("Loaded modules from openshot_qt directory: %s" % os.path.join(PATH, "openshot_qt"))

# Append possible build server paths

sys.path.insert(0, os.path.join(PATH, "build", "install-x86", "lib"))
sys.path.insert(0, os.path.join(PATH, "build", "install-x86", "bin"))

sys.path.insert(0, os.path.join(PATH, "build", "install-x64", "lib"))
sys.path.insert(0, os.path.join(PATH, "build", "install-x64", "bin"))


from classes import info
from classes.logger import log

log.info("Execution path: %s" % os.path.abspath(__file__))


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

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

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

0 comments on commit 1f93ca3

Please sign in to comment.