Re: xorg pixman testers wanted

[Bernd Ernesti <veego%NetBSD.org@localhost>]

On Sat, Oct 17, 2009 at 07:56:56AM +0200, Bernd Ernesti wrote:
[..]

> For that I need some testers who can rebuild pixman with the attached
> patch on both systems. Be warned that this patch is completely untested.

The patch for config.h was based on an old version.
Updated patch is attached, only the line numbers changed.

Regards,
Bernd

Index: src/external/mit/xorg/lib/pixman/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/pixman/Makefile,v
retrieving revision 1.9
diff -b -u -r1.9 Makefile
--- src/external/mit/xorg/lib/pixman/Makefile   9 Jul 2009 02:15:48 -0000       
1.9
+++ src/external/mit/xorg/lib/pixman/Makefile   17 Oct 2009 06:13:44 -0000
@@ -37,12 +37,17 @@
 
 # XXX
 
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+.if ${MACHINE_ARCH} == "i386"
+# SSE2 requires a gcc >= 4.2
+SRCS+= pixman-mmx.c
+COPTS.pixman-mmx.c=    -mmmx -fvisibility=hidden
+MKDEPFLAGS+=           -mmmx -fvisibility=hidden
+.elif ${MACHINE_ARCH} == "x86_64"
 SRCS+= pixman-mmx.c
 SRCS+= pixman-sse2.c
-MKDEPFLAGS+=           -msse -mmmx -fvisibility=hidden
-COPTS.pixman-mmx.c=    -msse -mmmx -fvisibility=hidden
-COPTS.pixman-sse2.c=   -msse -mmmx -fvisibility=hidden
+COPTS.pixman-mmx.c=    -mmmx -fvisibility=hidden
+COPTS.pixman-sse2.c=   -msse2 -fvisibility=hidden
+MKDEPFLAGS+=           -mmmx -msse2 -fvisibility=hidden
 .endif
 
 # .if VMX
Index: xsrc/external/mit/pixman/include/config.h
===================================================================
RCS file: /cvsroot/xsrc/external/mit/pixman/include/config.h,v
retrieving revision 1.4
diff -b -u -r1.4 config.h
--- xsrc/external/mit/pixman/include/config.h   2 Aug 2009 01:35:17 -0000       
1.4
+++ xsrc/external/mit/pixman/include/config.h   17 Oct 2009 06:14:00 -0000
@@ -77,9 +77,11 @@
 #if defined(__i386__) || defined(__x86_64__)
 /* use MMX compiler intrinsics */
 #define USE_MMX 1
+#endif
 
+#if defined(__x86_64__)
 /* use SSE2 compiler intrinsics */
-/* #undef USE_SSE2 */
+#define USE_SSE2 1
 #endif
 
 /* use VMX compiler intrinsics */