Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix the Qt gif dependency on the mac build server #3981

Merged
merged 1 commit into from
Jan 25, 2021
Merged

Fix the Qt gif dependency on the mac build server #3981

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions freeze.py
View file
Open in desktop
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