Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions patches/ffmpeg/03_fix_ios_api_available.patch
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@ index f365d3ceea..1cc637fec2 100644
@@ -29,16 +29,13 @@ void ff_metal_compute_encoder_dispatch(id<MTLDevice> device,
NSUInteger h = pipeline.maxTotalThreadsPerThreadgroup / w;
MTLSize threadsPerThreadgroup = MTLSizeMake(w, h, 1);
BOOL fallback = YES;
- // MAC_OS_X_VERSION_10_15 is only defined on SDKs new enough to include its functionality (including iOS, tvOS, etc)
-#ifdef MAC_OS_X_VERSION_10_15
- if (@available(macOS 10.15, iOS 11, tvOS 14.5, *)) {
- if (@available(macOS 10.15, iOS 13, tvOS 14.5, *)) {
+ if (@available(macOS 10.15, iOS 13, *)) {
if ([device supportsFamily:MTLGPUFamilyCommon3]) {
MTLSize threadsPerGrid = MTLSizeMake(width, height, 1);
[encoder dispatchThreads:threadsPerGrid threadsPerThreadgroup:threadsPerThreadgroup];
fallback = NO;
return;
}
}
-#endif
if (fallback) {

// Fallback path, if we took the above one we already returned so none of this is reached
{
MTLSize threadgroups = MTLSizeMake((width + w - 1) / w,
(height + h - 1) / h,
26 changes: 0 additions & 26 deletions patches/ffmpeg/04_fix_some_warnings.patch
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
diff --git a/configure b/configure
index 00c3cee33f..87a8fffd32 100755
--- a/configure
+++ b/configure
@@ -7386,7 +7386,7 @@ fi
enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"

# add some useful compiler flags if supported
-check_cflags -Wdeclaration-after-statement
+# check_cflags -Wdeclaration-after-statement
check_cflags -Wall
check_cflags -Wdisabled-optimization
check_cflags -Wpointer-arith
diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c
index 0f7ce8e4eb..a0fc27f76c 100644
--- a/libavcodec/audiotoolboxdec.c
Expand All @@ -37,16 +24,3 @@ index 1e7ee644f6..2da29a9abb 100644

switch (avctx->sample_rate) {
case 48000:
diff --git a/libavfilter/vf_yadif_videotoolbox.m b/libavfilter/vf_yadif_videotoolbox.m
index c47d3edfb8..4ec448de1d 100644
--- a/libavfilter/vf_yadif_videotoolbox.m
+++ b/libavfilter/vf_yadif_videotoolbox.m
@@ -172,7 +172,7 @@ static void filter(AVFilterContext *ctx, AVFrame *dst,
static av_cold void do_uninit(AVFilterContext *ctx) API_AVAILABLE(macos(10.11), ios(8.0))
{
YADIFVTContext *s = ctx->priv;
- YADIFContext *y = &s->yadif;
+ // YADIFContext *y = &s->yadif;

ff_yadif_uninit(ctx);

3 changes: 2 additions & 1 deletion patches/ffmpeg/07_fix_undef_AT_HWCAP2.patch
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ index cfa9306663..3ec07f529b 100644
--- a/libavutil/aarch64/cpu.c
+++ b/libavutil/aarch64/cpu.c
@@ -24,6 +24,10 @@
#if HAVE_GETAUXVAL || HAVE_ELF_AUX_INFO
#include <stdint.h>
#include <sys/auxv.h>

Expand All @@ -11,5 +12,5 @@ index cfa9306663..3ec07f529b 100644
+#endif
+
#define HWCAP_AARCH64_ASIMDDP (1 << 20)
#define HWCAP2_AARCH64_I8MM (1 << 13)
#define HWCAP_AARCH64_SVE (1 << 22)

6 changes: 3 additions & 3 deletions patches/ffmpeg/08_fix_some_warnings.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
index f4070571d3..e67fbe2280 100644
--- a/libavcodec/videotoolboxenc.c
+++ b/libavcodec/videotoolboxenc.c
@@ -1203,8 +1203,8 @@ static int vtenc_create_encoder(AVCodecContext *avctx,
@@ -1218,8 +1218,8 @@ static int vtenc_create_encoder(AVCodecContext *avctx,
return AVERROR_EXTERNAL;
}

-#if defined (MAC_OS_X_VERSION_10_13) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_13)
- if (__builtin_available(macOS 10.13, *)) {
- if (__builtin_available(macOS 10.13, iOS 11.0, *)) {
+#if AV_HAS_BUILTIN(__builtin_available) && (TARGET_OS_OSX || TARGET_OS_IOS || TARGET_OS_TV)
+ if (__builtin_available(macOS 10.15, iOS 11, tvOS 11, *)) {
+ if (__builtin_available(macOS 10.15, iOS 11.0, tvOS 11, *)) {
if (vtctx->supported_props) {
CFRelease(vtctx->supported_props);
vtctx->supported_props = NULL;
Expand Down
12 changes: 6 additions & 6 deletions patches/ffmpeg/09_more_gitignore.patch
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
diff --git a/.gitignore b/.gitignore
index e810d11107..2f530448e4 100644
index 4aa49c5..a9f67c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,5 @@
/src
/mapfile
/tools/python/__pycache__/
+
@@ -1,3 +1,5 @@
+.cache
+
*.a
*.o
*.objs
22 changes: 0 additions & 22 deletions patches/ffmpeg/10_fix_duplicate_symbol.patch

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/ffmpeg.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def _source_dl_3rd_deps():
'c765c83', 'static'); _ctx['EXTRA_ARGS_CONFIGURE'].append('--enable-mbedtls')

if _env['PKG_PLATFORM'] == 'macosx':
_env['FUNC_PKGC'](_ctx, _env, 'sdl2', 'v2.32.4', 'static')
_env['FUNC_PKGC'](_ctx, _env, 'sdl2', 'v2.32.8', 'static')
def _source_download():
_git_target = 'refs/heads/release/8.0'
_ctx['PKG_VERSION'] = f'release{_git_target.split("/")[-1]}'
Expand Down