libajantv2: 17.1.3 -> 17.5.0

pkgs/by-name/li/libajantv2/demos-ntv2overlay-no-makefile.patch

···
+From f822ffa9f886b668fe0a6269f0ba8bf48043d190 Mon Sep 17 00:00:00 2001
+From: Luke Granger-Brown <[e-mail]>
+Date: Sun, 22 Jun 2025 14:12:08 +0100
+Subject: [PATCH 4/4] Don't attempt to install a non-existent Makefile
+
+---
+ demos/ntv2overlay/CMakeLists.txt | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/demos/ntv2overlay/CMakeLists.txt b/demos/ntv2overlay/CMakeLists.txt
+index 4520e795..ae94906f 100644
+--- a/demos/ntv2overlay/CMakeLists.txt
++++ b/demos/ntv2overlay/CMakeLists.txt
+@@ -48,6 +48,3 @@ endif()
+ if (AJA_INSTALL_CMAKE)
+ 	install(FILES CMakeLists.txt DESTINATION ${CMAKE_INSTALL_PREFIX}/libajantv2/demos/ntv2overlay)
+ endif()
+-if (AJA_INSTALL_MISC)
+-	install(FILES Makefile DESTINATION ${CMAKE_INSTALL_PREFIX}/libajantv2/demos/ntv2overlay)
+-endif()
+-- 
+2.49.0
+

pkgs/by-name/li/libajantv2/device-info-list.patch

···
+From 5d6984729190139ddcbefb825e4d59a8bdfc3551 Mon Sep 17 00:00:00 2001
+From: Luke Granger-Brown <[e-mail]>
+Date: Sun, 22 Jun 2025 14:05:49 +0100
+Subject: [PATCH 2/3] Properly mark CNTV2DeviceScanner::GetDeviceInfoList as a
+ class member method
+
+---
+ ajantv2/src/ntv2devicescanner.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 diff --git a/ajantv2/src/ntv2devicescanner.cpp b/ajantv2/src/ntv2devicescanner.cpp
-index 448e48d372..6b46f9f69d 100644
+index 11d145be..1fb0b433 100644
 --- a/ajantv2/src/ntv2devicescanner.cpp
 +++ b/ajantv2/src/ntv2devicescanner.cpp
-@@ -137,7 +137,7 @@
+@@ -117,7 +117,7 @@ CNTV2DeviceScanner::CNTV2DeviceScanner (const bool inScanNow)
  		}
  	#endif	//	!defined(NTV2_DEPRECATE_16_3)
  
