<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/4d5e70321a481dc3a712e04f12a9e1d46157071f">https://github.com/macports/macports-ports/commit/4d5e70321a481dc3a712e04f12a9e1d46157071f</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 4d5e70321a4 ffmpeg-upstream: fix builds for 10.9 thru 10.11 Fixes: https://trac.macports.org/ticket/64469
</span>4d5e70321a4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4d5e70321a481dc3a712e04f12a9e1d46157071f
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Thu Jul 21 15:06:48 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg-upstream: fix builds for 10.9 thru 10.11
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/64469
</span>---
multimedia/ffmpeg-upstream/Portfile | 4 ++
.../files/patch-libavcodec-profvidworkflow.diff | 46 ++++++++++++++++++++++
2 files changed, 50 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-upstream/Portfile b/multimedia/ffmpeg-upstream/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e1f4234b984..55ee3a1901a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-upstream/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-upstream/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,6 +98,10 @@ depends_lib port:lame \
</span> patchfiles-append patch-libavcodec-audiotoolboxenc.c.diff
patchfiles-append patch-avutil-builtin-available.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Additional fixes related to use of '__builtin_available'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TODO: Submit patches to upstream
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-libavcodec-profvidworkflow.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # enable auto configure of asm optimizations
# requires Xcode 3.1 or better on Leopard
minimum_xcodeversions {9 3.1}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-upstream/files/patch-libavcodec-profvidworkflow.diff b/multimedia/ffmpeg-upstream/files/patch-libavcodec-profvidworkflow.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0afce56c40f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-upstream/files/patch-libavcodec-profvidworkflow.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,46 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/videotoolbox.c.orig 2022-07-21 13:09:43.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/videotoolbox.c 2022-07-21 13:24:45.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,6 +36,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Availability.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <TargetConditionals.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(MAC_OS_X_VERSION_10_9) && !TARGET_OS_IPHONE && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <VideoToolbox/VTProfessionalVideoWorkflow.h>
</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;'>+ #ifndef kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder CFSTR("RequireHardwareAcceleratedVideoDecoder")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libavcodec/videotoolboxenc.c.orig 2022-01-14 13:45:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libavcodec/videotoolboxenc.c 2022-07-21 14:14:29.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,6 +23,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <CoreMedia/CoreMedia.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <TargetConditionals.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Availability.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "avcodec.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "libavutil/opt.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "libavutil/avassert.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,6 +38,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "h264.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "h264_sei.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <dlfcn.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(MAC_OS_X_VERSION_10_9) && !TARGET_OS_IPHONE && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <VideoToolbox/VTProfessionalVideoWorkflow.h>
</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;'>+ #if !HAVE_KCMVIDEOCODECTYPE_HEVC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enum { kCMVideoCodecType_HEVC = 'hvc1' };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1424,11 +1428,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return AVERROR(EINVAL);
</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(MAC_OS_X_VERSION_10_9) && !TARGET_OS_IPHONE && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(MAC_OS_X_VERSION_10_10) && !TARGET_OS_IPHONE && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (avctx->codec_id == AV_CODEC_ID_PRORES) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (__builtin_available(macOS 10.10, *)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- VTRegisterProfessionalVideoWorkflowVideoEncoders();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ VTRegisterProfessionalVideoWorkflowVideoEncoders();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>