Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ffmpeg: Patch for compatibility with 10.12 AVFoundation #328424

Merged
merged 1 commit into from
Jul 22, 2024
Merged

ffmpeg: Patch for compatibility with 10.12 AVFoundation #328424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions pkgs/development/libraries/ffmpeg/0001-avfoundation.m-macOS-SDK-10.12-compatibility.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From a804dd05351716b1fd9a7c2b7ed636613edd9c0f Mon Sep 17 00:00:00 2001
From: toonn <toonn@toonn.io>
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) {
Comment on lines +18 to +19
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For how long will this be forward compatible?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like AVMediaType was introduced in 10.13, and is documented as an alias, so probably for a while unless there’s explicit notice that depending on it being an alias is deprecated?

#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

3 changes: 3 additions & 0 deletions pkgs/development/libraries/ffmpeg/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [];
Expand Down