Tue Jul 12 13:28:32 2011 UTC ()
Disable SSE2 support for NetBSD-*-x86_64. This prevents segfaults under
NetBSD/amd64 5.1_STABLE. Bump package revision because of this change.

It is possible that SSE2 support works fine if "pixman" is built with
NetBSD-current's newer toolchain. If you have such a setup please
test it and adjust the package accordingly if appropriate.


(tron)
diff -r1.41 -r1.42 pkgsrc/x11/pixman/Makefile
cvs diff -r1.41 -r1.42 pkgsrc/x11/pixman/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/pixman/Makefile 2011/07/11 19:19:42 1.41
+++ pkgsrc/x11/pixman/Makefile 2011/07/12 13:28:31 1.42
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.41 2011/07/11 19:19:42 tron Exp $ 1# $NetBSD: Makefile,v 1.42 2011/07/12 13:28:31 tron Exp $
2 2
3DISTNAME= pixman-0.22.2 3DISTNAME= pixman-0.22.2
 4PKGREVISION= 1
4CATEGORIES= x11 5CATEGORIES= x11
5MASTER_SITES= ${MASTER_SITE_XORG:=lib/} 6MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
6EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://xorg.freedesktop.org/ 10HOMEPAGE= http://xorg.freedesktop.org/
10COMMENT= Library of low-level pixel manipulation routines 11COMMENT= Library of low-level pixel manipulation routines
11LICENSE= mit 12LICENSE= mit
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 17USE_LIBTOOL= yes
@@ -34,23 +35,25 @@ PKGCONFIG_OVERRIDE+= pixman-1-uninstalle @@ -34,23 +35,25 @@ PKGCONFIG_OVERRIDE+= pixman-1-uninstalle
34### the desired symbols, hiding the rest. 35### the desired symbols, hiding the rest.
35### 36###
36### Please, do not forget to ensure the currency of this file! 37### Please, do not forget to ensure the currency of this file!
37 38
38MAKE_ENV+= PIXMAN_SYMFILE=${PIXMAN_SYMFILE:Q} 39MAKE_ENV+= PIXMAN_SYMFILE=${PIXMAN_SYMFILE:Q}
39PIXMAN_SYMFILE= ${WRKDIR}/pixman.sym 40PIXMAN_SYMFILE= ${WRKDIR}/pixman.sym
40 41
41post-extract: 42post-extract:
42 ${CP} ${FILESDIR}/pixman.sym ${WRKDIR} 43 ${CP} ${FILESDIR}/pixman.sym ${WRKDIR}
43 ${CP} ${FILESDIR}/solaris-hwcap.mapfile ${WRKSRC}/pixman 44 ${CP} ${FILESDIR}/solaris-hwcap.mapfile ${WRKSRC}/pixman
44 45
45.include "../../mk/bsd.prefs.mk" 46.include "../../mk/bsd.prefs.mk"
46 47
 48.if !empty(MACHINE_PLATFORM:NetBSD-*-x86_64)
 49CONFIGURE_ARGS+= --disable-sse2
47# Link the tests with the static library under Mac OS X as we cannot use 50# Link the tests with the static library under Mac OS X as we cannot use
48# the shared library out of the build area. 51# the shared library out of the build area.
49.if ${OPSYS} == "Darwin" 52.elif ${OPSYS} == "Darwin"
50SUBST_CLASSES+= pixmantests 53SUBST_CLASSES+= pixmantests
51SUBST_STAGE.pixmantests= post-configure 54SUBST_STAGE.pixmantests= post-configure
52SUBST_FILES.pixmantests= test/Makefile 55SUBST_FILES.pixmantests= test/Makefile
53SUBST_SED.pixmantests= -e 's@libpixman-1\.la@\.libs/libpixman-1\.a@' 56SUBST_SED.pixmantests= -e 's@libpixman-1\.la@\.libs/libpixman-1\.a@'
54.endif 57.endif
55 58
56.include "../../mk/bsd.pkg.mk" 59.include "../../mk/bsd.pkg.mk"