From 506b402846181055518ba2a88f0e7f320e1f2911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lo=C3=AFse=20Brosseau?= Date: Mon, 23 Feb 2026 14:12:46 -0500 Subject: [PATCH 1/4] Update AJA SDK version to 17.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Éloïse Brosseau --- cmake/defaults/CYCOMMON.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/defaults/CYCOMMON.cmake b/cmake/defaults/CYCOMMON.cmake index 472db3ac2..948ec855d 100644 --- a/cmake/defaults/CYCOMMON.cmake +++ b/cmake/defaults/CYCOMMON.cmake @@ -1,9 +1,9 @@ # Common build dependencies for all CY20XX platforms aja https://github.com/aja-video/libajantv2 SET(RV_DEPS_AJA_VERSION - "17.1.0" + "17.6.0.hotfix1" ) SET(RV_DEPS_AJA_DOWNLOAD_HASH - "b9d189f77e18dbdff7c39a339b1a5dd4" + "dba447ddd1b0ee84cee8441c0adba06a" ) # atomic_ops https://github.com/ivmai/libatomic_ops From a7a05e15c372529a07d17b71b598dff6e23ca763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lo=C3=AFse=20Brosseau?= Date: Mon, 23 Feb 2026 15:14:17 -0500 Subject: [PATCH 2/4] Disable unnecessary plugin load for mbedtls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Éloïse Brosseau --- cmake/dependencies/aja.cmake | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/cmake/dependencies/aja.cmake b/cmake/dependencies/aja.cmake index e45d1cb46..056b44afd 100644 --- a/cmake/dependencies/aja.cmake +++ b/cmake/dependencies/aja.cmake @@ -30,28 +30,6 @@ SET(_aja_include_dir ${_include_dir}/libajantv2 ) -IF(RHEL_VERBOSE) - SET(_mbedtls_lib_dir - ${_build_dir}/ajantv2/mbedtls-install/lib64 - ) -ELSE() - SET(_mbedtls_lib_dir - ${_build_dir}/ajantv2/mbedtls-install/lib - ) -ENDIF() - -SET(_mbedtls_lib - ${_mbedtls_lib_dir}/${CMAKE_STATIC_LIBRARY_PREFIX}mbedtls${CMAKE_STATIC_LIBRARY_SUFFIX} -) -SET(_mbedx509_lib - ${_mbedtls_lib_dir}/${CMAKE_STATIC_LIBRARY_PREFIX}mbedx509${CMAKE_STATIC_LIBRARY_SUFFIX} -) -SET(_mbedcrypto_lib - ${_mbedtls_lib_dir}/${CMAKE_STATIC_LIBRARY_PREFIX}mbedcrypto${CMAKE_STATIC_LIBRARY_SUFFIX} -) - -LIST(APPEND _byproducts ${_mbedtls_lib} ${_mbedx509_lib} ${_mbedcrypto_lib}) - # There is an issue with the recent AJA SDK : the OS specific header files are no longer copied to _aja_ntv2_include_dir Adding custom paths here to work around # this issue IF(RV_TARGET_LINUX) @@ -75,6 +53,7 @@ LIST( "-DAJANTV2_DISABLE_TOOLS=ON" "-DAJANTV2_DISABLE_TESTS=ON" "-DAJANTV2_BUILD_SHARED=ON" + "-DAJANTV2_DISABLE_PLUGIN_LOAD=ON" "-DNTV2_VERSION_BUILD=0" ) @@ -97,7 +76,7 @@ EXTERNALPROJECT_ADD( INSTALL_DIR ${_install_dir} CONFIGURE_COMMAND ${CMAKE_COMMAND} ${_configure_options} BUILD_COMMAND ${_cmake_build_command} - INSTALL_COMMAND ${_cmake_install_command} && ${CMAKE_COMMAND} -E copy_directory ${_mbedtls_lib_dir} ${_lib_dir} + INSTALL_COMMAND ${_cmake_install_command} BUILD_IN_SOURCE FALSE BUILD_ALWAYS FALSE BUILD_BYPRODUCTS ${_byproducts} @@ -126,11 +105,6 @@ RV_ADD_IMPORTED_LIBRARY( ADD_TO_DEPS_LIST ) -TARGET_LINK_LIBRARIES( - aja::ntv2 - INTERFACE ${_mbedtls_lib} ${_mbedx509_lib} ${_mbedcrypto_lib} -) - IF(RV_TARGET_DARWIN) LIST(APPEND _aja_compile_options "-DAJAMac=1") LIST(APPEND _aja_compile_options "-DAJA_MAC=1") From dc2a4aa6988dd41d6e55bcdc54275abb4c18b6ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lo=C3=AFse=20Brosseau?= Date: Mon, 23 Feb 2026 15:15:55 -0500 Subject: [PATCH 3/4] Disable unnecessary driver on Linux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Éloïse Brosseau --- cmake/dependencies/aja.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/dependencies/aja.cmake b/cmake/dependencies/aja.cmake index 056b44afd..756837d25 100644 --- a/cmake/dependencies/aja.cmake +++ b/cmake/dependencies/aja.cmake @@ -54,6 +54,7 @@ LIST( "-DAJANTV2_DISABLE_TESTS=ON" "-DAJANTV2_BUILD_SHARED=ON" "-DAJANTV2_DISABLE_PLUGIN_LOAD=ON" + "-DAJANTV2_DISABLE_DRIVER=ON" "-DNTV2_VERSION_BUILD=0" ) From 9e20e2b00c4863c35b2648fb4327c56f64c79bf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lo=C3=AFse=20Brosseau?= Date: Wed, 25 Feb 2026 10:38:07 -0500 Subject: [PATCH 4/4] Fix AJA Windows release lib name that now matches with the other OSes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Éloïse Brosseau --- cmake/dependencies/aja.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/dependencies/aja.cmake b/cmake/dependencies/aja.cmake index 756837d25..b47ebb63a 100644 --- a/cmake/dependencies/aja.cmake +++ b/cmake/dependencies/aja.cmake @@ -17,7 +17,9 @@ SET(_download_hash "${RV_DEPS_AJA_DOWNLOAD_HASH}" ) -IF(RV_TARGET_WINDOWS) +IF(RV_TARGET_WINDOWS + AND CMAKE_BUILD_TYPE MATCHES "^Debug$" +) RV_MAKE_STANDARD_LIB_NAME(ajantv2_vs143_MT "" "SHARED" "d") ELSE() RV_MAKE_STANDARD_LIB_NAME(ajantv2 "" "SHARED" "d")