oasis

commit: f8b20538cc063224c6a1a2a8a65fbaa5e87c3f3c
parent 0397356c5cd05aec2d9eced54c62c31e4af5c840
Author: Michael Forney <mforney@mforney.org>
Date:   Mon, 25 Oct 2021 17:10:28 -0700

ffmpeg: Use C11 _Alignas if available

Diffstat:
A
pkg/ffmpeg/patch/0007-libavutil-Use-C11-_Alignas-as-fallback-for-DECLARE_A.patch
27
+++++++++++++++++++++++++++
R
pkg/ffmpeg/patch/0007-HACK-Disable-__has_builtin-for-now.patch -> pkg/ffmpeg/patch/0008-HACK-Disable-__has_builtin-for-now.patch
0

M
pkg/ffmpeg/ver
2
+-

3 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/pkg/ffmpeg/patch/0007-libavutil-Use-C11-_Alignas-as-fallback-for-DECLARE_A.patch b/pkg/ffmpeg/patch/0007-libavutil-Use-C11-_Alignas-as-fallback-for-DECLARE_A.patch
@@ -0,0 +1,27 @@
+From 998e73fa83da20afd47263fce2e50876c799ee41 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Mon, 25 Oct 2021 17:08:29 -0700
+Subject: [PATCH] libavutil: Use C11 _Alignas as fallback for DECLARE_ALIGNED
+
+---
+ libavutil/mem.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/libavutil/mem.h b/libavutil/mem.h
+index e21a1feaae..aeaacd9d55 100644
+--- a/libavutil/mem.h
++++ b/libavutil/mem.h
+@@ -121,6 +121,10 @@
+     #define DECLARE_ALIGNED(n,t,v)      __declspec(align(n)) t v
+     #define DECLARE_ASM_ALIGNED(n,t,v)  __declspec(align(n)) t v
+     #define DECLARE_ASM_CONST(n,t,v)    __declspec(align(n)) static const t v
++#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
++    #define DECLARE_ALIGNED(n,t,v)      _Alignas(n) t v
++    #define DECLARE_ASM_ALIGNED(n,t,v)  _Alignas(n) t v
++    #define DECLARE_ASM_CONST(n,t,v)    static const _Alignas(n) t v
+ #else
+     #define DECLARE_ALIGNED(n,t,v)      t v
+     #define DECLARE_ASM_ALIGNED(n,t,v)  t v
+-- 
+2.32.0
+
diff --git a/pkg/ffmpeg/patch/0007-HACK-Disable-__has_builtin-for-now.patch b/pkg/ffmpeg/patch/0008-HACK-Disable-__has_builtin-for-now.patch
diff --git a/pkg/ffmpeg/ver b/pkg/ffmpeg/ver
@@ -1 +1 @@
-4.4 r1
+4.4 r2