diff options
Diffstat (limited to 'x11/pixman/patches/patch-ab')
| -rw-r--r-- | x11/pixman/patches/patch-ab | 97 |
1 files changed, 13 insertions, 84 deletions
diff --git a/x11/pixman/patches/patch-ab b/x11/pixman/patches/patch-ab index a36e7212ef2..3df4f8ee435 100644 --- a/x11/pixman/patches/patch-ab +++ b/x11/pixman/patches/patch-ab @@ -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); - -- 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; - } +--- pixman/Makefile.in.orig 2008-06-09 12:35:15.000000000 -0400 ++++ pixman/Makefile.in +@@ -260,7 +260,8 @@ target_alias = @target_alias@ + 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) \ ++ -export-symbols $(PIXMAN_SYMFILE) + libpixman_1_la_LIBADD = @DEP_LIBS@ -lm $(am__append_2) $(am__append_4) \ + $(am__append_6) + libpixman_1_la_CFLAGS = -DPIXMAN_DISABLE_DEPRECATED |