diff options
-rw-r--r-- | x11/pixman/Makefile | 7 | ||||
-rw-r--r-- | x11/pixman/distinfo | 12 | ||||
-rw-r--r-- | x11/pixman/files/pixman.sym | 7 | ||||
-rw-r--r-- | x11/pixman/hacks.mk | 12 | ||||
-rw-r--r-- | x11/pixman/patches/patch-aa | 6 | ||||
-rw-r--r-- | x11/pixman/patches/patch-ab | 6 |
6 files changed, 28 insertions, 22 deletions
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile index 5e5ac52c222..eaad5295f3d 100644 --- a/x11/pixman/Makefile +++ b/x11/pixman/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2008/07/14 05:31:57 tnn Exp $ +# $NetBSD: Makefile,v 1.16 2008/07/18 03:34:10 bjs Exp $ # -DISTNAME= pixman-0.11.6 +DISTNAME= pixman-0.11.8 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 @@ -18,6 +18,7 @@ USE_LIBTOOL= yes USE_TOOLS+= pkg-config perl PKGCONFIG_OVERRIDE+= pixman-1.pc.in +PKGCONFIG_OVERRIDE+= pixman-1-uninstalled.pc.in ### ### XXX The configure script is written to fail if it detects gcc<4.0 ### for lack of -fvisibility=hidden. In keeping with the pkgsrc @@ -32,7 +33,7 @@ PIXMAN_SYMFILE= ${WRKDIR}/pixman.sym .include "../../mk/compiler.mk" -.if !empty(PKGSRC_COMPILER:Msunpro) +.if !empty(PKGSRC_COMPILER:Msunpro) || empty(CC_VERSION:Mgcc-4.1*) CONFIGURE_ARGS+= --disable-sse2 .endif diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo index 3a7e448e802..58395210a6e 100644 --- a/x11/pixman/distinfo +++ b/x11/pixman/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.15 2008/07/13 23:16:02 bjs Exp $ +$NetBSD: distinfo,v 1.16 2008/07/18 03:34:10 bjs Exp $ -SHA1 (pixman-0.11.6.tar.bz2) = 9ee97f75d98678d50d4a400a9266bf05d3835481 -RMD160 (pixman-0.11.6.tar.bz2) = 0b9e7a1f8b5f724d6cb374a6ab467211c01fc880 -Size (pixman-0.11.6.tar.bz2) = 359630 bytes -SHA1 (patch-aa) = dbb1a2ef0c8f9db1e4897b60b3c8b6dc8a44dd39 -SHA1 (patch-ab) = 41634a1a885fcf08800073ccd094db4f02020e3a +SHA1 (pixman-0.11.8.tar.bz2) = 8db43d9fe094073cfcb03c1b1c86296b5a7df1aa +RMD160 (pixman-0.11.8.tar.bz2) = c1a69a2110b09c0af2bbc05637e74eebdfa7a120 +Size (pixman-0.11.8.tar.bz2) = 360229 bytes +SHA1 (patch-aa) = 70ed22b9c271e3329344719f575e3bf6ec6d9f89 +SHA1 (patch-ab) = d62794cb2bd230628fa3f263253b39ab106c943f SHA1 (patch-ac) = cce53aed1451e328a57c2f3dc80391b3959194af SHA1 (patch-ad) = c7fe169e062bbdc58db484874409a502f0f80018 SHA1 (patch-ae) = 007f2487b53975eb10550b6540650a220e6b60d8 diff --git a/x11/pixman/files/pixman.sym b/x11/pixman/files/pixman.sym index 91e8846b6a2..ccfa1e58c0b 100644 --- a/x11/pixman/files/pixman.sym +++ b/x11/pixman/files/pixman.sym @@ -35,11 +35,9 @@ pixman_image_unref pixman_line_fixed_edge_init pixman_rasterize_edges pixman_rasterize_trapezoid -pixman_region32_append pixman_region32_contains_point pixman_region32_contains_rectangle pixman_region32_copy -pixman_region32_empty pixman_region32_equal pixman_region32_extents pixman_region32_fini @@ -54,17 +52,13 @@ pixman_region32_not_empty pixman_region32_rectangles pixman_region32_reset pixman_region32_selfcheck -pixman_region32_set_static_pointers pixman_region32_subtract pixman_region32_translate pixman_region32_union pixman_region32_union_rect -pixman_region32_validate -pixman_region_append pixman_region_contains_point pixman_region_contains_rectangle pixman_region_copy -pixman_region_empty pixman_region_equal pixman_region_extents pixman_region_fini @@ -84,7 +78,6 @@ pixman_region_subtract pixman_region_translate pixman_region_union pixman_region_union_rect -pixman_region_validate pixman_sample_ceil_y pixman_sample_floor_y pixman_transform_point_3d diff --git a/x11/pixman/hacks.mk b/x11/pixman/hacks.mk new file mode 100644 index 00000000000..305e7ffd1c3 --- /dev/null +++ b/x11/pixman/hacks.mk @@ -0,0 +1,12 @@ +# $NetBSD: hacks.mk,v 1.1 2008/07/18 03:34:10 bjs Exp $ +# +.if !defined(PIXMAN_HACKS_MK) +PIXMAN_HACKS_MK= # empty +. include "../../mk/compiler.mk" +### +### XXX SSE2 intrinsics require gcc-4.2+ to build. +### +. if !empty(PKGSRC_COMPILER:Msunpro) || empty(CC_VERSION:Mgcc-4.2*) +CONFIGURE_ARGS+= --disable-sse2 +. endif +.endif diff --git a/x11/pixman/patches/patch-aa b/x11/pixman/patches/patch-aa index 85335785ff1..88e56483467 100644 --- a/x11/pixman/patches/patch-aa +++ b/x11/pixman/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.7 2008/06/19 17:51:27 bjs Exp $ +$NetBSD: patch-aa,v 1.8 2008/07/18 03:34:10 bjs Exp $ --- pixman/Makefile.am.orig 2008-06-09 01:56:58.000000000 -0400 +++ pixman/Makefile.am @@ -1,5 +1,6 @@ lib_LTLIBRARIES = libpixman-1.la --libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -+libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) \ +-libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined ++libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined \ + -export-symbols $(PIXMAN_SYMFILE) libpixman_1_la_LIBADD = @DEP_LIBS@ -lm libpixman_1_la_CFLAGS = -DPIXMAN_DISABLE_DEPRECATED diff --git a/x11/pixman/patches/patch-ab b/x11/pixman/patches/patch-ab index 3df4f8ee435..ee58d5616bd 100644 --- a/x11/pixman/patches/patch-ab +++ b/x11/pixman/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.6 2008/06/19 17:51:27 bjs Exp $ +$NetBSD: patch-ab,v 1.7 2008/07/18 03:34:10 bjs Exp $ --- pixman/Makefile.in.orig 2008-06-09 12:35:15.000000000 -0400 +++ pixman/Makefile.in @@ -6,8 +6,8 @@ $NetBSD: patch-ab,v 1.6 2008/06/19 17:51:27 bjs Exp $ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ lib_LTLIBRARIES = libpixman-1.la --libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -+libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) \ +-libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined ++libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined \ + -export-symbols $(PIXMAN_SYMFILE) libpixman_1_la_LIBADD = @DEP_LIBS@ -lm $(am__append_2) $(am__append_4) \ $(am__append_6) |