[pkgsrc/trunk]: pkgsrc/audio/openal Fix build with gcc-4.2. Problem reported ...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0603e51862cc
branches:  trunk
changeset: 593066:0603e51862cc
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Sep 22 15:18:39 2011 +0000

description:
Fix build with gcc-4.2. Problem reported and fix tested by joerg.

diffstat:

 audio/openal/distinfo                                    |   4 ++--
 audio/openal/patches/patch-src_arch_i386_x86__floatmul.c |  14 ++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r 2d86e71cbd73 -r 0603e51862cc audio/openal/distinfo
--- a/audio/openal/distinfo     Thu Sep 22 15:16:26 2011 +0000
+++ b/audio/openal/distinfo     Thu Sep 22 15:18:39 2011 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2011/08/22 13:36:31 wiz Exp $
+$NetBSD: distinfo,v 1.13 2011/09/22 15:18:39 wiz Exp $
 
 SHA1 (openal-0.0.8.tar.gz) = 31aaedc18bd26759bd51f4fa495bc4ccb08acb3e
 RMD160 (openal-0.0.8.tar.gz) = 29368dbceea7cfd8b5c520b9e0f0cfdc7324e265
@@ -9,4 +9,4 @@
 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
+SHA1 (patch-src_arch_i386_x86__floatmul.c) = ccd1a1a8780ba4f551df132cc22cc00be8580589
diff -r 2d86e71cbd73 -r 0603e51862cc audio/openal/patches/patch-src_arch_i386_x86__floatmul.c
--- a/audio/openal/patches/patch-src_arch_i386_x86__floatmul.c  Thu Sep 22 15:16:26 2011 +0000
+++ b/audio/openal/patches/patch-src_arch_i386_x86__floatmul.c  Thu Sep 22 15:18:39 2011 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_arch_i386_x86__floatmul.c,v 1.1 2011/08/22 13:36:31 wiz Exp $
+$NetBSD: patch-src_arch_i386_x86__floatmul.c,v 1.2 2011/09/22 15:18:39 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
+@@ -82,11 +82,27 @@ void _alFloatMul(ALshort *bpt, ALfloat s
                        v_sa.s[3] = v_sa.s[0];
                        
                        while (samples_main--) {
@@ -17,12 +17,18 @@
 +                              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);
++#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 3 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 2))
+                               *(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);
--                              *(v4hi*)bpt = __builtin_ia32_psllw(temp, 1LL);
++#if defined(__GNUC__) && defined(__GNUC_MINOR__) && (__GNUC__ <= 3 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 2))
+                               *(v4hi*)bpt = __builtin_ia32_psllw(temp, 1LL);
++#else
 +                              *(v4hi*)bpt = __builtin_ia32_psllw(temp, v_one.v);
++#endif
                                bpt += 4;
                        }
                }