Build lgpl

PyAV-Org · Jul 14, 2024 · e9766ca · e9766ca
1 parent 02d75e3
commit e9766ca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/build-ffmpeg.yml b/.github/workflows/build-ffmpeg.yml
@@ -61,8 +61,8 @@ jobs:
       - name: Build FFmpeg
         env:
           CIBW_ARCHS: ${{ matrix.arch }}
-          CIBW_BEFORE_BUILD: python scripts/build-ffmpeg.py /tmp/vendor
-          CIBW_BEFORE_BUILD_WINDOWS: python scripts\build-ffmpeg.py C:\cibw\vendor
+          CIBW_BEFORE_BUILD: python scripts/build-ffmpeg.py --disable-gpl /tmp/vendor
+          CIBW_BEFORE_BUILD_WINDOWS: python scripts\build-ffmpeg.py --disable-gpl C:\cibw\vendor
           CIBW_BUILD: cp39-*
           CIBW_REPAIR_WHEEL_COMMAND_LINUX: LD_LIBRARY_PATH=/tmp/vendor/lib:$LD_LIBRARY_PATH auditwheel repair -w {dest_dir} {wheel}
           CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: delvewheel repair --add-path C:\cibw\vendor\bin -w {dest_dir} {wheel}
@@ -99,7 +99,7 @@ jobs:
           docker run -v $PWD:/project:rw --workdir=/project quay.io/pypa/manylinux2014_${{ matrix.arch }} bash -exc '
             export PATH=/opt/python/cp38-cp38/bin:$PATH;
             export CIBUILDWHEEL=1;
-            python scripts/build-ffmpeg.py /tmp/vendor --stage ${{ env.stage }};
+            python scripts/build-ffmpeg.py --disable-gpl /tmp/vendor --stage ${{ env.stage }};
             cp -ar /tmp/vendor /project;
           '
         shell: bash
@@ -135,7 +135,7 @@ jobs:
             export PATH=/opt/python/cp38-cp38/bin:$PATH;
             export CIBUILDWHEEL=1;
             cp -ar vendor /tmp;
-            python scripts/build-ffmpeg.py /tmp/vendor --stage ${{ env.stage }};
+            python scripts/build-ffmpeg.py --disable-gpl /tmp/vendor --stage ${{ env.stage }};
             cp -ar /tmp/vendor /project;
           '
         shell: bash
@@ -169,7 +169,7 @@ jobs:
         env:
           CIBW_ARCHS: ${{ matrix.arch }}
           CIBW_BEFORE_ALL_LINUX: cp -ar vendor /tmp
-          CIBW_BEFORE_BUILD: python scripts/build-ffmpeg.py /tmp/vendor --stage ${{ env.stage }}
+          CIBW_BEFORE_BUILD: python scripts/build-ffmpeg.py --disable-gpl /tmp/vendor --stage ${{ env.stage }}
           CIBW_BUILD: cp38-*
           CIBW_REPAIR_WHEEL_COMMAND_LINUX: LD_LIBRARY_PATH=/tmp/vendor/lib:$LD_LIBRARY_PATH auditwheel repair -w {dest_dir} {wheel}
           CIBW_SKIP: "*musllinux*"

diff --git a/scripts/build-ffmpeg.py b/scripts/build-ffmpeg.py
@@ -435,10 +435,11 @@ def main():
             "swresample",
             "swscale",
         ):
-            shutil.move(
-                os.path.join(dest_dir, "bin", name + ".lib"),
-                os.path.join(dest_dir, "lib"),
-            )
+            if os.path.exists(os.path.join(dest_dir, "bin", name + ".lib")):
+                shutil.move(
+                    os.path.join(dest_dir, "bin", name + ".lib"),
+                    os.path.join(dest_dir, "lib"),
+                )
 
         # copy some libraries provided by mingw
         mingw_bindir = os.path.dirname(