[csw-devel] SF.net SVN: gar:[18632] csw/mgar/pkg/exiv2/trunk
cgrzemba at users.sourceforge.net
cgrzemba at users.sourceforge.net
Wed Jul 4 11:28:54 CEST 2012
Revision: 18632
http://gar.svn.sourceforge.net/gar/?rev=18632&view=rev
Author: cgrzemba
Date: 2012-07-04 09:28:53 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
exiv2/trunk: Initial commit
> * g++ build
> * Studio compiles with -library=stlport4, but do not link
Modified Paths:
--------------
csw/mgar/pkg/exiv2/trunk/Makefile
csw/mgar/pkg/exiv2/trunk/files/0002-fix-depend-flag-config.mk.in.patch
csw/mgar/pkg/exiv2/trunk/files/0003-type-cast-basicio.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0004-rsc-remove-error.cpp.patch
Added Paths:
-----------
csw/mgar/pkg/exiv2/trunk/files/0002-fix-test-flag-config.mk.in.patch
csw/mgar/pkg/exiv2/trunk/files/0005-include-XML_Node.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-actions.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-basicio.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-bmpimage.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-canonmn.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-convert.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-cr2image.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-dataset.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-easyaccess.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-epsimage.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-exiv2.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-futils.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-gifimage.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-jp2image.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-jpgimage.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-makernote.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-mrwimage.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-pgfimage.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-pngchunk.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-pngimage.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-preview.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-proteries.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-psdimage.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-rafimage.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-tags.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-tgaimage.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-tiffcomposite.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-tiffvisitor.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-types.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-utils.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-value.cpp.patch
csw/mgar/pkg/exiv2/trunk/files/0006-include-xmpsidecar.cpp.patch
Modified: csw/mgar/pkg/exiv2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/exiv2/trunk/Makefile 2012-07-04 08:06:19 UTC (rev 18631)
+++ csw/mgar/pkg/exiv2/trunk/Makefile 2012-07-04 09:28:53 UTC (rev 18632)
@@ -13,24 +13,93 @@
MASTER_SITES = http://www.exiv2.org/
DISTFILES = $(NAME)-$(VERSION).tar.gz
-PATCHFILES += 0001-Remove-unknown-flag-to-Sun-Studio.patch
-PATCHFILES += 0002-fix-depend-flag-config.mk.in.patch
-PATCHFILES += 0003-type-cast-basicio.cpp.patch
-PATCHFILES += 0004-rsc-remove-error.cpp.patch
-GARCOMPILER = SOS12U3
+BUILD_DEP_PKGS += CSWlibexpat-dev
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+PATCHFILES += 0002-fix-test-flag-config.mk.in.patch
+# Patches for Sun-Studio Compiler
+# PATCHFILES += 0001-Remove-unknown-flag-to-Sun-Studio.patch
+# PATCHFILES += 0002-fix-depend-flag-config.mk.in.patch
+# PATCHFILES += 0003-type-cast-basicio.cpp.patch
+# PATCHFILES += 0004-rsc-remove-error.cpp.patch
+# PATCHFILES += 0005-include-XML_Node.cpp.patch
+# PATCHFILES += 0006-include-basicio.cpp.patch
+# PATCHFILES += 0006-include-bmpimage.cpp.patch
+# PATCHFILES += 0006-include-canonmn.cpp.patch
+# PATCHFILES += 0006-include-convert.cpp.patch
+# PATCHFILES += 0006-include-cr2image.cpp.patch
+# PATCHFILES += 0006-include-dataset.cpp.patch
+# PATCHFILES += 0006-include-easyaccess.cpp.patch
+# PATCHFILES += 0006-include-epsimage.cpp.patch
+# PATCHFILES += 0006-include-futils.cpp.patch
+# PATCHFILES += 0006-include-gifimage.cpp.patch
+# PATCHFILES += 0006-include-jp2image.cpp.patch
+# PATCHFILES += 0006-include-jpgimage.cpp.patch
+# PATCHFILES += 0006-include-makernote.cpp.patch
+# PATCHFILES += 0006-include-mrwimage.cpp.patch
+# PATCHFILES += 0006-include-pgfimage.cpp.patch
+# PATCHFILES += 0006-include-pngchunk.cpp.patch
+# PATCHFILES += 0006-include-pngimage.cpp.patch
+# PATCHFILES += 0006-include-preview.cpp.patch
+# PATCHFILES += 0006-include-proteries.cpp.patch
+# PATCHFILES += 0006-include-psdimage.cpp.patch
+# PATCHFILES += 0006-include-rafimage.cpp.patch
+# PATCHFILES += 0006-include-tags.cpp.patch
+# PATCHFILES += 0006-include-tgaimage.cpp.patch
+# PATCHFILES += 0006-include-tiffcomposite.cpp.patch
+# PATCHFILES += 0006-include-tiffvisitor.cpp.patch
+# PATCHFILES += 0006-include-types.cpp.patch
+# PATCHFILES += 0006-include-value.cpp.patch
-BUILD64_LIBS_ONLY = 1
+GARCOMPILER = GCC4 # SOS12U3
+PACKAGES += CSWlibexiv2-12
+CATALOGNAME_CSWlibexiv2-12 = libexiv2_12
+PKGFILES_CSWlibexiv2-12 += $(call baseisadirs,$(libdir),libexiv2\.so\.12\.0\.0)
+PKGFILES_CSWlibexiv2-12 += $(call baseisadirs,$(libdir),libexiv2\.so\.12(\.\d+)*)
+SPKG_DESC_CSWlibexiv2-12 += $(DESCRIPTION), libexiv2.so.12
+RUNTIME_DEP_PKGS_CSWlibexiv2-12 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWlibexiv2-12 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibexiv2-12 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibexiv2-12 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibexiv2-12 += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWlibexiv2-12 += CSWlibgcc-s1
+CHECKPKG_OVERRIDES_CSWlibexiv2-12 += file-with-bad-content|/usr/local|root/opt/csw/lib/libexiv2.so.12.0.0
+
+
+PACKAGES += CSWexiv2-dev
+CATALOGNAME_CSWexiv2-dev = exiv2_dev
+SPKG_DESC_CSWexiv2-dev += $(DESCRIPTION), development files
+PKGFILES_CSWexiv2-dev += /opt/csw/lib/libexiv2.so
+PKGFILES_CSWexiv2-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWexiv2-dev += CSWlibexiv2-12
+
+PACKAGES += CSWexiv2
+CATALOGNAME_CSWexiv2 = exiv2
+SPKG_DESC_CSWexiv2 += $(DESCRIPTION), tools
+RUNTIME_DEP_PKGS_CSWexiv2 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWexiv2 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWexiv2 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWexiv2 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWexiv2 += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWexiv2 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWexiv2 += CSWlibexiv2-12
+CHECKPKG_OVERRIDES_CSWexiv2 += file-with-bad-content|/usr/local|root/opt/csw/bin/exiv2
+
+# BUILD64_LIBS_ONLY = 1
+
+# Options for Sun-Studio-Compiler
# see: http://solaris.bionicmutton.org/hg/kde4-specs-460/file/26c2cab27bbe/specs/patches/exiv2/0.14/README.STUDIO12
-EXTRA_CXXFLAGS = -features=anachronisms,except,rtti,export,extensions,nestedaccess,tmplife,tmplrefstatic
+# EXTRA_CXXFLAGS = -features=anachronisms,except,rtti,export,extensions,nestedaccess,tmplife,tmplrefstatic -library=stlport4
+# EXTRA_LINKER_FLAGS += -library=stlport4
+EXTRA_LINKER_FLAGS += -lintl
+SKIPTEST = 1
+
CONFIGURE_ARGS = $(DIRPATHS)
-
# Sun Studio doesn't unerstand g++ features
-CONFIGURE_ARGS += --disable-visibility
+# CONFIGURE_ARGS += --disable-visibility
include gar/category.mk
+
+PATH:=/opt/csw/gnu:$(PATH)
Modified: csw/mgar/pkg/exiv2/trunk/files/0002-fix-depend-flag-config.mk.in.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0002-fix-depend-flag-config.mk.in.patch 2012-07-04 08:06:19 UTC (rev 18631)
+++ csw/mgar/pkg/exiv2/trunk/files/0002-fix-depend-flag-config.mk.in.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -1,6 +1,6 @@
--- a/config/config.mk.in
+++ b/config/config.mk.in
-@@ -129,14 +129,14 @@ ifdef DEP_TRACKING
+@@ -129,11 +129,11 @@ ifdef DEP_TRACKING
# dependencies. If you're not using gcc, you may need to change
# this to something suitable for your compiler or simply unset
# the variable. See the link above for suggestions.
@@ -8,13 +8,9 @@
+ MAKEDEPEND = $(CXX) -xM1 $(CPPFLAGS) -o $*.d $<
# Dependency files post-process commands
-- POSTDEPEND = if test ! -d $(DEPDIR); then mkdir $(DEPDIR); fi; \
-+ POSTDEPEND = $(shell if test ! -d $(DEPDIR); then mkdir $(DEPDIR); fi; \
- if test -e $*.d; then cp $*.d $(DEPDIR)/$*.d; \
+ POSTDEPEND = if test ! -d $(DEPDIR); then mkdir $(DEPDIR); fi; \
+- if test -e $*.d; then cp $*.d $(DEPDIR)/$*.d; \
++ if test -f $*.d; then cp $*.d $(DEPDIR)/$*.d; \
sed -e 's/^\#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $(DEPDIR)/$*.d; \
-- $(RM) $*.d; fi
-+ $(RM) $*.d; fi)
-
- # Compiler flags to generate dependency files at the same time
- # as object files (for gcc)
+ $(RM) $*.d; fi
Added: csw/mgar/pkg/exiv2/trunk/files/0002-fix-test-flag-config.mk.in.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0002-fix-test-flag-config.mk.in.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0002-fix-test-flag-config.mk.in.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,11 @@
+--- a/config/config.mk.in
++++ b/config/config.mk.in
+@@ -133,7 +133,7 @@ ifdef DEP_TRACKING
+
+ # Dependency files post-process commands
+ POSTDEPEND = if test ! -d $(DEPDIR); then mkdir $(DEPDIR); fi; \
+- if test -e $*.d; then cp $*.d $(DEPDIR)/$*.d; \
++ if test -f $*.d; then cp $*.d $(DEPDIR)/$*.d; \
+ sed -e 's/^\#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+ -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $(DEPDIR)/$*.d; \
+ $(RM) $*.d; fi
Modified: csw/mgar/pkg/exiv2/trunk/files/0003-type-cast-basicio.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0003-type-cast-basicio.cpp.patch 2012-07-04 08:06:19 UTC (rev 18631)
+++ csw/mgar/pkg/exiv2/trunk/files/0003-type-cast-basicio.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -1,5 +1,3 @@
-diff --git a/src/basicio.cpp b/src/basicio.cpp
-index 0343dff..174e8a7 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -312,7 +312,7 @@ namespace Exiv2 {
Modified: csw/mgar/pkg/exiv2/trunk/files/0004-rsc-remove-error.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0004-rsc-remove-error.cpp.patch 2012-07-04 08:06:19 UTC (rev 18631)
+++ csw/mgar/pkg/exiv2/trunk/files/0004-rsc-remove-error.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -1,5 +1,3 @@
-diff --git a/src/error.cpp b/src/error.cpp
-index af588d0..efe2ebf 100644
--- a/src/error.cpp
+++ b/src/error.cpp
@@ -26,7 +26,7 @@
Added: csw/mgar/pkg/exiv2/trunk/files/0005-include-XML_Node.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0005-include-XML_Node.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0005-include-XML_Node.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,12 @@
+--- a/xmpsdk/src/XML_Node.cpp
++++ b/xmpsdk/src/XML_Node.cpp
+@@ -13,6 +13,9 @@
+ #include <cstring>
+ #include <cstdio>
+
++#include <strings.h>
++#include <stdio.h>
++
+ // ! Can't include XMP..._Impl.hpp - used by both Core and Files.
+ #define XMP_LitNMatch(s,l,n) (std::strncmp((s),(l),(n)) == 0)
+
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-actions.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-actions.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-actions.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,13 @@
+diff --git a/src/actions.cpp b/src/actions.cpp
+index a102683..a842648 100644
+--- a/src/actions.cpp
++++ b/src/actions.cpp
+@@ -76,6 +76,8 @@ EXIV2_RCSID("@(#) $Id: actions.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
+ #else
+ # include <utime.h>
+ #endif
++#include <strings.h>
++#include <stdio.h>
+
+ // *****************************************************************************
+ // local declarations
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-basicio.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-basicio.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-basicio.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,12 @@
+--- a/src/basicio.cpp
++++ b/src/basicio.cpp
+@@ -61,6 +61,9 @@ EXIV2_RCSID("@(#) $Id: basicio.cpp 2689 2012-03-24 13:00:00Z ahuggel $")
+ # include <unistd.h> // for getpid, stat
+ #endif
+
++#include <stdio.h>
++#include <string.h>
++
+ #if defined WIN32 && !defined __CYGWIN__
+ // Windows doesn't provide mode_t, nlink_t
+ typedef unsigned short mode_t;
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-bmpimage.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-bmpimage.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-bmpimage.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,11 @@
+--- a/src/bmpimage.cpp
++++ b/src/bmpimage.cpp
+@@ -48,6 +48,8 @@ EXIV2_RCSID("@(#) $Id: bmpimage.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
+ #include <cstring>
+ #include <iostream>
+
++#include <string.h>
++
+ // *****************************************************************************
+ // class member definitions
+ namespace Exiv2 {
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-canonmn.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-canonmn.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-canonmn.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,11 @@
+--- a/src/canonmn.cpp
++++ b/src/canonmn.cpp
+@@ -48,6 +48,8 @@ EXIV2_RCSID("@(#) $Id: canonmn.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
+ #include <cstring>
+ #include <cmath>
+
++#include <math.h>
++
+ // *****************************************************************************
+ // class member definitions
+ namespace Exiv2 {
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-convert.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-convert.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-convert.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,11 @@
+--- a/src/convert.cpp
++++ b/src/convert.cpp
+@@ -46,6 +46,8 @@ EXIV2_RCSID("@(#) $Id: convert.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
+ #include <ios>
+ #include <sstream>
+ #include <stdio.h> // for snprintf (C99)
++#include <string.h>
++
+ #ifdef _MSC_VER
+ # define snprintf _snprintf
+ #endif
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-cr2image.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-cr2image.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-cr2image.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,11 @@
+--- a/src/cr2image.cpp
++++ b/src/cr2image.cpp
+@@ -52,6 +52,8 @@ EXIV2_RCSID("@(#) $Id: cr2image.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
+ #include <cassert>
+ #include <cstring>
+
++#include <strings.h>
++
+ // *****************************************************************************
+ // class member definitions
+ namespace Exiv2 {
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-dataset.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-dataset.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-dataset.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,11 @@
+--- a/src/datasets.cpp
++++ b/src/datasets.cpp
+@@ -42,6 +42,8 @@ EXIV2_RCSID("@(#) $Id: datasets.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
+ #include <iomanip>
+ #include <sstream>
+
++#include <string.h>
++
+ // *****************************************************************************
+ // class member definitions
+ namespace Exiv2 {
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-easyaccess.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-easyaccess.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-easyaccess.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,10 @@
+--- a/src/easyaccess.cpp
++++ b/src/easyaccess.cpp
+@@ -32,6 +32,7 @@ EXIV2_RCSID("@(#) $Id: easyaccess.cpp 2711 2012-04-22 05:28:42Z ahuggel $")
+ // *****************************************************************************
+ // included header files
+ #include "easyaccess.hpp"
++#include <string.h>
+
+ // *****************************************************************************
+ namespace {
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-epsimage.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-epsimage.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-epsimage.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,11 @@
+--- a/src/epsimage.cpp
++++ b/src/epsimage.cpp
+@@ -55,6 +55,8 @@ EXIV2_RCSID("@(#) $Id: epsimage.cpp $")
+ #include <sstream>
+ #include <string>
+
++#include <string.h>
++
+ // *****************************************************************************
+ namespace {
+
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-exiv2.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-exiv2.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-exiv2.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,12 @@
+diff --git a/src/exiv2.cpp b/src/exiv2.cpp
+index 2dae4c7..67716c0 100644
+--- a/src/exiv2.cpp
++++ b/src/exiv2.cpp
+@@ -52,6 +52,7 @@ EXIV2_RCSID("@(#) $Id: exiv2.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
+ #include <cstring>
+ #include <cassert>
+ #include <cctype>
++#include <strings.h>
+
+ // *****************************************************************************
+ // local declarations
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-futils.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-futils.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-futils.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,11 @@
+--- a/src/futils.cpp
++++ b/src/futils.cpp
+@@ -42,6 +42,8 @@ EXIV2_RCSID("@(#) $Id: futils.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
+ // + standard includes
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <string.h>
++
+ #ifdef _MSC_VER
+ # define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
+ #endif
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-gifimage.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-gifimage.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-gifimage.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,10 @@
+--- a/src/gifimage.cpp
++++ b/src/gifimage.cpp
+@@ -47,6 +47,7 @@ EXIV2_RCSID("@(#) $Id: gifimage.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
+ #include <string>
+ #include <cstring>
+ #include <iostream>
++#include <string.h>
+
+ // *****************************************************************************
+ // class member definitions
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-jp2image.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-jp2image.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-jp2image.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,10 @@
+--- a/src/jp2image.cpp
++++ b/src/jp2image.cpp
+@@ -52,6 +52,7 @@ EXIV2_RCSID("@(#) $Id: jp2image.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
+ #include <cstring>
+ #include <iostream>
+ #include <cassert>
++#include <string.h>
+
+ // JPEG-2000 box types
+ const uint32_t kJp2BoxTypeJp2Header = 0x6a703268; // 'jp2h'
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-jpgimage.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-jpgimage.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-jpgimage.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,10 @@
+--- a/src/jpgimage.cpp
++++ b/src/jpgimage.cpp
+@@ -47,6 +47,7 @@ EXIV2_RCSID("@(#) $Id: jpgimage.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
+ #include <cstdio> // for EOF
+ #include <cstring>
+ #include <cassert>
++#include <string.h>
+
+ // *****************************************************************************
+ // class member definitions
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-makernote.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-makernote.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-makernote.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,10 @@
+--- a/src/makernote.cpp
++++ b/src/makernote.cpp
+@@ -45,6 +45,7 @@ EXIV2_RCSID("@(#) $Id: makernote.cpp 2698 2012-04-11 16:02:44Z ahuggel $")
+ // + standard includes
+ #include <string>
+ #include <cstring>
++#include <string.h>
+
+ // *****************************************************************************
+ namespace {
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-mrwimage.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-mrwimage.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-mrwimage.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,10 @@
+--- a/src/mrwimage.cpp
++++ b/src/mrwimage.cpp
+@@ -49,6 +49,7 @@ EXIV2_RCSID("@(#) $Id: mrwimage.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
+ #include <cstring>
+ #include <iostream>
+ #include <cassert>
++#include <string.h>
+
+ // *****************************************************************************
+ // class member definitions
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-pgfimage.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-pgfimage.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-pgfimage.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,10 @@
+--- a/src/pgfimage.cpp
++++ b/src/pgfimage.cpp
+@@ -54,6 +54,7 @@ EXIV2_RCSID("@(#) $Id: pgfimage.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
+ #include <cstring>
+ #include <iostream>
+ #include <cassert>
++#include <string.h>
+
+ // Signature from front of PGF file
+ const unsigned char pgfSignature[3] = { 0x50, 0x47, 0x46 };
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-pngchunk.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-pngchunk.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-pngchunk.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,11 @@
+--- a/src/pngchunk.cpp
++++ b/src/pngchunk.cpp
+@@ -60,6 +60,8 @@ extern "C" {
+ #include <iostream>
+ #include <cassert>
+ #include <cstdio>
++#include <string.h>
++#include <stdlib.h>
+
+ /*
+
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-pngimage.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-pngimage.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-pngimage.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,10 @@
+--- a/src/pngimage.cpp
++++ b/src/pngimage.cpp
+@@ -55,6 +55,7 @@ EXIV2_RCSID("@(#) $Id: pngimage.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
+ #include <cstring>
+ #include <iostream>
+ #include <cassert>
++#include <string.h>
+
+ // Signature from front of PNG file
+ const unsigned char pngSignature[8] = { 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A };
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-preview.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-preview.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-preview.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,11 @@
+--- a/src/preview.cpp
++++ b/src/preview.cpp
+@@ -48,6 +48,8 @@ EXIV2_RCSID("@(#) $Id: preview.cpp 2698 2012-04-11 16:02:44Z ahuggel $")
+ #include "tiffimage.hpp"
+ #include "tiffimage_int.hpp"
+
++#include <string.h>
++
+ // *****************************************************************************
+ namespace {
+
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-proteries.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-proteries.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-proteries.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,10 @@
+--- a/src/properties.cpp
++++ b/src/properties.cpp
+@@ -46,6 +46,7 @@ EXIV2_RCSID("@(#) $Id: properties.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
+ #include <cstring>
+ #include <cstdlib>
+ #include <cctype>
++#include <string.h>
+
+ // *****************************************************************************
+ namespace {
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-psdimage.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-psdimage.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-psdimage.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,10 @@
+--- a/src/psdimage.cpp
++++ b/src/psdimage.cpp
+@@ -52,6 +52,7 @@ EXIV2_RCSID("@(#) $Id: psdimage.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
+ #include <iomanip>
+ #include <cassert>
+ #include <memory>
++#include <string.h>
+
+ // Todo: Consolidate with existing code in struct Photoshop (jpgimage.hpp):
+ // Extend this helper to a proper class with all required functionality,
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-rafimage.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-rafimage.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-rafimage.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,10 @@
+--- a/src/rafimage.cpp
++++ b/src/rafimage.cpp
+@@ -49,6 +49,7 @@ EXIV2_RCSID("@(#) $Id: rafimage.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
+ #include <cstring>
+ #include <iostream>
+ #include <cassert>
++#include <string.h>
+
+ // *****************************************************************************
+ // class member definitions
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-tags.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-tags.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-tags.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,10 @@
+--- a/src/tags.cpp
++++ b/src/tags.cpp
+@@ -60,6 +60,7 @@ EXIV2_RCSID("@(#) $Id: tags.cpp 2696 2012-04-11 05:50:34Z ahuggel $")
+ #include <cassert>
+ #include <cmath>
+ #include <cstring>
++#include <string.h>
+
+ // *****************************************************************************
+ // local declarations
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-tgaimage.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-tgaimage.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-tgaimage.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,10 @@
+--- a/src/tgaimage.cpp
++++ b/src/tgaimage.cpp
+@@ -47,6 +47,7 @@ EXIV2_RCSID("@(#) $Id: tgaimage.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
+ #include <string>
+ #include <cstring>
+ #include <iostream>
++#include <string.h>
+
+ // *****************************************************************************
+ // class member definitions
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-tiffcomposite.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-tiffcomposite.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-tiffcomposite.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,10 @@
+--- a/src/tiffcomposite.cpp
++++ b/src/tiffcomposite.cpp
+@@ -49,6 +49,7 @@ EXIV2_RCSID("@(#) $Id: tiffcomposite.cpp 2699 2012-04-11 16:02:52Z ahuggel $")
+ #include <iostream>
+ #include <iomanip>
+ #include <algorithm>
++#include <string.h>
+
+ // *****************************************************************************
+ namespace {
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-tiffvisitor.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-tiffvisitor.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-tiffvisitor.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,10 @@
+--- a/src/tiffvisitor.cpp
++++ b/src/tiffvisitor.cpp
+@@ -52,6 +52,7 @@ EXIV2_RCSID("@(#) $Id: tiffvisitor.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
+ #include <iostream>
+ #include <iomanip>
+ #include <cassert>
++#include <string.h>
+
+ // *****************************************************************************
+ namespace {
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-types.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-types.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-types.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,10 @@
+--- a/src/types.cpp
++++ b/src/types.cpp
+@@ -49,6 +49,7 @@ EXIV2_RCSID("@(#) $Id: types.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
+ #include <cstdlib>
+ #include <cassert>
+ #include <cstring>
++#include <string.h>
+
+ // *****************************************************************************
+ namespace {
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-utils.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-utils.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-utils.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,12 @@
+diff --git a/src/utils.cpp b/src/utils.cpp
+index d316dc5..07629e8 100644
+--- a/src/utils.cpp
++++ b/src/utils.cpp
+@@ -56,6 +56,7 @@ EXIV2_RCSID("@(#) $Id: utils.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
+ #include <string>
+ #include <iostream>
+ #include <sstream>
++#include <stdio.h>
+
+ namespace Util {
+
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-value.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-value.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-value.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,12 @@
+--- a/src/value.cpp
++++ b/src/value.cpp
+@@ -47,6 +47,9 @@ EXIV2_RCSID("@(#) $Id: value.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
+ #include <cstdio>
+ #include <cstdlib>
+ #include <ctype.h>
++#include <string.h>
++#include <stdio.h>
++#include <math.h>
+
+ // *****************************************************************************
+ // class member definitions
Added: csw/mgar/pkg/exiv2/trunk/files/0006-include-xmpsidecar.cpp.patch
===================================================================
--- csw/mgar/pkg/exiv2/trunk/files/0006-include-xmpsidecar.cpp.patch (rev 0)
+++ csw/mgar/pkg/exiv2/trunk/files/0006-include-xmpsidecar.cpp.patch 2012-07-04 09:28:53 UTC (rev 18632)
@@ -0,0 +1,10 @@
+--- a/src/xmpsidecar.cpp
++++ b/src/xmpsidecar.cpp
+@@ -49,6 +49,7 @@ EXIV2_RCSID("@(#) $Id: xmpsidecar.cpp 2681 2012-03-22 15:19:35Z ahuggel $")
+ #include <string>
+ #include <iostream>
+ #include <cassert>
++#include <strings.h>
+
+ // *****************************************************************************
+ namespace {
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