From 6b4cbe186a0c01b74f433497c633b50247388772 Mon Sep 17 00:00:00 2001 From: Frankie Dintino Date: Sat, 9 Sep 2023 13:06:53 -0400 Subject: [PATCH] fixup --- wheelbuild/config.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/wheelbuild/config.sh b/wheelbuild/config.sh index b1c0ec5..523c55f 100644 --- a/wheelbuild/config.sh +++ b/wheelbuild/config.sh @@ -378,7 +378,7 @@ function build_libsharpyuv { -DBUILD_SHARED_LIBS=OFF \ -DCMAKE_INSTALL_LIBDIR=lib \ "${cmake_flags[@]}" \ - && ninja sharpyuv install) + && ninja sharpyuv) require_package libsharpyuv @@ -406,10 +406,10 @@ function build_libyuv { fi (cd libyuv-$LIBYUV_SHA/build \ && cmake -G Ninja .. \ - -DBUILD_SHARED_LIBS=0 \ + -DBUILD_SHARED_LIBS=OFF \ -DCMAKE_BUILD_TYPE=Release \ "${cmake_flags[@]}" .. \ - && ninja yuv install) + && ninja yuv) group_end touch libyuv-stamp } @@ -467,8 +467,11 @@ function build_libavif { build_libsharpyuv ln -s $PWD/libwebp-$LIBWEBP_SHA libavif-$LIBAVIF_VERSION/ext/libwebp + LIBAVIF_CMAKE_FLAGS+=(-DAVIF_LOCAL_LIBSHARPYUV=ON) build_libyuv + ln -s $PWD/libyuv-$LIBYUV_SHA libavif-$LIBAVIF_VERSION/ext/libyuv + LIBAVIF_CMAKE_FLAGS+=(-DAVIF_LOCAL_LIBYUV=ON) group_start "Build libavif" @@ -480,7 +483,6 @@ function build_libavif { -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ - -DAVIF_LOCAL_LIBSHARPYUV=ON \ "${LIBAVIF_CMAKE_FLAGS[@]}" \ && make install)