Merge branch 'main' into AppleProRes_SDK_Support

Author: dpmacri

cmake/defaults/CYCOMMON.cmake

@@ -213,10 +213,10 @@ SET(RV_DEPS_PCRE2_DOWNLOAD_HASH
 
 # png https://github.com/glennrp/libpng
 SET(RV_DEPS_PNG_VERSION
-    "1.6.48"
+    "1.6.55"
 )
 SET(RV_DEPS_PNG_DOWNLOAD_HASH
-    "be6cc9e411c26115db3b9eab1159a1d9"
+    "933118ac208387d0727e3d5e36558022"
 )
 
 # raw https://github.com/LibRaw/LibRaw Please check the libraw_version.h file for your version number to get the LIBRAW_SHLIB_CURRENT value

cmake/dependencies/CMakeLists.txt

@@ -6,7 +6,11 @@
 
 INCLUDE(rv_create_std_deps_vars)
 INCLUDE(rv_make_std_lib_name)
-INCLUDE(rv_copy_lib_bin_folders)
+INCLUDE(rv_stage_dependency_libs)
+INCLUDE(rv_add_imported_library)
+
+INCLUDE(ProcessorCount)
+PROCESSORCOUNT(_cpu_count)
 
 IF(NOT TARGET dependencies)
   ADD_CUSTOM_TARGET(dependencies)

cmake/dependencies/aja.cmake

@@ -4,9 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-INCLUDE(ProcessorCount) # require CMake 3.15+
-PROCESSORCOUNT(_cpu_count)
-
 RV_CREATE_STANDARD_DEPS_VARIABLES("RV_DEPS_AJA" "${RV_DEPS_AJA_VERSION}" "make" "")
 RV_SHOW_STANDARD_DEPS_VARIABLES()
 
@@ -71,7 +68,15 @@ ELSEIF(RV_TARGET_WINDOWS)
   )
 ENDIF()
 
