[webrtc-audio-processing] 03/03: Replace Don't error on unknown archs patch with generic code

[Felipe Sateler]

This is an automated email from the git hooks/post-receive script.

fsateler pushed a commit to branch master
in repository webrtc-audio-processing.

commit 7336f7d081a0dbecfb145ea702a75c858432537f
Author: Felipe Sateler <fsateler at debian.org>
Date:   Wed Jun 8 19:21:32 2016 -0400

    Replace Don't error on unknown archs patch with generic code
---
 ...ric-byte-order-and-pointer-size-detection.patch | 33 ++++++++++++++++++++++
 ...-or-set-options-for-unknown-architectures.patch | 20 -------------
 debian/patches/series                              |  2 +-
 3 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/debian/patches/Add-generic-byte-order-and-pointer-size-detection.patch b/debian/patches/Add-generic-byte-order-and-pointer-size-detection.patch
new file mode 100644
index 0000000..1338784
--- /dev/null
+++ b/debian/patches/Add-generic-byte-order-and-pointer-size-detection.patch
@@ -0,0 +1,33 @@
+From: Than <than at redhat.com>
+Date: Wed, 8 Jun 2016 19:10:08 -0400
+Subject: Add generic byte order and pointer size detection
+
+---
+ webrtc/typedefs.h | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/webrtc/typedefs.h b/webrtc/typedefs.h
+index d875490..dc074f1 100644
+--- a/webrtc/typedefs.h
++++ b/webrtc/typedefs.h
+@@ -48,7 +48,19 @@
+ #define WEBRTC_ARCH_32_BITS
+ #define WEBRTC_ARCH_LITTLE_ENDIAN
+ #else
+-#error Please add support for your architecture in typedefs.h
++/* instead of failing, use typical unix defines... */
++#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
++#define WEBRTC_ARCH_LITTLE_ENDIAN
++#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
++#define WEBRTC_ARCH_BIG_ENDIAN
++#else
++#error __BYTE_ORDER__ is not defined
++#endif
++#if defined(__LP64__)
++#define WEBRTC_ARCH_64_BITS
++#else
++#define WEBRTC_ARCH_32_BITS
++#endif
+ #endif
+ 
+ #if !(defined(WEBRTC_ARCH_LITTLE_ENDIAN) ^ defined(WEBRTC_ARCH_BIG_ENDIAN))
diff --git a/debian/patches/Don-t-error-or-set-options-for-unknown-architectures.patch b/debian/patches/Don-t-error-or-set-options-for-unknown-architectures.patch
deleted file mode 100644
index eee41fe..0000000
--- a/debian/patches/Don-t-error-or-set-options-for-unknown-architectures.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Sjoerd Simons <sjoerd at luon.net>
-Date: Sat, 19 May 2012 21:52:09 +0200
-Subject: Don't error or set options for unknown architectures
-
----
- webrtc/typedefs.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/webrtc/typedefs.h b/webrtc/typedefs.h
-index d875490..a546ae3 100644
---- a/webrtc/typedefs.h
-+++ b/webrtc/typedefs.h
-@@ -48,7 +48,6 @@
- #define WEBRTC_ARCH_32_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
- #else
--#error Please add support for your architecture in typedefs.h
- #endif
- 
- #if !(defined(WEBRTC_ARCH_LITTLE_ENDIAN) ^ defined(WEBRTC_ARCH_BIG_ENDIAN))
diff --git a/debian/patches/series b/debian/patches/series
index 50c90ca..022daab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-Don-t-error-or-set-options-for-unknown-architectures.patch
 big-endian-support.patch
 Apply-msse2-flag-to-the-source-objects-that-require-it.patch
+Add-generic-byte-order-and-pointer-size-detection.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/webrtc-audio-processing.git