Re: various new build breakage (mostly due to gcc-4.5)

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Most of the problems are now fixed, still open are:

> misc/fbreader:
> Compiling ZLTextStyleOptions.o ...In file included from 
> ZLTextStyleOptions.cpp:25:0:
> ZLTextStyle.h:307:36: error: invalid abstract return type for member function 
> 'const ZLTextPositionIndicatorInfo 
> ZLTextPositionIndicatorInfo::operator=(const ZLTextPositionIndicatorInfo&)'
> ZLTextStyle.h:282:35: note:   because the following virtual functions are 
> pure within 'ZLTextPositionIndicatorInfo':
> ZLTextStyle.h:296:15: note:     virtual ZLTextPositionIndicatorInfo::Type 
> ZLTextPositionIndicatorInfo::type() const
> ZLTextStyle.h:297:15: note:     virtual bool 
> ZLTextPositionIndicatorInfo::isSensitive() const
> ZLTextStyle.h:298:15: note:     virtual bool 
> ZLTextPositionIndicatorInfo::isTextPositionShown() const
> ZLTextStyle.h:299:15: note:     virtual bool 
> ZLTextPositionIndicatorInfo::isTimeShown() const
> ZLTextStyle.h:300:18: note:     virtual ZLColor 
> ZLTextPositionIndicatorInfo::color() const
> ZLTextStyle.h:301:14: note:     virtual int 
> ZLTextPositionIndicatorInfo::height() const
> ZLTextStyle.h:302:14: note:     virtual int 
> ZLTextPositionIndicatorInfo::offset() const
> ZLTextStyle.h:303:14: note:     virtual int 
> ZLTextPositionIndicatorInfo::fontSize() const

(no idea how to fix this) and

> audio/openal:
> libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I.. -I../common/include 
> -I../include -I../src/arch/i386 -Wall -ansi -pedantic -finline-functions 
> -ffast-math -fomit-frame-pointer -fvisibility=hidden -pthread -O2 -pthread 
> -MT libopenal_la-x86_cpu_caps_prk.lo -MD -MP -MF 
> .deps/libopenal_la-x86_cpu_caps_prk.Tpo -c arch/i386/x86_cpu_caps_prk.c  
> -fPIC -DPIC -o .libs/libopenal_la-x86_cpu_caps_prk.o
> arch/i386/x86_floatmul.c: In function '_alFloatMul':
> arch/i386/x86_floatmul.c:86:46: warning: use of C99 long long integer constant
> arch/i386/x86_floatmul.c:86:5: error: incompatible type for argument 2 of 
> '__builtin_ia32_psllw'
> arch/i386/x86_floatmul.c:86:5: note: expected '__vector(4) short int' but 
> argument is of type 'long long int'
> arch/i386/x86_floatmul.c:89:46: warning: use of C99 long long integer constant
> arch/i386/x86_floatmul.c:89:5: error: incompatible type for argument 2 of 
> '__builtin_ia32_psllw'
> arch/i386/x86_floatmul.c:89:5: note: expected '__vector(4) short int' but 
> argument is of type 'long long int'
> 
> The lines are both like:
>                                 *(v4hi*)bpt = __builtin_ia32_psllw(temp, 1LL);

Is the attached diff correct for this one? It makes it build.
 Thomas

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/openal/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- Makefile    28 May 2009 20:40:49 -0000      1.25
+++ Makefile    21 Aug 2011 18:51:47 -0000
@@ -8,6 +8,7 @@
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.openal.org/
 COMMENT=       3D positional spatialized sound library
+LICENSE=       gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
@@ -17,7 +18,7 @@
 
 PTHREAD_AUTO_VARS=     yes
 
-INFO_FILES=            # PLIST
+INFO_FILES=            yes
 INSTALLATION_DIRS=     ${PKGINFODIR} include/AL
 PKGCONFIG_OVERRIDE=    admin/pkgconfig/openal.pc.in
 LIBS+=                 ${LIBOSSAUDIO}
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/openal/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- distinfo    16 Feb 2009 12:46:00 -0000      1.11
+++ distinfo    21 Aug 2011 18:51:47 -0000
@@ -8,3 +8,4 @@
 SHA1 (patch-ac) = a8911a1c8f421c9043df3ed5d7054a30f92eb635
 SHA1 (patch-ad) = c740552ebcb4f846faa7ac17140753a6aac4393c
 SHA1 (patch-ae) = 590a40890ccfe488248ef9d58c8991c07f0422d7
+SHA1 (patch-src_arch_i386_x86__floatmul.c) = 
c0e0f7468d5171c3c941187ed0764c89d0262035
Index: patches/patch-src_arch_i386_x86__floatmul.c
===================================================================
RCS file: patches/patch-src_arch_i386_x86__floatmul.c
diff -N patches/patch-src_arch_i386_x86__floatmul.c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_arch_i386_x86__floatmul.c 21 Aug 2011 18:51:47 -0000
@@ -0,0 +1,28 @@
+$NetBSD$
+
+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;
+                       }
+               }