···
  {
  	AJAAutoLock tmpLock(&sDevInfoListLock);
  	return sDevInfoList;
+-- 
+2.49.0
+

pkgs/by-name/li/libajantv2/musl.patch

···
-From 6b27c75125f2b2c66d5d6dd8d35569260ac72f17 Mon Sep 17 00:00:00 2001
+From 8312398dbc1f0a960c0e64c2faaa756277c0f67c Mon Sep 17 00:00:00 2001
 From: Alyssa Ross <[e-mail]>
 Date: Fri, 3 Jan 2025 12:21:28 +0100
-Subject: [PATCH] Don't use non-standard ACCESSPERMS macro
+Subject: [PATCH 3/3] Don't use non-standard ACCESSPERMS macro
 
 This macro is non-standard, and is not defined by e.g. musl libc.
 It's just a define for 0777, so just use that instead.
···
  				char* result = getcwd(cwdBuf, AJA_MAX_PATH);
  				AJA_UNUSED(result);
 -- 
-2.47.0
+2.49.0
 

pkgs/by-name/li/libajantv2/package.nix

···
 
 stdenv.mkDerivation rec {
   pname = "libajantv2";
-  version = "17.1.3";
+  version = "17.5.0";
 
   src = fetchFromGitHub {
     owner = "aja-video";
     repo = "libajantv2";
     rev = "ntv2_${builtins.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-7APoPj2LnvdwfuVforoJz0YxKU1WmAgRqIfXao4IZmY=";
+    hash = "sha256-/BfFbBScS75TpUZEeYzAHd1PtnZgnCNfGtjwYPJJjkg=";
   };
   patches = [
     ./use-system-mbedtls.patch
     ./device-info-list.patch
     ./musl.patch
+    ./demos-ntv2overlay-no-makefile.patch
   ];
 
   outputs = [

pkgs/by-name/li/libajantv2/use-system-mbedtls.patch

···
-Commit ID: 1aeee534119a22e717ce3d0e9f62c8791cd825b9
-Change ID: pzyrusopmyvtvnwnruvrltqtpqtzxrpo
-Author: Luke Granger-Brown <[e-mail]> (2024-12-20 18:03:16)
-Committer: Luke Granger-Brown <[e-mail]> (2024-12-20 18:03:25)
+From 6c8dca24e48b0bbeb11e9611fe547246167030ab Mon Sep 17 00:00:00 2001
+From: Luke Granger-Brown <[e-mail]>
+Date: Fri, 20 Dec 2024 18:03:16 +0000
+Subject: [PATCH 1/3] Use system mbedtls, rather than downloading from a random
+ Git branch...
 
-    Use system mbedtls, rather than downloading from a random Git branch...
+---
+ ajantv2/CMakeLists.txt | 50 +++---------------------------------------
+ 1 file changed, 3 insertions(+), 47 deletions(-)
 
 diff --git a/ajantv2/CMakeLists.txt b/ajantv2/CMakeLists.txt
-index ffa572e9c8..74c23e8e4e 100644
+index 8037dd4b..aa6e6577 100644
 --- a/ajantv2/CMakeLists.txt
 +++ b/ajantv2/CMakeLists.txt
-@@ -52,49 +52,13 @@
- else()
+@@ -55,49 +55,13 @@ else()
+     endif()
      message(STATUS "NTV2 SDK will load signed 3rd-party plugins")
  
 -    set(MBEDTLS_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/mbedtls-install)
···
 -        set(MBEDCRYPTO_LIBRARY ${MBEDTLS_LIBRARY_DIR}/mbedcrypto.lib)
 -        set(MBEDTLS_EXTRA_CONFIG_FLAGS
 -                "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
--                "-DMSVC_STATIC_RUNTIME=ON"
 -                "-DCMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY}")
 -    elseif (CMAKE_SYSTEM_NAME MATCHES "^(Linux|Darwin)$")
 -        set(MBEDTLS_LIBRARY ${MBEDTLS_LIBRARY_DIR}/libmbedtls.a)
···
 -    # BUILD_BYPRODUCTS informing CMake where the .a files are located is required to make Ninja build work
 -    ExternalProject_Add(
 -        mbedtls
--        GIT_REPOSITORY https://github.com/aja-video/mbedtls.git
+-        GIT_REPOSITORY ${AJANTV2_MBEDTLS_URL}
 -        GIT_TAG fix-win-dll-cmake
 -        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${MBEDTLS_INSTALL_DIR}
 -                    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
···
 -                    -DUSE_STATIC_MBEDTLS_LIBRARY=ON
 -                    -DUSE_SHARED_MBEDTLS_LIBRARY=OFF
 -                    ${MBEDTLS_EXTRA_CONFIG_FLAGS}
+-		CMAKE_CACHE_ARGS "-DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}"
 -        BUILD_ALWAYS TRUE
 -        BUILD_BYPRODUCTS ${MBEDTLS_LIBRARY} ${MBEDX509_LIBRARY} ${MBEDCRYPTO_LIBRARY}
 -    )
···
  endif()
  
  
-@@ -668,10 +632,6 @@
+@@ -671,10 +635,6 @@ if (NOT TARGET ${PROJECT_NAME})
          aja_ntv2_log_build_info()
  
          add_library(${PROJECT_NAME} SHARED ${TARGET_SOURCES})
···
  
          target_compile_definitions(${PROJECT_NAME} PUBLIC
              ${TARGET_COMPILE_DEFS_DYNAMIC}
-@@ -687,10 +647,6 @@
+@@ -690,10 +650,6 @@ if (NOT TARGET ${PROJECT_NAME})
  
          add_library(${PROJECT_NAME} STATIC ${TARGET_SOURCES})
  
···
          target_compile_definitions(${PROJECT_NAME} PUBLIC
              ${TARGET_COMPILE_DEFS_STATIC}
              ${AJANTV2_TARGET_COMPILE_DEFS})
+-- 
+2.49.0
+