[vlc-commits] contrib: soxr: fix build with arm64

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Nov  5 14:45:38 2015 +0100| [dacc4cb76266734692dc11d6ccd48a59ddd0ccd5] | committer: Thomas Guillem

contrib: soxr: fix build with arm64

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dacc4cb76266734692dc11d6ccd48a59ddd0ccd5
---

 .../0003-config-use-stdint.h-and-stdbool.h.patch   |   53 ++++++++++++++++++++
 contrib/src/soxr/rules.mak                         |    1 +
 2 files changed, 54 insertions(+)

diff --git a/contrib/src/soxr/0003-config-use-stdint.h-and-stdbool.h.patch b/contrib/src/soxr/0003-config-use-stdint.h-and-stdbool.h.patch
new file mode 100644
index 0000000..a0866e9
--- /dev/null
+++ b/contrib/src/soxr/0003-config-use-stdint.h-and-stdbool.h.patch
@@ -0,0 +1,53 @@
+From 0a07b23a280b3a80dc933edc0db3aafd2bb5626f Mon Sep 17 00:00:00 2001
+From: Thomas Guillem <thomas at gllm.fr>
+Date: Thu, 5 Nov 2015 14:16:51 +0100
+Subject: [PATCH 3/3] config: use stdint.h and stdbool.h
+
+---
+ soxr-config.h.in | 31 ++-----------------------------
+ 1 file changed, 2 insertions(+), 29 deletions(-)
+
+diff --git a/soxr-config.h.in b/soxr-config.h.in
+index 227bcfd..539efe0 100644
+--- a/soxr-config.h.in
++++ b/soxr-config.h.in
+@@ -13,34 +13,7 @@
+ #define WORDS_BIGENDIAN       @WORDS_BIGENDIAN@
+ 
+ #include <limits.h>
+-
+-#undef bool
+-#undef false
+-#undef true
+-#define bool int
+-#define false 0
+-#define true 1
+-
+-#undef int16_t
+-#undef int32_t
+-#undef int64_t
+-#undef uint32_t
+-#undef uint64_t
+-#define int16_t short
+-#if LONG_MAX > 2147483647L
+-  #define int32_t int
+-  #define int64_t long
+-#elif LONG_MAX < 2147483647L
+-#error this library requires that 'long int' has at least 32-bits
+-#else
+-  #define int32_t long
+-  #if defined _MSC_VER
+-    #define int64_t __int64
+-  #else
+-    #define int64_t long long
+-  #endif
+-#endif
+-#define uint32_t unsigned int32_t
+-#define uint64_t unsigned int64_t
++#include <stdint.h>
++#include <stdbool.h>
+ 
+ #endif
+-- 
+2.1.4
+
diff --git a/contrib/src/soxr/rules.mak b/contrib/src/soxr/rules.mak
index 489c847..90b9b7d 100644
--- a/contrib/src/soxr/rules.mak
+++ b/contrib/src/soxr/rules.mak
@@ -17,6 +17,7 @@ soxr: soxr-$(SOXR_VERSION)-Source.tar.xz .sum-soxr
 	$(UNPACK)
 	$(APPLY) $(SRC)/soxr/0001-FindSIMD-add-arm-neon-detection.patch
 	$(APPLY) $(SRC)/soxr/0002-cpu_has_simd-detect-neon-via-av_get_cpu_flags.patch
+	$(APPLY) $(SRC)/soxr/0003-config-use-stdint.h-and-stdbool.h.patch
 	$(MOVE)
 
 .soxr: soxr toolchain.cmake