[csw-devel] SF.net SVN: gar:[16276] csw/mgar/pkg/babl/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Fri Nov 25 13:06:15 CET 2011
Revision: 16276
http://gar.svn.sourceforge.net/gar/?rev=16276&view=rev
Author: dmichelsen
Date: 2011-11-25 12:06:14 +0000 (Fri, 25 Nov 2011)
Log Message:
-----------
babl/trunk: Update to 0.1.6, package split
Modified Paths:
--------------
csw/mgar/pkg/babl/trunk/Makefile
csw/mgar/pkg/babl/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/babl/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch
Modified: csw/mgar/pkg/babl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/babl/trunk/Makefile 2011-11-25 12:00:05 UTC (rev 16275)
+++ csw/mgar/pkg/babl/trunk/Makefile 2011-11-25 12:06:14 UTC (rev 16276)
@@ -1,40 +1,37 @@
NAME = babl
-VERSION = 0.1.2
+VERSION = 0.1.6
CATEGORIES = gnome
-DESCRIPTION = babl is a dynamic, any to any, pixel format translation library
+DESCRIPTION = A dynamic, any to any, pixel format translation library
define BLURB
babl is a library for dynamically handling pixel formats and managing
conversions between them. It is being used by GEGL.
endef
-MASTER_SITES = http://ftp.gnome.org/pub/gimp/babl/0.1/
-DISTFILES = $(NAME)-$(VERSION).tar.bz2
+MASTER_SITES = http://ftp.gtk.org/pub/babl/$(shell echo $(VERSION) | awk -F. '{print $$1"."$$2}')/
+DISTFILES += $(NAME)-$(VERSION).tar.bz2
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
+PATCHFILES += 0001-Use-inttypes.h-if-stdint.h-is-not-available.patch
-# If the url used to check for software update is different of MASTER_SITES, then
-# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
-# UPSTREAM_MASTER_SITES =
+PACKAGES += CSWlibbabl0-1-0
+SPKG_DESC_CSWlibbabl0-1-0 = A dynamic, any to any, pixel format translation library, libbabl-0.1.so.0
+PKGFILES_CSWlibbabl0-1-0 += $(call pkgfiles_lib,libbabl-0.1.so.0)
+PKGFILES_CSWlibbabl0-1-0 += $(call baseisadirs,$(libdir),babl-0.1/.*)
+OBSOLETED_BY_CSWlibbabl0-1-0 += CSWlibbabl
-CONFIGURE_ARGS = $(DIRPATHS)
+PACKAGES += CSWlibbabl-dev
+SPKG_DESC_CSWlibbabl-dev = Development files for libbabl-0.1.so.0
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibbabl-dev += CSWlibbabl0-1-0
-# STRIP_LIBTOOL = 1
-PATCHFILES += patch-xml_insert.sh
+BUILD64 = 1
-CHECKPKG_OVERRIDES_CSWbabl += symbol-not-found|CIE.so
-CHECKPKG_OVERRIDES_CSWbabl += symbol-not-found|gimp-8bit.so
-CHECKPKG_OVERRIDES_CSWbabl += symbol-not-found|gegl-fixups.so
-CHECKPKG_OVERRIDES_CSWbabl += symbol-not-found|gggl.so
-CHECKPKG_OVERRIDES_CSWbabl += symbol-not-found|gggl-lies.so
-CHECKPKG_OVERRIDES_CSWbabl += symbol-not-found|naive-CMYK.so
+REINPLACEMENTS += pthread
+REINPLACE_MATCH_pthread = -pthread
+REINPLACE_WITH_pthread = -lpthread
+REINPLACE_FILES_pthread = tests/Makefile.in
-TEST_SCRIPTS =
+# There is currently one test failing, upstream has been notified, disable for now.
+SKIPTEST ?= 1
include gar/category.mk
-
-post-configure-modulated:
- gfind $(WORKSRC) -name \*.c | xargs perl -pi \
- -e 's/stdint.h/limits.h/'
- perl -pi -e 's/-pthread/-lpthread/' $(WORKSRC)/tests/Makefile
Modified: csw/mgar/pkg/babl/trunk/checksums
===================================================================
--- csw/mgar/pkg/babl/trunk/checksums 2011-11-25 12:00:05 UTC (rev 16275)
+++ csw/mgar/pkg/babl/trunk/checksums 2011-11-25 12:06:14 UTC (rev 16276)
@@ -1,2 +1 @@
-8eebd8d78d3173db7af5e3e60b1e03ea babl-0.1.2.tar.bz2
-90be8f7b8dd32a8a94964953449c5c42 patch-xml_insert.sh
+dc960981a5ec5330fc1c177be9f59068 babl-0.1.6.tar.bz2
Added: csw/mgar/pkg/babl/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch
===================================================================
--- csw/mgar/pkg/babl/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch (rev 0)
+++ csw/mgar/pkg/babl/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch 2011-11-25 12:06:14 UTC (rev 16276)
@@ -0,0 +1,113 @@
+From 2aebaf7b99852121d4314ea77f20b395f959d9f3 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 25 Nov 2011 11:35:09 +0100
+Subject: [PATCH] Use inttypes.h if stdint.h is not available
+
+---
+ babl/babl-memory.c | 4 ++++
+ babl/babl-mutex.c | 4 ++++
+ babl/base/type-u16.c | 4 ++++
+ babl/base/type-u32.c | 4 ++++
+ babl/base/type-u8.c | 4 ++++
+ extensions/sse-fixups.c | 4 ++++
+ 6 files changed, 24 insertions(+), 0 deletions(-)
+
+diff --git a/babl/babl-memory.c b/babl/babl-memory.c
+index 6ceca90..799e91d 100644
+--- a/babl/babl-memory.c
++++ b/babl/babl-memory.c
+@@ -17,7 +17,11 @@
+ */
+
+ #include "config.h"
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#elif defined(HAVE_INTTYPES_H)
++#include <inttypes.h>
++#endif
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+diff --git a/babl/babl-mutex.c b/babl/babl-mutex.c
+index 3f82cc5..dce124b 100644
+--- a/babl/babl-mutex.c
++++ b/babl/babl-mutex.c
+@@ -17,7 +17,11 @@
+ */
+
+ #include "config.h"
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#elif defined(HAVE_INTTYPES_H)
++#include <inttypes.h>
++#endif
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+diff --git a/babl/base/type-u16.c b/babl/base/type-u16.c
+index 9fcad8b..7f1926a 100644
+--- a/babl/base/type-u16.c
++++ b/babl/base/type-u16.c
+@@ -18,7 +18,11 @@
+
+ #include "config.h"
+ #include <string.h>
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#elif defined(HAVE_INTTYPES_H)
++#include <inttypes.h>
++#endif
+ #include <assert.h>
+ #include <math.h>
+
+diff --git a/babl/base/type-u32.c b/babl/base/type-u32.c
+index fc38a01..6a31e8b 100644
+--- a/babl/base/type-u32.c
++++ b/babl/base/type-u32.c
+@@ -18,7 +18,11 @@
+
+ #include "config.h"
+ #include <string.h>
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#elif defined(HAVE_INTTYPES_H)
++#include <inttypes.h>
++#endif
+ #include <assert.h>
+ #include <math.h>
+
+diff --git a/babl/base/type-u8.c b/babl/base/type-u8.c
+index 9a67a0e..d4f804e 100644
+--- a/babl/base/type-u8.c
++++ b/babl/base/type-u8.c
+@@ -19,7 +19,11 @@
+ #include "config.h"
+ #include <string.h>
+ #include <assert.h>
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#elif defined(HAVE_INTTYPES_H)
++#include <inttypes.h>
++#endif
+
+ #include "babl-internal.h"
+ #include "babl-base.h"
+diff --git a/extensions/sse-fixups.c b/extensions/sse-fixups.c
+index 96c2585..7c98969 100644
+--- a/extensions/sse-fixups.c
++++ b/extensions/sse-fixups.c
+@@ -23,7 +23,11 @@
+
+ #if defined(__GNUC__) && (__GNUC__ >= 4) && defined(USE_SSE) && defined(USE_MMX)
+
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#elif defined(HAVE_INTTYPES_H)
++#include <inttypes.h>
++#endif
+ #include <stdlib.h>
+
+ #include "babl.h"
+--
+1.7.6.1
+
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