Merge pull request #328424 from toonn/ffmpeg_7-avfoundation-compat

ffmpeg: Patch for compatibility with 10.12 AVFoundation

pkgs/development/libraries/ffmpeg/0001-avfoundation.m-macOS-SDK-10.12-compatibility.patch

@@ -0,0 +1,25 @@
+From a804dd05351716b1fd9a7c2b7ed636613edd9c0f Mon Sep 17 00:00:00 2001
+From: toonn <[email protected]>
+Date: Fri, 21 Jun 2024 18:59:49 +0000
+Subject: [PATCH] avfoundation.m: macOS SDK 10.12 compatibility
+
+---
+ libavdevice/avfoundation.m | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m
+index d9b17ccdae..2a1f66d751 100644
+--- a/libavdevice/avfoundation.m
++++ b/libavdevice/avfoundation.m
+@@ -762,7 +762,7 @@ static int get_audio_config(AVFormatContext *s)
+     return 0;
+ }
+
+-static NSArray* getDevicesWithMediaType(AVMediaType mediaType) {
++static NSArray* getDevicesWithMediaType(NSString * mediaType) {
+ #if ((TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (TARGET_OS_OSX && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500))
+     NSMutableArray *deviceTypes = nil;
+     if (mediaType == AVMediaTypeVideo) {
+-- 
+2.44.0
+

pkgs/development/libraries/ffmpeg/generic.nix

@@ -512,6 +512,9 @@ stdenv.mkDerivation (finalAttrs: {
         url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/7b7b7819bd21cc92ac07f6696b0e7f26fa8f9834";
         hash = "sha256-TKI289XqtG86Sj9s7mVYvmkjAuRXeK+2cYYEDkg6u6I=";
       })
+    ]
+    ++ optionals (lib.versionAtLeast version "7.0") [
+      ./0001-avfoundation.m-macOS-SDK-10.12-compatibility.patch
     ];
 
   configurePlatforms = [];