summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2012-04-17 17:40:49 +0000
committerjoerg <joerg@pkgsrc.org>2012-04-17 17:40:49 +0000
commit31e8ad430111f0aaf41b197d78732349f1ac17b5 (patch)
treedc768b7bed29733a1200941a354f99d67364ffcb /audio
parentd9a2224bf7e2e1ed1f2cf034fa5fa100eeab7a15 (diff)
downloadpkgsrc-31e8ad430111f0aaf41b197d78732349f1ac17b5.tar.gz
Fix build with clang.
Diffstat (limited to 'audio')
-rw-r--r--audio/openal/distinfo6
-rw-r--r--audio/openal/patches/patch-aa11
-rw-r--r--audio/openal/patches/patch-src_arch_i386_x86__floatmul.c6
3 files changed, 16 insertions, 7 deletions
diff --git a/audio/openal/distinfo b/audio/openal/distinfo
index 4f02d6214b9..6a1cc9a5dff 100644
--- a/audio/openal/distinfo
+++ b/audio/openal/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.13 2011/09/22 15:18:39 wiz Exp $
+$NetBSD: distinfo,v 1.14 2012/04/17 17:40:49 joerg Exp $
SHA1 (openal-0.0.8.tar.gz) = 31aaedc18bd26759bd51f4fa495bc4ccb08acb3e
RMD160 (openal-0.0.8.tar.gz) = 29368dbceea7cfd8b5c520b9e0f0cfdc7324e265
Size (openal-0.0.8.tar.gz) = 870671 bytes
-SHA1 (patch-aa) = a56bdb2f66d5899628ed6aa452d816f439778ccc
+SHA1 (patch-aa) = 6beefc3db89261d96d869ce54c47b314d5242fbf
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) = ccd1a1a8780ba4f551df132cc22cc00be8580589
+SHA1 (patch-src_arch_i386_x86__floatmul.c) = 302581fa21ef94bb9f9e34df68e14601eaa1b5e1
diff --git a/audio/openal/patches/patch-aa b/audio/openal/patches/patch-aa
index 328c00d1883..1cac0f79b5c 100644
--- a/audio/openal/patches/patch-aa
+++ b/audio/openal/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2007/04/06 15:47:29 obache Exp $
+$NetBSD: patch-aa,v 1.4 2012/04/17 17:40:50 joerg Exp $
--- src/backends/alc_backend_bsd.c.orig 2006-01-05 15:11:20.000000000 +0000
+++ src/backends/alc_backend_bsd.c
@@ -42,3 +42,12 @@ $NetBSD: patch-aa,v 1.3 2007/04/06 15:47:29 obache Exp $
#ifdef DEBUG_MAXIMUS
fprintf(stderr, "Couldn't reset dsp\n");
#endif
+@@ -385,7 +401,7 @@ alcBackendSetAttributesNative_(ALC_OpenM
+ static void *grab_read_native(void)
+ {
+ fprintf(stderr,"grab_read_native Not implemented! (%s:%d)\n",__FILE__,__LINE__);
+- return;
++ return NULL;
+ }
+
+ void *
diff --git a/audio/openal/patches/patch-src_arch_i386_x86__floatmul.c b/audio/openal/patches/patch-src_arch_i386_x86__floatmul.c
index f8ea04ed696..b454640e1b5 100644
--- a/audio/openal/patches/patch-src_arch_i386_x86__floatmul.c
+++ b/audio/openal/patches/patch-src_arch_i386_x86__floatmul.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_arch_i386_x86__floatmul.c,v 1.2 2011/09/22 15:18:39 wiz Exp $
+$NetBSD: patch-src_arch_i386_x86__floatmul.c,v 1.3 2012/04/17 17:40:50 joerg Exp $
Fix build with gcc-4.5.
@@ -17,14 +17,14 @@ Fix build with gcc-4.5.
+ v_one.s[2] = 0;
+ v_one.s[3] = 0;
temp = __builtin_ia32_pmulhw(*(v4hi*)bpt, v_sa.v);
-+#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 3 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 2))
++#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 3 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 2)) && !defined(__clang__)
*(v4hi*)bpt = __builtin_ia32_psllw(temp, 1LL);
+#else
+ *(v4hi*)bpt = __builtin_ia32_psllw(temp, v_one.v);
+#endif
bpt += 4;
temp = __builtin_ia32_pmulhw(*(v4hi*)bpt, v_sa.v);
-+#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 3 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 2))
++#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 3 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 2)) && !defined(__clang__)
*(v4hi*)bpt = __builtin_ia32_psllw(temp, 1LL);
+#else
+ *(v4hi*)bpt = __builtin_ia32_psllw(temp, v_one.v);