Fix Android CI and libsharpyuv

.github/workflows/ci-disable-gtest.yml

@@ -88,8 +88,7 @@ jobs:
         -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF
         -DAVIF_CODEC_AOM=LOCAL -DAVIF_CODEC_DAV1D=LOCAL
         -DAVIF_CODEC_RAV1E=LOCAL -DAVIF_CODEC_SVT=LOCAL
-        -DAVIF_LIBYUV=LOCAL
-        -DAVIF_LOCAL_LIBSHARPYUV=ON
+        -DAVIF_LIBYUV=LOCAL -DAVIF_LIBSHARPYUV=LOCAL
         -DAVIF_BUILD_EXAMPLES=ON -DAVIF_BUILD_APPS=ON
         -DAVIF_BUILD_TESTS=ON -DAVIF_ENABLE_GTEST=OFF
     - name: Build libavif (ninja)

.github/workflows/ci-unix-shared-local.yml

@@ -83,7 +83,7 @@ jobs:
         -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON
         -DAVIF_CODEC_AOM=LOCAL -DAVIF_CODEC_DAV1D=LOCAL
         -DAVIF_LIBYUV=${{ matrix.libyuv }}
-        -DAVIF_LOCAL_LIBSHARPYUV=ON
+        -DAVIF_LIBSHARPYUV=LOCAL
         -DAVIF_BUILD_EXAMPLES=ON -DAVIF_BUILD_APPS=ON
         -DAVIF_BUILD_TESTS=ON -DAVIF_ENABLE_GTEST=ON -DAVIF_LOCAL_GTEST=ON
     - name: Build libavif (ninja)

.github/workflows/ci-unix-static-av2.yml

@@ -90,7 +90,7 @@ jobs:
         -DAVIF_CODEC_RAV1E=${{ matrix.also-enable-av1-codecs }}
         -DAVIF_CODEC_SVT=${{ matrix.also-enable-av1-codecs }}
         -DAVIF_LIBYUV=LOCAL
-        -DAVIF_LOCAL_LIBSHARPYUV=ON
+        -DAVIF_LIBSHARPYUV=LOCAL
         -DAVIF_BUILD_EXAMPLES=ON -DAVIF_BUILD_APPS=ON
         -DAVIF_BUILD_TESTS=ON -DAVIF_ENABLE_GTEST=ON -DAVIF_LOCAL_GTEST=ON
     - name: Build libavif (ninja)

.github/workflows/ci-unix-static.yml

@@ -95,7 +95,7 @@ jobs:
         -DAVIF_CODEC_AOM=LOCAL -DAVIF_CODEC_DAV1D=LOCAL
         -DAVIF_CODEC_RAV1E=LOCAL -DAVIF_CODEC_SVT=LOCAL
         -DAVIF_CODEC_LIBGAV1=LOCAL -DAVIF_LIBYUV=LOCAL
-        -DAVIF_LOCAL_LIBSHARPYUV=ON
+        -DAVIF_LIBSHARPYUV=LOCAL
         -DAVIF_BUILD_EXAMPLES=ON -DAVIF_BUILD_APPS=ON
         -DAVIF_BUILD_TESTS=ON -DAVIF_ENABLE_GTEST=ON -DAVIF_LOCAL_GTEST=ON
         -DAVIF_ENABLE_EXPERIMENTAL_YCGCO_R=ON

.github/workflows/ci-windows.yml

@@ -105,11 +105,10 @@ jobs:
 
         cmake .. -G Ninja
         -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF
-        -DAVIF_CODEC_AOM=LOCAL
-        -DAVIF_CODEC_DAV1D=LOCAL -DAVIF_CODEC_RAV1E=LOCAL
-        -DAVIF_CODEC_SVT=LOCAL -DAVIF_CODEC_LIBGAV1=LOCAL
-        -DAVIF_LIBYUV=LOCAL -DAVIF_LOCAL_JPEG=ON
-        -DAVIF_LOCAL_LIBSHARPYUV=ON
+        -DAVIF_CODEC_AOM=LOCAL -DAVIF_CODEC_DAV1D=LOCAL
+        -DAVIF_CODEC_RAV1E=LOCAL -DAVIF_CODEC_SVT=LOCAL
+        -DAVIF_CODEC_LIBGAV1=LOCAL -DAVIF_LIBYUV=LOCAL
+        -DAVIF_LOCAL_JPEG=ON -DAVIF_LIBSHARPYUV=LOCAL
         -DAVIF_LOCAL_ZLIBPNG=ON
         -DAVIF_BUILD_EXAMPLES=ON -DAVIF_BUILD_APPS=ON
         -DAVIF_BUILD_TESTS=ON -DAVIF_ENABLE_GTEST=ON -DAVIF_LOCAL_GTEST=ON

CMakeLists.txt

@@ -40,10 +40,12 @@ option(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP
 )
 option(AVIF_ENABLE_EXPERIMENTAL_AVIR "Enable experimental reduced header" OFF)
 
-macro(set_local_system_option VAR DEFAULT TEXT)
+macro(set_local_or_system_option VAR DEFAULT TEXT)
     # Deal with the older way of setting options.
     if(DEFINED AVIF_LOCAL_${VAR})
         set(DEFAULT ${AVIF_LOCAL_${VAR}})
+    elseif(DEFINED AVIF_${VAR})
+        set(DEFAULT ${AVIF_${VAR}})
     endif()
     set(AVIF_${VAR} ${DEFAULT} CACHE STRING ${TEXT} FORCE)
     set_property(CACHE AVIF_${VAR} PROPERTY STRINGS OFF LOCAL SYSTEM)
