pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/pixman Update to pixman-0.11.4. No ChangeLog--you...
details: https://anonhg.NetBSD.org/pkgsrc/rev/829b9f6d7bd7
branches: trunk
changeset: 543527:829b9f6d7bd7
user: bjs <bjs%pkgsrc.org@localhost>
date: Thu Jun 19 17:51:27 2008 +0000
description:
Update to pixman-0.11.4. No ChangeLog--you may check the GIT history
if you're curious.
Also (this is noted in the Makefile):
The configure script is written to fail if it detects gcc<4.0
for lack of -fvisibility=hidden. In keeping with the pkgsrc
tradition of portability, we'll opt to use libtool to export
the desired symbols, hiding the rest.
I have verified the list of visible symbols is unchanged from
the "factory" build.
diffstat:
x11/pixman/Makefile | 21 +++++++--
x11/pixman/distinfo | 19 ++++----
x11/pixman/files/pixman.sym | 92 ++++++++++++++++++++++++++++++++++++++++++
x11/pixman/patches/patch-aa | 51 +++++------------------
x11/pixman/patches/patch-ab | 97 ++++++--------------------------------------
x11/pixman/patches/patch-ac | 22 +++++-----
x11/pixman/patches/patch-ad | 37 +++++++++++------
x11/pixman/patches/patch-ae | 43 +++++++++----------
x11/pixman/patches/patch-af | 74 ----------------------------------
9 files changed, 196 insertions(+), 260 deletions(-)
diffs (truncated from 515 to 300 lines):
diff -r 3f69973358a0 -r 829b9f6d7bd7 x11/pixman/Makefile
--- a/x11/pixman/Makefile Thu Jun 19 17:34:43 2008 +0000
+++ b/x11/pixman/Makefile Thu Jun 19 17:51:27 2008 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2008/05/24 21:45:20 tnn Exp $
+# $NetBSD: Makefile,v 1.12 2008/06/19 17:51:27 bjs Exp $
#
-DISTNAME= pixman-0.10.0
+DISTNAME= pixman-0.11.4
PKGNAME= ${DISTNAME:C/pl[0-9]*//}
-PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -16,10 +15,22 @@
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_TOOLS+= pkg-config
+USE_TOOLS+= pkg-config perl
PKGCONFIG_OVERRIDE+= pixman-1.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
+### tradition of portability, we'll opt to use libtool to export
+### the desired symbols, hiding the rest.
+###
+### I have verified the list of visible symbols is unchanged from
+### the "factory" build.
+###
+PIXMAN_SYMFILE= ${WRKDIR}/pixman.sym
+MAKE_ENV+= PIXMAN_SYMFILE=${PIXMAN_SYMFILE:Q}
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
+post-extract:
+ ${CP} ${FILESDIR}/pixman.sym ${WRKDIR}
.include "../../mk/bsd.pkg.mk"
diff -r 3f69973358a0 -r 829b9f6d7bd7 x11/pixman/distinfo
--- a/x11/pixman/distinfo Thu Jun 19 17:34:43 2008 +0000
+++ b/x11/pixman/distinfo Thu Jun 19 17:51:27 2008 +0000
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.12 2008/05/19 19:16:56 tnn Exp $
+$NetBSD: distinfo,v 1.13 2008/06/19 17:51:27 bjs Exp $
-SHA1 (pixman-0.10.0.tar.bz2) = 9262e945281877c42d484098de664dcf1a68d857
-RMD160 (pixman-0.10.0.tar.bz2) = 16c356f5fa3dfa4c0196456552daca3ab6244276
-Size (pixman-0.10.0.tar.bz2) = 312275 bytes
-SHA1 (patch-aa) = 56388eac3744ea78e4c2ba656d5c5110623a7de4
-SHA1 (patch-ab) = 5322a03dbcacca50898e3a318174cb47344da28e
-SHA1 (patch-ac) = 093aab2151261285506197e566dd3ae62b06b716
-SHA1 (patch-ad) = d35b932e5fb29b5022fc1f02a9568183ae4cdbd4
-SHA1 (patch-ae) = a3a572d46a1b6d3b2eacf6b84c79d418321c2c52
-SHA1 (patch-af) = c2f0cd54a1bcb342a9769b34b303b143735ddc3f
+SHA1 (pixman-0.11.4.tar.bz2) = e74dfcc6435edf7a397e8c42ffb4d581484e05d3
+RMD160 (pixman-0.11.4.tar.bz2) = 000ec544e1c25b6ef955eed098c3906b095e10d5
+Size (pixman-0.11.4.tar.bz2) = 330235 bytes
+SHA1 (patch-aa) = dbb1a2ef0c8f9db1e4897b60b3c8b6dc8a44dd39
+SHA1 (patch-ab) = 41634a1a885fcf08800073ccd094db4f02020e3a
+SHA1 (patch-ac) = cce53aed1451e328a57c2f3dc80391b3959194af
+SHA1 (patch-ad) = c7fe169e062bbdc58db484874409a502f0f80018
+SHA1 (patch-ae) = c040428b7a1bad8c5c5f95dd7e96ffecc9d74b49
diff -r 3f69973358a0 -r 829b9f6d7bd7 x11/pixman/files/pixman.sym
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/pixman/files/pixman.sym Thu Jun 19 17:51:27 2008 +0000
@@ -0,0 +1,92 @@
+pixman_add_trapezoids
+pixman_add_traps
+pixman_blt
+pixman_compute_composite_region
+pixman_edge_init
+pixman_edge_step
+pixman_fill
+pixman_format_supported_destination
+pixman_format_supported_source
+pixman_image_composite
+pixman_image_create_bits
+pixman_image_create_conical_gradient
+pixman_image_create_linear_gradient
+pixman_image_create_radial_gradient
+pixman_image_create_solid_fill
+pixman_image_fill_rectangles
+pixman_image_get_data
+pixman_image_get_depth
+pixman_image_get_height
+pixman_image_get_stride
+pixman_image_get_width
+pixman_image_ref
+pixman_image_set_accessors
+pixman_image_set_alpha_map
+pixman_image_set_clip_region
+pixman_image_set_clip_region32
+pixman_image_set_component_alpha
+pixman_image_set_filter
+pixman_image_set_has_client_clip
+pixman_image_set_indexed
+pixman_image_set_repeat
+pixman_image_set_source_clipping
+pixman_image_set_transform
+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
+pixman_region32_init
+pixman_region32_init_rect
+pixman_region32_init_rects
+pixman_region32_init_with_extents
+pixman_region32_intersect
+pixman_region32_inverse
+pixman_region32_n_rects
+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
+pixman_region_init
+pixman_region_init_rect
+pixman_region_init_rects
+pixman_region_init_with_extents
+pixman_region_intersect
+pixman_region_inverse
+pixman_region_n_rects
+pixman_region_not_empty
+pixman_region_rectangles
+pixman_region_reset
+pixman_region_selfcheck
+pixman_region_set_static_pointers
+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
+pixman_version
+pixman_version_string
diff -r 3f69973358a0 -r 829b9f6d7bd7 x11/pixman/patches/patch-aa
--- a/x11/pixman/patches/patch-aa Thu Jun 19 17:34:43 2008 +0000
+++ b/x11/pixman/patches/patch-aa Thu Jun 19 17:51:27 2008 +0000
@@ -1,41 +1,12 @@
-$NetBSD: patch-aa,v 1.6 2008/04/07 15:02:05 bjs Exp $
+$NetBSD: patch-aa,v 1.7 2008/06/19 17:51:27 bjs Exp $
---- pixman/pixman-combine.c.orig 2008-03-24 09:13:13.000000000 -0400
-+++ pixman/pixman-combine.c
-@@ -17,7 +17,7 @@
- /*
- * Combine src and mask
- */
--FASTCALL void
-+FASTCALL static void
- pixman_fbCombineMaskU (uint32_t *src, const uint32_t *mask, int width)
- {
- int i;
-@@ -1165,7 +1165,7 @@ fbCombineConjointXorC (uint32_t *dest, u
- fbCombineConjointGeneralC (dest, src, mask, width, CombineXor);
- }
-
--CombineFuncU pixman_fbCombineFuncU[] = {
-+static CombineFuncU pixman_fbCombineFuncU[] = {
- fbCombineClear,
- fbCombineSrcU,
- NULL, /* CombineDst */
-@@ -1212,7 +1212,7 @@ CombineFuncU pixman_fbCombineFuncU[] = {
- fbCombineConjointXorU,
- };
-
--CombineFuncC pixman_fbCombineFuncC[] = {
-+static CombineFuncC pixman_fbCombineFuncC[] = {
- fbCombineClearC,
- fbCombineSrcC,
- NULL, /* Dest */
-@@ -1258,3 +1258,9 @@ CombineFuncC pixman_fbCombineFuncC[] = {
- fbCombineConjointAtopReverseC,
- fbCombineConjointXorC,
- };
-+
-+FbComposeFunctions pixman_composeFunctions = {
-+ pixman_fbCombineFuncU,
-+ pixman_fbCombineFuncC,
-+ pixman_fbCombineMaskU
-+};
+--- 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) \
++ -export-symbols $(PIXMAN_SYMFILE)
+ libpixman_1_la_LIBADD = @DEP_LIBS@ -lm
+ libpixman_1_la_CFLAGS = -DPIXMAN_DISABLE_DEPRECATED
+ libpixman_1_la_SOURCES = \
diff -r 3f69973358a0 -r 829b9f6d7bd7 x11/pixman/patches/patch-ab
--- a/x11/pixman/patches/patch-ab Thu Jun 19 17:34:43 2008 +0000
+++ b/x11/pixman/patches/patch-ab Thu Jun 19 17:51:27 2008 +0000
@@ -1,85 +1,14 @@
-$NetBSD: patch-ab,v 1.5 2008/04/07 15:02:05 bjs Exp $
+$NetBSD: patch-ab,v 1.6 2008/06/19 17:51:27 bjs Exp $
---- pixman/pixman-compose.c.orig 2008-03-24 09:13:13.000000000 -0400
-+++ pixman/pixman-compose.c
-@@ -37,7 +37,6 @@
-
- #ifdef PIXMAN_FB_ACCESSORS
- #define PIXMAN_COMPOSITE_RECT_GENERAL pixman_composite_rect_general_accessors
--#define PIXMAN_COMPOSE_FUNCTIONS pixman_composeFunctions_accessors
-
- #define FETCH_PROC_FOR_PICTURE pixman_fetchProcForPicture_accessors
- #define FETCH_PIXEL_PROC_FOR_PICTURE pixman_fetchPixelProcForPicture_accessors
-@@ -50,7 +49,6 @@
- #else
-
- #define PIXMAN_COMPOSITE_RECT_GENERAL pixman_composite_rect_general_no_accessors
--#define PIXMAN_COMPOSE_FUNCTIONS pixman_composeFunctions
-
- #define FETCH_PROC_FOR_PICTURE pixman_fetchProcForPicture
- #define FETCH_PIXEL_PROC_FOR_PICTURE pixman_fetchPixelProcForPicture
-@@ -142,15 +140,6 @@ static void fbFetch(bits_image_t * pict,
- fetch(pict, x, y, width, buffer);
- }
-
--#ifdef PIXMAN_FB_ACCESSORS /* The accessor version can't be parameterized from outside */
--static const
--#endif
--FbComposeFunctions PIXMAN_COMPOSE_FUNCTIONS = {
-- pixman_fbCombineFuncU,
-- pixman_fbCombineFuncC,
-- pixman_fbCombineMaskU
--};
--
- static void
- fbStore(bits_image_t * pict, int x, int y, int width, uint32_t *buffer)
- {
-@@ -313,7 +302,7 @@ PIXMAN_COMPOSITE_RECT_GENERAL (const FbC
- PIXMAN_FORMAT_RGB (data->mask->bits.format))
- {
- uint32_t *mask_buffer = dest_buffer + data->width;
-- CombineFuncC compose = PIXMAN_COMPOSE_FUNCTIONS.combineC[data->op];
-+ CombineFuncC compose = pixman_composeFunctions.combineC[data->op];
- if (!compose)
- return;
-
-@@ -377,7 +366,7 @@ PIXMAN_COMPOSITE_RECT_GENERAL (const FbC
- else
- {
- uint32_t *src_mask_buffer = 0, *mask_buffer = 0;
-- CombineFuncU compose = PIXMAN_COMPOSE_FUNCTIONS.combineU[data->op];
-+ CombineFuncU compose = pixman_composeFunctions.combineU[data->op];
- if (!compose)
- return;
-
-@@ -406,7 +395,7 @@ PIXMAN_COMPOSITE_RECT_GENERAL (const FbC
-
- if (mask_buffer)
- {
-- PIXMAN_COMPOSE_FUNCTIONS.combineU[PIXMAN_OP_IN] (mask_buffer, src_buffer, data->width);
-+ pixman_composeFunctions.combineU[PIXMAN_OP_IN] (mask_buffer, src_buffer, data->width);
- src_mask_buffer = mask_buffer;
- }
- else
-@@ -421,9 +410,9 @@ PIXMAN_COMPOSITE_RECT_GENERAL (const FbC
- 0xff000000);
-
- if (mask_buffer)
-- PIXMAN_COMPOSE_FUNCTIONS.combineMaskU (src_buffer,
-- mask_buffer,
-- data->width);
-+ pixman_composeFunctions.combineMaskU (src_buffer,
-+ mask_buffer,
-+ data->width);
-
- src_mask_buffer = src_buffer;
- }
-@@ -433,7 +422,7 @@ PIXMAN_COMPOSITE_RECT_GENERAL (const FbC
- fetchMask (data->mask, data->xMask, data->yMask + i,
- data->width, mask_buffer, 0, 0);
Home |
Main Index |
Thread Index |
Old Index