fix

radarhere · Dec 4, 2024 · 526147a · 526147a
1 parent c40bcbf
commit 526147a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 52 deletions.
diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh
@@ -97,49 +97,31 @@ function build_harfbuzz {
     touch harfbuzz-stamp
 }
 
-function install_rav1e {
-    if [ -n "$IS_MACOS" ]; then
-        suffix="macos"
-        if [[ "$PLAT" == "arm64" ]]; then
-            suffix+="-aarch64"
-        fi
-    else
-        suffix="linux"
-        if [[ "$PLAT" == "aarch64" ]]; then
-            suffix+="-aarch64"
-        else
-            suffix+="-generic"
-        fi
-    fi
-
-    curl -sLo - \
-        https://github.com/xiph/rav1e/releases/download/v$RAV1E_VERSION/librav1e-$RAV1E_VERSION-$suffix.tar.gz \
-        | tar -C $BUILD_PREFIX --exclude LICENSE --exclude '*.so' --exclude '*.dylib' -zxf -
+function build_rav1e {
+    if [ -e rav1e-stamp ]; then return; fi
+    curl https://sh.rustup.rs -sSf | sh -s -- -y
+    . "$HOME/.cargo/env"
 
-    if [ -z "$IS_MACOS" ]; then
-        sed -i 's/-lgcc_s/-lgcc_eh/g' "${BUILD_PREFIX}/lib/pkgconfig/rav1e.pc"
+    if [[ -z "$IS_MACOS" ]]; then
+        yum install -y openssl-devel
     fi
 
-    # Force libavif to treat system rav1e as if it were local
-    mkdir -p /tmp/cmake/Modules
-    cat <<EOF > /tmp/cmake/Modules/Findrav1e.cmake
-    add_library(rav1e::rav1e STATIC IMPORTED GLOBAL)
-    set_target_properties(rav1e::rav1e PROPERTIES
-        IMPORTED_LOCATION "$BUILD_PREFIX/lib/librav1e.a"
-        AVIF_LOCAL ON
-        INTERFACE_INCLUDE_DIRECTORIES "$BUILD_PREFIX/include/rav1e"
-    )
-EOF
+    local out_dir=$(fetch_unpack https://github.com/xiph/rav1e/archive/refs/tags/v$RAV1E_VERSION.tar.gz)
+    (cd $out_dir \
+        && cargo install cargo-c \
+        && sudo cargo cinstall --release)
+    touch rav1e-stamp
 }
 
 function build_libavif {
     if [ -e libavif-stamp ]; then return; fi
-    install_rav1e
-    python3 -m pip install meson ninja
 
     if [[ "$PLAT" == "x86_64" ]]; then
         build_simple nasm 2.16.03 https://www.nasm.us/pub/nasm/releasebuilds/2.16.03/
     fi
+    build_rav1e
+
+    python3 -m pip install meson ninja
 
     local out_dir=$(fetch_unpack https://github.com/AOMediaCodec/libavif/archive/refs/tags/v$LIBAVIF_VERSION.tar.gz libavif-$LIBAVIF_VERSION.tar.gz)
     (cd $out_dir \

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -10,32 +10,12 @@ on:
   #        │  │ │ │ │
   - cron: "42 1 * * 0,3"
   push:
-    paths:
-      - ".ci/requirements-cibw.txt"
-      - ".github/workflows/wheel*"
-      - "setup.py"
-      - "wheels/*"
-      - "winbuild/build_prepare.py"
-      - "winbuild/fribidi.cmake"
-    tags:
-      - "*"
   pull_request:
-    paths:
-      - ".ci/requirements-cibw.txt"
-      - ".github/workflows/wheel*"
-      - "setup.py"
-      - "wheels/*"
-      - "winbuild/build_prepare.py"
-      - "winbuild/fribidi.cmake"
   workflow_dispatch:
 
 permissions:
   contents: read
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 env:
   FORCE_COLOR: 1