fdk-aac: fix build on aarch64

This commit is contained in:
tnn 2023-05-28 09:03:03 +00:00
parent 06c2343829
commit 97960588d9
2 changed files with 19 additions and 1 deletions

View File

@ -1,5 +1,6 @@
$NetBSD: distinfo,v 1.8 2023/05/24 08:15:28 adam Exp $
$NetBSD: distinfo,v 1.9 2023/05/28 09:03:03 tnn Exp $
BLAKE2s (fdk-aac-2.0.2.tar.gz) = b9d8334eb496a97c5f4b5a447eb5e2be1df372a0bb6f017ed59a12553efb9166
SHA512 (fdk-aac-2.0.2.tar.gz) = 8e5a7992869a7e649bee6d41bf7c6e408cec7ba1931a6cd7a9ad8a01e6ac49bd299ddd147b18823e8ee379ce7c6373d7f5a94f0f859ed973a30c61eccd53fa7e
Size (fdk-aac-2.0.2.tar.gz) = 2886434 bytes
SHA1 (patch-libFDK_include_FDK__archdef.h) = 44d41ab45ca75ca20a2f9e86b06accd83858d889

View File

@ -0,0 +1,17 @@
$NetBSD: patch-libFDK_include_FDK__archdef.h,v 1.1 2023/05/28 09:03:03 tnn Exp $
Don't redefine system reserved macro, it breaks <sys/cdefs.h>
--- libFDK/include/FDK_archdef.h.orig 2021-04-28 12:45:10.000000000 +0000
+++ libFDK/include/FDK_archdef.h
@@ -114,8 +114,8 @@ amm-info@iis.fraunhofer.de
#define __x86__
#endif
-#if defined(_M_ARM) && !defined(__arm__) || defined(__aarch64__) || defined(_M_ARM64)
-#define __arm__
+#if !defined(__arm__) && (defined(_M_ARM) || defined(__aarch64__) || defined(_M_ARM64))
+#define __arm__ 1
#endif
#if defined(_ARCH_PPC) && !defined(__powerpc__)