<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c9524df26d4fe2a772634e973f6c76233396ed80">https://github.com/macports/macports-ports/commit/c9524df26d4fe2a772634e973f6c76233396ed80</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c9524df26d4 ffmpeg7: fix compilation for OS X 10.7 through 10.12
</span>c9524df26d4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c9524df26d4fe2a772634e973f6c76233396ed80
</span>Author: Erik BrĂ¥then Solem <erikbsolem@hotmail.com>
AuthorDate: Tue Aug 20 22:31:43 2024 +0200
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg7: fix compilation for OS X 10.7 through 10.12
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add typedef for AVMediaType when compiling against older SDK versions
</span><span style='display:block; white-space:pre;color:#404040;'> that use NSString* directly.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/70519
</span>---
multimedia/ffmpeg7/Portfile | 8 ++++++++
.../ffmpeg7/files/patch-libavdevice-avfoundation.diff | 14 ++++++++++++++
2 files changed, 22 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg7/Portfile b/multimedia/ffmpeg7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cd413bfc956..4250c54927f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,6 +107,14 @@ patchfiles-append patch-libavcodec-profvidworkflow.diff
</span> # TODO: Raise the issue to upstream
patchfiles-append patch-libavcodec-librsvgdec.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Typedef AVMediaType to NSString* on older systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Patch submitted to upstream, remove once upstream has included it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 17} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-libavdevice-avfoundation.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # https://trac.macports.org/ticket/68720
# Remove once upstream has included these in the next release
# patchfiles-append patch-issue-10695.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg7/files/patch-libavdevice-avfoundation.diff b/multimedia/ffmpeg7/files/patch-libavdevice-avfoundation.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d9dec027672
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg7/files/patch-libavdevice-avfoundation.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavdevice/avfoundation.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavdevice/avfoundation.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -763,6 +763,11 @@ static int get_audio_config(AVFormatContext *s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MAX_ALLOWED < 110000) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ((!defined(TARGET_OS_OSX) || TARGET_OS_OSX) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101300)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef NSString* AVMediaType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static NSArray* getDevicesWithMediaType(AVMediaType mediaType) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if ((TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (TARGET_OS_OSX && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSMutableArray *deviceTypes = nil;
</span></pre><pre style='margin:0'>
</pre>