diff options
author | drochner <drochner@pkgsrc.org> | 2010-06-16 16:35:57 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2010-06-16 16:35:57 +0000 |
commit | a50afe5e6119d331a22ec49af094d7d974a81069 (patch) | |
tree | f69f4dbfb936e641e7cc5c2119200345cccd0cba /x11 | |
parent | fafa9aa2446369dbdb2fbc9bd549ce610729f8b5 (diff) | |
download | pkgsrc-a50afe5e6119d331a22ec49af094d7d974a81069.tar.gz |
update to 0.18.2
changes: minor fixes
Diffstat (limited to 'x11')
-rw-r--r-- | x11/pixman/Makefile | 4 | ||||
-rw-r--r-- | x11/pixman/distinfo | 15 | ||||
-rw-r--r-- | x11/pixman/patches/patch-aa | 13 | ||||
-rw-r--r-- | x11/pixman/patches/patch-ab | 15 | ||||
-rw-r--r-- | x11/pixman/patches/patch-ae | 19 | ||||
-rw-r--r-- | x11/pixman/patches/patch-af | 22 |
6 files changed, 54 insertions, 34 deletions
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile index b80c5b443cf..29485a4704b 100644 --- a/x11/pixman/Makefile +++ b/x11/pixman/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.35 2010/02/18 21:30:44 drochner Exp $ +# $NetBSD: Makefile,v 1.36 2010/06/16 16:35:57 drochner Exp $ # -DISTNAME= pixman-0.16.6 +DISTNAME= pixman-0.18.2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo index d1ce593df78..f5ca0dc8a83 100644 --- a/x11/pixman/distinfo +++ b/x11/pixman/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.38 2010/02/27 10:41:00 tnn Exp $ +$NetBSD: distinfo,v 1.39 2010/06/16 16:35:57 drochner Exp $ -SHA1 (pixman-0.16.6.tar.bz2) = a2beccb6b3bfbb55524a7a1c0b57354957b45af0 -RMD160 (pixman-0.16.6.tar.bz2) = ebeebf61864c7bdb601575f95cdc1b04112f8382 -Size (pixman-0.16.6.tar.bz2) = 406016 bytes -SHA1 (patch-aa) = 94e9fe38d2de8cfe75433b486bbbaf0536c48212 -SHA1 (patch-ab) = 422f2c0f3450da01c11a4005473945291421d41f +SHA1 (pixman-0.18.2.tar.bz2) = d66ab37ebc111e8031dd6d0ff1edf19b7adab5be +RMD160 (pixman-0.18.2.tar.bz2) = e6d89e6112a4f47bf2fd1a1cb0b8125b1161452c +Size (pixman-0.18.2.tar.bz2) = 421621 bytes +SHA1 (patch-aa) = d677fc21632e0e34c65681210ed6c2666e639634 +SHA1 (patch-ab) = 94c677d142edb43a61b0aff78f85cbc4448dc221 SHA1 (patch-ad) = b2fa221652bc5f8bec000e071417b0180816a451 -SHA1 (patch-ae) = b7f67753671dbba1ea62ed98c12ccf3b1b0905c3 +SHA1 (patch-ae) = e1857a415770b4f3c8ac7d4caeef1603472c235a +SHA1 (patch-af) = e021d2c97e8c3ff69f832ae92d2ec1999a864193 diff --git a/x11/pixman/patches/patch-aa b/x11/pixman/patches/patch-aa index ba093dcda13..b9e0f487ff9 100644 --- a/x11/pixman/patches/patch-aa +++ b/x11/pixman/patches/patch-aa @@ -1,12 +1,11 @@ -$NetBSD: patch-aa,v 1.10 2009/06/06 22:28:41 wiz Exp $ +$NetBSD: patch-aa,v 1.11 2010/06/16 16:35:57 drochner Exp $ ---- pixman/Makefile.am.orig 2009-05-31 02:07:19.000000000 +0000 +--- pixman/Makefile.am.orig 2010-05-12 20:13:49.000000000 +0000 +++ pixman/Makefile.am -@@ -1,5 +1,6 @@ +@@ -1,5 +1,5 @@ lib_LTLIBRARIES = libpixman-1.la --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_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined @PTHREAD_LDFLAGS@ ++libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -no-undefined @PTHREAD_LDFLAGS@ -export-symbols $(PIXMAN_SYMFILE) libpixman_1_la_LIBADD = @DEP_LIBS@ -lm - libpixman_1_la_CFLAGS = -DPIXMAN_DISABLE_DEPRECATED libpixman_1_la_SOURCES = \ + pixman.h \ diff --git a/x11/pixman/patches/patch-ab b/x11/pixman/patches/patch-ab index 17833927806..9602de0cfc9 100644 --- a/x11/pixman/patches/patch-ab +++ b/x11/pixman/patches/patch-ab @@ -1,14 +1,13 @@ -$NetBSD: patch-ab,v 1.10 2009/06/06 22:28:41 wiz Exp $ +$NetBSD: patch-ab,v 1.11 2010/06/16 16:35:57 drochner Exp $ ---- pixman/Makefile.in.orig 2009-05-31 02:07:50.000000000 +0000 +--- pixman/Makefile.in.orig 2010-05-12 20:26:22.000000000 +0000 +++ pixman/Makefile.in -@@ -313,7 +313,8 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ +@@ -355,7 +355,7 @@ top_srcdir = @top_srcdir@ lib_LTLIBRARIES = libpixman-1.la libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) \ -- -no-undefined $(am__append_2) $(am__append_7) -+ -no-undefined $(am__append_2) $(am__append_7) \ -+ -export-symbols $(PIXMAN_SYMFILE) + -no-undefined @PTHREAD_LDFLAGS@ $(am__append_2) \ +- $(am__append_7) ++ $(am__append_7) -export-symbols $(PIXMAN_SYMFILE) libpixman_1_la_LIBADD = @DEP_LIBS@ -lm $(am__append_3) $(am__append_5) \ $(am__append_8) $(am__append_10) $(am__append_12) - libpixman_1_la_CFLAGS = -DPIXMAN_DISABLE_DEPRECATED + libpixman_1_la_SOURCES = \ diff --git a/x11/pixman/patches/patch-ae b/x11/pixman/patches/patch-ae index b993ca91c68..63704f8ad57 100644 --- a/x11/pixman/patches/patch-ae +++ b/x11/pixman/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.10 2009/11/15 13:00:01 drochner Exp $ +$NetBSD: patch-ae,v 1.11 2010/06/16 16:35:57 drochner Exp $ ---- configure.orig 2009-09-28 15:10:12.000000000 +0200 +--- configure.orig 2010-05-12 20:26:22.000000000 +0000 +++ configure -@@ -11763,7 +11763,7 @@ fi +@@ -11070,7 +11070,7 @@ fi # if we're using Sun Studio and neither the user nor a config.site # has set CFLAGS. if test $SUNCC = yes && \ @@ -11,20 +11,19 @@ $NetBSD: patch-ae,v 1.10 2009/11/15 13:00:01 drochner Exp $ test "$CFLAGS" = "-g" then CFLAGS="-O -g" -@@ -11856,6 +11856,7 @@ fi +@@ -11161,6 +11161,7 @@ fi have_gcc4=no +if false; then - { $as_echo "$as_me:$LINENO: checking for -fvisibility" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fvisibility" >&5 $as_echo_n "checking for -fvisibility... " >&6; } - cat >conftest.$ac_ext <<_ACEOF -@@ -11894,7 +11895,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -11177,6 +11178,7 @@ if ac_fn_c_try_compile "$LINENO"; then : + have_gcc4=yes fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- +fi + if test "x$have_gcc4" = "xyes"; then CFLAGS="$CFLAGS -fvisibility=hidden" - fi diff --git a/x11/pixman/patches/patch-af b/x11/pixman/patches/patch-af new file mode 100644 index 00000000000..4cc0c593e47 --- /dev/null +++ b/x11/pixman/patches/patch-af @@ -0,0 +1,22 @@ +$NetBSD: patch-af,v 1.8 2010/06/16 16:35:57 drochner Exp $ + +--- pixman/pixman-compiler.h.orig 2010-05-12 20:15:42.000000000 +0000 ++++ pixman/pixman-compiler.h +@@ -70,7 +70,7 @@ + #endif + + /* TLS */ +-#if defined(TOOLCHAIN_SUPPORTS__THREAD) ++#if defined(TOOLCHAIN_SUPPORTS__THREAD) && !defined(__NetBSD__) + + # define PIXMAN_DEFINE_THREAD_LOCAL(type, name) \ + static __thread type name +@@ -149,7 +149,7 @@ extern __stdcall int ReleaseMutex (void + # define PIXMAN_GET_THREAD_LOCAL(name) \ + (&name) + +-#elif defined(HAVE_PTHREAD_SETSPECIFIC) ++#elif defined(HAVE_PTHREAD_SETSPECIFIC) || defined(__NetBSD__) + + #include <pthread.h> + |