CVS commit: pkgsrc/audio/fdk-aac

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun May 28 09:03:04 UTC 2023

Modified Files:
        pkgsrc/audio/fdk-aac: distinfo
Added Files:
        pkgsrc/audio/fdk-aac/patches: patch-libFDK_include_FDK__archdef.h

Log Message:
fdk-aac: fix build on aarch64


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/audio/fdk-aac/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/fdk-aac/patches/patch-libFDK_include_FDK__archdef.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/fdk-aac/distinfo
diff -u pkgsrc/audio/fdk-aac/distinfo:1.8 pkgsrc/audio/fdk-aac/distinfo:1.9
--- pkgsrc/audio/fdk-aac/distinfo:1.8   Wed May 24 08:15:28 2023
+++ pkgsrc/audio/fdk-aac/distinfo       Sun May 28 09:03:03 2023
@@ -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

Added files:

Index: pkgsrc/audio/fdk-aac/patches/patch-libFDK_include_FDK__archdef.h
diff -u /dev/null pkgsrc/audio/fdk-aac/patches/patch-libFDK_include_FDK__archdef.h:1.1
--- /dev/null   Sun May 28 09:03:04 2023
+++ pkgsrc/audio/fdk-aac/patches/patch-libFDK_include_FDK__archdef.h    Sun May 28 09:03:03 2023
@@ -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@localhost
+ #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__)