From 317be62c4c180b1008e7395173a2d1c213e37f83 Mon Sep 17 00:00:00 2001
From: tfield <devnull@localhost>
Date: Thu, 8 Apr 2010 00:48:30 +0000
Subject: [PATCH] colladadom: patch to use rosboost-cfg for boost compile/link
 flags

---
 colladadom/Makefile          |  3 +-
 colladadom/collada-dom.patch | 54 ++++++++++++++++++++++++++++++++++++
 colladadom/manifest.xml      |  2 +-
 colladadom/use_1_5.patch     | 22 ---------------
 4 files changed, 56 insertions(+), 25 deletions(-)
 create mode 100644 colladadom/collada-dom.patch
 delete mode 100644 colladadom/use_1_5.patch

diff --git a/colladadom/Makefile b/colladadom/Makefile
index 223b1c4..efb8121 100644
--- a/colladadom/Makefile
+++ b/colladadom/Makefile
@@ -4,7 +4,7 @@ TARBALL_URL = http://pr.willowgarage.com/downloads/collada-dom-2.2.zip
 SOURCE_DIR = build/colladadom
 INITIAL_DIR = build/collada-dom
 UNPACK_CMD = unzip
-TARBALL_PATCH=use_1_5.patch
+TARBALL_PATCH = collada-dom.patch
 MD5SUM_FILE = collada-dom-2.2.zip.md5sum
 
 include $(shell rospack find mk)/download_unpack_build.mk
@@ -25,7 +25,6 @@ endif
 installed: wiped $(SOURCE_DIR)/unpacked
 	@echo "ROOT is: $(ROOT)"
 	-mkdir -p $(ROOT)/include
-	-mkdir -p $(ROOT)/include
 	-mkdir -p $(ROOT)/lib
 	@echo "making it"
 	cd $(SOURCE_DIR)/dom && make $(ROS_PARALLEL_JOBS)
diff --git a/colladadom/collada-dom.patch b/colladadom/collada-dom.patch
new file mode 100644
index 0000000..eb05cec
--- /dev/null
+++ b/colladadom/collada-dom.patch
@@ -0,0 +1,54 @@
+Index: dom/Makefile
+===================================================================
+--- dom/Makefile	2008-10-02 17:48:30.000000000 -0700
++++ dom/Makefile	2010-03-03 14:44:09.162398249 -0800
+@@ -55,7 +55,7 @@
+ conf := release
+ 
+ # Collada version: '1.4', '1.5', or 'all'
+-colladaVersion := 1.4
++colladaVersion := 1.5
+ 
+ # parser: 'libxml', 'tinyxml', or 'all'.
+ parser := libxml
+@@ -188,7 +188,7 @@
+ ifneq ($(filter install uninstall installTest,$(MAKECMDGOALS)),)
+ # You can only install on Mac or Linux. Check for that.
+ ifeq ($(oss),linux)
+-prefix := /usr/local
++prefix := ../../../
+ else ifeq ($(oss),mac)
+ prefix := /Library/Frameworks
+ else
+Index: dom/make/common.mk
+===================================================================
+--- dom/make/common.mk	2008-05-14 17:30:42.000000000 -0700
++++ dom/make/common.mk	2010-04-07 17:16:11.000000000 -0700
+@@ -17,6 +17,8 @@
+ debugSuffix :=
+ endif
+ 
++ccFlags += $(shell rosboost-cfg --cflags)
++
+ ifeq ($(os),mac)
+ # Add the -arch flags to specify what architectures we're building for.
+ ccFlags += $(addprefix -arch ,$(subst x86,i386,$(archs)))
+Index: dom/make/domTest.mk
+===================================================================
+--- dom/make/domTest.mk	2008-09-03 08:51:18.000000000 -0700
++++ dom/make/domTest.mk	2010-04-07 17:17:18.000000000 -0700
+@@ -55,13 +55,7 @@
+ endif
+ 
+ # Boost defs
+-ifeq ($(os),linux)
+-libOpts += -lboost_filesystem
+-else
+-includeOpts += -Iexternal-libs/boost
+-libOpts += external-libs/boost/lib/$(buildID)/libboost_system.a
+-libOpts += external-libs/boost/lib/$(buildID)/libboost_filesystem.a
+-endif
++libOpts += $(shell rosboost-cfg --lflags system,filesystem)
+ ifeq ($(os),ps3)
+ # PS3 doesn't support C++ locales, so tell boost not to use them
+ ccFlags += -DBOOST_NO_STD_LOCALE
diff --git a/colladadom/manifest.xml b/colladadom/manifest.xml
index 8d05612..da732a0 100644
--- a/colladadom/manifest.xml
+++ b/colladadom/manifest.xml
@@ -6,7 +6,7 @@
     See http://sourceforge.net/projects/collada-dom.
 
   </description>
-  <author>John Hsu (package)</author>
+  <author>John Hsu, Tim Field</author>
   <license>BSD</license>
   <review status="unreviewed" notes=""/>
   <url>http://ros.org/wiki/colladadom</url>
diff --git a/colladadom/use_1_5.patch b/colladadom/use_1_5.patch
deleted file mode 100644
index e8a739c..0000000
--- a/colladadom/use_1_5.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: dom/Makefile
-===================================================================
---- dom/Makefile	2008-10-02 17:48:30.000000000 -0700
-+++ dom/Makefile	2010-03-03 14:44:09.162398249 -0800
-@@ -55,7 +55,7 @@
- conf := release
- 
- # Collada version: '1.4', '1.5', or 'all'
--colladaVersion := 1.4
-+colladaVersion := 1.5
- 
- # parser: 'libxml', 'tinyxml', or 'all'.
- parser := libxml
-@@ -188,7 +188,7 @@
- ifneq ($(filter install uninstall installTest,$(MAKECMDGOALS)),)
- # You can only install on Mac or Linux. Check for that.
- ifeq ($(oss),linux)
--prefix := /usr/local
-+prefix := ../../../
- else ifeq ($(oss),mac)
- prefix := /Library/Frameworks
- else