diff options
author | bjs <bjs@pkgsrc.org> | 2008-06-19 17:51:27 +0000 |
---|---|---|
committer | bjs <bjs@pkgsrc.org> | 2008-06-19 17:51:27 +0000 |
commit | 0aa3d316dc24a3ac6cba1ac3fab2a1f792ad920f (patch) | |
tree | 3537ccce484796eef69d3a8da437a05f706dae5d | |
parent | 475ecc6951427fc9230aab5fac004efaf2abe9f1 (diff) | |
download | pkgsrc-0aa3d316dc24a3ac6cba1ac3fab2a1f792ad920f.tar.gz |
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.
-rw-r--r-- | x11/pixman/Makefile | 21 | ||||
-rw-r--r-- | x11/pixman/distinfo | 19 | ||||
-rw-r--r-- | x11/pixman/files/pixman.sym | 92 | ||||
-rw-r--r-- | x11/pixman/patches/patch-aa | 51 | ||||
-rw-r--r-- | x11/pixman/patches/patch-ab | 97 | ||||
-rw-r--r-- | x11/pixman/patches/patch-ac | 22 | ||||
-rw-r--r-- | x11/pixman/patches/patch-ad | 35 | ||||
-rw-r--r-- | x11/pixman/patches/patch-ae | 43 | ||||
-rw-r--r-- | x11/pixman/patches/patch-af | 74 |
9 files changed, 195 insertions, 259 deletions
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile index d51aa20f389..98849a5a300 100644 --- a/x11/pixman/Makefile +++ b/x11/pixman/Makefile @@ -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 @@ PKG_DESTDIR_SUPPORT= user-destdir 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 --git a/x11/pixman/distinfo b/x11/pixman/distinfo index 9b200608c5d..6d33d8ab652 100644 --- a/x11/pixman/distinfo +++ b/x11/pixman/distinfo @@ -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 --git a/x11/pixman/files/pixman.sym b/x11/pixman/files/pixman.sym new file mode 100644 index 00000000000..91e8846b6a2 --- /dev/null +++ b/x11/pixman/files/pixman.sym @@ -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 --git a/x11/pixman/patches/patch-aa b/x11/pixman/patches/patch-aa index 200ef593a8d..85335785ff1 100644 --- a/x11/pixman/patches/patch-aa +++ b/x11/pixman/patches/patch-aa @@ -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 --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 diff --git a/x11/pixman/patches/patch-ac b/x11/pixman/patches/patch-ac index aa16294b8c2..2f8d28164d6 100644 --- a/x11/pixman/patches/patch-ac +++ b/x11/pixman/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.5 2008/04/23 12:12:06 tnn Exp $ +$NetBSD: patch-ac,v 1.6 2008/06/19 17:51:27 bjs Exp $ ---- pixman/pixman-pict.c.orig 2008-03-27 06:58:20.000000000 -0400 -+++ pixman/pixman-pict.c -@@ -1428,6 +1428,8 @@ static const FastPathInfo mmx_fast_paths +--- pixman/pixman-private.h.orig 2008-06-09 01:56:34.000000000 -0400 ++++ pixman/pixman-private.h +@@ -701,7 +701,7 @@ pixman_compute_composite_region32 (pixma + uint16_t height); - { PIXMAN_OP_SRC, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_a8r8g8b8, fbCompositeCopyAreammx, 0 }, - { PIXMAN_OP_SRC, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_a8b8g8r8, fbCompositeCopyAreammx, 0 }, -+ { PIXMAN_OP_SRC, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_x8r8g8b8, fbCompositeCopyAreammx, 0 }, -+ { PIXMAN_OP_SRC, PIXMAN_a8b8g8r8, PIXMAN_null, PIXMAN_x8b8g8r8, fbCompositeCopyAreammx, 0 }, - { PIXMAN_OP_SRC, PIXMAN_x8r8g8b8, PIXMAN_null, PIXMAN_x8r8g8b8, fbCompositeCopyAreammx, 0 }, - { PIXMAN_OP_SRC, PIXMAN_x8b8g8r8, PIXMAN_null, PIXMAN_x8b8g8r8, fbCompositeCopyAreammx, 0 }, - { PIXMAN_OP_SRC, PIXMAN_r5g6b5, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeCopyAreammx, 0 }, + /* GCC visibility */ +-#if defined(__GNUC__) && __GNUC__ >= 4 ++#if 0 + #define PIXMAN_EXPORT __attribute__ ((visibility("default"))) + #else + #define PIXMAN_EXPORT diff --git a/x11/pixman/patches/patch-ad b/x11/pixman/patches/patch-ad index 9c3c3bcb3ea..eed1987c561 100644 --- a/x11/pixman/patches/patch-ad +++ b/x11/pixman/patches/patch-ad @@ -1,15 +1,26 @@ -$NetBSD: patch-ad,v 1.1 2008/04/07 15:02:05 bjs Exp $ +$NetBSD: patch-ad,v 1.2 2008/06/19 17:51:27 bjs Exp $ ---- pixman/pixman-private.h.orig 2008-03-24 09:13:13.000000000 -0400 -+++ pixman/pixman-private.h -@@ -332,10 +332,6 @@ union pixman_image - }; +--- configure.ac.orig 2008-06-09 12:32:10.000000000 -0400 ++++ configure.ac +@@ -112,14 +112,14 @@ dnl ==================================== + dnl -fvisibility stuff + have_gcc4=no +-AC_MSG_CHECKING(for -fvisibility) +-AC_COMPILE_IFELSE([ +-#if defined(__GNUC__) && (__GNUC__ >= 4) +-#else +-#error Need GCC 4.0 for visibility +-#endif ++dnl AC_MSG_CHECKING(for -fvisibility) ++dnl AC_COMPILE_IFELSE([ ++dnl #if defined(__GNUC__) && (__GNUC__ >= 4) ++dnl #else ++dnl #error Need GCC 4.0 for visibility ++dnl #endif + int main () { return 0; } +-], have_gcc4=yes) ++dnl ], have_gcc4=yes) --extern CombineFuncU pixman_fbCombineFuncU[]; --extern CombineFuncC pixman_fbCombineFuncC[]; --FASTCALL void pixman_fbCombineMaskU (uint32_t *src, const uint32_t *mask, int width); -- - #define LOG2_BITMAP_PAD 5 - #define FB_STIP_SHIFT LOG2_BITMAP_PAD - #define FB_STIP_UNIT (1 << FB_STIP_SHIFT) + if test "x$have_gcc4" = "xyes"; then + CFLAGS="$CFLAGS -fvisibility=hidden" diff --git a/x11/pixman/patches/patch-ae b/x11/pixman/patches/patch-ae index 018c843ae8b..e701c21d61f 100644 --- a/x11/pixman/patches/patch-ae +++ b/x11/pixman/patches/patch-ae @@ -1,24 +1,21 @@ -$NetBSD: patch-ae,v 1.2 2008/05/19 19:16:56 tnn Exp $ +$NetBSD: patch-ae,v 1.3 2008/06/19 17:51:27 bjs Exp $ ---- pixman/pixman.h.orig 2008-03-27 11:58:20.000000000 +0100 -+++ pixman/pixman.h -@@ -77,7 +77,7 @@ SOFTWARE. - #if defined (__SVR4) && defined (__sun) - # include <sys/int_types.h> - # include <stdint.h> --#elif defined (__OpenBSD__) -+#elif defined (__OpenBSD__) || defined(__sgi) - # include <inttypes.h> - #elif defined (_MSC_VER) - typedef __int8 int8_t; -@@ -563,10 +563,6 @@ pixman_bool_t pixman_image_set_filter - const pixman_fixed_t *filter_params, - int n_filter_params); - PIXMAN_EXPORT --void pixman_image_set_filter_params (pixman_image_t *image, -- pixman_fixed_t *params, -- int n_params); --PIXMAN_EXPORT - void pixman_image_set_source_clipping (pixman_image_t *image, - pixman_bool_t source_clipping); - PIXMAN_EXPORT +--- configure.orig 2008-06-09 12:35:16.000000000 -0400 ++++ configure +@@ -19770,6 +19770,7 @@ fi + + + have_gcc4=no ++if false; then + { echo "$as_me:$LINENO: checking for -fvisibility" >&5 + echo $ECHO_N "checking for -fvisibility... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF +@@ -19807,7 +19808,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 + 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 deleted file mode 100644 index c00fafc2efd..00000000000 --- a/x11/pixman/patches/patch-af +++ /dev/null @@ -1,74 +0,0 @@ -$NetBSD: patch-af,v 1.2 2008/04/27 11:58:09 tnn Exp $ - -Basically this patch: - -http://gitweb.freedesktop.org/?p=pixman.git;a=blobdiff;h=637f835221631b0f3d79d8 -f0f3b256883d34770b;hp=79997e15ea645ab74d2858b574b4e8b451fb8084;hb=0c33317f59b93f -5cab348619b1c38a5dce97de94;f=configure.ac - -... but also avoid --param inline-unit-growth with gcc3, -and don't attempt to use SSE2 if the SSE test failed. - ---- configure.orig 2008-03-27 15:02:11.000000000 +0100 -+++ configure -@@ -19762,7 +19762,11 @@ fi - echo "${ECHO_T}$have_gcc4" >&6; } - - --MMX_CFLAGS="-mmmx -Winline --param inline-unit-growth=10000 --param large-function-growth=10000" -+MMX_CFLAGS="-mmmx -Winline" -+ -+if test "x$have_gcc4" = "xyes"; then -+ MMX_CFLAGS="$MMX_CFLAGS --param inline-unit-growth=10000 --param large-function-growth=10000" -+fi - - have_mmx_intrinsics=no - { echo "$as_me:$LINENO: checking whether to use MMX intrinsics" >&5 -@@ -19839,6 +19843,9 @@ CFLAGS="$CFLAGS -msse $MMX_CFLAGS" - - cat >conftest.$ac_ext <<_ACEOF - -+#if defined(__GNUC__) && (__GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4)) -+#error "Need GCC >= 3.4 for SSE intrinsics" -+#endif - #if !defined(__amd64__) && !defined(__x86_64__) - #error "Need x86-64 for SSE" - #endif -@@ -19900,18 +19907,27 @@ fi - - - --SSE_CFLAGS="-mmmx -msse2 -Winline --param inline-unit-growth=10000 --param large-function-growth=10000" -+SSE_CFLAGS="-mmmx -msse2 -Winline" -+ -+if test "x$have_gcc4" = "xyes"; then -+ SSE_CFLAGS="$SSE_CFLAGS --param inline-unit-growth=10000 --param large-function-growth=10000 --param max-inline-insns-single=6000" -+fi - - have_sse2_intrinsics=no - { echo "$as_me:$LINENO: checking whether to use SSE2 intrinsics" >&5 - echo $ECHO_N "checking whether to use SSE2 intrinsics... $ECHO_C" >&6; } -+if test $have_sse_intrinsics = yes; then - xserver_save_CFLAGS=$CFLAGS --CFLAGS="$CFLAGS -msse2 $MMX_CFLAGS" -+CFLAGS="$CFLAGS -msse2 $SSE_CFLAGS" - - cat >conftest.$ac_ext <<_ACEOF - -+#if defined(__GNUC__) && (__GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4)) -+#error "Need GCC >= 3.4 for SSE2 intrinsics" -+#endif - #include <mmintrin.h> - #include <xmmintrin.h> -+#include <emmintrin.h> - int main () { - __m128i a, b, c; - c = _mm_xor_si128 (a, b); -@@ -19945,6 +19961,7 @@ fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS=$xserver_save_CFLAGS -+fi - { echo "$as_me:$LINENO: result: $have_sse2_intrinsics" >&5 - echo "${ECHO_T}$have_sse2_intrinsics" >&6; } - |