Thu Aug 15 09:45:58 2013 UTC ()
fix libcanberra build for solaris


(richard)
diff -r1.32 -r1.33 pkgsrc/audio/libcanberra/Makefile
diff -r1.5 -r1.6 pkgsrc/audio/libcanberra/distinfo
diff -r1.3 -r1.4 pkgsrc/audio/libcanberra/patches/patch-aa
diff -r0 -r1.1 pkgsrc/audio/libcanberra/patches/patch-config.h.in
cvs diff -r1.32 -r1.33 pkgsrc/audio/libcanberra/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/libcanberra/Makefile 2013/08/12 07:09:59 1.32
+++ pkgsrc/audio/libcanberra/Makefile 2013/08/15 09:45:58 1.33
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.32 2013/08/12 07:09:59 obache Exp $ 1# $NetBSD: Makefile,v 1.33 2013/08/15 09:45:58 richard Exp $
2 2
3DISTNAME= libcanberra-0.27 3DISTNAME= libcanberra-0.27
 4PKGREVISION= 1
4CATEGORIES= audio 5CATEGORIES= audio
5MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/ 6MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://0pointer.de/lennart/projects/libcanberra/ 9HOMEPAGE= http://0pointer.de/lennart/projects/libcanberra/
9COMMENT= Desktop event sound library 10COMMENT= Desktop event sound library
10LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
11 12
12GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
13USE_LIBTOOL= yes 14USE_LIBTOOL= yes
14USE_TOOLS+= pkg-config gmake 15USE_TOOLS+= pkg-config gmake
15 16
16PKGCONFIG_OVERRIDE+= libcanberra-gtk.pc.in 17PKGCONFIG_OVERRIDE+= libcanberra-gtk.pc.in
cvs diff -r1.5 -r1.6 pkgsrc/audio/libcanberra/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/libcanberra/distinfo 2013/08/12 07:09:59 1.5
+++ pkgsrc/audio/libcanberra/distinfo 2013/08/15 09:45:58 1.6
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.5 2013/08/12 07:09:59 obache Exp $ 1$NetBSD: distinfo,v 1.6 2013/08/15 09:45:58 richard Exp $
2 2
3SHA1 (libcanberra-0.27.tar.gz) = b2dc2b23109f32a11217b71f87c044f1ef9b7977 3SHA1 (libcanberra-0.27.tar.gz) = b2dc2b23109f32a11217b71f87c044f1ef9b7977
4RMD160 (libcanberra-0.27.tar.gz) = 1003bedf3fd6025ad046645f9a88af3d8653a0e5 4RMD160 (libcanberra-0.27.tar.gz) = 1003bedf3fd6025ad046645f9a88af3d8653a0e5
5Size (libcanberra-0.27.tar.gz) = 490442 bytes 5Size (libcanberra-0.27.tar.gz) = 490442 bytes
6SHA1 (patch-aa) = ad38999e6c630d1c620c7395df9eb85410b68668 6SHA1 (patch-aa) = abef0e544f8d9789e971511c9b363b33dd2391ca
7SHA1 (patch-ab) = 2a5767e0aa29f5dc4f6b6fd15a0f2aaf1f5dd329 7SHA1 (patch-ab) = 2a5767e0aa29f5dc4f6b6fd15a0f2aaf1f5dd329
 8SHA1 (patch-config.h.in) = 26c549594db30b525cab345bb19c9455f52098d2
cvs diff -r1.3 -r1.4 pkgsrc/audio/libcanberra/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/audio/libcanberra/patches/patch-aa 2013/08/12 07:09:59 1.3
+++ pkgsrc/audio/libcanberra/patches/patch-aa 2013/08/15 09:45:58 1.4
@@ -1,25 +1,47 @@ @@ -1,25 +1,47 @@
1$NetBSD: patch-aa,v 1.3 2013/08/12 07:09:59 obache Exp $ 1$NetBSD: patch-aa,v 1.4 2013/08/15 09:45:58 richard Exp $
2 2
3* configure OSS device name 3* configure OSS device name
4* use more portable macro 4* use config.h WORDS_BIGENDIAN macro
5 5
6--- src/oss.c.orig 2011-02-09 21:02:40.000000000 +0000 6--- src/oss.c.orig 2011-02-09 21:02:40.000000000 +0000
7+++ src/oss.c 7+++ src/oss.c
 8@@ -21,10 +21,6 @@
 9 <http://www.gnu.org/licenses/>.
 10 ***/
 11
 12-#ifdef HAVE_CONFIG_H
 13-#include <config.h>
 14-#endif
 15-
 16 #include <sys/types.h>
 17 #include <sys/ioctl.h>
 18 #include <sys/param.h>
 19@@ -38,6 +34,10 @@
 20 #include <pthread.h>
 21 #include <semaphore.h>
 22
 23+#ifdef HAVE_CONFIG_H
 24+#include <config.h>
 25+#endif
 26+
 27 #ifdef HAVE_MACHINE_SOUNDCARD_H
 28 # include <machine/soundcard.h>
 29 #else
8@@ -240,7 +240,7 @@ static int open_oss(ca_context *c, struc 30@@ -240,7 +240,7 @@ static int open_oss(ca_context *c, struc
9 * multichannel streams. We cannot support those files hence */ 31 * multichannel streams. We cannot support those files hence */
10 ca_return_val_if_fail(ca_sound_file_get_nchannels(out->file) <= 2, CA_ERROR_NOTSUPPORTED); 32 ca_return_val_if_fail(ca_sound_file_get_nchannels(out->file) <= 2, CA_ERROR_NOTSUPPORTED);
11  33
12- if ((out->pcm = open(c->device ? c->device : "/dev/dsp", O_WRONLY | O_NONBLOCK, 0)) < 0) 34- if ((out->pcm = open(c->device ? c->device : "/dev/dsp", O_WRONLY | O_NONBLOCK, 0)) < 0)
13+ if ((out->pcm = open(c->device ? c->device : DEVOSSAUDIO, O_WRONLY | O_NONBLOCK, 0)) < 0) 35+ if ((out->pcm = open(c->device ? c->device : DEVOSSAUDIO, O_WRONLY | O_NONBLOCK, 0)) < 0)
14 goto finish_errno; 36 goto finish_errno;
15  37
16 if ((mode = fcntl(out->pcm, F_GETFL)) < 0) 38 if ((mode = fcntl(out->pcm, F_GETFL)) < 0)
17@@ -259,7 +259,7 @@ static int open_oss(ca_context *c, struc 39@@ -259,7 +259,7 @@ static int open_oss(ca_context *c, struc
18 val = AFMT_S16_NE; 40 val = AFMT_S16_NE;
19 break; 41 break;
20 case CA_SAMPLE_S16RE: 42 case CA_SAMPLE_S16RE:
21-#if __BYTE_ORDER == __LITTLE_ENDIAN 43-#if __BYTE_ORDER == __LITTLE_ENDIAN
22+#if _BYTE_ORDER == _LITTLE_ENDIAN 44+#ifndef WORDS_BIGENDIAN
23 val = AFMT_S16_BE; 45 val = AFMT_S16_BE;
24 #else 46 #else
25 val = AFMT_S16_LE; 47 val = AFMT_S16_LE;
File Added: pkgsrc/audio/libcanberra/patches/patch-config.h.in
$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