summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11/pixman/Makefile5
-rw-r--r--x11/pixman/distinfo17
-rw-r--r--x11/pixman/patches/patch-aa12
-rw-r--r--x11/pixman/patches/patch-ab12
-rw-r--r--x11/pixman/patches/patch-ae29
-rw-r--r--x11/pixman/patches/patch-bb14
-rw-r--r--x11/pixman/patches/patch-bc12
7 files changed, 36 insertions, 65 deletions
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index 76014ba7e93..d5cfcecb3ec 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2011/10/27 16:52:51 drochner Exp $
+# $NetBSD: Makefile,v 1.46 2012/05/12 17:38:32 wiz Exp $
-DISTNAME= pixman-0.22.2
-PKGREVISION= 2
+DISTNAME= pixman-0.24.4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index c810e36159c..55673aaa72c 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.44 2011/12/31 15:37:55 bsiegert Exp $
+$NetBSD: distinfo,v 1.45 2012/05/12 17:38:32 wiz Exp $
-SHA1 (pixman-0.22.2.tar.bz2) = ad2b828ce4280472f5933d8bb5f0f4d583aed7f3
-RMD160 (pixman-0.22.2.tar.bz2) = 13dbab02962cf45995aaebde4ec9a952ca8e6e76
-Size (pixman-0.22.2.tar.bz2) = 461319 bytes
-SHA1 (patch-aa) = 019368315a48e7f928a0d85c340da7a5131504ec
-SHA1 (patch-ab) = dd31ac6ff6dffb5a29b9d2ac372be55900e773f6
+SHA1 (pixman-0.24.4.tar.bz2) = 683450f917015366ac7918fc517c76801aeff374
+RMD160 (pixman-0.24.4.tar.bz2) = 1df92f83b0b944e8a493a8cdf6318ebc6e778914
+Size (pixman-0.24.4.tar.bz2) = 468400 bytes
+SHA1 (patch-aa) = 7096dcb1f999ad4c9c0797bbdc5a4dd1f994275d
+SHA1 (patch-ab) = 85ece7667c4c24adf92c1a2ec25bb2e12e83d0e4
SHA1 (patch-ad) = 2841fb543df1a180a263a770d1934924a4648d8d
-SHA1 (patch-ae) = 3bec7a866692b06fd2d9a1376d36277b2d618e14
SHA1 (patch-af) = 76a94e09758f1d6e3055430c82fbcdaaefe0436d
SHA1 (patch-ba) = 9bd8a7fd0cfbd280df06d69838d3d10ab1b51e23
-SHA1 (patch-bb) = 5017e070676b9e4613e02fe4b9d129c08abe6c7a
-SHA1 (patch-bc) = 6a95770dca37d1ed0379a0b0313589a44ae0b4b0
+SHA1 (patch-bb) = bf9a4725e5dc20af7cafbedd212f6e2e2d78fa71
+SHA1 (patch-bc) = 7e1ba2de0c29a8f89f3549f4b3b8d1dd9e4fbaa5
SHA1 (patch-bd) = cd2feeedffd78dbcc16b327d346afc0b14c78136
diff --git a/x11/pixman/patches/patch-aa b/x11/pixman/patches/patch-aa
index d2f0acf949a..65cb2633421 100644
--- a/x11/pixman/patches/patch-aa
+++ b/x11/pixman/patches/patch-aa
@@ -1,11 +1,13 @@
-$NetBSD: patch-aa,v 1.12 2011/01/26 19:25:55 drochner Exp $
+$NetBSD: patch-aa,v 1.13 2012/05/12 17:38:32 wiz Exp $
---- pixman/Makefile.am.orig 2011-01-19 12:13:01.000000000 +0000
+--- pixman/Makefile.am.orig 2012-01-27 15:45:27.000000000 +0000
+++ pixman/Makefile.am
-@@ -1,5 +1,5 @@
+@@ -2,7 +2,7 @@ include $(top_srcdir)/pixman/Makefile.so
+
lib_LTLIBRARIES = libpixman-1.la
+
-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 = @PTHREAD_LIBS@ @DEP_LIBS@ -lm
- libpixman_1_la_SOURCES = \
- pixman.h \
+ libpixman_1_la_SOURCES = $(libpixman_sources) $(libpixman_headers)
+
diff --git a/x11/pixman/patches/patch-ab b/x11/pixman/patches/patch-ab
index 0597def89af..2a4e2e04cd4 100644
--- a/x11/pixman/patches/patch-ab
+++ b/x11/pixman/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.12 2011/01/26 19:25:55 drochner Exp $
+$NetBSD: patch-ab,v 1.13 2012/05/12 17:38:32 wiz Exp $
---- pixman/Makefile.in.orig 2011-01-19 13:22:55.000000000 +0000
+--- pixman/Makefile.in.orig 2012-02-09 00:03:39.000000000 +0000
+++ pixman/Makefile.in
-@@ -358,7 +358,7 @@ top_srcdir = @top_srcdir@
+@@ -429,7 +429,7 @@ BUILT_SOURCES = \
lib_LTLIBRARIES = libpixman-1.la
libpixman_1_la_LDFLAGS = -version-info $(LT_VERSION_INFO) \
-no-undefined @PTHREAD_LDFLAGS@ $(am__append_2) \
-- $(am__append_7)
-+ $(am__append_7) -export-symbols $(PIXMAN_SYMFILE)
+- $(am__append_7) $(am__append_14)
++ $(am__append_7) $(am__append_14) -export-symbols $(PIXMAN_SYMFILE)
libpixman_1_la_LIBADD = @PTHREAD_LIBS@ @DEP_LIBS@ -lm $(am__append_3) \
$(am__append_5) $(am__append_8) $(am__append_10) \
- $(am__append_12)
+ $(am__append_12) $(am__append_15)
diff --git a/x11/pixman/patches/patch-ae b/x11/pixman/patches/patch-ae
deleted file mode 100644
index 933ee33fd38..00000000000
--- a/x11/pixman/patches/patch-ae
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ae,v 1.13 2011/07/11 10:50:58 drochner Exp $
-
---- configure.orig 2011-07-04 20:24:41.000000000 +0000
-+++ configure
-@@ -21325,7 +21325,7 @@ fi
- # if we're using Sun Studio and neither the user nor a config.site
- # has set CFLAGS.
- if test $SUNCC = yes && \
-- test "$test_CFLAGS" == "" && \
-+ test "$test_CFLAGS" = "" && \
- test "$CFLAGS" = "-g"
- then
- CFLAGS="-O -g"
-@@ -21767,6 +21767,7 @@ fi
-
-
-
-+if false; then
- { $as_echo "$as_me:$LINENO: checking whether the compiler supports -fvisibility=hidden" >&5
- $as_echo_n "checking whether the compiler supports -fvisibility=hidden... " >&6; }
- save_CFLAGS="$CFLAGS"
-@@ -21841,6 +21842,7 @@ rm -f core conftest.err conftest.$ac_obj
- fi
- { $as_echo "$as_me:$LINENO: result: $_yesno" >&5
- $as_echo "$_yesno" >&6; }
-+fi
-
-
- { $as_echo "$as_me:$LINENO: checking whether the compiler supports -xldscope=hidden" >&5
diff --git a/x11/pixman/patches/patch-bb b/x11/pixman/patches/patch-bb
index 57d7f59188e..d7a7daa7367 100644
--- a/x11/pixman/patches/patch-bb
+++ b/x11/pixman/patches/patch-bb
@@ -1,12 +1,12 @@
-$NetBSD: patch-bb,v 1.1 2011/10/27 16:52:51 drochner Exp $
+$NetBSD: patch-bb,v 1.2 2012/05/12 17:38:32 wiz Exp $
---- pixman/pixman-private.h.orig 2011-07-04 20:22:40.000000000 +0000
+--- pixman/pixman-private.h.orig 2012-02-09 00:00:47.000000000 +0000
+++ pixman/pixman-private.h
-@@ -595,6 +595,7 @@ _pixman_iter_get_scanline_noop (pixman_i
- #define FAST_PATH_ROTATE_90_TRANSFORM (1 << 21)
- #define FAST_PATH_ROTATE_180_TRANSFORM (1 << 22)
- #define FAST_PATH_ROTATE_270_TRANSFORM (1 << 23)
-+#define FAST_PATH_NEEDS_WORKAROUND (1 << 24)
+@@ -636,6 +636,7 @@ _pixman_iter_get_scanline_noop (pixman_i
+ #define FAST_PATH_SAMPLES_COVER_CLIP_NEAREST (1 << 23)
+ #define FAST_PATH_SAMPLES_COVER_CLIP_BILINEAR (1 << 24)
+ #define FAST_PATH_BITS_IMAGE (1 << 25)
++#define FAST_PATH_NEEDS_WORKAROUND (1 << 26)
#define FAST_PATH_PAD_REPEAT \
(FAST_PATH_NO_NONE_REPEAT | \
diff --git a/x11/pixman/patches/patch-bc b/x11/pixman/patches/patch-bc
index 4a94a9625b7..6543b0f28f9 100644
--- a/x11/pixman/patches/patch-bc
+++ b/x11/pixman/patches/patch-bc
@@ -1,6 +1,6 @@
-$NetBSD: patch-bc,v 1.1 2011/10/27 16:52:51 drochner Exp $
+$NetBSD: patch-bc,v 1.2 2012/05/12 17:38:32 wiz Exp $
---- pixman/pixman.c.orig 2011-07-04 20:22:40.000000000 +0000
+--- pixman/pixman.c.orig 2012-01-27 15:45:27.000000000 +0000
+++ pixman/pixman.c
@@ -162,6 +162,57 @@ optimize_operator (pixman_op_t op,
return operator_table[op].opaque_info[is_dest_opaque | is_source_opaque];
@@ -60,10 +60,10 @@ $NetBSD: patch-bc,v 1.1 2011/10/27 16:52:51 drochner Exp $
/*
* Computing composite region
*/
-@@ -690,6 +741,13 @@ pixman_image_composite32 (pixman_op_t
+@@ -586,6 +637,13 @@ pixman_image_composite32 (pixman_op_t
uint32_t src_flags, mask_flags, dest_flags;
pixman_region32_t region;
- pixman_box32_t *extents;
+ pixman_box32_t extents;
+ uint32_t *src_bits;
+ int src_dx, src_dy;
+ uint32_t *mask_bits;
@@ -74,7 +74,7 @@ $NetBSD: patch-bc,v 1.1 2011/10/27 16:52:51 drochner Exp $
pixman_implementation_t *imp;
pixman_composite_func_t func;
-@@ -727,6 +785,16 @@ pixman_image_composite32 (pixman_op_t
+@@ -623,6 +681,16 @@ pixman_image_composite32 (pixman_op_t
src_format = mask_format = PIXMAN_rpixbuf;
}
@@ -91,7 +91,7 @@ $NetBSD: patch-bc,v 1.1 2011/10/27 16:52:51 drochner Exp $
pixman_region32_init (&region);
if (!pixman_compute_composite_region32 (
-@@ -793,6 +861,13 @@ pixman_image_composite32 (pixman_op_t
+@@ -716,6 +784,13 @@ pixman_image_composite32 (pixman_op_t
}
out:
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-14 05:48:52 +0000