-LIST(APPEND _configure_options "-DAJANTV2_DISABLE_DEMOS=ON" "-DAJANTV2_DISABLE_TOOLS=ON" "-DAJANTV2_DISABLE_TESTS=ON" "-DAJANTV2_BUILD_SHARED=ON")
+LIST(
+  APPEND
+  _configure_options
+  "-DAJANTV2_DISABLE_DEMOS=ON"
+  "-DAJANTV2_DISABLE_TOOLS=ON"
+  "-DAJANTV2_DISABLE_TESTS=ON"
+  "-DAJANTV2_BUILD_SHARED=ON"
+  "-DNTV2_VERSION_BUILD=0"
+)
 
 # In Debug, the MSVC runtime library needs to be set to MultiThreadedDebug. Otherwise, it will be set to MultiThreaded.
 IF(RV_TARGET_WINDOWS
@@ -99,29 +104,26 @@ EXTERNALPROJECT_ADD(
   USES_TERMINAL_BUILD TRUE
 )
 
-RV_COPY_LIB_BIN_FOLDERS()
-
-ADD_LIBRARY(aja::ntv2 SHARED IMPORTED GLOBAL)
-ADD_DEPENDENCIES(aja::ntv2 ${_target})
-SET_PROPERTY(
-  TARGET aja::ntv2
-  PROPERTY IMPORTED_LOCATION ${_libpath}
-)
-SET_PROPERTY(
-  TARGET aja::ntv2
-  PROPERTY IMPORTED_SONAME ${_libname}
-)
-IF(RV_TARGET_WINDOWS)
-  SET_PROPERTY(
-    TARGET aja::ntv2
-    PROPERTY IMPORTED_IMPLIB ${_implibpath}
-  )
-ENDIF()
+RV_STAGE_DEPENDENCY_LIBS(TARGET ${_target} LIBNAME ${_libname})
 
-FILE(MAKE_DIRECTORY ${_aja_include_dir} ${_aja_ntv2_include_dir} ${_aja_ntv2_os_specific_include_dir})
-TARGET_INCLUDE_DIRECTORIES(
+RV_ADD_IMPORTED_LIBRARY(
+  NAME
   aja::ntv2
-  INTERFACE ${_aja_include_dir} ${_aja_ntv2_include_dir} ${_aja_ntv2_os_specific_include_dir}
+  TYPE
+  SHARED
+  LOCATION
+  ${_libpath}
+  SONAME
+  ${_libname}
+  IMPLIB
+  ${_implibpath}
+  INCLUDE_DIRS
+  ${_aja_include_dir}
+  ${_aja_ntv2_include_dir}
+  ${_aja_ntv2_os_specific_include_dir}
+  DEPENDS
+  ${_target}
+  ADD_TO_DEPS_LIST
 )
 
 TARGET_LINK_LIBRARIES(
@@ -143,12 +145,3 @@ SET(RV_DEPS_AJA_COMPILE_OPTIONS
     ${_aja_compile_options}
     CACHE INTERNAL "" FORCE
 )
-
-LIST(APPEND RV_DEPS_LIST aja::ntv2)
-
-ADD_DEPENDENCIES(dependencies ${_target}-stage-target)
-
-SET(RV_DEPS_AJA_VERSION
-    ${_version}
-    CACHE INTERNAL "" FORCE
-)

cmake/dependencies/atomic_ops.cmake

@@ -4,9 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-INCLUDE(ProcessorCount) # require CMake 3.15+
-PROCESSORCOUNT(_cpu_count)
-
 SET(_target
     "RV_DEPS_ATOMIC_OPS"
 )
@@ -79,36 +76,25 @@ EXTERNALPROJECT_ADD(
   USES_TERMINAL_BUILD TRUE
 )
 
-ADD_LIBRARY(atomic_ops::atomic_ops STATIC IMPORTED GLOBAL)
-ADD_DEPENDENCIES(atomic_ops::atomic_ops ${_target})
-SET_PROPERTY(
-  TARGET atomic_ops::atomic_ops
-  PROPERTY IMPORTED_LOCATION ${_atomic_ops_lib}
-)
-
 SET(_include_dir
     ${_install_dir}/include
 )
-FILE(MAKE_DIRECTORY ${_include_dir})
-TARGET_INCLUDE_DIRECTORIES(
-  atomic_ops::atomic_ops
-  INTERFACE ${_include_dir}
-)
-LIST(APPEND RV_DEPS_LIST atomic_ops::atomic_ops)
 
-ADD_CUSTOM_COMMAND(
-  COMMENT "Installing ${_target}'s libs into ${RV_STAGE_LIB_DIR}"
-  OUTPUT ${RV_STAGE_LIB_DIR}/${_atomic_ops_lib_name}
-  COMMAND ${CMAKE_COMMAND} -E copy_directory ${_lib_dir} ${RV_STAGE_LIB_DIR}
-  DEPENDS ${_target}
-)
-
-ADD_CUSTOM_TARGET(
-  ${_target}-stage-target ALL
-  DEPENDS ${RV_STAGE_LIB_DIR}/${_atomic_ops_lib_name}
+RV_ADD_IMPORTED_LIBRARY(
+  NAME
+  atomic_ops::atomic_ops
+  TYPE
+  STATIC
+  LOCATION
+  ${_atomic_ops_lib}
+  INCLUDE_DIRS
+  ${_include_dir}
+  DEPENDS
+  ${_target}
+  ADD_TO_DEPS_LIST
 )
 
-ADD_DEPENDENCIES(dependencies ${_target}-stage-target)
+RV_STAGE_DEPENDENCY_LIBS(TARGET ${_target} OUTPUTS ${RV_STAGE_LIB_DIR}/${_atomic_ops_lib_name})
 
 SET(RV_DEPS_ATOMIC_OPS_VERSION
     ${_version}

cmake/dependencies/bmd.cmake

@@ -4,9 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-INCLUDE(ProcessorCount) # require CMake 3.15+
-PROCESSORCOUNT(_cpu_count)
-
 SET(_target
     "RV_DEPS_BMD"
 )

cmake/dependencies/boost.cmake

@@ -9,9 +9,6 @@
 #
 # Starting from CMake 3.30, FindBoost.cmake has been removed in favor of BoostConfig.cmake (Boost 1.70+). This behavior is covered by CMake policy CMP0167.
 
-INCLUDE(ProcessorCount) # require CMake 3.15+
-PROCESSORCOUNT(_cpu_count)
-
 SET(_ext_boost_version
     ${RV_DEPS_BOOST_VERSION}
 )
@@ -30,19 +27,6 @@ SET(_download_url
     "https://archives.boost.io/release/${_version}/source/boost_${_version_with_underscore}.tar.gz"
 )
 
-# Set _base_dir for Clean-<target>
-SET(_base_dir
-    ${RV_DEPS_BASE_DIR}/${_target}
-)
-
-SET(_install_dir
-    ${RV_DEPS_BASE_DIR}/${_target}/install
-)
-
-SET(${_target}_ROOT_DIR
-    ${_install_dir}
-)
-
 SET(_boost_libs
     atomic
     chrono
@@ -255,31 +239,9 @@ SET_TARGET_PROPERTIES(
   PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_include_dir}"
 )
 
+# Note: On Windows, Boost's b2 puts both .lib and .dll in lib/, so we copy _lib_dir to both RV_STAGE_LIB_DIR and RV_STAGE_BIN_DIR.
 IF(RV_TARGET_WINDOWS)
-  ADD_CUSTOM_COMMAND(
-    TARGET ${_target}
-    POST_BUILD
-    COMMENT "Installing ${_target}'s libs and bin into ${RV_STAGE_LIB_DIR} and ${RV_STAGE_BIN_DIR}"
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${_lib_dir} ${RV_STAGE_LIB_DIR}
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${_lib_dir} ${RV_STAGE_BIN_DIR}
-  )
+  RV_STAGE_DEPENDENCY_LIBS(TARGET ${_target} EXTRA_LIB_DIRS ${RV_STAGE_BIN_DIR} OUTPUTS ${_boost_stage_output})
 ELSE()
-  ADD_CUSTOM_COMMAND(
-    COMMENT "Installing ${_target}'s libs into ${RV_STAGE_LIB_DIR}"
-    OUTPUT ${_boost_stage_output}
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${_lib_dir} ${RV_STAGE_LIB_DIR}
-    DEPENDS ${_target}
-  )
+  RV_STAGE_DEPENDENCY_LIBS(TARGET ${_target} OUTPUTS ${_boost_stage_output})
 ENDIF()
-
-ADD_CUSTOM_TARGET(
-  ${_target}-stage-target ALL
-  DEPENDS ${_boost_stage_output}
-)
-
-ADD_DEPENDENCIES(dependencies ${_target}-stage-target)
-
-SET(RV_DEPS_BOOST_VERSION
-    ${_version}
-    CACHE INTERNAL "" FORCE
-)

cmake/dependencies/dav1d.cmake

@@ -4,16 +4,8 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-INCLUDE(ProcessorCount) # require CMake 3.15+
-PROCESSORCOUNT(_cpu_count)
-
-SET(_target
-    "RV_DEPS_DAV1D"
-)
-
-SET(_version
-    ${RV_DEPS_DAV1D_VERSION}
-)
+RV_CREATE_STANDARD_DEPS_VARIABLES("RV_DEPS_DAV1D" "${RV_DEPS_DAV1D_VERSION}" "ninja" "meson")
+RV_SHOW_STANDARD_DEPS_VARIABLES()
 
 SET(_download_url
     "https://github.com/videolan/dav1d/archive/refs/tags/${_version}.zip"
@@ -22,26 +14,15 @@ SET(_download_hash
     ${RV_DEPS_DAV1D_DOWNLOAD_HASH}
 )
 
-SET(_install_dir
-    ${RV_DEPS_BASE_DIR}/${_target}/install
-)
-SET(_include_dir
-    ${_install_dir}/include
-)
+# _lib_dir_name is needed for the meson --libdir option
 IF(RHEL_VERBOSE)
   SET(_lib_dir_name
       lib64
   )
-  SET(_lib_dir
-      ${_install_dir}/lib64
-  )
 ELSE()
   SET(_lib_dir_name
       lib
   )
-  SET(_lib_dir
-      ${_install_dir}/lib
-  )
 ENDIF()
 
 SET(_david_lib_name
@@ -52,13 +33,6 @@ SET(_dav1d_lib
     ${_lib_dir}/${_david_lib_name}
 )
 
-SET(_configure_command
-    meson
-)
-SET(_make_command
-    ninja
-)
-
 IF(APPLE)
   # Cross-file must be specified because if Rosetta is used to compile for x86_64 from ARM64, Meson still detects ARM64 as the default architecture.
 
@@ -92,7 +66,7 @@ EXTERNALPROJECT_ADD(
   DOWNLOAD_NAME ${_target}_${_version}.zip
   DOWNLOAD_DIR ${RV_DEPS_DOWNLOAD_DIR}
   DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-  SOURCE_DIR ${RV_DEPS_BASE_DIR}/${_target}/src
+  SOURCE_DIR ${_source_dir}
   INSTALL_DIR ${_install_dir}
   URL ${_download_url}
   URL_MD5 ${_download_hash}
@@ -107,56 +81,26 @@ EXTERNALPROJECT_ADD(
   USES_TERMINAL_BUILD TRUE
 )
 
-ADD_LIBRARY(dav1d::dav1d STATIC IMPORTED GLOBAL)
-ADD_DEPENDENCIES(dav1d::dav1d ${_target})
-SET_PROPERTY(
-  TARGET dav1d::dav1d
-  PROPERTY IMPORTED_LOCATION ${_dav1d_lib}
-)
-SET_PROPERTY(
-  TARGET dav1d::dav1d
-  PROPERTY IMPORTED_SONAME ${_david_lib_name}
-)
-
-FILE(MAKE_DIRECTORY ${_include_dir})
-TARGET_INCLUDE_DIRECTORIES(
+RV_ADD_IMPORTED_LIBRARY(
+  NAME
   dav1d::dav1d
-  INTERFACE ${_include_dir}
+  TYPE
+  STATIC
+  LOCATION
+  ${_dav1d_lib}
+  INCLUDE_DIRS
+  ${_include_dir}
+  DEPENDS
+  ${_target}
+  ADD_TO_DEPS_LIST
 )
-LIST(APPEND RV_DEPS_LIST dav1d::dav1d)
 
 IF(RV_TARGET_WINDOWS)
-  ADD_CUSTOM_COMMAND(
-    TARGET ${_target}
-    POST_BUILD
-    COMMENT "Installing ${_target}'s libs and bin into ${RV_STAGE_LIB_DIR} and ${RV_STAGE_BIN_DIR}"
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${_install_dir}/lib ${RV_STAGE_LIB_DIR}
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${_install_dir}/bin ${RV_STAGE_BIN_DIR}
-  )
-  ADD_CUSTOM_TARGET(
-    ${_target}-stage-target ALL
-    DEPENDS ${RV_STAGE_LIB_DIR}/${_david_lib_name}
-  )
+  RV_STAGE_DEPENDENCY_LIBS(TARGET ${_target} BIN_DIR ${_install_dir}/bin OUTPUTS ${RV_STAGE_LIB_DIR}/${_david_lib_name})
 ELSE()
-  ADD_CUSTOM_COMMAND(
-    COMMENT "Installing ${_target}'s libs into ${RV_STAGE_LIB_DIR}"
-    OUTPUT ${RV_STAGE_LIB_DIR}/${_david_lib_name}
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${_lib_dir} ${RV_STAGE_LIB_DIR}
-    DEPENDS ${_target}
-  )
-  ADD_CUSTOM_TARGET(
-    ${_target}-stage-target ALL
-    DEPENDS ${RV_STAGE_LIB_DIR}/${_david_lib_name}
-  )
+  RV_STAGE_DEPENDENCY_LIBS(TARGET ${_target} OUTPUTS ${RV_STAGE_LIB_DIR}/${_david_lib_name})
 ENDIF()
 
-ADD_DEPENDENCIES(dependencies ${_target}-stage-target)
-
-SET(RV_DEPS_DAV1D_VERSION
-    ${_version}
-    CACHE INTERNAL "" FORCE
-)
-
 # FFmpeg customization adding dav1d codec support to FFmpeg
 SET_PROPERTY(
   GLOBAL APPEND