[csw-devel] SF.net SVN: gar:[16422] csw/mgar/pkg/libgegl/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Dec 8 20:06:52 CET 2011
Revision: 16422
http://gar.svn.sourceforge.net/gar/?rev=16422&view=rev
Author: dmichelsen
Date: 2011-12-08 19:06:51 +0000 (Thu, 08 Dec 2011)
Log Message:
-----------
libgegl/trunk: Complete rework
Modified Paths:
--------------
csw/mgar/pkg/libgegl/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/libgegl/trunk/files/0001-Enforce-array-size-even-if-zero-length.patch
csw/mgar/pkg/libgegl/trunk/files/0002-Keep-norunpath-during-linkage.patch
Removed Paths:
-------------
csw/mgar/pkg/libgegl/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch
csw/mgar/pkg/libgegl/trunk/files/patch-xml_insert.sh
Modified: csw/mgar/pkg/libgegl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libgegl/trunk/Makefile 2011-12-08 18:59:20 UTC (rev 16421)
+++ csw/mgar/pkg/libgegl/trunk/Makefile 2011-12-08 19:06:51 UTC (rev 16422)
@@ -9,13 +9,16 @@
MASTER_SITES = http://ftp.gtk.org/pub/gegl/$(shell echo $(VERSION) | awk -F. '{print $$1"."$$2}')/
DISTFILES += $(NAME)-$(VERSION).tar.bz2
+PATCHFILES += 0001-Enforce-array-size-even-if-zero-length.patch
+PATCHFILES += 0002-Keep-norunpath-during-linkage.patch
+
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 += CSWlibsdl-dev
BUILD_DEP_PKGS += CSWasciidoc
BUILD_DEP_PKGS += CSWlua
@@ -24,13 +27,23 @@
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 += CSWlibsdl1-2-0
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
+RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibrsvg2-2
+RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWilmbase
+RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWpango
+RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWopenexrrt
+RUNTIME_DEP_PKGS_CSWlibgegl0-1-0 += CSWlibgio2-0-0
OBSOLETED_BY_CSWlibgegl0-1-0 += CSWlibgegl
PACKAGES += CSWlibgegl-dev
@@ -45,8 +58,22 @@
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
+RUNTIME_DEP_PKGS_CSWgegl += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWgegl += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWgegl += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWgegl += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWgegl += CSWlibgmodule2-0-0
+# There are zero-sized structs/unions used
+EXTRA_CXXFLAGS += -features=extensions
+EXTRA_CXXFLAGS += -features=zla -feat
+EXTRA_CXXFLAGS += -norunpath
+
+# We don't need it and if defined the test breaks
+LD_OPTIONS =
+EXTRA_LINKER_FLAGS += $(RUNPATH_LINKER_FLAGS)
+
+# librsvg is missing
BUILD64 = 1
ISAEXEC = 1
Added: csw/mgar/pkg/libgegl/trunk/files/0001-Enforce-array-size-even-if-zero-length.patch
===================================================================
--- csw/mgar/pkg/libgegl/trunk/files/0001-Enforce-array-size-even-if-zero-length.patch (rev 0)
+++ csw/mgar/pkg/libgegl/trunk/files/0001-Enforce-array-size-even-if-zero-length.patch 2011-12-08 19:06:51 UTC (rev 16422)
@@ -0,0 +1,25 @@
+From 12bba7cb6c0d79a212452ab0470c288a8b55fdec Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 8 Dec 2011 14:55:12 +0100
+Subject: [PATCH] Enforce array size, even if zero length
+
+---
+ gegl/gegl-lookup.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/gegl/gegl-lookup.h b/gegl/gegl-lookup.h
+index d1e239f..940690d 100644
+--- a/gegl/gegl-lookup.h
++++ b/gegl/gegl-lookup.h
+@@ -33,7 +33,7 @@ typedef struct GeglLookup
+ gint shift;
+ guint32 positive_min, positive_max, negative_min, negative_max;
+ guint32 bitmask[GEGL_LOOKUP_MAX_ENTRIES/32];
+- gfloat table[];
++ gfloat table[0];
+ } GeglLookup;
+
+
+--
+1.7.5.4
+
Deleted: csw/mgar/pkg/libgegl/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 2011-12-08 18:59:20 UTC (rev 16421)
+++ csw/mgar/pkg/libgegl/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch 2011-12-08 19:06:51 UTC (rev 16422)
@@ -1,113 +0,0 @@
-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
-
Added: csw/mgar/pkg/libgegl/trunk/files/0002-Keep-norunpath-during-linkage.patch
===================================================================
--- csw/mgar/pkg/libgegl/trunk/files/0002-Keep-norunpath-during-linkage.patch (rev 0)
+++ csw/mgar/pkg/libgegl/trunk/files/0002-Keep-norunpath-during-linkage.patch 2011-12-08 19:06:51 UTC (rev 16422)
@@ -0,0 +1,25 @@
+From 6e9141101cbe79f728e2a93c315fb5e5b63cf8dd Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 8 Dec 2011 18:34:01 +0100
+Subject: [PATCH] Keep -norunpath during linkage
+
+---
+ ltmain.sh | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/ltmain.sh b/ltmain.sh
+index c7d06c3..4e4e214 100644
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -5853,7 +5853,7 @@ func_mode_link ()
+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-norunpath)
+ func_quote_for_eval "$arg"
+ arg="$func_quote_for_eval_result"
+ func_append compile_command " $arg"
+--
+1.7.6.1
+
Deleted: csw/mgar/pkg/libgegl/trunk/files/patch-xml_insert.sh
===================================================================
--- csw/mgar/pkg/libgegl/trunk/files/patch-xml_insert.sh 2011-12-08 18:59:20 UTC (rev 16421)
+++ csw/mgar/pkg/libgegl/trunk/files/patch-xml_insert.sh 2011-12-08 19:06:51 UTC (rev 16422)
@@ -1,40 +0,0 @@
---- babl-0.1.2.orig/docs/tools/xml_insert.sh 2009-09-25 18:14:41.000000000 +0200
-+++ babl-0.1.2/docs/tools/xml_insert.sh 2010-02-18 13:57:12.000000000 +0100
-@@ -11,7 +11,7 @@
- #
- # FIXME: add argument checking / error handling
-
--: ${AWK="awk"}
-+: ${AWK="nawk"}
- : ${ECHO="echo"}
- : ${MKDIR="mkdir"}
- : ${SED="sed"}
-@@ -84,8 +84,27 @@
-
- $ECHO "X$my_tmpdir" | $Xsed
- }
-+# tmp_dir="`func_mktempdir`"
-+
-+func_perlfunc_mktempdir ()
-+{
-+ my_template="${TMPDIR-/tmp}/${1-$progname}"
-+ if test "$opt_dry_run" = ":"; then
-+ # Return a directory name, but don't create it in dry-run mode
-+ my_tmpdir="${my_template}-$$"
-+ else
-+ my_template="${my_template}-XXXXXXXX"
-+ my_tmpdir=`/opt/csw/bin/perl -e 'use File::Temp qw/ :mktemp /; print mkdtemp("'${my_template}'")."\n"'`
-+ if test ! -d "$my_tmpdir"; then
-+ func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
-+ fi
-+
-+ fi
-+
-+ $ECHO "X$my_tmpdir" | $Xsed
-+}
-+tmp_dir="`func_perlfunc_mktempdir`"
-
--tmp_dir="`func_mktempdir`"
- tmp_file="$tmp_dir/one"
-
- cp $1 $tmp_file
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