From 619bf1696b1878f6a1b9c61b59f185ed8785985e Mon Sep 17 00:00:00 2001 From: Richard M. Shaw Date: Apr 28 2011 20:18:20 +0000 Subject: Initial import (#694287). --- diff --git a/.gitignore b/.gitignore index e69de29..dba62f4 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/openCOLLADA-svn838.tar.xz diff --git a/CHANGES.txt b/CHANGES.txt new file mode 100644 index 0000000..6b57192 --- /dev/null +++ b/CHANGES.txt @@ -0,0 +1,179 @@ +------------------------------------------------------------------------ +r836 | opencollada2@gmail.com | 2011-03-04 16:40:46 +0200 (Fri, 04 Mar 2011) | 1 line + +fix validation preprocessor flag +------------------------------------------------------------------------ +r835 | opencollada2@gmail.com | 2011-03-04 13:29:44 +0200 (Fri, 04 Mar 2011) | 1 line + +inti member variables +------------------------------------------------------------------------ +r834 | opencollada2@gmail.com | 2011-03-03 16:32:01 +0200 (Thu, 03 Mar 2011) | 2 lines + +fix uri copy ctor +add missing includes +------------------------------------------------------------------------ +r833 | opencollada2@gmail.com | 2011-01-31 15:59:05 +0200 (Mon, 31 Jan 2011) | 1 line + +fix google ware house integration +------------------------------------------------------------------------ +r832 | opencollada2@gmail.com | 2011-01-31 13:40:55 +0200 (Mon, 31 Jan 2011) | 1 line + +replace asserts +------------------------------------------------------------------------ +r831 | opencollada2@gmail.com | 2011-01-31 13:34:40 +0200 (Mon, 31 Jan 2011) | 1 line + +fix import +------------------------------------------------------------------------ +r830 | opencollada2@gmail.com | 2011-01-28 16:58:29 +0200 (Fri, 28 Jan 2011) | 1 line + +fix crash in utf conversion with recent gcc +------------------------------------------------------------------------ +r829 | opencollada2@gmail.com | 2011-01-28 12:44:34 +0200 (Fri, 28 Jan 2011) | 1 line + +define assert for Maya data model +------------------------------------------------------------------------ +r828 | opencollada2@gmail.com | 2011-01-27 16:52:25 +0200 (Thu, 27 Jan 2011) | 1 line + +replace asserts by custom assert +------------------------------------------------------------------------ +r827 | opencollada2@gmail.com | 2011-01-27 14:16:19 +0200 (Thu, 27 Jan 2011) | 1 line + +mac os x port +------------------------------------------------------------------------ +r824 | opencollada2@gmail.com | 2011-01-25 15:20:06 +0200 (Tue, 25 Jan 2011) | 1 line + +fix Issue 125: cgfx shader source file is not honoring the search path on export +------------------------------------------------------------------------ +r817 | opencollada2@gmail.com | 2011-01-20 14:43:31 +0200 (Thu, 20 Jan 2011) | 2 lines + +fix Issue 89: CONTINUITY semantic is not defined. +Define all semantics in COLLADASWInputList.h +------------------------------------------------------------------------ +r816 | opencollada2@gmail.com | 2011-01-20 12:46:14 +0200 (Thu, 20 Jan 2011) | 1 line + +fix Issue 84: G3DWarehouseBrowser can't download lowpolygon3d models +------------------------------------------------------------------------ +r815 | opencollada2@gmail.com | 2011-01-19 18:32:56 +0200 (Wed, 19 Jan 2011) | 1 line + +partially fix Issue 71: wrong opacity for effects without set transparency +------------------------------------------------------------------------ +r814 | opencollada2@gmail.com | 2011-01-19 17:31:37 +0200 (Wed, 19 Jan 2011) | 1 line + +fix Issue 65: COLLADASaxFWL::Loader::loadDocument() don't check if the file correctly loads +------------------------------------------------------------------------ +r813 | opencollada2@gmail.com | 2011-01-19 17:24:56 +0200 (Wed, 19 Jan 2011) | 1 line + +fix Issue 62: build fixes for linux (gcc 4.4.3) +------------------------------------------------------------------------ +r812 | opencollada2@gmail.com | 2011-01-19 16:22:53 +0200 (Wed, 19 Jan 2011) | 1 line + +ignore bin and lib folder in pcre +------------------------------------------------------------------------ +r811 | opencollada2@gmail.com | 2011-01-19 16:14:50 +0200 (Wed, 19 Jan 2011) | 1 line + +Issue 35: IWriter start, cancel, and finish methods not called +------------------------------------------------------------------------ +r810 | opencollada2@gmail.com | 2011-01-19 13:56:41 +0200 (Wed, 19 Jan 2011) | 1 line + +remove precompiled pcre pattern from source +------------------------------------------------------------------------ +r809 | opencollada2@gmail.com | 2011-01-19 13:55:13 +0200 (Wed, 19 Jan 2011) | 1 line + +update to pcre 8.12 +------------------------------------------------------------------------ +r808 | opencollada2@gmail.com | 2011-01-18 18:26:41 +0200 (Tue, 18 Jan 2011) | 1 line + +fix Issue 122: Root::loadDocument("../a/b/c.dae") attempts to open "../a/a/b/c.dae" +------------------------------------------------------------------------ +r807 | opencollada2@gmail.com | 2011-01-18 17:38:08 +0200 (Tue, 18 Jan 2011) | 1 line + +partially fix Issue 92: Parsing crashes when compiled with Visual Studio 2010 +------------------------------------------------------------------------ +r806 | opencollada2@gmail.com | 2011-01-18 16:54:58 +0200 (Tue, 18 Jan 2011) | 1 line + +Issue 145: std::terminate() while loading lightwave dae through OpenCOLLADAValidator +------------------------------------------------------------------------ +r805 | opencollada2@gmail.com | 2011-01-18 16:19:23 +0200 (Tue, 18 Jan 2011) | 1 line + +fix Issue 146: OpenCOLLADAValidator crash COLLADASaxFWL::LibraryEffectsLoader::handleTexture +------------------------------------------------------------------------ +r804 | opencollada2@gmail.com | 2011-01-18 16:00:57 +0200 (Tue, 18 Jan 2011) | 1 line + +fix Issue 151: CMakeLists.txt overwrites custom CMAKE_CXX_FLAGS +------------------------------------------------------------------------ +r803 | opencollada2@gmail.com | 2011-01-18 14:03:35 +0200 (Tue, 18 Jan 2011) | 2 lines + +Issue 153: crash in +improvements in kinematics loader related to mathml +------------------------------------------------------------------------ +r798 | opencollada2@gmail.com | 2011-01-17 10:04:45 +0200 (Mon, 17 Jan 2011) | 2 lines + +fix Issue 152: Support for VS2005 and VS2010 +using provided patch +------------------------------------------------------------------------ +r790 | opencollada2@gmail.com | 2011-01-14 17:53:38 +0200 (Fri, 14 Jan 2011) | 1 line + +ignore files +------------------------------------------------------------------------ +r789 | opencollada2@gmail.com | 2011-01-14 17:44:42 +0200 (Fri, 14 Jan 2011) | 3 lines + +fix project settings in expat +increase plugin version +minor bug fix +------------------------------------------------------------------------------------------------------------------------------------------------ +r788 | robert%opencollada.org@gtempaccount.com | 2010-12-15 16:05:34 +0200 (Wed, 15 Dec 2010) | 1 line + +fix Issue 148: Glitch in ftoa and dtoa (rename variables) +------------------------------------------------------------------------ +r787 | robert%opencollada.org@gtempaccount.com | 2010-12-15 16:04:33 +0200 (Wed, 15 Dec 2010) | 1 line + +fix Issue 144: [ColladaMAX] Material names have an unnecessary and sometimes inconsisten suffix "_1" +------------------------------------------------------------------------ +r786 | robert%opencollada.org@gtempaccount.com | 2010-12-15 12:46:20 +0200 (Wed, 15 Dec 2010) | 1 line + +fix Issue 148: Glitch in ftoa and dtoa +------------------------------------------------------------------------ +r785 | robert%opencollada.org@gtempaccount.com | 2010-11-22 10:36:59 +0200 (Mon, 22 Nov 2010) | 1 line + +fix Issue 137: SetParam does not properly export float with 0's in it +------------------------------------------------------------------------ +r784 | robert%opencollada.org@gtempaccount.com | 2010-11-22 10:13:51 +0200 (Mon, 22 Nov 2010) | 1 line + +apply patch (only first change) provided in Issue 136: Fix for color sets not exporting in colladaMaya +------------------------------------------------------------------------ +r783 | robert%opencollada.org@gtempaccount.com | 2010-11-18 11:40:39 +0200 (Thu, 18 Nov 2010) | 1 line + +fix: do not write empty element in +------------------------------------------------------------------------ +r782 | robert%opencollada.org@gtempaccount.com | 2010-11-17 14:00:41 +0200 (Wed, 17 Nov 2010) | 1 line + +fix performance issue with many materials +------------------------------------------------------------------------ +r781 | robert%opencollada.org@gtempaccount.com | 2010-11-16 09:54:39 +0200 (Tue, 16 Nov 2010) | 1 line + +apply path from Issue 4: CMake or Scons +------------------------------------------------------------------------ +r780 | robert%opencollada.org@gtempaccount.com | 2010-11-16 09:52:44 +0200 (Tue, 16 Nov 2010) | 1 line + +upgrade to vs2008 +------------------------------------------------------------------------ +-r779 | robert%opencollada.org@gtempaccount.com | 2010-11-04 17:08:55 +0200 (Thu, 04 Nov 2010) | 1 line + +apply patch provided in Issue 4: CMake or Scons (add cmake files) +------------------------------------------------------------------------ +r778 | robert%opencollada.org@gtempaccount.com | 2010-11-04 16:24:01 +0200 (Thu, 04 Nov 2010) | 1 line + +fix Issue 132: Small fix from compiling blender - collada with -Wall -Werror +------------------------------------------------------------------------ +r777 | robert%opencollada.org@gtempaccount.com | 2010-11-03 14:03:30 +0200 (Wed, 03 Nov 2010) | 1 line + +fix Issue 131: Gcc will be initialized after warning fixes +------------------------------------------------------------------------ +r776 | robert%opencollada.org@gtempaccount.com | 2010-10-25 10:01:28 +0200 (Mon, 25 Oct 2010) | 1 line + +fix Issue 126: cgfx shader source file is not honoring the search path on export +------------------------------------------------------------------------ +r775 | robert%opencollada.org@gtempaccount.com | 2010-10-12 11:18:05 +0200 (Tue, 12 Oct 2010) | 1 line + +delete COLLADASaxFrameworkLoader.patch +------------------------------------------------------------------------ diff --git a/openCOLLADA-cmake_dynamic_libs.patch b/openCOLLADA-cmake_dynamic_libs.patch new file mode 100644 index 0000000..0f0c4cb --- /dev/null +++ b/openCOLLADA-cmake_dynamic_libs.patch @@ -0,0 +1,167 @@ +diff -up openCOLLADA-svn838/CMakeLists.txt.orig openCOLLADA-svn838/CMakeLists.txt +--- openCOLLADA-svn838/CMakeLists.txt.orig 2011-01-18 15:00:57.000000000 +0100 ++++ openCOLLADA-svn838/CMakeLists.txt 2011-04-26 20:41:54.000139779 +0200 +@@ -66,9 +66,6 @@ ELSE (PCRE_FOUND) #if pcre not found bui + ENDIF (PCRE_FOUND) + + #building required libs +-ADD_SUBDIRECTORY(common/libftoa) +-ADD_SUBDIRECTORY(common/libBuffer) +-ADD_SUBDIRECTORY(${EXTERNAL_LIBRARIES}/UTF) + ADD_SUBDIRECTORY(${EXTERNAL_LIBRARIES}/MathMLSolver) + + #building OpenCOLLADA libs +diff -up openCOLLADA-svn838/COLLADABaseUtils/CMakeLists.txt.orig openCOLLADA-svn838/COLLADABaseUtils/CMakeLists.txt +--- openCOLLADA-svn838/COLLADABaseUtils/CMakeLists.txt.orig 2010-11-16 08:54:39.000000000 +0100 ++++ openCOLLADA-svn838/COLLADABaseUtils/CMakeLists.txt 2011-04-26 20:43:21.886139804 +0200 +@@ -8,17 +8,25 @@ SET(libBaseUtils_include_dirs + + SET(libBaseUtils_include_dirs ${libBaseUtils_include_dirs} PARENT_SCOPE) #adding include dirs to a parent scope + ++SET(libUTF_include_dirs ++ ${CMAKE_CURRENT_SOURCE_DIR}/../Externals/UTF/include/ ++) ++ + SET(libBaseUtils_src_dirs + ${CMAKE_CURRENT_SOURCE_DIR}/src/ + ) + ++SET(libUTF_src_dirs ++ ${CMAKE_CURRENT_SOURCE_DIR}/../Externals/UTF/src/ ++) ++ + file(GLOB_RECURSE libBaseUtils_src_files + ${libBaseUtils_src_dirs}/*.cpp + ${libBaseUtils_src_dirs}/*.h ++ ${libUTF_src_dirs}/*.c + ) + + SET(libBaseUtils_libs +- UTF + ${PCRE_LIBRARIES} + ) + +@@ -40,7 +48,7 @@ IF (USE_SHARED) + message(${name} " WARNING: Shared library support implemented for UNIX-like OS only") + ENDIF (NOT UNIX) + ADD_LIBRARY(${name}_shared SHARED ${libBaseUtils_src_files}) +- SET_TARGET_PROPERTIES(${name}_shared PROPERTIES OUTPUT_NAME ${name}) ++ SET_TARGET_PROPERTIES(${name}_shared PROPERTIES OUTPUT_NAME ${name} SOVERSION ${soversion}) + TARGET_LINK_LIBRARIES(${name}_shared ${libBaseUtils_libs}) + SET(CMAKE_REQUIRED_LIBRARIES "${name}_shared;${CMAKE_REQUIRED_LIBRARIES}" PARENT_SCOPE) + ENDIF (USE_SHARED) +diff -up openCOLLADA-svn838/COLLADAFramework/CMakeLists.txt.orig openCOLLADA-svn838/COLLADAFramework/CMakeLists.txt +--- openCOLLADA-svn838/COLLADAFramework/CMakeLists.txt.orig 2010-11-16 08:54:39.000000000 +0100 ++++ openCOLLADA-svn838/COLLADAFramework/CMakeLists.txt 2011-04-26 20:44:00.015139815 +0200 +@@ -36,7 +36,7 @@ IF (USE_SHARED) + message(${name} " WARNING: Shared library support implemented for UNIX-like OS only") + ENDIF (NOT UNIX) + ADD_LIBRARY(${name}_shared SHARED ${libFramework_src_files}) +- SET_TARGET_PROPERTIES(${name}_shared PROPERTIES OUTPUT_NAME ${name}) ++ SET_TARGET_PROPERTIES(${name}_shared PROPERTIES OUTPUT_NAME ${name} SOVERSION ${soversion}) + TARGET_LINK_LIBRARIES(${name}_shared ${libFramework_libs}) + SET(CMAKE_REQUIRED_LIBRARIES "${name}_shared;${CMAKE_REQUIRED_LIBRARIES}" PARENT_SCOPE) + ENDIF (USE_SHARED) +diff -up openCOLLADA-svn838/COLLADASaxFrameworkLoader/CMakeLists.txt.orig openCOLLADA-svn838/COLLADASaxFrameworkLoader/CMakeLists.txt +--- openCOLLADA-svn838/COLLADASaxFrameworkLoader/CMakeLists.txt.orig 2010-11-16 08:54:39.000000000 +0100 ++++ openCOLLADA-svn838/COLLADASaxFrameworkLoader/CMakeLists.txt 2011-04-26 20:43:08.287139799 +0200 +@@ -58,7 +58,7 @@ IF (USE_SHARED) + message(${name} " WARNING: Shared library support implemented for UNIX-like OS only") + ENDIF (NOT UNIX) + ADD_LIBRARY(${name}_shared SHARED ${libSaxFrameworkLoader_src_files}) +- SET_TARGET_PROPERTIES(${name}_shared PROPERTIES OUTPUT_NAME ${name}) ++ SET_TARGET_PROPERTIES(${name}_shared PROPERTIES OUTPUT_NAME ${name} SOVERSION ${soversion}) + TARGET_LINK_LIBRARIES(${name}_shared ${libSaxFrameworkLoader_libs}) + SET(CMAKE_REQUIRED_LIBRARIES "${name}_shared;${CMAKE_REQUIRED_LIBRARIES}" PARENT_SCOPE) + ENDIF (USE_SHARED) +\ No newline at end of file +diff -up openCOLLADA-svn838/COLLADAStreamWriter/CMakeLists.txt.orig openCOLLADA-svn838/COLLADAStreamWriter/CMakeLists.txt +--- openCOLLADA-svn838/COLLADAStreamWriter/CMakeLists.txt.orig 2010-11-16 08:54:39.000000000 +0100 ++++ openCOLLADA-svn838/COLLADAStreamWriter/CMakeLists.txt 2011-04-26 20:44:08.879139822 +0200 +@@ -7,19 +7,40 @@ SET(libStreamWriter_include_dirs + + SET(libStreamWriter_include_dirs ${libStreamWriter_include_dirs} PARENT_SCOPE) #adding include dirs to a parent scope + ++SET(libBuffer_include_dirs ++ ${CMAKE_CURRENT_SOURCE_DIR}/../common/libBuffer/include/ ++) ++ ++SET(libftoa_include_dirs ++ ${CMAKE_CURRENT_SOURCE_DIR}/../common/libftoa/include/ ++) ++ + SET(libStreamWriter_src_dirs + ${CMAKE_CURRENT_SOURCE_DIR}/src/ + ) + ++SET(libBuffer_src_dirs ++ ${CMAKE_CURRENT_SOURCE_DIR}/../common/libBuffer/src/ ++) ++ ++SET(libftoa_src_dirs ++ ${CMAKE_CURRENT_SOURCE_DIR}/../common/libftoa/src/ ++) ++ + file(GLOB_RECURSE libStreamWriterLoader_src_files + ${libStreamWriter_src_dirs}/*.cpp + ${libStreamWriter_src_dirs}/*.h ++ ${libBuffer_src_dirs}/CommonBuffer.cpp ++ ${libBuffer_src_dirs}/CommonCharacterBuffer.cpp ++ ${libBuffer_src_dirs}/CommonFWriteBufferFlusher.cpp ++ ${libBuffer_src_dirs}/CommonStreamBufferFlusher.cpp ++ ${libftoa_src_dirs}/Commondtoa.cpp ++ ${libftoa_src_dirs}/Commonftoa.cpp ++ ${libftoa_src_dirs}/Commonitoa.cpp + ) + + SET(libStreamWriter_libs + OpenCOLLADABaseUtils +- buffer +- ftoa + ) + + INCLUDE_DIRECTORIES(${libStreamWriter_include_dirs} +@@ -42,7 +63,7 @@ IF (USE_SHARED) + message(${name} " WARNING: Shared library support implemented for UNIX-like OS only") + ENDIF (NOT UNIX) + ADD_LIBRARY(${name}_shared SHARED ${libStreamWriterLoader_src_files}) +- SET_TARGET_PROPERTIES(${name}_shared PROPERTIES OUTPUT_NAME ${name}) ++ SET_TARGET_PROPERTIES(${name}_shared PROPERTIES OUTPUT_NAME ${name} SOVERSION ${soversion}) + TARGET_LINK_LIBRARIES(${name}_shared ${libStreamWriter_libs}) + SET(CMAKE_REQUIRED_LIBRARIES "${name}_shared;${CMAKE_REQUIRED_LIBRARIES}" PARENT_SCOPE) + ENDIF (USE_SHARED) +diff -up openCOLLADA-svn838/COLLADAValidator/CMakeLists.txt.orig openCOLLADA-svn838/COLLADAValidator/CMakeLists.txt +--- openCOLLADA-svn838/COLLADAValidator/CMakeLists.txt.orig 2010-11-16 08:54:39.000000000 +0100 ++++ openCOLLADA-svn838/COLLADAValidator/CMakeLists.txt 2011-04-26 20:45:26.158139837 +0200 +@@ -24,7 +24,6 @@ SET(libValidator_libs + MathMLSolver + ${PCRE_LIBRARIES} + ${LIBXML2_LIBRARIES} +- UTF + ) + + INCLUDE_DIRECTORIES( +diff -up openCOLLADA-svn838/Externals/MathMLSolver/CMakeLists.txt.orig openCOLLADA-svn838/Externals/MathMLSolver/CMakeLists.txt +--- openCOLLADA-svn838/Externals/MathMLSolver/CMakeLists.txt.orig 2010-11-16 08:54:39.000000000 +0100 ++++ openCOLLADA-svn838/Externals/MathMLSolver/CMakeLists.txt 2011-04-26 20:43:33.262139795 +0200 +@@ -34,7 +34,7 @@ IF (USE_SHARED) + message(${name} " WARNING: Shared library support implemented for UNIX-like OS only") + ENDIF (NOT UNIX) + ADD_LIBRARY(${name}_shared SHARED ${libMathMLSolver_src_files}) +- SET_TARGET_PROPERTIES(${name}_shared PROPERTIES OUTPUT_NAME ${name}) ++ SET_TARGET_PROPERTIES(${name}_shared PROPERTIES OUTPUT_NAME ${name} SOVERSION ${soversion}) + TARGET_LINK_LIBRARIES(${name}_shared ${libMathMLSolver_libs}) + SET(CMAKE_REQUIRED_LIBRARIES "${name}_shared;${CMAKE_REQUIRED_LIBRARIES}" PARENT_SCOPE) + ENDIF (USE_SHARED) +diff -up openCOLLADA-svn838/GeneratedSaxParser/CMakeLists.txt.orig openCOLLADA-svn838/GeneratedSaxParser/CMakeLists.txt +--- openCOLLADA-svn838/GeneratedSaxParser/CMakeLists.txt.orig 2010-11-16 08:54:39.000000000 +0100 ++++ openCOLLADA-svn838/GeneratedSaxParser/CMakeLists.txt 2011-04-26 20:41:54.005139779 +0200 +@@ -59,7 +59,7 @@ IF (USE_SHARED) + message(${name} " WARNING: Shared library support implemented for UNIX-like OS only") + ENDIF (NOT UNIX) + ADD_LIBRARY(${name}_shared SHARED ${libGeneratedSaxParser_src_files}) +- SET_TARGET_PROPERTIES(${name}_shared PROPERTIES OUTPUT_NAME ${name}) ++ SET_TARGET_PROPERTIES(${name}_shared PROPERTIES OUTPUT_NAME ${name} SOVERSION ${soversion}) + TARGET_LINK_LIBRARIES(${name}_shared ${libGeneratedSaxParser_libs}) + SET(CMAKE_REQUIRED_LIBRARIES "${name}_shared;${CMAKE_REQUIRED_LIBRARIES}" PARENT_SCOPE) + ENDIF (USE_SHARED) diff --git a/openCOLLADA.spec b/openCOLLADA.spec new file mode 100644 index 0000000..9d1c783 --- /dev/null +++ b/openCOLLADA.spec @@ -0,0 +1,246 @@ +# These are needed to fake the library version. +%define AGE 838 + +Name: openCOLLADA +Version: 0 +Release: 5.svn%{AGE}%{?dist} +License: MIT +Summary: Collada 3D import and export libraries +Url: http://www.opencollada.org/ +Group: System Environment/Libraries + +# The source for this package was pulled from upstream's svn. Use the +# following commands to generate the tarball (revision 836 shown): +# svn -r 836 export http://opencollada.googlecode.com/svn/trunk/ openCOLLADA-svn836 +# tar acf openCOLLADA-svn836.tar.xz openCOLLADA-svn836 +Source0: %{name}-svn%{AGE}.tar.xz +Source1: CHANGES.txt +Patch0: openCOLLADA-cmake_dynamic_libs.patch + +BuildRequires: dos2unix +BuildRequires: fftw3-devel +BuildRequires: pcre-devel +BuildRequires: cmake +BuildRequires: zlib-devel +BuildRequires: libxml2-devel + +%description +COLLADA is a royalty-free XML schema that enables digital asset +exchange within the interactive 3D industry. +OpenCOLLADA is a Google summer of code opensource project providing +libraries for 3D file interchange between applications like blender. +COLLADABaseUtils Utils used by many of the other projects +COLLADAFramework Datamodel used to load COLLADA files +COLLADAStreamWriter Sources (Library to write COLLADA files) +COLLADASaxFrameworkLoader Library that loads COLLADA files in a sax + like manner into the framework data model +COLLADAValidator XML validator for COLLADA files, based on + the COLLADASaxFrameworkLoader +GeneratedSaxParser Library used to load xml files in the way + used by COLLADASaxFrameworkLoader +Authors +------- +sebastian@opencollada.org +robert@opencollada.org + +%package doc +Summary: Developer documentation for %{name} +Group: Documentation +Requires: %{name} = %{version}-%{release} + +%description doc +This package provides documentation for %{name}. + +%package devel +Summary: Include files for openCOLLADA development +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +This package provides the include files necessary to build and +develop with the %{name} export and import libraries. + +%package utils +Summary: XML validator for COLLADA files +Group: Development/Tools +Requires: %{name} = %{version}-%{release} + +%description utils +XML validator for COLLADA files, based on the COLLADASaxFrameworkLoader. + +%prep +%setup -q -n %{name}-svn%{AGE} +%patch0 -p1 + +# Remove unused bundled libraries +rm -rf Externals/{Cg,expat,lib3ds,LibXML,MayaDataModel,pcre,zlib,zziplib} + +# Add some docs, need to fix eol encoding with dos2unix in some files. +find ./ -name .project -delete +cp -pf COLLADAStreamWriter/README README.COLLADAStreamWriter +cp -pf COLLADAStreamWriter/LICENSE ./ + +iconv -f ISO_8859-1 -t utf-8 COLLADAStreamWriter/AUTHORS > \ + COLLADAStreamWriter/AUTHORS.tmp +touch -r COLLADAStreamWriter/AUTHORS COLLADAStreamWriter/AUTHORS.tmp +mv COLLADAStreamWriter/AUTHORS.tmp COLLADAStreamWriter/AUTHORS + +dos2unix -f -k README.COLLADAStreamWriter +dos2unix -f -k LICENSE +dos2unix -f -k README +find htdocs/ -name *.php -exec dos2unix -f {} \; +find htdocs/ -name *.css -exec dos2unix -f {} \; + +# copy CHANGES.txt +install -p -m 0644 %{S:1} ./ + +%build +# Build openCOLLADA shared libraries. +mkdir -p Build +pushd Build +%cmake ../ -DUSE_STATIC=OFF -DUSE_SHARED=ON -Dsoversion=svn%{AGE} -DCMAKE_SKIP_RPATH=ON +# Note building with _smp_mflags does not work for some reason... +make +popd + +%install +# Manual install linking and renaming of libraries is necessary. +mkdir -p %{buildroot}%{_libdir} +install -p -m 0755 lib/*.so.svn%{AGE} %{buildroot}%{_libdir}/ +cp -a lib/*.so %{buildroot}%{_libdir}/ + +# Manual install of include files is necessary. +mkdir -p %{buildroot}%{_prefix} +for dir in COLLADABaseUtils COLLADAFramework COLLADASaxFrameworkLoader \ + COLLADAStreamWriter COLLADAValidator Externals/MathMLSolver \ + GeneratedSaxParser; do + mkdir -p %{buildroot}%{_includedir}/$(basename $dir) + cp -a $dir/include/* %{buildroot}%{_includedir}/$(basename $dir) +done + +# Manually install binaries +mkdir -p %{buildroot}%{_bindir}/ +install -p -m 0755 bin/* %{buildroot}%{_bindir}/ + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc README LICENSE README.COLLADAStreamWriter COLLADAStreamWriter/AUTHORS CHANGES.txt +%{_libdir}/lib*.so.svn%{AGE} + +%files doc +%defattr(-,root,root,-) +%doc htdocs/ + +%files devel +%defattr(-,root,root,-) +%{_libdir}/*.so +%{_includedir}/* + +%files utils +%defattr(-,root,root,-) +%{_bindir}/* + +%changelog +* Wed Apr 27 2011 Richard Shaw - 0-5 +- Created -utils and -doc sub-packages. +- Corrected installation location of -devel header files. + +* Wed Apr 27 2011 Richard Shaw - 0-4 +- Move from scons to cmake for building. +- Various other fixes. + +* Thu Apr 21 2011 Richard Shaw - 0-3 +- Switched from expat to libxml2 for xml support. +- Updated to svn838 + +* Fri Apr 15 2011 Richard Shaw - 0-2 +- Updated spec file for better packaging compliance +- Fixed some rpmlint warnings + +* Wed Apr 12 2011 Richard Shaw - 0-1 +- Updated spec file for Fedora packaging compliance + +* Thu Mar 31 2011 davejplater@gmail.com +- Update to svn836 +- Upstream changes : + * fix validation preprocessor flag + * inti member variables + * fix uri copy ctor, add missing includes + * replace asserts + * fix import + * fix crash in utf conversion with recent gcc + * replace asserts by custom assert + +* Fri Feb 11 2011 davejplater@gmail.com +- Update to svn827 +- Upstream changes: + * fix Issue 125: cgfx shader source file is not honoring the + search path on export. + * fix Issue 89: CONTINUITY semantic is not defined. Define all + semantics in COLLADASWInputList.h + * partially fix Issue 71: wrong opacity for effects without set + transparency + * fix Issue 65: COLLADASaxFWL::Loader::loadDocument() don't check + if the file correctly loads + * fix Issue 62: build fixes for linux (gcc 4.4.3) + * ignore bin and lib folder in pcre + * Issue 35: IWriter start, cancel, and finish methods not called + * remove precompiled pcre pattern from source + * fix Issue 122: Root::loadDocument("../a/b/c.dae") attempts to + open "../a/a/b/c.dae" + * Issue 145: std::terminate() while loading lightwave dae through + OpenCOLLADAValidator + * fix Issue 146: OpenCOLLADAValidator crash + COLLADASaxFWL::LibraryEffectsLoader::handleTexture + * fix Issue 151: CMakeLists.txt overwrites custom CMAKE_CXX_FLAGS + * Issue 153: crash in improvements in + kinematics loader related to mathml + +* Fri Jan 7 2011 davejplater@gmail.com +- Spec file change to fix SLE_11_SP1 build made by repabuild. + +* Mon Dec 27 2010 davejplater@gmail.com +- Update to svn788 +- Upstream changes + * fix Issue 148: Glitch in ftoa and dtoa (rename variables) + +* Mon Nov 22 2010 davejplater@gmail.com +- Update to svn785 +- Prevent build of dae2ogre with openCOLLADA-nodae2ogre.patch +- Upstream changes : + * apply path from Issue 4: CMake or Scons + * fix performance issue with many materials + * fix: do not write empty element in + * apply patch (only first change) provided in Issue 136: Fix for + color sets not exporting in colladaMaya + * fix Issue 137: SetParam does not properly export float with + 0's in it + +* Sat Nov 6 2010 davejplater@gmail.com +- Update to svn 779 Removed openCOLLADA-assign_value.patch which is + already incorporated in this revision. +- Upstream changes : + * fix Issue 126: cgfx shader source file is not honoring the search + path on export. + * apply patch provided in Issue 4: CMake or Scons (add cmake files) + * fix Issue 132: Small fix from compiling blender - collada with + - Wall -Werror + * fix Issue 131: Gcc will be initialized after warning fixes + +* Tue Oct 26 2010 pth@suse.de +- Actually assign the passed value in setter function. +- Manually strip libraries + +* Sun Oct 24 2010 davejplater@gmail.com +- Added patch COLLADA-linuxbuild.patch to fix shared lib build includes. +- Added patch openCOLLADA-buildflags.patch for optflags. +- Added patch openCOLLADA-soname.patch to add sonames to libs. + +* Mon Oct 18 2010 davejplater@gmail.com +- Created new package openCOLLADA needed by blender-2.5x +- OpenCOLLADA is a stream based reader and writer library for + COLLADA files. support@opencollada.org diff --git a/sources b/sources index e69de29..bb4ed65 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +558c651ed25e9b3be3b47ebb5992391e openCOLLADA-svn838.tar.xz