[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31871] trunk/lib/darwin-8.0.0-powerpc: OSX libs 10.4-ppc : update opencollada libs to rev 768

Damien Plisson damien.plisson at yahoo.fr
Sat Sep 11 07:23:19 CEST 2010


Revision: 31871
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31871
Author:   damien78
Date:     2010-09-11 07:23:18 +0200 (Sat, 11 Sep 2010)

Log Message:
-----------
OSX libs 10.4-ppc : update opencollada libs to rev 768

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=768

Modified Paths:
--------------
    trunk/lib/darwin-8.0.0-powerpc/README
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADABaseUtils/COLLADABUHashFunctions.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADABaseUtils/COLLADABUPrerequisites.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADABaseUtils/COLLADABUStableHeaders.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADABaseUtils/COLLADABUStringUtils.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADABaseUtils/COLLADABUhash_map.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADAFramework/COLLADAFWInstanceBase.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADAFramework/COLLADAFWKinematicsController.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADAFramework/COLLADAFWKinematicsModel.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADAFramework/COLLADAFWKinematicsScene.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADAFramework/COLLADAFWLines.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADAFramework/COLLADAFWMeshPrimitive.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADAFramework/COLLADAFWMeshVertexData.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADAFramework/COLLADAFWScene.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADAFramework/COLLADAFWTypes.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLDocumentProcessor.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLIFilePartLoader.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLInputUnshared.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLIntermediateTargetable.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLKinematicsIntermediateData.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLKinematicsSceneCreator.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryArticulatedSystemsLoader.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryEffectsLoader.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLMeshLoader.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLPrerequisites.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLRootParser15.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLSaxFWLError.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLSceneLoader.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLUtils.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLXmlTypes.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADASaxFrameworkLoader/generated14/COLLADASaxFWLLibraryEffectsLoader14.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADASaxFrameworkLoader/generated15/COLLADASaxFWLLibraryEffectsLoader15.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADASaxFrameworkLoader/generated15/COLLADASaxFWLSceneLoader15.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADAStreamWriter/COLLADASWEffectProfile.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADAStreamWriter/COLLADASWLibrary.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/lib/libGeneratedSaxParser.a
    trunk/lib/darwin-8.0.0-powerpc/opencollada/lib/libMathMLSolver.a
    trunk/lib/darwin-8.0.0-powerpc/opencollada/lib/libOpenCOLLADABaseUtils.a
    trunk/lib/darwin-8.0.0-powerpc/opencollada/lib/libOpenCOLLADAFramework.a
    trunk/lib/darwin-8.0.0-powerpc/opencollada/lib/libOpenCOLLADASaxFrameworkLoader.a
    trunk/lib/darwin-8.0.0-powerpc/opencollada/lib/libOpenCOLLADAStreamWriter.a
    trunk/lib/darwin-8.0.0-powerpc/opencollada/lib/libUTF.a
    trunk/lib/darwin-8.0.0-powerpc/opencollada/lib/libbuffer.a
    trunk/lib/darwin-8.0.0-powerpc/opencollada/lib/libftoa.a
    trunk/lib/darwin-8.0.0-powerpc/opencollada/lib/libpcre.a

Added Paths:
-----------
    trunk/lib/darwin-8.0.0-powerpc/opencollada/collada_OSXbuild.patch
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADAFramework/COLLADAFWHashFunctions.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADAFramework/COLLADAFWInstanceKinematicsScene.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLInstanceArticulatedSystemLoader.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLInstanceKinematicsModelLoader.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADASaxFrameworkLoader/COLLADASaxFWLLibraryKinematicsScenesLoader.h
    trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADASaxFrameworkLoader/generated15/COLLADASaxFWLLibraryKinematicsScenesLoader15.h

Modified: trunk/lib/darwin-8.0.0-powerpc/README
===================================================================
--- trunk/lib/darwin-8.0.0-powerpc/README	2010-09-11 04:39:00 UTC (rev 31870)
+++ trunk/lib/darwin-8.0.0-powerpc/README	2010-09-11 05:23:18 UTC (rev 31871)
@@ -10,6 +10,7 @@
 x264 (version 20090331)
 flac 1.2.1
 sndfile 1.0.21
