diff options
author | wiz <wiz@pkgsrc.org> | 2011-08-22 13:36:31 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2011-08-22 13:36:31 +0000 |
commit | 4f7006ab8363fa1a0bab37ff1d9676fad0240917 (patch) | |
tree | d2a83082bf0162b8f2991094891405f145248206 /audio/openal/patches | |
parent | a2f504381e525848a7de12f8313a443ba0b48a26 (diff) | |
download | pkgsrc-4f7006ab8363fa1a0bab37ff1d9676fad0240917.tar.gz |
Fix build and installed header file for gcc-4.5. Bump PKGREVISION.
Diffstat (limited to 'audio/openal/patches')
-rw-r--r-- | audio/openal/patches/patch-common_include_AL_alc.h | 42 | ||||
-rw-r--r-- | audio/openal/patches/patch-src_arch_i386_x86__floatmul.c | 28 |
2 files changed, 70 insertions, 0 deletions
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; + } + } |