[csw-devel] SF.net SVN: gar:[13175] csw/mgar/pkg/pixman/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Wed Feb 2 16:21:14 CET 2011


Revision: 13175
          http://gar.svn.sourceforge.net/gar/?rev=13175&view=rev
Author:   dmichelsen
Date:     2011-02-02 15:21:14 +0000 (Wed, 02 Feb 2011)

Log Message:
-----------
pixman: Update to 0.21.4

Modified Paths:
--------------
    csw/mgar/pkg/pixman/trunk/Makefile
    csw/mgar/pkg/pixman/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/pixman/trunk/files/0001-Use-inttypes-if-stdint-is-not-available.patch

Removed Paths:
-------------
    csw/mgar/pkg/pixman/trunk/files/pixman-bits-image.c.diff
    csw/mgar/pkg/pixman/trunk/files/pixman-private.h.diff

Modified: csw/mgar/pkg/pixman/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pixman/trunk/Makefile	2011-02-02 15:06:56 UTC (rev 13174)
+++ csw/mgar/pkg/pixman/trunk/Makefile	2011-02-02 15:21:14 UTC (rev 13175)
@@ -1,5 +1,5 @@
 NAME      = pixman
-VERSION   = 0.18.0
+VERSION   = 0.21.4
 CATEGORIES   = lib
 
 DESCRIPTION = The pixel-manipulation library for X and cairo
@@ -9,20 +9,27 @@
 MASTER_SITES = http://www.cairographics.org/releases/
 DISTFILES = $(NAME)-$(VERSION).tar.gz
 
+PATCHFILES += 0001-Use-inttypes-if-stdint-is-not-available.patch
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-# Same as from gar/x11/categories/x11/category.mk
-EXTRA_CFLAGS = -xlibmil -errtags=yes -erroff=E_EMPTY_DECLARATION
-EXTRA_CXXFLAGS = -xlibmil -xlibmopt -features=tmplife -norunpath
+# It should be sufficient to add '-mt', but then I get
+# undefined symbol on ___tls_get_addr. Explicit linkage against libthread.so
+# solved it, but I am unsure if this is correct.
+EXTRA_CFLAGS = -mt
+EXTRA_LINKER_FLAGS = -mt -lthread
 
 BUILD64 = 1
 NOISALIST = 1
-
-PATCHFILES = pixman-private.h.diff
-
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --disable-gtk
-CONFIGURE_ARGS += --disable-timers
 
+CONFIGURE_ARGS-i386 = --disable-sse2
+CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(ISA))
+
+#CONFIGURE_ARGS += --disable-timers
+#CONFIGURE_ARGS += --disable-gcc-inline-asm
+# CONFIGURE_ARGS += --disable-openmp
+
 include gar/category.mk

Modified: csw/mgar/pkg/pixman/trunk/checksums
===================================================================
--- csw/mgar/pkg/pixman/trunk/checksums	2011-02-02 15:06:56 UTC (rev 13174)
+++ csw/mgar/pkg/pixman/trunk/checksums	2011-02-02 15:21:14 UTC (rev 13175)
@@ -1,2 +1 @@
-a4fb870fc325be258089f1683642e976  pixman-0.18.0.tar.gz
-f78d71433a7d574ff66b7d2bf3ea2a49  pixman-private.h.diff
+e50975ace979cd416a505827c15191b4  pixman-0.21.4.tar.gz

Added: csw/mgar/pkg/pixman/trunk/files/0001-Use-inttypes-if-stdint-is-not-available.patch
===================================================================
--- csw/mgar/pkg/pixman/trunk/files/0001-Use-inttypes-if-stdint-is-not-available.patch	                        (rev 0)
+++ csw/mgar/pkg/pixman/trunk/files/0001-Use-inttypes-if-stdint-is-not-available.patch	2011-02-02 15:21:14 UTC (rev 13175)
@@ -0,0 +1,32 @@
+From 51a0082ec56c17697871d3f08910a435fefefbe2 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 2 Feb 2011 16:17:35 +0100
+Subject: [PATCH] Use inttypes if stdint is not available
+
+---
+ test/lowlevel-blt-bench.c |    9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+diff --git a/test/lowlevel-blt-bench.c b/test/lowlevel-blt-bench.c
+index f7ebb1f..c3e402f 100644
+--- a/test/lowlevel-blt-bench.c
++++ b/test/lowlevel-blt-bench.c
+@@ -22,7 +22,14 @@
+  * DEALINGS IN THE SOFTWARE.
+  */
+ 
+-#include <stdint.h>
++#ifdef HAVE_STDINT_H
++#       include <stdint.h>
++#else
++# ifdef HAVE_INTTYPES_H
++#       include <inttypes.h>
++# endif
++#endif
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-- 
+1.7.3.2
+

Deleted: csw/mgar/pkg/pixman/trunk/files/pixman-bits-image.c.diff
===================================================================
--- csw/mgar/pkg/pixman/trunk/files/pixman-bits-image.c.diff	2011-02-02 15:06:56 UTC (rev 13174)
+++ csw/mgar/pkg/pixman/trunk/files/pixman-bits-image.c.diff	2011-02-02 15:21:14 UTC (rev 13175)
@@ -1,12 +0,0 @@
-diff --speed-large-files --minimal -Nru  pixman-0.15.12.orig/pixman/pixman-bits-image.c pixman-0.15.12/pixman/pixman-bits-image.c
---- pixman-0.15.12.orig/pixman/pixman-bits-image.c    2009-06-18 23:17:05.103503620 +0200
-+++ pixman-0.15.12/pixman/pixman-bits-image.c         2009-06-18 23:17:14.684711072 +0200
-@@ -251,7 +251,7 @@
-        coords[i + 1] = y;
-     }
-
--    return bits_image_fetch_pixels_src_clip (image, buffer, n_pixels);
-+    bits_image_fetch_pixels_src_clip (image, buffer, n_pixels);
- }
-
- #define N_TMP_PIXELS   (256)

Deleted: csw/mgar/pkg/pixman/trunk/files/pixman-private.h.diff
===================================================================
--- csw/mgar/pkg/pixman/trunk/files/pixman-private.h.diff	2011-02-02 15:06:56 UTC (rev 13174)
+++ csw/mgar/pkg/pixman/trunk/files/pixman-private.h.diff	2011-02-02 15:21:14 UTC (rev 13175)
@@ -1,11 +0,0 @@
-diff --speed-large-files --minimal -Nru  pixman-0.15.12.orig/pixman/pixman-private.h pixman-0.15.12/pixman/pixman-private.h
---- pixman-0.15.12.orig/pixman/pixman-private.h    2009-06-18 23:17:05.103503620 +0200
-+++ pixman-0.15.12/pixman/pixman-private.h         2009-06-18 23:17:14.684711072 +0200
-@@ -788,6 +788,7 @@
-                                                 pixman_region16_data_t *empty_data,
-                                                 pixman_region16_data_t *broken_data);
-
-+#undef PIXMAN_TIMERS
- #ifdef PIXMAN_TIMERS
-
- /* Timing */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


More information about the devel mailing list