diff options
Diffstat (limited to 'x11')
-rw-r--r-- | x11/pixman/Makefile | 4 | ||||
-rw-r--r-- | x11/pixman/distinfo | 4 | ||||
-rw-r--r-- | x11/pixman/patches/patch-af | 24 |
3 files changed, 24 insertions, 8 deletions
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile index 6137cbf9314..6ec0a1f2f27 100644 --- a/x11/pixman/Makefile +++ b/x11/pixman/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.9 2008/04/23 09:44:05 tnn Exp $ +# $NetBSD: Makefile,v 1.10 2008/04/27 11:58:09 tnn Exp $ # DISTNAME= pixman-0.10.0 PKGNAME= ${DISTNAME:C/pl[0-9]*//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= http://xorg.freedesktop.org/releases/individual/lib/ EXTRACT_SUFX= .tar.bz2 diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo index e7a3764129f..e7712b19901 100644 --- a/x11/pixman/distinfo +++ b/x11/pixman/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2008/04/23 12:12:06 tnn Exp $ +$NetBSD: distinfo,v 1.11 2008/04/27 11:58:09 tnn Exp $ SHA1 (pixman-0.10.0.tar.bz2) = 9262e945281877c42d484098de664dcf1a68d857 RMD160 (pixman-0.10.0.tar.bz2) = 16c356f5fa3dfa4c0196456552daca3ab6244276 @@ -8,4 +8,4 @@ SHA1 (patch-ab) = 5322a03dbcacca50898e3a318174cb47344da28e SHA1 (patch-ac) = 093aab2151261285506197e566dd3ae62b06b716 SHA1 (patch-ad) = d35b932e5fb29b5022fc1f02a9568183ae4cdbd4 SHA1 (patch-ae) = 9fb4cedc19c07c368af02589fda6d5d9cd47c174 -SHA1 (patch-af) = 040742ec6fc84aaa78ee4e55997a9dc216ed70af +SHA1 (patch-af) = c2f0cd54a1bcb342a9769b34b303b143735ddc3f diff --git a/x11/pixman/patches/patch-af b/x11/pixman/patches/patch-af index 3c372b5d7b5..c00fafc2efd 100644 --- a/x11/pixman/patches/patch-af +++ b/x11/pixman/patches/patch-af @@ -1,8 +1,15 @@ -$NetBSD: patch-af,v 1.1 2008/04/23 09:44:05 tnn Exp $ +$NetBSD: patch-af,v 1.2 2008/04/27 11:58:09 tnn Exp $ -http://gitweb.freedesktop.org/?p=pixman.git;a=blobdiff;h=637f835221631b0f3d79d8f0f3b256883d34770b;hp=79997e15ea645ab74d2858b574b4e8b451fb8084;hb=0c33317f59b93f5cab348619b1c38a5dce97de94;f=configure.ac +Basically this patch: ---- configure.orig 2008-04-23 11:18:48.000000000 +0200 +http://gitweb.freedesktop.org/?p=pixman.git;a=blobdiff;h=637f835221631b0f3d79d8 +f0f3b256883d34770b;hp=79997e15ea645ab74d2858b574b4e8b451fb8084;hb=0c33317f59b93f +5cab348619b1c38a5dce97de94;f=configure.ac + +... but also avoid --param inline-unit-growth with gcc3, +and don't attempt to use SSE2 if the SSE test failed. + +--- configure.orig 2008-03-27 15:02:11.000000000 +0100 +++ configure @@ -19762,7 +19762,11 @@ fi echo "${ECHO_T}$have_gcc4" >&6; } @@ -27,7 +34,7 @@ http://gitweb.freedesktop.org/?p=pixman.git;a=blobdiff;h=637f835221631b0f3d79d8f #if !defined(__amd64__) && !defined(__x86_64__) #error "Need x86-64 for SSE" #endif -@@ -19900,18 +19907,26 @@ fi +@@ -19900,18 +19907,27 @@ fi @@ -41,6 +48,7 @@ http://gitweb.freedesktop.org/?p=pixman.git;a=blobdiff;h=637f835221631b0f3d79d8f have_sse2_intrinsics=no { echo "$as_me:$LINENO: checking whether to use SSE2 intrinsics" >&5 echo $ECHO_N "checking whether to use SSE2 intrinsics... $ECHO_C" >&6; } ++if test $have_sse_intrinsics = yes; then xserver_save_CFLAGS=$CFLAGS -CFLAGS="$CFLAGS -msse2 $MMX_CFLAGS" +CFLAGS="$CFLAGS -msse2 $SSE_CFLAGS" @@ -56,3 +64,11 @@ http://gitweb.freedesktop.org/?p=pixman.git;a=blobdiff;h=637f835221631b0f3d79d8f int main () { __m128i a, b, c; c = _mm_xor_si128 (a, b); +@@ -19945,6 +19961,7 @@ fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$xserver_save_CFLAGS ++fi + { echo "$as_me:$LINENO: result: $have_sse2_intrinsics" >&5 + echo "${ECHO_T}$have_sse2_intrinsics" >&6; } + |