[csw-devel] SF.net SVN: gar:[8111] csw/mgar/pkg
hson at users.sourceforge.net
hson at users.sourceforge.net
Thu Jan 21 15:06:25 CET 2010
Revision: 8111
http://gar.svn.sourceforge.net/gar/?rev=8111&view=rev
Author: hson
Date: 2010-01-21 14:06:24 +0000 (Thu, 21 Jan 2010)
Log Message:
-----------
exempi: Initial commit
Added Paths:
-----------
csw/mgar/pkg/exempi/
csw/mgar/pkg/exempi/Makefile
csw/mgar/pkg/exempi/branches/
csw/mgar/pkg/exempi/tags/
csw/mgar/pkg/exempi/trunk/
csw/mgar/pkg/exempi/trunk/Makefile
csw/mgar/pkg/exempi/trunk/checksums
csw/mgar/pkg/exempi/trunk/files/
csw/mgar/pkg/exempi/trunk/files/Makefiles.patch
csw/mgar/pkg/exempi/trunk/files/RIFF_Support.cpp
csw/mgar/pkg/exempi/trunk/files/XML_Node.cpp
csw/mgar/pkg/exempi/trunk/files/boost.m4.patch
csw/mgar/pkg/exempi/trunk/files/configure.patch
csw/mgar/pkg/exempi/trunk/files/exempi.cpp.patch
csw/mgar/pkg/exempi/trunk/files/utils.cpp.patch
csw/mgar/pkg/exempi/trunk/files/xmp.h.patch
Added: csw/mgar/pkg/exempi/Makefile
===================================================================
--- csw/mgar/pkg/exempi/Makefile (rev 0)
+++ csw/mgar/pkg/exempi/Makefile 2010-01-21 14:06:24 UTC (rev 8111)
@@ -0,0 +1,15 @@
+# vim: ft=make ts=4 sw=4 noet
+
+default:
+ @echo "You are in the pkg/ directory."
+
+%:
+ $(MAKE) -C trunk $*
+
+paranoid-%:
+ $(MAKE) -C trunk $* || exit 2
+
+export BUILDLOG ?= $(shell pwd)/buildlog.txt
+
+report-%:
+ $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG)
Property changes on: csw/mgar/pkg/exempi/trunk
___________________________________________________________________
Added: svn:ignore
+ cookies
download
work
Added: svn:externals
+ gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2
Added: csw/mgar/pkg/exempi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/exempi/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/exempi/trunk/Makefile 2010-01-21 14:06:24 UTC (rev 8111)
@@ -0,0 +1,47 @@
+GARNAME = exempi
+GARVERSION = 2.1.1
+CATEGORIES = lib
+
+DESCRIPTION = Exempi is an implementation of XMP
+define BLURB
+ Exempi is an implementation of XMP. Version 2.x is based on Adobe XMP SDK
+ 4.1.1 and released under a BSD-style license like Adobe's. The 3 clause
+ BSD (aka New-BSD) license is compatible with GPL. The licensing is kept
+ identical in order to allow two-way merging of the code (ie sending our
+ change to the XMP SDK to Adobe for integration).
+
+ The API is C based and means to be used from any language and be easier
+ to maintain ABI stability.
+endef
+
+MASTER_SITES = http://libopenraw.freedesktop.org/download/
+DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+
+REQUIRED_PKGS += CSWexpat CSWstlport CSWzlib
+PREREQUISITE_PKGS += CSWiconv CSWboostrt CSWboostdevel
+
+PATCHFILES += Makefiles.patch
+PATCHFILES += RIFF_Support.cpp
+PATCHFILES += XML_Node.cpp
+PATCHFILES += configure.patch
+PATCHFILES += exempi.cpp.patch
+PATCHFILES += utils.cpp.patch
+PATCHFILES += xmp.h.patch
+PATCHFILES += boost.m4.patch
+
+EXTRA_CXXFLAGS = -D__EXTENSIONS__ -library=stlport4 -DHAVE_NATIVE_TLS=0
+EXTRA_LINKER_FLAGS = -liconv
+
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --with-boost=/opt/csw
+
+TEST_TARGET = check
+
+include gar/category.mk
+
+pre-configure-modulated:
+ @echo " ==> Regenerating build tools..."
+ @(cd $(WORKSRC) ; autoconf)
+ @$(MAKECOOKIE)
Added: csw/mgar/pkg/exempi/trunk/checksums
===================================================================
--- csw/mgar/pkg/exempi/trunk/checksums (rev 0)
+++ csw/mgar/pkg/exempi/trunk/checksums 2010-01-21 14:06:24 UTC (rev 8111)
@@ -0,0 +1,9 @@
+8fded282d0b747d5be8d401f268e6c87 Makefiles.patch
+58df21dd4e8418040ef8e422b7f50fe9 RIFF_Support.cpp
+2624b4b7c56c09d1311716c28aa94424 XML_Node.cpp
+ad7b0d343edb20fdca06f7a2b66e3b46 boost.m4.patch
+432f995204aff834ac8ac6a5d6ff4a1f configure.patch
+62ecb5a01387b9f940a5429b3df67e65 exempi-2.1.1.tar.gz
+9919b1d4e37a3b48a8d9977c433e6193 exempi.cpp.patch
+24f2cde07cbd4d999d9ec30625841158 utils.cpp.patch
+eede9560fa348ca476dc37ae2dc93271 xmp.h.patch
Added: csw/mgar/pkg/exempi/trunk/files/Makefiles.patch
===================================================================
--- csw/mgar/pkg/exempi/trunk/files/Makefiles.patch (rev 0)
+++ csw/mgar/pkg/exempi/trunk/files/Makefiles.patch 2010-01-21 14:06:24 UTC (rev 8111)
@@ -0,0 +1,159 @@
+diff -Nru exempi-2.1.1.orig/exempi/Makefile.in exempi-2.1.1/exempi/Makefile.in
+--- exempi-2.1.1.orig/exempi/Makefile.in 2009-05-16 05:25:19.000000000 +0200
++++ exempi-2.1.1/exempi/Makefile.in 2010-01-20 21:17:55.040718572 +0100
+@@ -276,7 +276,7 @@
+ exempidir = $(includedir)/@EXEMPI_INCLUDE_BASE@/exempi
+ exempi_HEADERS = xmp.h xmpconsts.h xmperrors.h
+ INCLUDES = -I$(top_srcdir)/public/include
+-AM_CPPFLAGS = -Wall -D at EXEMPI_PLATFORM_DEF@=1
++AM_CPPFLAGS = -D at EXEMPI_PLATFORM_DEF@=1
+ lib_LTLIBRARIES = libexempi.la
+ pkgconfig_DATA = exempi- at EXEMPI_MAJOR_VERSION@.pc
+ libexempi_la_SOURCES = exempi.cpp
+diff -Nru exempi-2.1.1.orig/exempi/tests/Makefile.in exempi-2.1.1/exempi/tests/Makefile.in
+--- exempi-2.1.1.orig/exempi/tests/Makefile.in 2009-05-16 01:33:41.000000000 +0200
++++ exempi-2.1.1/exempi/tests/Makefile.in 2010-01-21 07:54:09.406465019 +0100
+@@ -188,6 +188,8 @@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
++BOOST_TEST_EXEC_MONITOR_LDFLAGS = @BOOST_TEST_EXEC_MONITOR_LDFLAGS@
++BOOST_TEST_EXEC_MONITOR_LIBS = @BOOST_TEST_EXEC_MONITOR_LIBS@
+ BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS = @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
+ BOOST_UNIT_TEST_FRAMEWORK_LIBS = @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+ CC = @CC@
+@@ -323,32 +325,32 @@
+ EXTRA_DIST = $(check_DATA) $(check_SCRIPTS)
+ CLEANFILES = test.jpg
+ testinit_SOURCES = testinit.cpp utils.cpp
+-testinit_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+-testinit_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
++testinit_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@
++testinit_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@
+ testexempicore_SOURCES = test-exempi-core.cpp utils.cpp
+-testexempicore_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+-testexempicore_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
++testexempicore_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@
++testexempicore_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@
+ testserialise_SOURCES = test-serialise.cpp utils.cpp
+-testserialise_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+-testserialise_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
++testserialise_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@
++testserialise_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@
+ testwritenewprop_SOURCES = test-write-new-prop.cpp utils.cpp
+-testwritenewprop_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+-testwritenewprop_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
++testwritenewprop_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@
++testwritenewprop_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@
+ testtiffleak_SOURCES = test-tiff-leak.cpp utils.cpp
+-testtiffleak_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+-testtiffleak_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
++testtiffleak_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@
++testtiffleak_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@
+ testxmpfiles_SOURCES = test-xmpfiles.cpp utils.cpp
+-testxmpfiles_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+-testxmpfiles_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
++testxmpfiles_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@
++testxmpfiles_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@
+ testxmpfileswrite_SOURCES = test-xmpfiles-write.cpp utils.cpp
+-testxmpfileswrite_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+-testxmpfileswrite_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
++testxmpfileswrite_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@
++testxmpfileswrite_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@
+ test3_SOURCES = test3.cpp utils.cpp
+-test3_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+-test3_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
++test3_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@
++test3_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@
+ testfdo18635_SOURCES = test-bgo.cpp utils.cpp
+-testfdo18635_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@
+-testfdo18635_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@
++testfdo18635_LDADD = ../libexempi.la @BOOST_UNIT_TEST_FRAMEWORK_LIBS@ @BOOST_TEST_EXEC_MONITOR_LIBS@
++testfdo18635_LDFLAGS = -static @BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS@ @BOOST_TEST_EXEC_MONITOR_LDFLAGS@
+ all: all-am
+
+ .SUFFIXES:
+diff -Nru exempi-2.1.1.orig/samples/source/Makefile.in exempi-2.1.1/samples/source/Makefile.in
+--- exempi-2.1.1.orig/samples/source/Makefile.in 2009-05-16 01:33:42.000000000 +0200
++++ exempi-2.1.1/samples/source/Makefile.in 2010-01-21 04:13:57.049873855 +0100
+@@ -273,8 +273,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-AM_CXXFLAGS = -fexceptions -funsigned-char -fPIC \
+- -Wno-multichar -Wno-implicit -Wno-ctor-dtor-privacy
++AM_CXXFLAGS = -xchar=unsigned -KPIC
+
+ AM_CPPFLAGS = -D at EXEMPI_PLATFORM_DEF@=1 -D_FILE_OFFSET_BITS=64
+ XMPLIBS = $(top_builddir)/source/XMPCore/libXMPCore.la \
+diff -Nru exempi-2.1.1.orig/source/XMPCore/Makefile.in exempi-2.1.1/source/XMPCore/Makefile.in
+--- exempi-2.1.1.orig/source/XMPCore/Makefile.in 2009-05-16 01:33:42.000000000 +0200
++++ exempi-2.1.1/source/XMPCore/Makefile.in 2010-01-20 21:31:48.303689677 +0100
+@@ -252,10 +252,9 @@
+ -I$(srcdir)/../common/ \
+ -I$(top_srcdir)/third-party/MD5
+
+-AM_CXXFLAGS = -Wno-multichar -Wno-implicit -Wno-ctor-dtor-privacy \
+- -funsigned-char -fexceptions
++AM_CXXFLAGS = -xchar=unsigned
+
+-AM_CPPFLAGS = -Wall \
++AM_CPPFLAGS = \
+ -D at EXEMPI_PLATFORM_DEF@=1 -DXMP_IMPL=1 -DXMP_ClientBuild=0 \
+ -D_FILE_OFFSET_BITS=64 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1
+
+diff -Nru exempi-2.1.1.orig/source/XMPFiles/FileHandlers/Makefile.in exempi-2.1.1/source/XMPFiles/FileHandlers/Makefile.in
+--- exempi-2.1.1.orig/source/XMPFiles/FileHandlers/Makefile.in 2009-05-16 01:33:42.000000000 +0200
++++ exempi-2.1.1/source/XMPFiles/FileHandlers/Makefile.in 2010-01-20 21:33:24.157916525 +0100
+@@ -260,6 +260,8 @@
+ -I$(top_srcdir)/public/include/ -I$(top_srcdir)/build/ \
+ -I$(top_srcdir)/third-party/MD5
+
++AM_CXXFLAGS =
++
+ AM_CPPFLAGS = \
+ -D at EXEMPI_PLATFORM_DEF@=1 -DXMP_IMPL=1 -DXMP_ClientBuild=0 \
+ -D_FILE_OFFSET_BITS=64 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1
+diff -Nru exempi-2.1.1.orig/source/XMPFiles/FormatSupport/Makefile.in exempi-2.1.1/source/XMPFiles/FormatSupport/Makefile.in
+--- exempi-2.1.1.orig/source/XMPFiles/FormatSupport/Makefile.in 2009-05-16 01:33:42.000000000 +0200
++++ exempi-2.1.1/source/XMPFiles/FormatSupport/Makefile.in 2010-01-20 21:34:48.039865264 +0100
+@@ -266,7 +266,9 @@
+ -I$(top_srcdir)/public/include/ -I$(top_srcdir)/build/ \
+ -I$(top_srcdir)/third-party/MD5
+
+-AM_CPPFLAGS = -Wno-multichar\
++AM_CXXFLAGS =
++
++AM_CPPFLAGS = \
+ -D at EXEMPI_PLATFORM_DEF@=1 -DXMP_IMPL=1 -DXMP_ClientBuild=0 \
+ -D_FILE_OFFSET_BITS=64 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1
+
+diff -Nru exempi-2.1.1.orig/source/XMPFiles/Makefile.in exempi-2.1.1/source/XMPFiles/Makefile.in
+--- exempi-2.1.1.orig/source/XMPFiles/Makefile.in 2009-05-16 01:33:42.000000000 +0200
++++ exempi-2.1.1/source/XMPFiles/Makefile.in 2010-01-20 21:33:54.330126061 +0100
+@@ -261,10 +261,9 @@
+ -I$(srcdir)/../common/ \
+ -I$(top_srcdir)/third-party/MD5
+
+-AM_CXXFLAGS = -Wno-multichar -Wno-implicit -Wno-ctor-dtor-privacy \
+- -funsigned-char -fexceptions -fno-strict-aliasing
++AM_CXXFLAGS = -xchar=unsigned
+
+-AM_CPPFLAGS = -Wall\
++AM_CPPFLAGS = \
+ -D at EXEMPI_PLATFORM_DEF@=1 -DXMP_IMPL=1 -DXMP_ClientBuild=0 \
+ -D_FILE_OFFSET_BITS=64 -DHAVE_EXPAT_CONFIG_H=1 -DXML_STATIC=1 \
+ -DDISABLE_QUICKTIME
+diff -Nru exempi-2.1.1.orig/source/common/Makefile.in exempi-2.1.1/source/common/Makefile.in
+--- exempi-2.1.1.orig/source/common/Makefile.in 2009-05-16 01:33:42.000000000 +0200
++++ exempi-2.1.1/source/common/Makefile.in 2010-01-20 21:28:47.770546778 +0100
+@@ -246,8 +246,7 @@
+ INCLUDES = -I$(top_srcdir)/public/include \
+ -I$(top_srcdir)/public/include/client-glue
+
+-AM_CXXFLAGS = -Wno-multichar -Wno-implicit -Wno-ctor-dtor-privacy \
+- -funsigned-char -fexceptions
++AM_CXXFLAGS = -xchar=unsigned
+
+ AM_CPPFLAGS = \
+ -D at EXEMPI_PLATFORM_DEF@=1 -DXMP_IMPL=1 -DXMP_ClientBuild=0 \
Added: csw/mgar/pkg/exempi/trunk/files/RIFF_Support.cpp
===================================================================
--- csw/mgar/pkg/exempi/trunk/files/RIFF_Support.cpp (rev 0)
+++ csw/mgar/pkg/exempi/trunk/files/RIFF_Support.cpp 2010-01-21 14:06:24 UTC (rev 8111)
@@ -0,0 +1,21 @@
+diff -Nru exempi-2.1.1.orig/source/XMPFiles/FormatSupport/RIFF_Support.cpp exempi-2.1.1/source/XMPFiles/FormatSupport/RIFF_Support.cpp
+--- exempi-2.1.1.orig/source/XMPFiles/FormatSupport/RIFF_Support.cpp 2009-02-17 05:10:42.000000000 +0100
++++ exempi-2.1.1/source/XMPFiles/FormatSupport/RIFF_Support.cpp 2010-01-20 21:35:32.833002097 +0100
+@@ -550,7 +550,7 @@
+
+ // *** Could be moved to a separate header
+
+-#pragma pack(push,1)
++//#pragma pack(push,1)
+
+ // [TODO] Can we switch to using just a full path here?
+ struct FSSpecLegacy
+@@ -603,7 +603,7 @@
+ FSSpecLegacy fullPath; // Full path of the project file
+ };
+
+-#pragma pack(pop)
++//#pragma pack(pop)
+
+ // -------------------------------------------------------------------------------------------------
+
Added: csw/mgar/pkg/exempi/trunk/files/XML_Node.cpp
===================================================================
--- csw/mgar/pkg/exempi/trunk/files/XML_Node.cpp (rev 0)
+++ csw/mgar/pkg/exempi/trunk/files/XML_Node.cpp 2010-01-21 14:06:24 UTC (rev 8111)
@@ -0,0 +1,11 @@
+diff -Nru exempi-2.1.1.orig/source/common/XML_Node.cpp exempi-2.1.1/source/common/XML_Node.cpp
+--- exempi-2.1.1.orig/source/common/XML_Node.cpp 2009-02-17 05:10:42.000000000 +0100
++++ exempi-2.1.1/source/common/XML_Node.cpp 2010-01-20 21:30:44.823511273 +0100
+@@ -9,6 +9,7 @@
+ #include "XMP_Environment.h" // ! Must be the first #include!
+ #include "XMLParserAdapter.hpp"
+
++#include <stdio.h>
+ #include <string.h>
+ #include <cstring>
+ #include <cstdio>
Added: csw/mgar/pkg/exempi/trunk/files/boost.m4.patch
===================================================================
--- csw/mgar/pkg/exempi/trunk/files/boost.m4.patch (rev 0)
+++ csw/mgar/pkg/exempi/trunk/files/boost.m4.patch 2010-01-21 14:06:24 UTC (rev 8111)
@@ -0,0 +1,12 @@
+--- exempi-2.1.1.orig/m4/boost.m4 2009-02-17 05:10:40.000000000 +0100
++++ exempi-2.1.1/m4/boost.m4 2010-01-21 07:23:38.252002318 +0100
+@@ -489,6 +489,9 @@
+ BOOST_FIND_LIB([unit_test_framework], [$1],
+ [boost/test/unit_test.hpp], [BOOST_CHECK(2==2);],
+ [using boost::unit_test::test_suite; test_suite* init_unit_test_suite( int argc, char ** argv ) { return NULL;}])
++BOOST_FIND_LIB([test_exec_monitor], [$1],
++ [boost/test/test_tools.hpp], [BOOST_CHECK(1==1);],
++ [int test_main( int argc, char ** argv ) {return 0;}])
+ ])# BOOST_TEST
+
+
Added: csw/mgar/pkg/exempi/trunk/files/configure.patch
===================================================================
--- csw/mgar/pkg/exempi/trunk/files/configure.patch (rev 0)
+++ csw/mgar/pkg/exempi/trunk/files/configure.patch 2010-01-21 14:06:24 UTC (rev 8111)
@@ -0,0 +1,11 @@
+diff -Nru exempi-2.1.1.orig/configure exempi-2.1.1/configure
+--- exempi-2.1.1.orig/configure 2009-05-16 01:32:11.000000000 +0200
++++ exempi-2.1.1/configure 2010-01-20 21:14:55.409183278 +0100
+@@ -16528,6 +16528,7 @@
+ "defined _MSC_VER && _MSC_VER == 1300 @ vc7" \
+ "defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 3 && !defined __ICC @ gcc43" \
+ "defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ == 95 && !defined __ICC @ gcc295" \
++ "defined __SUNPRO_CC @ sun" \
+ "defined __MWERKS__ && __MWERKS__ <= 0x32FF @ cw9" \
+ "defined _MSC_VER && _MSC_VER < 1300 && !defined UNDER_CE @ vc6" \
+ "defined _MSC_VER && _MSC_VER < 1300 && defined UNDER_CE @ evc4" \
Added: csw/mgar/pkg/exempi/trunk/files/exempi.cpp.patch
===================================================================
--- csw/mgar/pkg/exempi/trunk/files/exempi.cpp.patch (rev 0)
+++ csw/mgar/pkg/exempi/trunk/files/exempi.cpp.patch 2010-01-21 14:06:24 UTC (rev 8111)
@@ -0,0 +1,21 @@
+diff -Nru exempi-2.1.1.orig/exempi/exempi.cpp exempi-2.1.1/exempi/exempi.cpp
+--- exempi-2.1.1.orig/exempi/exempi.cpp 2009-05-16 05:25:05.000000000 +0200
++++ exempi-2.1.1/exempi/exempi.cpp 2010-01-21 04:42:31.483045937 +0100
+@@ -587,7 +587,7 @@
+ SXMPMeta *txmp = (SXMPMeta *)xmp;
+ XMP_OptionBits optionBits;
+ // the long converstion is needed until XMPCore is fixed it use proper types.
+- ret = txmp->GetProperty_Int(schema, name, property, &optionBits);
++ ret = txmp->GetProperty_Int(schema, name, (long *) property, &optionBits);
+ if(propsBits) {
+ *propsBits = optionBits;
+ }
+@@ -988,7 +988,7 @@
+ return titer->Next(reinterpret_cast<std::string*>(schema),
+ reinterpret_cast<std::string*>(propName),
+ reinterpret_cast<std::string*>(propValue),
+- options);
++ (unsigned long *)options);
+ }
+
+ bool xmp_iterator_skip(XmpIteratorPtr iter, XmpIterSkipOptions options)
Added: csw/mgar/pkg/exempi/trunk/files/utils.cpp.patch
===================================================================
--- csw/mgar/pkg/exempi/trunk/files/utils.cpp.patch (rev 0)
+++ csw/mgar/pkg/exempi/trunk/files/utils.cpp.patch 2010-01-21 14:06:24 UTC (rev 8111)
@@ -0,0 +1,12 @@
+diff -Nru exempi-2.1.1.orig/exempi/tests/utils.cpp exempi-2.1.1/exempi/tests/utils.cpp
+--- exempi-2.1.1.orig/exempi/tests/utils.cpp 2009-02-17 05:10:40.000000000 +0100
++++ exempi-2.1.1/exempi/tests/utils.cpp 2010-01-20 21:24:39.303070019 +0100
+@@ -34,6 +34,8 @@
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
++#include <stdlib.h>
++#include <stdio.h>
+ #include <cstdio>
+
+ #include <boost/test/unit_test.hpp>
Added: csw/mgar/pkg/exempi/trunk/files/xmp.h.patch
===================================================================
--- csw/mgar/pkg/exempi/trunk/files/xmp.h.patch (rev 0)
+++ csw/mgar/pkg/exempi/trunk/files/xmp.h.patch 2010-01-21 14:06:24 UTC (rev 8111)
@@ -0,0 +1,15 @@
+diff -Nru exempi-2.1.1.orig/exempi/xmp.h exempi-2.1.1/exempi/xmp.h
+--- exempi-2.1.1.orig/exempi/xmp.h 2009-02-17 05:10:40.000000000 +0100
++++ exempi-2.1.1/exempi/xmp.h 2010-01-21 04:16:45.610494834 +0100
+@@ -43,8 +43,10 @@
+ /* stdbool choke on Sun (bug# 14612) */
+ #if !defined(__sun)
+ #include <stdbool.h>
+-#endif
+ #include <stdint.h>
++#else
++#include <sys/inttypes.h>
++#endif
+
+ #include <time.h>
+
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