Fix build and installed header file for gcc-4.5. Bump PKGREVISION.

4 files changed, 75 insertions, 3 deletions

diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index 890efcd802a..d17dd386142 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2011/08/22 13:06:19 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2011/08/22 13:36:31 wiz Exp $
 
 DISTNAME=	openal-0.0.8
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GENTOO:=distfiles/}
 
diff --git a/audio/openal/distinfo b/audio/openal/distinfo
index a024dcff77b..ddfcdf8590e 100644
--- a/audio/openal/distinfo
+++ b/audio/openal/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2009/02/16 12:46:00 drochner Exp $
+$NetBSD: distinfo,v 1.12 2011/08/22 13:36:31 wiz Exp $
 
 SHA1 (openal-0.0.8.tar.gz) = 31aaedc18bd26759bd51f4fa495bc4ccb08acb3e
 RMD160 (openal-0.0.8.tar.gz) = 29368dbceea7cfd8b5c520b9e0f0cfdc7324e265
@@ -8,3 +8,5 @@ SHA1 (patch-ab) = df734f669866c728ede17d1bfc809ec6a31c43d2
 SHA1 (patch-ac) = a8911a1c8f421c9043df3ed5d7054a30f92eb635
 SHA1 (patch-ad) = c740552ebcb4f846faa7ac17140753a6aac4393c
 SHA1 (patch-ae) = 590a40890ccfe488248ef9d58c8991c07f0422d7
+SHA1 (patch-common_include_AL_alc.h) = 22ee2edf133c5691487fc8628d3ef25d871dcb0d
+SHA1 (patch-src_arch_i386_x86__floatmul.c) = c0e0f7468d5171c3c941187ed0764c89d0262035
diff --git a/audio/openal/patches/patch-common_include_AL_alc.h b/audio/openal/patches/patch-common_include_AL_alc.h
new file mode 100644
index 00000000000..50f1ac702a1
--- /dev/null
+++ b/audio/openal/patches/patch-common_include_AL_alc.h
@@ -0,0 +1,42 @@
+$NetBSD: patch-common_include_AL_alc.h,v 1.1 2011/08/22 13:36:31 wiz Exp $
+
+gcc-4.5 doesn't like this.
+
+--- common/include/AL/alc.h.orig	2006-02-11 09:36:55.000000000 +0000
++++ common/include/AL/alc.h
+@@ -187,7 +187,7 @@ ALC_API void            ALC_APIENTRY alc
+ 
+ ALC_API void            ALC_APIENTRY alcDestroyContext( ALCcontext *context );
+ 
+-ALC_API ALCcontext *    ALC_APIENTRY alcGetCurrentContext( ALCvoid );
++ALC_API ALCcontext *    ALC_APIENTRY alcGetCurrentContext( void );
+ 
+ ALC_API ALCdevice*      ALC_APIENTRY alcGetContextsDevice( ALCcontext *context );
+ 
+@@ -238,7 +238,7 @@ ALC_API void            ALC_APIENTRY alc
+ 
+ ALC_API void            ALC_APIENTRY alcCaptureStop( ALCdevice *device );
+ 
+-ALC_API void            ALC_APIENTRY alcCaptureSamples( ALCdevice *device, ALCvoid *buffer, ALCsizei samples );
++ALC_API void            ALC_APIENTRY alcCaptureSamples( ALCdevice *device, void *buffer, ALCsizei samples );
+ 
+ /*
+  * Pointer-to-function types, useful for dynamically getting ALC entry points.
+@@ -248,7 +248,7 @@ typedef ALCboolean     (ALC_APIENTRY *LP
+ typedef void           (ALC_APIENTRY *LPALCPROCESSCONTEXT)( ALCcontext *context );
+ typedef void           (ALC_APIENTRY *LPALCSUSPENDCONTEXT)( ALCcontext *context );
+ typedef void           (ALC_APIENTRY *LPALCDESTROYCONTEXT)( ALCcontext *context );
+-typedef ALCcontext *   (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)( ALCvoid );
++typedef ALCcontext *   (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)( void );
+ typedef ALCdevice *    (ALC_APIENTRY *LPALCGETCONTEXTSDEVICE)( ALCcontext *context );
+ typedef ALCdevice *    (ALC_APIENTRY *LPALCOPENDEVICE)( const ALCchar *devicename );
+ typedef ALCboolean     (ALC_APIENTRY *LPALCCLOSEDEVICE)( ALCdevice *device );
+@@ -262,7 +262,7 @@ typedef ALCdevice *    (ALC_APIENTRY *LP
+ typedef ALCboolean     (ALC_APIENTRY *LPALCCAPTURECLOSEDEVICE)( ALCdevice *device );
+ typedef void           (ALC_APIENTRY *LPALCCAPTURESTART)( ALCdevice *device );
+ typedef void           (ALC_APIENTRY *LPALCCAPTURESTOP)( ALCdevice *device );
+-typedef void           (ALC_APIENTRY *LPALCCAPTURESAMPLES)( ALCdevice *device, ALCvoid *buffer, ALCsizei samples );
++typedef void           (ALC_APIENTRY *LPALCCAPTURESAMPLES)( ALCdevice *device, void *buffer, ALCsizei samples );
+ 
+ #if defined(TARGET_OS_MAC) && TARGET_OS_MAC
+  #pragma export off
diff --git a/audio/openal/patches/patch-src_arch_i386_x86__floatmul.c b/audio/openal/patches/patch-src_arch_i386_x86__floatmul.c
new file mode 100644
index 00000000000..4a7614bdfac
--- /dev/null
+++ b/audio/openal/patches/patch-src_arch_i386_x86__floatmul.c
@@ -0,0 +1,28 @@
+$NetBSD: patch-src_arch_i386_x86__floatmul.c,v 1.1 2011/08/22 13:36:31 wiz Exp $
+
+Fix build with gcc-4.5.
+
+--- src/arch/i386/x86_floatmul.c.orig	2005-12-21 19:06:35.000000000 +0000
++++ src/arch/i386/x86_floatmul.c
+@@ -82,11 +82,19 @@ void _alFloatMul(ALshort *bpt, ALfloat s
+ 			v_sa.s[3] = v_sa.s[0];
+ 			
+ 			while (samples_main--) {
++				union {
++					short s[4];
++					v4hi v;
++				} ALIGN16(v_one);
++				v_one.s[0] = 1;
++				v_one.s[1] = 0;
++				v_one.s[2] = 0;
++				v_one.s[3] = 0;
+ 				temp = __builtin_ia32_pmulhw(*(v4hi*)bpt, v_sa.v);
+-				*(v4hi*)bpt = __builtin_ia32_psllw(temp, 1LL);
++				*(v4hi*)bpt = __builtin_ia32_psllw(temp, v_one.v);
+ 				bpt += 4;
+ 				temp = __builtin_ia32_pmulhw(*(v4hi*)bpt, v_sa.v);
+-				*(v4hi*)bpt = __builtin_ia32_psllw(temp, 1LL);
++				*(v4hi*)bpt = __builtin_ia32_psllw(temp, v_one.v);
+ 				bpt += 4;
+ 			}
+ 		}