Bump libavif and libheif

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.7.1
+
+- Bump the versions of the libavif and libheif dependencies.
+
 ## v0.7.0
 
 - Replace deps.sh by cmake/Modules.

CMakeLists.txt

@@ -16,7 +16,7 @@ cmake_minimum_required(VERSION 3.20)
 project(
   codec-compare-gen
   LANGUAGES CXX
-  VERSION 0.7.0)
+  VERSION 0.7.1)
 set(CMAKE_CXX_STANDARD 17)
 
 # Options
@@ -256,7 +256,6 @@ endif()
 
 if(CCGEN_ENABLE_WEBP2)
   include(LocalLibwebp2)
-  target_compile_definitions(libccgen PRIVATE HAS_WEBP2)
   target_link_libraries(libccgen webp2 imageio)
   if(CCGEN_ENABLE_WEBP)
     # libccgen also uses WebP encoding and decoding through libwebp2.
@@ -397,12 +396,10 @@ if(NOT CCGEN_WASM)
   target_include_directories(are_images_equivalent
                              PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
   target_link_libraries(are_images_equivalent libccgen)
-  target_compile_definitions(are_images_equivalent PRIVATE HAS_WEBP2)
 
   add_executable(strip_metadata tools/strip_metadata.cc)
   target_include_directories(strip_metadata PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
   target_link_libraries(strip_metadata libccgen)
-  target_compile_definitions(strip_metadata PRIVATE HAS_WEBP2)
 endif()
 
 # Tests
@@ -435,7 +432,6 @@ if(CCGEN_BUILD_TESTING)
       target_include_directories(${TEST_NAME}
                                  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
       target_link_libraries(${TEST_NAME} PRIVATE libccgen GTest::gtest)
-      target_compile_definitions(${TEST_NAME} PRIVATE HAS_WEBP2)
       if(${ARGC} EQUAL 3)
         add_test(NAME ${TEST_NAME}
                  COMMAND ${TEST_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/${ARGV1}/

cmake/Modules/LocalLibavif.cmake

@@ -4,10 +4,9 @@ include(CcgenFetchContent)
 FetchContent_Declare(
   libavif
   GIT_REPOSITORY "https://github.com/AOMediaCodec/libavif.git"
-  # GIT_TAG v1.4.1 does not contain the latest AVM tag.
-  GIT_TAG 257b1e45f979491d905786d80691ba33a7597290
+  GIT_TAG v1.4.2
   GIT_PROGRESS ON
-  GIT_SHALLOW OFF
+  GIT_SHALLOW ON
   UPDATE_COMMAND "")
 
 set(AVIF_BUILD_APPS

cmake/Modules/LocalLibheif.cmake

@@ -4,7 +4,7 @@ include(CcgenFetchContent)
 FetchContent_Declare(
   libheif
   GIT_REPOSITORY "https://github.com/strukturag/libheif.git"
-  GIT_TAG v1.21.2
+  GIT_TAG v1.23.0
   GIT_PROGRESS ON
   GIT_SHALLOW ON
   UPDATE_COMMAND "")

src/base.h

@@ -142,12 +142,10 @@ struct LogError {
 
 // Can be used as follows:
 //   OK_WP2_OR_RETURN(FuncThatReturnsWP2Status(), quiet);
-#if defined(HAS_WEBP2)
 #define OK_WP2_OR_RETURN(STATUS, QUIET)                                     \
   const WP2Status CONCAT(checked_status, __LINE__) = (STATUS);              \
   CHECK_OR_RETURN(CONCAT(checked_status, __LINE__) == WP2_STATUS_OK, QUIET) \
       << WP2GetStatusMessage(CONCAT(checked_status, __LINE__)) << " "
-#endif  // HAS_WEBP2
 
 //------------------------------------------------------------------------------