@@ -62,7 +64,7 @@ macro(set_codec_option CODEC NAME ENCDEC EXTRA)
     else()
         set(AOM_CODEC_DEFAULT "OFF")
     endif()
-    set_local_system_option("CODEC_${CODEC}" ${AOM_CODEC_DEFAULT} "Use the ${NAME} codec for ${ENCDEC}${EXTRA}")
+    set_local_or_system_option("CODEC_${CODEC}" ${AOM_CODEC_DEFAULT} "Use the ${NAME} codec for ${ENCDEC}${EXTRA}")
 endmacro()
 set_codec_option(AOM "AOM" "encoding/decoding" " (see AVIF_CODEC_AOM_DECODE/AVIF_CODEC_AOM_ENCODE)")
 set_codec_option(DAV1D "dav1d" "decoding" "")
@@ -186,7 +188,7 @@ if(AVIF_LOCAL_JPEG)
     endif()
 endif()
 
-set_local_system_option("LIBYUV" "OFF" "Use libyuv.")
+set_local_or_system_option("LIBYUV" "OFF" "Use libyuv.")
 if(AVIF_LIBYUV STREQUAL "LOCAL")
     set(AVIF_LIBYUV_BUILD_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ext/libyuv/build")
 
@@ -197,7 +199,7 @@ if(AVIF_LIBYUV STREQUAL "LOCAL")
     set(LIB_FILENAME "${AVIF_LIBYUV_BUILD_DIR}/${AVIF_LIBRARY_PREFIX}yuv${CMAKE_STATIC_LIBRARY_SUFFIX}")
 
     if(NOT EXISTS "${LIB_FILENAME}")
-        message(FATAL_ERROR "libavif(AVIF_LOCAL_LIBYUV): ${LIB_FILENAME} is missing, bailing out")
+        message(FATAL_ERROR "libavif(AVIF_LIBYUV): ${LIB_FILENAME} is missing, bailing out")
     endif()
     if(("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") OR (DEFINED ANDROID_ABI))
         set(LIBYUV_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ext/libyuv/include")
@@ -234,11 +236,11 @@ if(libyuv_FOUND)
     set(AVIF_PLATFORM_LIBRARIES ${AVIF_PLATFORM_LIBRARIES} ${LIBYUV_LIBRARY})
 endif(libyuv_FOUND)
 
-set_local_system_option("LIBSHARPYUV" "OFF" "Use libsharpyuv.")
+set_local_or_system_option("LIBSHARPYUV" "OFF" "Use libsharpyuv.")
 if(AVIF_LIBSHARPYUV STREQUAL "LOCAL")
     set(LIB_FILENAME "${CMAKE_CURRENT_SOURCE_DIR}/ext/libwebp/build/libsharpyuv${CMAKE_STATIC_LIBRARY_SUFFIX}")
     if(NOT EXISTS "${LIB_FILENAME}")
-        message(FATAL_ERROR "libavif(AVIF_LOCAL_LIBSHARPYUV): ${LIB_FILENAME} is missing, bailing out")
+        message(FATAL_ERROR "libavif(AVIF_LIBSHARPYUV): ${LIB_FILENAME} is missing, bailing out")
     endif()
     if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
         set(LIBSHARPYUV_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ext/libwebp")
@@ -254,14 +256,12 @@ endif()
 if(libsharpyuv_FOUND)
     message(STATUS "libavif: libsharpyuv found; sharp rgb to yuv conversion enabled.")
     set(AVIF_PLATFORM_DEFINITIONS ${AVIF_PLATFORM_DEFINITIONS} -DAVIF_LIBSHARPYUV_ENABLED=1)
-    if(AVIF_LOCAL_LIBSHARPYUV)
+    if(AVIF_LIBSHARPYUV STREQUAL "LOCAL")
         set(AVIF_PLATFORM_INCLUDES ${AVIF_PLATFORM_INCLUDES} ${LIBSHARPYUV_INCLUDE_DIR})
     else()
         set(AVIF_PLATFORM_SYSTEM_INCLUDES ${AVIF_PLATFORM_SYSTEM_INCLUDES} ${LIBSHARPYUV_INCLUDE_DIR})
     endif()
     set(AVIF_PLATFORM_LIBRARIES ${AVIF_PLATFORM_LIBRARIES} ${LIBSHARPYUV_LIBRARY})
-else(libsharpyuv_FOUND)
-    message(STATUS "libavif: libsharpyuv not found")
 endif(libsharpyuv_FOUND)
 
 option(AVIF_LOCAL_LIBXML2 "Build libxml2 by providing your own copy inside the ext subdir. \

android_jni/avifandroidjni/src/main/jni/CMakeLists.txt

@@ -17,7 +17,7 @@ project(avif_android_jni)
 set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
 
 # To disable dav1d, change the following two variables to OFF.
-set(AVIF_CODEC_DAV1D "LOCAL" CACHE BOOL "" FORCE)
+set(AVIF_CODEC_DAV1D "LOCAL" CACHE STRING "" FORCE)
 
 # To disable libyuv, change this variable to OFF.
 set(AVIF_LIBYUV "LOCAL" CACHE STRING "" FORCE)

ext/libsharpyuv.cmd

@@ -1,5 +1,5 @@
 : # If you want to use a local build of libsharpyuv, you must clone the libwebp repo in this directory first,
-: # then enable CMake's AVIF_LOCAL_LIBSHARPYUV option.
+: # then set CMake's AVIF_LIBSHARPYUV to LOCAL.
 
 : # The odd choice of comment style in this file is to try to share this script between *nix and win32.