+opencollada (svn rev 768)
 
 The following configuration parameters were used to build the libs:
 
@@ -58,3 +59,7 @@
 Note: Ogg/Vorbis/FLAC forced to Yes in configure script
 
 ./configure --disable-shared --disable-sqlite --build=powerpc-apple-darwin9.8.0 CC="gcc-4.0" CXX="g++-4.0" CFLAGS="-arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -I/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include -I/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.2.3/include -I/Users/damien/Documents/Dev/blender2.5/sources/flac-1.2.1/include" CXXFLAGS="-arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -I/Users/damien/Documents/Dev/blender2.5/sources/libogg-1.1.4/include -I/Users/damien/Documents/Dev/blender2.5/sources/libvorbis-1.2.3/include -I/Users/damien/Documents/Dev/blender2.5/sources/flac-1.2.1/include" LDFLAGS="-arch ppc -mcpu=powerpc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-8.0.0-powerpc/ffmpeg/lib -L/Users/damien/Documents/Dev/blender2.5/svnroot/lib/darwin-8.0.0-powerpc/sndfile/lib" LIBS="-logg -lvorbis -lvorbisenc -lFLAC"
+
+OPENCOLLADA:
+patch the OpenCollada Sconstruct file with opencollada/collada_OSXbuild.patch
+python scons.py -j 2  RELEASE=1 PCRENATIVE=0 XMLPARSER=libxmlnative NOVALIDATION=1

Added: trunk/lib/darwin-8.0.0-powerpc/opencollada/collada_OSXbuild.patch
===================================================================
--- trunk/lib/darwin-8.0.0-powerpc/opencollada/collada_OSXbuild.patch	                        (rev 0)
+++ trunk/lib/darwin-8.0.0-powerpc/opencollada/collada_OSXbuild.patch	2010-09-11 05:23:18 UTC (rev 31871)
@@ -0,0 +1,65 @@
+Index: SConstruct
+===================================================================
+--- SConstruct	(revision 768)
++++ SConstruct	(working copy)
+@@ -6,12 +6,12 @@
+ 
+ # define the variables the user can set on the command line
+ vars = Variables('custom.py')
+-vars.Add(BoolVariable('RELEASE', 'Set to build for release', 0))
++vars.Add(BoolVariable('RELEASE', 'Set to build for release', 1))
+ vars.Add(BoolVariable('PG', 'Set to build with -pg set for gcc for profiling', 0))
+ vars.Add(BoolVariable('SHAREDLIB', 'Set to build shared libraries instead of static ones (untested).', 0))
+ vars.Add(BoolVariable('PCRENATIVE', 
+ """Set to build using the systems native pcre lib instead of the delivered lib. Uses same configuration dir for both configurations.
+-""", 1))
++""", 0))
+ vars.Add(EnumVariable('XMLPARSER',
+ """Selects the xml parser to be used
+     libxml: Use libXML contained in OpenCOLLADA external sources
+@@ -21,14 +21,17 @@
+ 
+ """
+ , 'libxmlnative', allowed_values=('libxml', 'expat', 'libxmlnative', 'expatnative'), ignorecase=2))
+-vars.Add(BoolVariable('NOVALIDATION', 'Set to disable shema validation in sax frame work loader', 0))
++vars.Add(BoolVariable('NOVALIDATION', 'Set to disable shema validation in sax frame work loader', 1))
+ 
+ env=Environment( variables=vars )
+ Help(vars.GenerateHelpText(env))
+ 
+ if env['RELEASE']:
+     configurationName = 'release'
+-    env['CPPFLAGS'] = ' -O2 -DNDEBUG'
++    #env['CPPFLAGS'] = ' -O2 -DNDEBUG -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -arch x86_64 -arch i386 -arch ppc'
++    env['CPPFLAGS'] = ' -O2 -DNDEBUG -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -arch ppc'
++    env['CC'] = 'gcc-4.0'
++    env['CXX'] = 'g++-4.0'
+ else:
+     configurationName = 'debug'
+     env['CPPFLAGS'] = ' -O0 -g3 -ggdb3 -fno-inline'
+@@ -65,10 +68,10 @@
+     SConscript(['Externals/pcre/SConscript'], exports = 'env')
+ 
+ 
+-if env['XMLPARSER'] == 'expat':
+-    SConscript(['Externals/expat/SConscript'], exports = 'env')
+-elif env['XMLPARSER'] == 'libxml':
+-    SConscript(['Externals/LibXML/SConscript'], exports = 'env')
++#if env['XMLPARSER'] == 'expat':
++    #SConscript(['Externals/expat/SConscript'], exports = 'env')
++#elif env['XMLPARSER'] == 'libxml':
++    #SConscript(['Externals/LibXML/SConscript'], exports = 'env')
+ 
+ SConscript(['COLLADAFramework/SConscript'], exports = 'env')
+ 
+@@ -76,8 +79,8 @@
+ SConscript(['COLLADASaxFrameworkLoader/SConscript'], exports = 'env')
+ SConscript(['COLLADAStreamWriter/SConscript'], exports = 'env')
+ 
+-SConscript(['COLLADAValidator/SConscript'], exports = 'env')
+-SConscript(['dae2ogre/SConscript'], exports = 'env')
++#SConscript(['COLLADAValidator/SConscript'], exports = 'env')
++#SConscript(['dae2ogre/SConscript'], exports = 'env')
+ 
+ 
+ Help("""

