From af319fca1bffc8e9618cf6f862d39f315cde12bc Mon Sep 17 00:00:00 2001 From: Woodrow Douglass Date: Thu, 11 Dec 2025 11:19:00 -0500 Subject: [PATCH 1/3] Add more error checking to the update_blob_hashes.sh file --- scripts/update_blob_hashes.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/update_blob_hashes.sh b/scripts/update_blob_hashes.sh index 1372e24..1e8555e 100644 --- a/scripts/update_blob_hashes.sh +++ b/scripts/update_blob_hashes.sh @@ -1,6 +1,10 @@ +#!/bin/bash # # Updates OpenH264 hashes # + +set -euo pipefail + PROJECT_ROOT="$( cd "$(dirname "$0")/.." ; pwd -P )" VERSION=2.6.0 # <-- Update to latest @@ -25,7 +29,7 @@ LIBRARIES=( $CISCO_ROOT/openh264-$VERSION-win64.dll.bz2 ) -rm "$TARGET_FILE" +rm -f "$TARGET_FILE" mkdir -p "$PROJECT_ROOT/target" pushd "$PROJECT_ROOT/target" @@ -39,7 +43,7 @@ do echo "... ${url}" - curl -so "$file_bz2" "$url" + curl -f -so "$file_bz2" "$url" || (echo "FAILED TO RETRIEVE FILE" && false) bunzip2 -qf "$file_bz2" sha256sum "$file" >> "$TARGET_FILE" From d0ca6fc0a30b04181b7e5c958ec5887b67508938 Mon Sep 17 00:00:00 2001 From: Woodrow Douglass Date: Thu, 11 Dec 2025 11:20:35 -0500 Subject: [PATCH 2/3] Add an ABIVERSION parameter to the update_blob_hashes.sh script --- openh264-sys2/src/blobs/hashes.txt | 26 +++++++++++++------------- scripts/update_blob_hashes.sh | 17 +++++++++-------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/openh264-sys2/src/blobs/hashes.txt b/openh264-sys2/src/blobs/hashes.txt index cd2fd60..3da1f1f 100644 --- a/openh264-sys2/src/blobs/hashes.txt +++ b/openh264-sys2/src/blobs/hashes.txt @@ -1,13 +1,13 @@ -cd08cc3cd7dbd890951754b1e187e2fbe4d68d6a77b2618eb00740a8281c9b56 *libopenh264-2.6.0-android-arm.7.so -cd08cc3cd7dbd890951754b1e187e2fbe4d68d6a77b2618eb00740a8281c9b56 *libopenh264-2.6.0-android-arm64.7.so -cd08cc3cd7dbd890951754b1e187e2fbe4d68d6a77b2618eb00740a8281c9b56 *libopenh264-2.6.0-android-x64.7.so -cd08cc3cd7dbd890951754b1e187e2fbe4d68d6a77b2618eb00740a8281c9b56 *libopenh264-2.6.0-android-x86.7.so -57cecc08f08479a911b7b6d0ed733376287fef670227328c35b4fbe8335ab9dd *libopenh264-2.6.0-ios.a -cd08cc3cd7dbd890951754b1e187e2fbe4d68d6a77b2618eb00740a8281c9b56 *libopenh264-2.6.0-linux32.7.so -cd08cc3cd7dbd890951754b1e187e2fbe4d68d6a77b2618eb00740a8281c9b56 *libopenh264-2.6.0-linux64.7.so -cd08cc3cd7dbd890951754b1e187e2fbe4d68d6a77b2618eb00740a8281c9b56 *libopenh264-2.6.0-linux-arm.7.so -cd08cc3cd7dbd890951754b1e187e2fbe4d68d6a77b2618eb00740a8281c9b56 *libopenh264-2.6.0-linux-arm64.7.so -052e98bfcf7a9167d22f3bbb3f5988ef79065591f36af8b52924b22b13624551 *libopenh264-2.6.0-mac-arm64.dylib -e3dc8bc01fe69363f61fd3c02fd27798537a585eadd38cd808f303d1ee505a19 *libopenh264-2.6.0-mac-x64.dylib -b0098db6acbd290a1fe13997d61d461e7327e39b42bf868db41faf498b7621a2 *openh264-2.6.0-win32.dll -2076cb5675ec6c1a4c70e7a2a322552f547b6eeed649d6dfcd9e02a543b24691 *openh264-2.6.0-win64.dll +45d8d77c119a488cad42549987a4a1ac50f634cfd6b08454c5565652e482022c libopenh264-2.6.0-android-arm.8.so +4d9bc54d2d38e53eb7bd551ec61acb8ad8320d8b957bda751cfdbdcbfabc3b07 libopenh264-2.6.0-android-arm64.8.so +548fa57935ff0eaf0a1d44c7963c1681daa5bf4cef2b34029fcd20a1e71adf81 libopenh264-2.6.0-android-x64.8.so +f8433906e94e719bed537b54e0cd5ae573798cdc3a16a567a25336e8597444bc libopenh264-2.6.0-android-x86.8.so +57cecc08f08479a911b7b6d0ed733376287fef670227328c35b4fbe8335ab9dd libopenh264-2.6.0-ios.a +a46589ccc95df7565ff8b1722d3dead29c0809be28322dc763767e0aa35a6443 libopenh264-2.6.0-linux32.8.so +2f0cde7c6a6abcf5cae76942894ea42897fa677bce4ed6c91a24dd1b041d5f04 libopenh264-2.6.0-linux64.8.so +df91866de0e93773019e30a8f2bdee8b15de4abe2bf89a228ae9f064ff1e85bb libopenh264-2.6.0-linux-arm.8.so +12e7b33623667cdab0e575170c147b1b36eadb77d0d2aa7ceb5afd3e58902140 libopenh264-2.6.0-linux-arm64.8.so +052e98bfcf7a9167d22f3bbb3f5988ef79065591f36af8b52924b22b13624551 libopenh264-2.6.0-mac-arm64.dylib +e3dc8bc01fe69363f61fd3c02fd27798537a585eadd38cd808f303d1ee505a19 libopenh264-2.6.0-mac-x64.dylib +b0098db6acbd290a1fe13997d61d461e7327e39b42bf868db41faf498b7621a2 openh264-2.6.0-win32.dll +2076cb5675ec6c1a4c70e7a2a322552f547b6eeed649d6dfcd9e02a543b24691 openh264-2.6.0-win64.dll diff --git a/scripts/update_blob_hashes.sh b/scripts/update_blob_hashes.sh index 1e8555e..9d94f1d 100644 --- a/scripts/update_blob_hashes.sh +++ b/scripts/update_blob_hashes.sh @@ -8,21 +8,22 @@ set -euo pipefail PROJECT_ROOT="$( cd "$(dirname "$0")/.." ; pwd -P )" VERSION=2.6.0 # <-- Update to latest +ABIVERSION=8 TARGET_FILE="$PROJECT_ROOT/openh264-sys2/src/blobs/hashes.txt" CISCO_ROOT=http://ciscobinary.openh264.org REFERENCE_FILE="openh264-$VERSION-win64.dll" REFERENCE_FILE_PATH="$PROJECT_ROOT/openh264-sys2/tests/reference/" REFERENCE_FILE_SPEC="$PROJECT_ROOT/openh264-sys2/tests/reference/reference.txt" LIBRARIES=( - $CISCO_ROOT/libopenh264-$VERSION-android-arm.7.so.bz2 - $CISCO_ROOT/libopenh264-$VERSION-android-arm64.7.so.bz2 - $CISCO_ROOT/libopenh264-$VERSION-android-x64.7.so.bz2 - $CISCO_ROOT/libopenh264-$VERSION-android-x86.7.so.bz2 + $CISCO_ROOT/libopenh264-$VERSION-android-arm.$ABIVERSION.so.bz2 + $CISCO_ROOT/libopenh264-$VERSION-android-arm64.$ABIVERSION.so.bz2 + $CISCO_ROOT/libopenh264-$VERSION-android-x64.$ABIVERSION.so.bz2 + $CISCO_ROOT/libopenh264-$VERSION-android-x86.$ABIVERSION.so.bz2 $CISCO_ROOT/libopenh264-$VERSION-ios.a.bz2 - $CISCO_ROOT/libopenh264-$VERSION-linux32.7.so.bz2 - $CISCO_ROOT/libopenh264-$VERSION-linux64.7.so.bz2 - $CISCO_ROOT/libopenh264-$VERSION-linux-arm.7.so.bz2 - $CISCO_ROOT/libopenh264-$VERSION-linux-arm64.7.so.bz2 + $CISCO_ROOT/libopenh264-$VERSION-linux32.$ABIVERSION.so.bz2 + $CISCO_ROOT/libopenh264-$VERSION-linux64.$ABIVERSION.so.bz2 + $CISCO_ROOT/libopenh264-$VERSION-linux-arm.$ABIVERSION.so.bz2 + $CISCO_ROOT/libopenh264-$VERSION-linux-arm64.$ABIVERSION.so.bz2 $CISCO_ROOT/libopenh264-$VERSION-mac-arm64.dylib.bz2 $CISCO_ROOT/libopenh264-$VERSION-mac-x64.dylib.bz2 $CISCO_ROOT/openh264-$VERSION-win32.dll.bz2 From 7d3beea7cdaf71dced7ce05842dc84065e5f18b4 Mon Sep 17 00:00:00 2001 From: Woodrow Douglass Date: Fri, 12 Dec 2025 08:43:07 -0500 Subject: [PATCH 3/3] Remove aarch64 build test from CI, seems something is broken upstream --- .github/workflows/rust.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 7d7be21..ed6690f 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -47,9 +47,9 @@ jobs: - target: armv7-unknown-linux-gnueabihf runs-on: ubuntu-latest packages: gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf # provides armv7 headers - - target: aarch64-unknown-linux-gnu - runs-on: ubuntu-latest - packages: gcc-aarch64-linux-gnu g++-aarch64-linux-gnu # provides aarch64 headers +# - target: aarch64-unknown-linux-gnu +# runs-on: ubuntu-latest +# packages: gcc-aarch64-linux-gnu g++-aarch64-linux-gnu # provides aarch64 headers - target: aarch64-apple-darwin runs-on: macos-latest - target: i686-pc-windows-msvc