bundle srt

PyAV-Org · Jan 4, 2025 · d9ae1a1 · d9ae1a1
1 parent 0e953c9
commit d9ae1a1
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/.github/workflows/build-ffmpeg.yml b/.github/workflows/build-ffmpeg.yml
@@ -46,15 +46,15 @@ jobs:
       - name: Set deployment target
         if: matrix.os == 'macos-13' || matrix.os == 'macos-14'
         run: echo "MACOSX_DEPLOYMENT_TARGET=11.0" >> $GITHUB_ENV
-      - name: Install packages
+      - name: Install packages for macOS
         if: matrix.os == 'macos-13' || matrix.os == 'macos-14'
         run: |
           brew update
           brew unlink gettext libidn2 libpng libtiff libunistring libx11 libxau libxcb libxdmcp little-cms2 unbound
       - uses: msys2/setup-msys2@v2
         if: matrix.os == 'windows-latest'
         with:
-          install: base-devel mingw-w64-x86_64-gcc mingw-w64-x86_64-gperf mingw-w64-x86_64-nasm
+          install: base-devel mingw-w64-x86_64-gcc mingw-w64-x86_64-gperf mingw-w64-x86_64-nasm openssl-devel
           path-type: inherit
           release: false
       - name: Build FFmpeg
@@ -131,7 +131,9 @@ jobs:
       - name: Build FFmpeg
         env:
           CIBW_ARCHS: ${{ matrix.arch }}
-          CIBW_BEFORE_ALL_LINUX: cp -ar vendor /tmp
+          CIBW_BEFORE_ALL_LINUX: |
+            yum install -y openssl-devel
+            cp -ar vendor /tmp
           CIBW_BEFORE_BUILD: python scripts/build-ffmpeg.py /tmp/vendor --enable-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}

diff --git a/README.rst b/README.rst
@@ -27,6 +27,7 @@ Currently FFmpeg 7.1 is built with the following packages enabled for all platfo
 - opus 1.4
 - speex 1.2.1
 - svt-av1 2.2.1
+- srt 1.5.4 (encryption disabled on macOS)
 - twolame 0.4.0
 - vorbis 1.3.7
 - vpx 1.14.0

diff --git a/scripts/build-ffmpeg.py b/scripts/build-ffmpeg.py
@@ -7,6 +7,7 @@
 
 from cibuildpkg import Builder, Package, fetch, get_platform, log_group, run
 
+
 plat = platform.system()
 
 library_group = [
@@ -177,6 +178,15 @@
         source_dir="source",
         gpl=True,
     ),
+    Package(
+        name="srt",
+        source_url="https://github.com/Haivision/srt/archive/refs/tags/v1.5.4.tar.gz",
+        build_system="cmake",
+        build_arguments =
+            [r"-DOPENSSL_ROOT_DIR=C:\Program Files\OpenSSL"] if plat == "Windows"
+            else ["-DENABLE_ENCRYPTION=OFF"] if plat == "Darwin"
+            else [""]
+            ),
 ]
 
 openh264 = Package(
@@ -329,6 +339,7 @@ def main():
         "--enable-libopus",
         "--enable-libspeex",
         "--enable-libsvtav1",
+        "--enable-libsrt",
         "--enable-libtwolame",
         "--enable-libvorbis",
         "--enable-libvpx",

diff --git a/scripts/cibuildpkg.py b/scripts/cibuildpkg.py
@@ -238,7 +238,14 @@ def _build_with_autoconf(self, package: Package, for_builder: bool) -> None:
 
         if package.name == "ffmpeg" and platform.system() == "Windows":
             correct_configure(os.path.join(package_source_path, "configure"))
-
+            prepend_env(env, "LDFLAGS", "-LC:/PROGRA~1/OpenSSL/lib")
+            prepend_env(
+                env,
+                "PKG_CONFIG_PATH",
+                "/c/msys64/usr/lib/pkgconfig",
+                separator=":",
+            )
+
         # build package
         os.makedirs(package_build_path, exist_ok=True)
         with chdir(package_build_path):
@@ -274,6 +281,9 @@ def _build_with_cmake(self, package: Package, for_builder: bool) -> None:
         if platform.system() == "Darwin":
             cmake_args.append("-DCMAKE_INSTALL_NAME_DIR=" + os.path.join(prefix, "lib"))
 
+        if package.name == "srt" and platform.system() == "Linux":
+            run(["yum", "-y", "install", "openssl-devel"])
+
         # build package
         os.makedirs(package_build_path, exist_ok=True)
         with chdir(package_build_path):