Modified: trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADABaseUtils/COLLADABUHashFunctions.h
===================================================================
--- trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADABaseUtils/COLLADABUHashFunctions.h	2010-09-11 04:39:00 UTC (rev 31870)
+++ trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADABaseUtils/COLLADABUHashFunctions.h	2010-09-11 05:23:18 UTC (rev 31871)
@@ -12,29 +12,22 @@
 #define __COLLADABU_HASHFUNCTIONS_H__
 
 #include "COLLADABUPrerequisites.h"
-#include "COLLADABUhash_map.h"
+#include "COLLADABUPlatform.h"
+#include "COLLADABUURI.h"
+  
 
-#ifdef COLLADABU_HAVE_TR1_UNORDERED_MAP
-//#  include 
-#else
-#  ifdef COLLADABU_OS_LINUX
-#	include <ext/hash_fun.h>
-#   include "COLLADABUURI.h"
-#  elif (defined COLLADABU_OS_MAC)
-#	include <ext/hash_fun.h>
-#   include "COLLADABUURI.h"
-#  endif
-#endif
-
 namespace COLLADABU
 {
-	class URI;
-
-
 	size_t calculateHash(const String& str);
 
+	/** Converts all lower case ASCII caracters to the corresponding upper case character befor calculating the hash.*/
+	size_t calculateHashUpper(const String& str);
+
 	size_t calculateHash(const char* str);
 
+	/** Converts all lower case ASCII caracters to the corresponding upper case character befor calculating the hash.*/
+	size_t calculateHashUpper(const char* str);
+
 	size_t calculateHash(const URI& uri);
 	inline size_t calculateHashU(const URI& uri){
 		return calculateHash(uri);
@@ -56,14 +49,6 @@
 			operator()(const COLLADABU::URI& uri) const
 		{ return COLLADABU::calculateHash(uri); }
 	};
-/*
-	template<>
-	struct hash<COLLADAFW::UniqueId>
-	{
-		size_t
-			operator()(const COLLADAFW::UniqueId& uniqueId) const { return uniqueId; }
-	};
-*/
 #if defined(COLLADABU_HAVE_TR1_UNORDERED_MAP)
 }
 #endif

Modified: trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADABaseUtils/COLLADABUPrerequisites.h
===================================================================
--- trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADABaseUtils/COLLADABUPrerequisites.h	2010-09-11 04:39:00 UTC (rev 31870)
+++ trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADABaseUtils/COLLADABUPrerequisites.h	2010-09-11 05:23:18 UTC (rev 31871)
@@ -6,13 +6,17 @@
     Licensed under the MIT Open Source License, 
     for details please see LICENSE file or the website
     http://www.opensource.org/licenses/mit-license.php
-*/
+*/
 
 #ifndef __COLLADABU_PREREQUISITES_H__
 #define __COLLADABU_PREREQUISITES_H__
 
+#include "COLLADABUPlatform.h"
+
 #include <string>
+#include <string.h>
 
+#include "COLLADABUPlatform.h"
 
 namespace COLLADABU
 {
@@ -20,4 +24,76 @@
     typedef std::wstring WideString;
 }
 
+#define COLLADABU_HAVE_TR1_UNORDERED_MAP
+#ifndef WIN32
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)
+#undef COLLADABU_HAVE_TR1_UNORDERED_MAP
+#else
+  #include <tr1/unordered_map>
+  #include <tr1/unordered_set>
+#endif
+#else
+#  undef COLLADABU_HAVE_TR1_UNORDERED_MAP
+#  if defined(_MSC_VER) && (_MSC_VER >= 1500) \
+   && defined(_MSC_FULL_VER) && \
+   !defined(__SGI_STL_PORT) && \
+   !defined(_STLPORT_VERSION) && \
+   !defined(_RWSTD_VER_STR) && \
+   !defined(_RWSTD_VER)
+#    define COLLADABU_HAVE_TR1_UNORDERED_MAP
+#    include <unordered_map>
+#    include <unordered_set>
+#  endif
+#endif
+#ifndef COLLADABU_HAVE_TR1_UNORDERED_MAP
+#  if defined(COLLADABU_OS_LINUX) || defined(COLLADABU_OS_MAC)
+#   include <ext/hash_map>
+#   include <ext/hash_set>
+#  else
+#   include <hash_map>
+#   include <hash_set>
+#  endif
+#endif
+
+#ifdef COLLADABU_HAVE_TR1_UNORDERED_MAP
+//#  include 
+#else
+#  ifdef COLLADABU_OS_LINUX
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)
+#   include <ext/hash_fun.h>
+#else
+#   include <backward/hash_fun.h>
+#endif
+#   include "COLLADABUURI.h"
+#  elif (defined COLLADABU_OS_MAC)
+#   include <ext/hash_fun.h>
+#   include "COLLADABUURI.h"
+#  endif
+#endif
+
+#ifndef COLLADABU_HAVE_TR1_UNORDERED_MAP
+    namespace __gnu_cxx {
+
+        template <>
+        struct hash<std::string> 
+        {
+            size_t operator() (const std::string& x) const 
+            {
+                return hash<const char*>()(x.c_str());
+            }
+        };
+
+        template < class _TYPE_ >
+        struct hash< _TYPE_ *> 
+        {
+            typedef _TYPE_* TYPE_PTR;
+            
+            size_t operator() ( TYPE_PTR x) const 
+            {
+                return hash<intptr_t>()((intptr_t)x);
+            }
+        };
+    }
+#endif
+
 #endif //__COLLADABU_PREREQUISITES_H__

Modified: trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADABaseUtils/COLLADABUStableHeaders.h
===================================================================
--- trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADABaseUtils/COLLADABUStableHeaders.h	2010-09-11 04:39:00 UTC (rev 31870)
+++ trunk/lib/darwin-8.0.0-powerpc/opencollada/include/COLLADABaseUtils/COLLADABUStableHeaders.h	2010-09-11 05:23:18 UTC (rev 31871)
@@ -6,11 +6,13 @@
     Licensed under the MIT Open Source License,
     for details please see LICENSE file or the website
     http://www.opensource.org/licenses/mit-license.php
-*/
+*/
 
 #ifndef __COLLADABU_STABLE_HEADERS_H__
 #define __COLLADABU_STABLE_HEADERS_H__
 
+#include "COLLADABUPrerequisites.h"
+
 //STL
 #include <vector>
 #include <sstream>
@@ -19,4 +21,7 @@
 #include <string>
 #include <iostream>
 
+
+
+
 #endif //__COLLADABU_STABLE_HEADERS_H__


@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list