Skip to content

Commit acb47f4

Browse files
committed
no longer include ffpyplayer's ffmpeg binaries, but fix inclusion of those from the ffmpeg-binaries package
fix inclusions of glassesTools.validation assets
1 parent f998d84 commit acb47f4

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

buildGUI.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,23 @@ def get_include_files():
1515
d = pathlib.Path(d) / 'share' / 'ffpyplayer'
1616
for lib in ('ffmpeg', 'sdl'):
1717
for f in (d/lib/'bin').glob('*'):
18-
if f.is_file() and f.suffix=='' or f.suffix in ['.dll', '.exe']:
18+
if f.is_file() and f.suffix=='' or f.suffix in ['.dll']:
1919
files.append((f,pathlib.Path('lib')/f.name))
20+
21+
# ffmpeg binaries and all related files
22+
for d in site.getsitepackages():
23+
base = pathlib.Path(d)
24+
p = base / 'ffmpeg' / 'binaries'
25+
for f in p.rglob('*'):
26+
if f.is_file():
27+
files.append((f, pathlib.Path('lib')/os.path.relpath(f,base)))
2028
return files
2129

2230
def get_zip_include_files():
2331
files = []
2432
for d in site.getsitepackages():
2533
base = pathlib.Path(d)
26-
p = base / 'glassesValidator' / 'config'
34+
p = base / 'glassesTools' / 'validation' / 'config'
2735

2836
for f in p.rglob('*'):
2937
if f.is_file() and f.suffix not in ['.py','.pyc']:
@@ -46,6 +54,7 @@ def get_zip_include_files():
4654
"zip_includes": get_zip_include_files(),
4755
"zip_include_packages": "*",
4856
"zip_exclude_packages": [
57+
"ffmpeg",
4958
"OpenGL_accelerate",
5059
"glfw",
5160
"imgui_bundle",

0 commit comments

Comments
 (0)