fix libcanberra build for solaris

4 files changed, 45 insertions, 6 deletions

diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index 734a98f3e95..ba21f4771da 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2013/08/12 07:09:59 obache Exp $
+# $NetBSD: Makefile,v 1.33 2013/08/15 09:45:58 richard Exp $
 
 DISTNAME=	libcanberra-0.27
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/libcanberra/
 
diff --git a/audio/libcanberra/distinfo b/audio/libcanberra/distinfo
index 40c5b182733..226a1276a2b 100644
--- a/audio/libcanberra/distinfo
+++ b/audio/libcanberra/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2013/08/12 07:09:59 obache Exp $
+$NetBSD: distinfo,v 1.6 2013/08/15 09:45:58 richard Exp $
 
 SHA1 (libcanberra-0.27.tar.gz) = b2dc2b23109f32a11217b71f87c044f1ef9b7977
 RMD160 (libcanberra-0.27.tar.gz) = 1003bedf3fd6025ad046645f9a88af3d8653a0e5
 Size (libcanberra-0.27.tar.gz) = 490442 bytes
-SHA1 (patch-aa) = ad38999e6c630d1c620c7395df9eb85410b68668
+SHA1 (patch-aa) = abef0e544f8d9789e971511c9b363b33dd2391ca
 SHA1 (patch-ab) = 2a5767e0aa29f5dc4f6b6fd15a0f2aaf1f5dd329
+SHA1 (patch-config.h.in) = 26c549594db30b525cab345bb19c9455f52098d2
diff --git a/audio/libcanberra/patches/patch-aa b/audio/libcanberra/patches/patch-aa
index 7bdae685002..97361f89d76 100644
--- a/audio/libcanberra/patches/patch-aa
+++ b/audio/libcanberra/patches/patch-aa
@@ -1,10 +1,32 @@
-$NetBSD: patch-aa,v 1.3 2013/08/12 07:09:59 obache Exp $
+$NetBSD: patch-aa,v 1.4 2013/08/15 09:45:58 richard Exp $
 
 * configure OSS device name
-* use more portable macro
+* use config.h WORDS_BIGENDIAN macro
 
 --- src/oss.c.orig	2011-02-09 21:02:40.000000000 +0000
 +++ src/oss.c
+@@ -21,10 +21,6 @@
+   <http://www.gnu.org/licenses/>.
+ ***/
+ 
+-#ifdef HAVE_CONFIG_H
+-#include <config.h>
+-#endif
+-
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
+ #include <sys/param.h>
+@@ -38,6 +34,10 @@
+ #include <pthread.h>
+ #include <semaphore.h>
+ 
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #ifdef HAVE_MACHINE_SOUNDCARD_H
+ #  include <machine/soundcard.h>
+ #else
 @@ -240,7 +240,7 @@ static int open_oss(ca_context *c, struc
           * multichannel streams. We cannot support those files hence */
          ca_return_val_if_fail(ca_sound_file_get_nchannels(out->file) <= 2, CA_ERROR_NOTSUPPORTED);
@@ -19,7 +41,7 @@ $NetBSD: patch-aa,v 1.3 2013/08/12 07:09:59 obache Exp $
                  break;
          case CA_SAMPLE_S16RE:
 -#if __BYTE_ORDER == __LITTLE_ENDIAN
-+#if _BYTE_ORDER == _LITTLE_ENDIAN
++#ifndef WORDS_BIGENDIAN
                  val = AFMT_S16_BE;
  #else
                  val = AFMT_S16_LE;
diff --git a/audio/libcanberra/patches/patch-config.h.in b/audio/libcanberra/patches/patch-config.h.in
new file mode 100644
index 00000000000..bf7a6193576
--- /dev/null
+++ b/audio/libcanberra/patches/patch-config.h.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-config.h.in,v 1.1 2013/08/15 09:45:58 richard Exp $
+
+* better support for solaris which defines _BIG_ENDIAN
+
+--- config.h.in.orig	2011-02-18 00:26:31.000000000 +0000
++++ config.h.in
+@@ -210,7 +210,7 @@
+ /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+    significant byte first (like Motorola and SPARC, unlike Intel). */
+ #if defined AC_APPLE_UNIVERSAL_BUILD
+-# if defined __BIG_ENDIAN__
++# if defined(__BIG_ENDIAN__) || defined(_BIG_ENDIAN)
+ #  define WORDS_BIGENDIAN 1
+ # endif
+ #else