diff options
| author | jperkin <jperkin> | 2014-01-13 14:53:37 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2014-01-13 14:53:37 +0000 |
| commit | 2e2d6b5bdb21df5a6c1ee13583277b3fd5220df1 (patch) | |
| tree | edfa679141ad1a75ecc9ab8c405b4a6629dbfc67 /audio | |
| parent | 7155d3e4d914fa6381e5474331db02962f885723 (diff) | |
| download | pkgsrc-2e2d6b5bdb21df5a6c1ee13583277b3fd5220df1.tar.gz | |
Fix build with Apple GCC 4.2.1.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/openal/distinfo | 4 | ||||
| -rw-r--r-- | audio/openal/patches/patch-src_arch_i386_x86__floatmul.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/audio/openal/distinfo b/audio/openal/distinfo index 76967e392ee..b8bd89a3acb 100644 --- a/audio/openal/distinfo +++ b/audio/openal/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2014/01/10 08:58:01 pho Exp $ +$NetBSD: distinfo,v 1.17 2014/01/13 14:53:37 jperkin Exp $ SHA1 (openal-0.0.8.tar.gz) = 31aaedc18bd26759bd51f4fa495bc4ccb08acb3e RMD160 (openal-0.0.8.tar.gz) = 29368dbceea7cfd8b5c520b9e0f0cfdc7324e265 @@ -9,5 +9,5 @@ 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) = 302581fa21ef94bb9f9e34df68e14601eaa1b5e1 +SHA1 (patch-src_arch_i386_x86__floatmul.c) = 88d050249673393f702a6c3dd124650656296a4b SHA1 (patch-src_backends_alc__backend__darwin.c) = f1ae045dd05e35f76cebaec2e47949a6e507fe4f 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 b454640e1b5..031eeb72f59 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.3 2012/04/17 17:40:50 joerg Exp $ +$NetBSD: patch-src_arch_i386_x86__floatmul.c,v 1.4 2014/01/13 14:53:37 jperkin 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)) && !defined(__clang__) ++#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 3 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 2)) && !defined(__clang__) && !defined(__APPLE__) *(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)) && !defined(__clang__) ++#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 3 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 2)) && !defined(__clang__) && !defined(__APPLE__) *(v4hi*)bpt = __builtin_ia32_psllw(temp, 1LL); +#else + *(v4hi*)bpt = __builtin_ia32_psllw(temp, v_one.v); |