summaryrefslogtreecommitdiff
path: root/multimedia/ffmpeg4/files/patch-libavutil-x86-asm.h
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2023-03-17 18:58:47 +0000
committerJan Beich <jbeich@FreeBSD.org>2023-03-17 20:59:23 +0000
commitf0dadc529fe9c4ee69dd96db92e2d0572d2092aa (patch)
tree80091ad194c99a3a9f5a775d81ee866d5c7128ba /multimedia/ffmpeg4/files/patch-libavutil-x86-asm.h
parentmultimedia/ffmpeg: respect DOCSDIR more (diff)
multimedia/ffmpeg: fork 4.* into a pinned port
Mainly for leaf consumers: applications but not plugins or libraries. Otherwise, indirectly mixing different versions of ffmpeg libraries at runtime can lead to crashes. To use simply add the following before <bsd.port.mk> or <bsd.port.pre.mk> .include "${.CURDIR:H:H}/multimedia/ffmpeg4/override.mk" PR: 261302 Inspired by: c717faa5c764
Diffstat (limited to 'multimedia/ffmpeg4/files/patch-libavutil-x86-asm.h')
-rw-r--r--multimedia/ffmpeg4/files/patch-libavutil-x86-asm.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/multimedia/ffmpeg4/files/patch-libavutil-x86-asm.h b/multimedia/ffmpeg4/files/patch-libavutil-x86-asm.h
new file mode 100644
index 000000000000..71e31a029955
--- /dev/null
+++ b/multimedia/ffmpeg4/files/patch-libavutil-x86-asm.h
@@ -0,0 +1,11 @@
+--- libavutil/x86/asm.h.orig 2015-06-19 20:44:54 UTC
++++ libavutil/x86/asm.h
+@@ -71,7 +71,7 @@ typedef int32_t x86_reg;
+ typedef int x86_reg;
+ #endif
+
+-#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
++#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE && !defined(__clang__)))
+ #define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE))
+
+ #if ARCH_X86_64 && defined(PIC)