Revision: 16289 http://gar.svn.sourceforge.net/gar/?rev=16289&view=rev Author: dmichelsen Date: 2011-11-25 15:55:37 +0000 (Fri, 25 Nov 2011) Log Message: ----------- libgegl/trunk: Complete rework
Added Paths: ----------- csw/mgar/pkg/libgegl/trunk/ csw/mgar/pkg/libgegl/trunk/Makefile csw/mgar/pkg/libgegl/trunk/checksums csw/mgar/pkg/libgegl/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch Removed Paths: ------------- csw/mgar/pkg/libgegl/trunk/Makefile csw/mgar/pkg/libgegl/trunk/checksums Deleted: csw/mgar/pkg/libgegl/trunk/Makefile =================================================================== --- csw/mgar/pkg/babl/trunk/Makefile 2011-11-15 10:21:50 UTC (rev 16195) +++ csw/mgar/pkg/libgegl/trunk/Makefile 2011-11-25 15:55:37 UTC (rev 16289) @@ -1,40 +0,0 @@ -NAME = babl -VERSION = 0.1.2 -CATEGORIES = gnome - -DESCRIPTION = babl is 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 - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - -# 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 = - -CONFIGURE_ARGS = $(DIRPATHS) - -# STRIP_LIBTOOL = 1 -PATCHFILES += patch-xml_insert.sh - -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 - -TEST_SCRIPTS = - -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 Copied: csw/mgar/pkg/libgegl/trunk/Makefile (from rev 16282, csw/mgar/pkg/babl/trunk/Makefile) =================================================================== --- csw/mgar/pkg/libgegl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libgegl/trunk/Makefile 2011-11-25 15:55:37 UTC (rev 16289) @@ -0,0 +1,56 @@ +NAME = gegl +VERSION = 0.1.8 +CATEGORIES = gnome + +DESCRIPTION = A graph based image processing framework +define BLURB +endef + +MASTER_SITES = http://ftp.gtk.org/pub/gegl/$(shell echo $(VERSION) | awk -F. '{print $$1"."$$2}')/ +DISTFILES += $(NAME)-$(VERSION).tar.bz2 + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +VENDOR_URL = http://gegl.org/ + +BUILD_DEP_PKGS += CSWlibpng-dev +BUILD_DEP_PKGS += CSWlibrsvg-dev +BUILD_DEP_PKGS += CSWlibsdldevel +BUILD_DEP_PKGS += CSWasciidoc +BUILD_DEP_PKGS += CSWlua + +PACKAGES += CSWlibgegl0-1-0 +SPKG_DESC_CSWlibgegl0-1-0 = A graph based image processing framework library, libgegl-0.1.so.0 +PKGFILES_CSWlibgegl0-1-0 += $(call pkgfiles_lib,libgegl-0.1.so.0) +PKGFILES_CSWlibgegl0-1-0 += $(call baseisadirs,$(libdir),gegl-0.1/.*) +RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibsdl +RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibbabl0-1-0 +RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWjasper +RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWgtk2 +RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibjpeg62 +RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWglib2 +OBSOLETED_BY_CSWlibgegl0-1-0 += CSWlibgegl + +PACKAGES += CSWlibgegl-dev +SPKG_DESC_CSWlibgegl-dev = Development files for +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibgegl-dev += CSWlibgegl0-1-0 + +PACKAGES += CSWgegl +SPKG_DESC_CSWgegl = The gegl image processing utility +PKGFILES_CSWgegl += $(call baseisadirs,$(bindir),gegl) +RUNTIME_DEP_PKGS_CSWgegl += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgegl += CSWlibbabl0-1-0 +RUNTIME_DEP_PKGS_CSWgegl += CSWlibgegl0-1-0 +RUNTIME_DEP_PKGS_CSWgegl += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWgegl += CSWglib2 + +BUILD64 = 1 +ISAEXEC = 1 + +include gar/category.mk + +# For diff option --report-identical-files +PATH := /opt/csw/gnu:$(PATH) Deleted: csw/mgar/pkg/libgegl/trunk/checksums =================================================================== --- csw/mgar/pkg/babl/trunk/checksums 2011-11-15 10:21:50 UTC (rev 16195) +++ csw/mgar/pkg/libgegl/trunk/checksums 2011-11-25 15:55:37 UTC (rev 16289) @@ -1,2 +0,0 @@ -8eebd8d78d3173db7af5e3e60b1e03ea babl-0.1.2.tar.bz2 -90be8f7b8dd32a8a94964953449c5c42 patch-xml_insert.sh Copied: csw/mgar/pkg/libgegl/trunk/checksums (from rev 16276, csw/mgar/pkg/babl/trunk/checksums) =================================================================== --- csw/mgar/pkg/libgegl/trunk/checksums (rev 0) +++ csw/mgar/pkg/libgegl/trunk/checksums 2011-11-25 15:55:37 UTC (rev 16289) @@ -0,0 +1 @@ +c8279b86b3d584ee4f503839fc500425 gegl-0.1.8.tar.bz2 Copied: csw/mgar/pkg/libgegl/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch (from rev 16276, csw/mgar/pkg/babl/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch) =================================================================== --- csw/mgar/pkg/libgegl/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch (rev 0) +++ csw/mgar/pkg/libgegl/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch 2011-11-25 15:55:37 UTC (rev 16289) @@ -0,0 +1,113 @@ +From 2aebaf7b99852121d4314ea77f20b395f959d9f3 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen <d...@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. _______________________________________________ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel