[gentoo-commits] gentoo-x86 commit in media-libs/opencollada/files: opencollada-0_p864-gcc-4.7.patch opencollada-0_p864-parallel.patch

[gentoo-commits] gentoo-x86 commit in media-libs/opencollada/files: opencollada-0_p864-gcc-4.7.patch opencollada-0_p864-parallel.patch

[Sebastian Pipping (sping)]

sping       12/09/10 12:55:11

  Added:                opencollada-0_p864-gcc-4.7.patch
                        opencollada-0_p864-parallel.patch
  Log:
  media-libs/opencollada: Fix compilation (bug #428016)
  
  (Portage version: 2.1.10.65/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-libs/opencollada/files/opencollada-0_p864-gcc-4.7.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/files/opencollada-0_p864-gcc-4.7.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/files/opencollada-0_p864-gcc-4.7.patch?rev=1.1&content-type=text/plain

Index: opencollada-0_p864-gcc-4.7.patch
===================================================================
--- common//libBuffer/include/CommonBuffer.h.ori	2012-04-28 15:45:37.621142222 +0200
+++ common//libBuffer/include/CommonBuffer.h	2012-04-28 15:45:28.740797826 +0200
@@ -11,6 +11,12 @@
 #ifndef __COMMON_BUFFER_H__
 #define __COMMON_BUFFER_H__
 
+/* size_t for gcc, may want to move this include some place else - campbell */
+#ifdef __GNUC__
+#  include <cstdlib> /* size_t */
+#  include <cstring> /* memcpy */
+#endif
+
 #include "CommonIBufferFlusher.h"
 
 namespace Common
--- COLLADAStreamWriter/include/COLLADASWAnnotation.h	2012-01-15 04:37:13.000000000 +0100
+++ COLLADAStreamWriter/include/COLLADASWAnnotation.h	2012-03-14 22:17:51.000000000 +0100
@@ -219,7 +219,7 @@
         void add ( 
             const String &name, 
             const ValueType::ColladaType &type, 
-            const T val ) const
+            const T val )
         {
             openAnnotation ( name );
             openValuesElement ( type );



1.1                  media-libs/opencollada/files/opencollada-0_p864-parallel.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/files/opencollada-0_p864-parallel.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/opencollada/files/opencollada-0_p864-parallel.patch?rev=1.1&content-type=text/plain

Index: opencollada-0_p864-parallel.patch
===================================================================
diff -Naur openCOLLADA-svn864.orig/COLLADASaxFrameworkLoader/CMakeLists.txt openCOLLADA-svn864/COLLADASaxFrameworkLoader/CMakeLists.txt
--- openCOLLADA-svn864.orig/COLLADASaxFrameworkLoader/CMakeLists.txt	2011-10-13 18:54:06.000000000 -0500
+++ openCOLLADA-svn864/COLLADASaxFrameworkLoader/CMakeLists.txt	2012-01-17 16:11:35.825610565 -0600
@@ -260,6 +260,14 @@
 	${PCRE_LIBRARIES}
 )
 
+# For parallel building.
+if(USE_SHARED)
+    add_dependencies(GeneratedSaxParser_shared OpenCOLLADABaseUtils_shared)
+endif()
+if(USE_STATIC)
+    add_dependencies(GeneratedSaxParser_static OpenCOLLADABaseUtils_static)
+endif()
+
 if (USE_LIBXML)
 	list(APPEND libGeneratedSaxParser_include_dirs ${LIBXML2_INCLUDE_DIR})
 	list(APPEND TARGET_LIBS ${LIBXML2_LIBRARIES})