Do not allow libyuv to find_package JPEG (#2473)

AOMediaCodec · Oct 9, 2024 · df2f379 · df2f379
1 parent 5ae2a41
commit df2f379
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/cmake/Modules/LocalLibyuv.cmake b/cmake/Modules/LocalLibyuv.cmake
@@ -29,17 +29,26 @@ else()
     if(ANDROID_ABI)
         set(LIBYUV_BINARY_DIR "${LIBYUV_BINARY_DIR}/${ANDROID_ABI}")
     endif()
+
+    # unset JPEG_FOUND so that libyuv does not find it
+    set(JPEG_FOUND_ORIG ${JPEG_FOUND})
+    unset(JPEG_FOUND CACHE)
+    set(CMAKE_DISABLE_FIND_PACKAGE_JPEG TRUE)
+
     FetchContent_Declare(
         libyuv
         GIT_REPOSITORY "https://chromium.googlesource.com/libyuv/libyuv"
         BINARY_DIR "${LIBYUV_BINARY_DIR}"
         GIT_TAG "${AVIF_LOCAL_LIBYUV_TAG}"
-        PATCH_COMMAND sed -i.bak -e "s:find_package.*(.*JPEG.*)::" CMakeLists.txt
         UPDATE_COMMAND ""
     )
 
     avif_fetchcontent_populate_cmake(libyuv)
 
+    set(JPEG_FOUND ${JPEG_FOUND_ORIG})
+    unset(JPEG_FOUND_ORIG CACHE)
+    set(CMAKE_DISABLE_FIND_PACKAGE_JPEG FALSE)
+
     set_target_properties(yuv PROPERTIES AVIF_LOCAL ON POSITION_INDEPENDENT_CODE ON)
 
     add_library(yuv::yuv ALIAS yuv)