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

[dmichelsen at users.sourceforge.net]

Revision: 15782
          http://gar.svn.sourceforge.net/gar/?rev=15782&view=rev
Author:   dmichelsen
Date:     2011-09-27 15:45:30 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
pixman: Update to 0.22.2 and general rework

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

Modified: csw/mgar/pkg/pixman/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pixman/trunk/Makefile	2011-09-27 15:17:53 UTC (rev 15781)
+++ csw/mgar/pkg/pixman/trunk/Makefile	2011-09-27 15:45:30 UTC (rev 15782)
@@ -1,5 +1,5 @@
 NAME      = pixman
-VERSION   = 0.21.4
+VERSION   = 0.22.2
 CATEGORIES   = lib
 
 DESCRIPTION = The pixel-manipulation library for X and cairo
@@ -9,35 +9,24 @@
 MASTER_SITES = http://www.cairographics.org/releases/
 DISTFILES = $(NAME)-$(VERSION).tar.gz
 
+# Use patch until this is fixed:
+#   https://bugs.freedesktop.org/show_bug.cgi?id=41257
 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
-
-PACKAGES += CSWpixman
-CATALOGNAME_CSWpixman = pixman
-SPKG_DESC_CSWpixman = Legacy package as contents moved to CSWlibpixman1-0
-PKGFILES_CSWpixman = NOFILES
-ARCHALL_CSWpixman = 1
-RUNTIME_DEP_PKGS_CSWpixman = CSWlibpixman1-0
-CHECKPKG_OVERRIDES_CSWpixman += surplus-dependency|CSWlibpixman1-0
-
 PACKAGES += CSWlibpixman1-0
 CATALOGNAME_CSWlibpixman1-0 = libpixman1_0
 SPKG_DESC_CSWlibpixman1-0 = The pixel-manipulation library for X and cairo, libpixman-1.so.0
-PKGFILES_CSWlibpixman1-0 += $(call baseisadirs,$(libdir),libpixman-1\.so\.0(\.\d+)*)
+PKGFILES_CSWlibpixman1-0 += $(call pkgfiles_lib,libpixman-1.so.0)
+OBSOLETED_BY_CSWlibpixman1-0 += CSWpixman
 
 PACKAGES += CSWlibpixman-dev
 CATALOGNAME_CSWlibpixman-dev = libpixman_dev
-SPKG_DESC_CSWlibpixman-dev = Development files for libpixman
+SPKG_DESC_CSWlibpixman-dev = Development files for libpixman-1.so.0
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibpixman-dev += CSWlibpixman1-0
 
-# 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
+EXTRA_LINKER_FLAGS = -mt
 
 BUILD64 = 1
 NOISALIST = 1
@@ -47,8 +36,6 @@
 CONFIGURE_ARGS-i386 = --disable-sse2
 CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(ISA))
 
-#CONFIGURE_ARGS += --disable-timers
-#CONFIGURE_ARGS += --disable-gcc-inline-asm
-# CONFIGURE_ARGS += --disable-openmp
+BUILD_ARGS += V=1
 
 include gar/category.mk

Modified: csw/mgar/pkg/pixman/trunk/checksums
===================================================================
--- csw/mgar/pkg/pixman/trunk/checksums	2011-09-27 15:17:53 UTC (rev 15781)
+++ csw/mgar/pkg/pixman/trunk/checksums	2011-09-27 15:45:30 UTC (rev 15782)
@@ -1 +1 @@
-e50975ace979cd416a505827c15191b4  pixman-0.21.4.tar.gz
+3dd0d9ed05dbf0e5e75d526ebae42e11  pixman-0.22.2.tar.gz

Modified: 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	2011-09-27 15:17:53 UTC (rev 15781)
+++ csw/mgar/pkg/pixman/trunk/files/0001-Use-inttypes-if-stdint-is-not-available.patch	2011-09-27 15:45:30 UTC (rev 15782)
@@ -1,14 +1,15 @@
-From 51a0082ec56c17697871d3f08910a435fefefbe2 Mon Sep 17 00:00:00 2001
+From a89ac61266679d7dd2fbaece6aad691ce712f533 Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen <dam at opencsw.org>
-Date: Wed, 2 Feb 2011 16:17:35 +0100
+Date: Tue, 27 Sep 2011 16:03:17 +0200
 Subject: [PATCH] Use inttypes if stdint is not available
 
 ---
- test/lowlevel-blt-bench.c |    9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
+ test/lowlevel-blt-bench.c   |    9 ++++++++-
+ test/scaling-helpers-test.c |   10 +++++++++-
+ 2 files changed, 17 insertions(+), 2 deletions(-)
 
 diff --git a/test/lowlevel-blt-bench.c b/test/lowlevel-blt-bench.c
-index f7ebb1f..c3e402f 100644
+index 67c845f..9a4c16f 100644
 --- a/test/lowlevel-blt-bench.c
 +++ b/test/lowlevel-blt-bench.c
 @@ -22,7 +22,14 @@
@@ -27,6 +28,25 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
+diff --git a/test/scaling-helpers-test.c b/test/scaling-helpers-test.c
+index c186138..4942a7f 100644
+--- a/test/scaling-helpers-test.c
++++ b/test/scaling-helpers-test.c
+@@ -1,5 +1,13 @@
+ #include <config.h>
+-#include <stdint.h>
++
++#ifdef HAVE_STDINT_H
++#	include <stdint.h>
++#else
++# ifdef HAVE_INTTYPES_H
++#	include <inttypes.h>
++# endif
++#endif
++
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <assert.h>
 -- 
-1.7.3.2
+1.7.6.1
 

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