Skip to content

Upgrade openh264 #125

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

Merged
WyattBlue merged 2 commits into from
Nov 13, 2024
Merged

Upgrade openh264 #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c64457
Upgrade openh264
WyattBlue Nov 12, 2024
cd56522
Drop powerPC
WyattBlue Nov 12, 2024
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
12 changes: 6 additions & 6 deletions .github/workflows/build-ffmpeg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -82,7 +82,7 @@ jobs:
strategy:
fail-fast: false
matrix:
arch: [aarch64, ppc64le]
arch: [aarch64]
os: [ubuntu-latest]
env:
stage: 1
Expand All @@ -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
Expand All @@ -113,7 +113,7 @@ jobs:
strategy:
fail-fast: false
matrix:
arch: [aarch64, ppc64le]
arch: [aarch64]
os: [ubuntu-latest]
env:
stage: 2
Expand All @@ -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*"
Expand Down
65 changes: 0 additions & 65 deletions patches/openh264.patch
View file
Open in desktop

This file was deleted.

6 changes: 4 additions & 2 deletions scripts/build-ffmpeg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)

Expand Down Expand Up @@ -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
Expand Down