From c0829285ff6aa420e4174c01bdb3c390fe18c840 Mon Sep 17 00:00:00 2001 From: BtbN Date: Sun, 12 Jan 2025 18:59:58 +0100 Subject: [PATCH 1/2] Add libsnappy for hap encoding support Closes #443 --- scripts.d/50-snappy.sh | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100755 scripts.d/50-snappy.sh diff --git a/scripts.d/50-snappy.sh b/scripts.d/50-snappy.sh new file mode 100755 index 0000000000..418abee757 --- /dev/null +++ b/scripts.d/50-snappy.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +SCRIPT_REPO="https://github.com/google/snappy.git" +SCRIPT_COMMIT="32ded457c0b1fe78ceb8397632c416568d6714a0" + +ffbuild_enabled() { + return 0 +} + +ffbuild_dockerbuild() { + mkdir build && cd build + + cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \ + -DBUILD_SHARED_LIBS=OFF -DSNAPPY_BUILD_TESTS=OFF -DSNAPPY_BUILD_BENCHMARKS=OFF -DSNAPPY_FUZZING_BUILD=OFF \ + -DSNAPPY_REQUIRE_AVX=OFF -DSNAPPY_REQUIRE_AVX2=OFF .. + make -j$(nproc) + make install +} + +ffbuild_configure() { + echo --enable-libsnappy +} + +ffbuild_unconfigure() { + echo --disable-libsnappy +} From e338f23f15b0901c6906de3c5f5652eda19a52ee Mon Sep 17 00:00:00 2001 From: BtbN Date: Sun, 12 Jan 2025 19:33:38 +0100 Subject: [PATCH 2/2] Update docker-build-push action --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 63281ddd34..a803e4bd9c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -67,7 +67,7 @@ jobs: - name: Stop Commands run: T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}" - name: Build target base image - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: images/base pull: true @@ -136,7 +136,7 @@ jobs: - name: Stop Commands run: T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}" - name: Build target base image - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: images/base-${{ matrix.target }} pull: true @@ -203,7 +203,7 @@ jobs: key: download-cache-${{ steps.dl_cache.outputs.dltagname }} fail-on-cache-miss: true - name: Build target base image - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . pull: true