diff --git a/.github/workflows/build-ffmpeg.yml b/.github/workflows/build-ffmpeg.yml index 25ca8ab1..7b7b127e 100644 --- a/.github/workflows/build-ffmpeg.yml +++ b/.github/workflows/build-ffmpeg.yml @@ -60,8 +60,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 /tmp/vendor --disable-gpl + CIBW_BEFORE_BUILD_WINDOWS: python scripts\build-ffmpeg.py C:\cibw\vendor --disable-gpl 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} @@ -82,7 +82,7 @@ jobs: strategy: fail-fast: false matrix: - arch: [aarch64, ppc64le] + arch: [aarch64] os: [ubuntu-latest] env: stage: 1 @@ -98,7 +98,7 @@ jobs: docker run -v $PWD:/project:rw --workdir=/project quay.io/pypa/manylinux2014_${{ matrix.arch }} bash -exc ' export PATH=/opt/python/cp39-cp39/bin:$PATH; export CIBUILDWHEEL=1; - python scripts/build-ffmpeg.py /tmp/vendor --stage ${{ env.stage }}; + python scripts/build-ffmpeg.py /tmp/vendor --disable-gpl --stage ${{ env.stage }}; cp -ar /tmp/vendor /project; ' shell: bash @@ -113,7 +113,7 @@ jobs: strategy: fail-fast: false matrix: - arch: [aarch64, ppc64le] + arch: [aarch64] os: [ubuntu-latest] env: stage: 2 @@ -132,7 +132,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 /tmp/vendor --disable-gpl --stage ${{ env.stage }} CIBW_BUILD: cp39-* 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/patches/openh264.patch b/patches/openh264.patch deleted file mode 100644 index c833a2fd..00000000 --- a/patches/openh264.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/codec/common/meson.build b/codec/common/meson.build -index 4033da05..d254da3d 100644 ---- a/codec/common/meson.build -+++ b/codec/common/meson.build -@@ -69,8 +69,6 @@ elif cpu_family in ['loongarch32', 'loongarch64'] - 'loongarch/satd_sad_lasx.c', - ] - cpp_sources += asm_sources --else -- error('Unsupported cpu_family @0@'.format(cpu_family)) - endif - - libcommon = static_library('common', cpp_sources, objs_asm, -diff --git a/codec/decoder/meson.build b/codec/decoder/meson.build -index cb984f7d..d22c1213 100644 ---- a/codec/decoder/meson.build -+++ b/codec/decoder/meson.build -@@ -54,8 +54,6 @@ elif cpu_family in ['loongarch32', 'loongarch64'] - 'core/loongarch/mb_aux_lsx.c', - ] - cpp_sources += asm_sources --else -- error('Unsupported cpu family @0@'.format(cpu_family)) - endif - - libdecoder = static_library('decoder', cpp_sources, objs_asm, -diff --git a/codec/encoder/meson.build b/codec/encoder/meson.build -index c2880941..27c5776c 100644 ---- a/codec/encoder/meson.build -+++ b/codec/encoder/meson.build -@@ -83,8 +83,6 @@ elif cpu_family in ['loongarch32', 'loongarch64'] - 'core/loongarch/sample_lasx.c', - ] - cpp_sources += asm_sources --else -- error('Unsupported cpu family @0@'.format(cpu_family)) - endif - - libencoder = static_library('encoder', cpp_sources, objs_asm, -diff --git a/codec/processing/meson.build b/codec/processing/meson.build -index 482e72c6..bf5539ce 100644 ---- a/codec/processing/meson.build -+++ b/codec/processing/meson.build -@@ -56,8 +56,6 @@ elif cpu_family in ['loongarch32', 'loongarch64'] - 'src/loongarch/vaa_lasx.c', - ] - cpp_sources += asm_sources --else -- error('Unsupported cpu family @0@'.format(cpu_family)) - endif - - libprocessing = static_library('processing', cpp_sources, objs_asm, -diff --git a/meson.build b/meson.build -index 4f4376f0..739c7631 100644 ---- a/meson.build -+++ b/meson.build -@@ -96,8 +96,6 @@ if ['linux', 'android', 'ios', 'darwin'].contains(system) - add_project_arguments('-mlsx', '-DHAVE_LSX', '-mlasx', '-DHAVE_LASX', language: 'c') - add_project_arguments('-DHAVE_LSX', '-DHAVE_LASX', language: 'cpp') - casm_inc = include_directories(join_paths('codec', 'common', 'loongarch')) -- else -- error('FIXME: unhandled CPU family @0@ for @1@'.format(cpu_family, system)) - endif - - if ['ios', 'darwin', 'android'].contains(system) diff --git a/scripts/build-ffmpeg.py b/scripts/build-ffmpeg.py index 818847a8..92072f1d 100644 --- a/scripts/build-ffmpeg.py +++ b/scripts/build-ffmpeg.py @@ -177,8 +177,8 @@ openh264 = Package( name="openh264", requires=["meson", "nasm", "ninja"], - source_filename="openh264-2.4.1.tar.gz", - source_url="https://github.com/cisco/openh264/archive/refs/tags/v2.4.1.tar.gz", + source_filename="openh264-2.5.0.tar.gz", + source_url="https://github.com/cisco/openh264/archive/refs/tags/v2.5.0.tar.gz", build_system="meson", ) @@ -228,7 +228,9 @@ def main(): default=None, help="AArch64 build requires stage and possible values can be 1, 2", ) + parser.add_argument("--enable-gpl", action="store_true") parser.add_argument("--disable-gpl", action="store_true") + args = parser.parse_args() dest_dir = args.destination