[openCOLLADA] Update to latest svn.
Richard Shaw
hobbes1069 at fedoraproject.org
Mon Jun 18 17:30:06 UTC 2012
commit b74549bf205eaa90bc9d6400c8bf1482f4f18934
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date: Mon Jun 18 12:30:06 2012 -0500
Update to latest svn.
- Add MathMLSolver includes.
.gitignore | 1 +
ChangeLog => Changelog | 128 +++++++++++++++++++++++++++++++++++++++
openCOLLADA-gcc47.patch | 23 -------
openCOLLADA-smp_build.patch | 18 ++++++
openCOLLADA-svn871-memcpy.patch | 11 +++
openCOLLADA.spec | 31 ++++++---
sources | 2 +-
7 files changed, 179 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 59dd1f9..dd444f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/openCOLLADA-svn838.tar.xz
/openCOLLADA-svn863.tar.xz
/openCOLLADA-svn864.tar.xz
+/openCOLLADA-svn871.tar.xz
diff --git a/ChangeLog b/Changelog
similarity index 96%
rename from ChangeLog
rename to Changelog
index 1b0e232..4c93470 100644
--- a/ChangeLog
+++ b/Changelog
@@ -1,4 +1,132 @@
------------------------------------------------------------------------
+r871 | nathan.letwory | 2012-05-16 06:27:20 -0500 (Wed, 16 May 2012) | 1 line
+
+Changes to support MinGW64 compiler.
+------------------------------------------------------------------------
+r870 | ideasman42 at gmail.com | 2012-05-16 05:54:09 -0500 (Wed, 16 May 2012) | 2 lines
+
+set native line endings on all c/c++ source and headers.
+
+------------------------------------------------------------------------
+r869 | ideasman42 at gmail.com | 2012-04-27 08:37:16 -0500 (Fri, 27 Apr 2012) | 2 lines
+
+fix for building with gcc 4.7 on linux
+
+------------------------------------------------------------------------
+r868 | ideasman42 at gmail.com | 2012-03-14 16:17:51 -0500 (Wed, 14 Mar 2012) | 2 lines
+
+patch to fix issue: 182: Building openCOLLADA r864 fails with gcc 4.7.
+
+------------------------------------------------------------------------
+r867 | opencollada at gmail.com | 2012-01-07 14:01:33 -0600 (Sat, 07 Jan 2012) | 1 line
+
+First commit of the xsd2cpp framework that is capable of generating the OpenCOLLADA libraries from the corresponding XSD
+------------------------------------------------------------------------
+r866 | athibault at ngmoco.com | 2012-01-03 20:49:51 -0600 (Tue, 03 Jan 2012) | 2 lines
+
+COLLADAMaya : build fixes for Maya 2012 on Mac OS X.
+
+------------------------------------------------------------------------
+r865 | athibault at ngmoco.com | 2012-01-03 20:24:04 -0600 (Tue, 03 Jan 2012) | 2 lines
+
+Fix build on Mac OS X, this resolves Issue 177.
+
+------------------------------------------------------------------------
+r864 | opencollada at gmail.com | 2011-11-02 03:38:22 -0500 (Wed, 02 Nov 2011) | 1 line
+
+fixed multibyte conversion (thanks to uijin.tw)
+------------------------------------------------------------------------
+r863 | ideasman42 at gmail.com | 2011-10-13 19:46:23 -0500 (Thu, 13 Oct 2011) | 4 lines
+
+configure cmake to add warning flags if supported -Wextra too, but spress some of the more noisy warnings.
+
+also quiet some more harmless warnings.
+
+------------------------------------------------------------------------
+r862 | ideasman42 at gmail.com | 2011-10-13 19:38:47 -0500 (Thu, 13 Oct 2011) | 2 lines
+
+comment/ifdef unused vars (quiet some compiler warnings)
+
+------------------------------------------------------------------------
+r861 | ideasman42 at gmail.com | 2011-10-13 19:07:57 -0500 (Thu, 13 Oct 2011) | 2 lines
+
+cmake: build 'Release' by default.
+
+------------------------------------------------------------------------
+r860 | ideasman42 at gmail.com | 2011-10-13 19:02:26 -0500 (Thu, 13 Oct 2011) | 2 lines
+
+apply some changes suggested by Alexey.Z, issue 172.
+
+------------------------------------------------------------------------
+r859 | ideasman42 at gmail.com | 2011-10-13 18:54:06 -0500 (Thu, 13 Oct 2011) | 4 lines
+
+added script to double check cmake files (copied from blender where I maintain it),
+this helps ensure all source files are either explicitly ignored or accounted for by cmake.
+very nice for generating project files.
+
+------------------------------------------------------------------------
+r858 | ideasman42 at gmail.com | 2011-10-13 18:26:23 -0500 (Thu, 13 Oct 2011) | 2 lines
+
+move header installs into each libs cmake file and make the headers apart of the source so generated project files will include.
+
+------------------------------------------------------------------------
+r857 | ideasman42 at gmail.com | 2011-10-13 08:47:26 -0500 (Thu, 13 Oct 2011) | 2 lines
+
+remove redundant source file prefix and fix for previously committed wrong header install location
+
+------------------------------------------------------------------------
+r856 | ideasman42 at gmail.com | 2011-10-13 08:26:37 -0500 (Thu, 13 Oct 2011) | 2 lines
+
+greately simplify library definitions using a generic macro: opencollada_add_lib(...)
+
+------------------------------------------------------------------------
+r855 | ideasman42 at gmail.com | 2011-10-13 07:54:08 -0500 (Thu, 13 Oct 2011) | 2 lines
+
+CMake: make install target now works, use debian package as a reference to where files should go.
+
+------------------------------------------------------------------------
+r854 | ideasman42 at gmail.com | 2011-10-13 06:31:43 -0500 (Thu, 13 Oct 2011) | 2 lines
+
+fix for cmake creating libs in the source dir
+
+------------------------------------------------------------------------
+r853 | ideasman42 at gmail.com | 2011-10-13 05:34:29 -0500 (Thu, 13 Oct 2011) | 2 lines
+
+remove source dirs variables, list files directly
+
+------------------------------------------------------------------------
+r852 | ideasman42 at gmail.com | 2011-10-13 05:27:45 -0500 (Thu, 13 Oct 2011) | 2 lines
+
+missed these last commit.
+
+------------------------------------------------------------------------
+r851 | ideasman42 at gmail.com | 2011-10-13 05:20:47 -0500 (Thu, 13 Oct 2011) | 2 lines
+
+pedantic formatting / style edits
+
+------------------------------------------------------------------------
+r850 | ideasman42 at gmail.com | 2011-10-13 04:49:59 -0500 (Thu, 13 Oct 2011) | 8 lines
+
+use explicit file paths for CMake rather then globing, This is recommended by cmake devs.
+
+globbing vs explicit is discussed here. http://www.cmake.org/pipermail/cmake/2008-December/025694.html
+
+Practical implications are:
+- developers need to keep CMakeLists.txt files up to date.
+- Users wont get strange linking errors if they build after a file is added, since CMake detects CMakeLists.txt is modified and automatically reconfigure.
+
+------------------------------------------------------------------------
+r849 | ideasman42 at gmail.com | 2011-10-13 03:55:07 -0500 (Thu, 13 Oct 2011) | 3 lines
+
+fix for building on linux with gcc4.6.1
+note: FWriteBufferFlusher::FWriteBufferFlusher is disabled on non windows systems for now because _wfopen* is windows only.
+
+------------------------------------------------------------------------
+r848 | ideasman42 at gmail.com | 2011-10-13 03:08:55 -0500 (Thu, 13 Oct 2011) | 2 lines
+
+initial test commit
+
+------------------------------------------------------------------------
r847 | opencollada2 at gmail.com | 2011-09-13 07:16:16 -0500 (Tue, 13 Sep 2011) | 1 line
*COLLADABUMathUtils: added epsilonEquals(..) + getMatrixTransposed(..)
diff --git a/openCOLLADA-smp_build.patch b/openCOLLADA-smp_build.patch
new file mode 100644
index 0000000..cac6ee2
--- /dev/null
+++ b/openCOLLADA-smp_build.patch
@@ -0,0 +1,18 @@
+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})
diff --git a/openCOLLADA-svn871-memcpy.patch b/openCOLLADA-svn871-memcpy.patch
new file mode 100644
index 0000000..09619f5
--- /dev/null
+++ b/openCOLLADA-svn871-memcpy.patch
@@ -0,0 +1,11 @@
+diff -Naur openCOLLADA-svn868.orig/common/libBuffer/include/CommonBuffer.h openCOLLADA-svn868/common/libBuffer/include/CommonBuffer.h
+--- openCOLLADA-svn868.orig/common/libBuffer/include/CommonBuffer.h 2011-08-30 05:51:20.000000000 -0500
++++ openCOLLADA-svn868/common/libBuffer/include/CommonBuffer.h 2012-03-19 12:47:25.106873286 -0500
+@@ -11,6 +11,7 @@
+ #ifndef __COMMON_BUFFER_H__
+ #define __COMMON_BUFFER_H__
+
++#include <string.h>
+ #include "CommonIBufferFlusher.h"
+
+ namespace Common
diff --git a/openCOLLADA.spec b/openCOLLADA.spec
index 395e588..9ef8722 100644
--- a/openCOLLADA.spec
+++ b/openCOLLADA.spec
@@ -1,4 +1,4 @@
-%global AGE 864
+%global AGE 871
# Upstream does not maintain a soversion so we define one here.
# abi-compliance-checker will be used to determine if an abi breakage occurs
# and the soversion will be incremented.
@@ -7,7 +7,7 @@
Name: openCOLLADA
Version: 0
-Release: 11.svn%{AGE}%{?dist}
+Release: 12.svn%{AGE}%{?dist}
License: MIT
Summary: Collada 3D import and export libraries
Url: http://www.opencollada.org/
@@ -18,11 +18,12 @@ Group: System Environment/Libraries
# svn -r 863 export http://opencollada.googlecode.com/svn/trunk/ openCOLLADA-svn863
# tar acf openCOLLADA-svn836.tar.xz openCOLLADA-svn863
Source0: %{name}-svn%{AGE}.tar.xz
-Source1: ChangeLog
+Source1: Changelog
Patch0: openCOLLADA-svn863-cmake.patch
Patch1: openCOLLADA-svn863-libs.patch
-Patch2: openCOLLADA-gcc47.patch
+Patch2: openCOLLADA-smp_build.patch
+Patch3: openCOLLADA-svn871-memcpy.patch
BuildRequires: dos2unix
BuildRequires: fftw-devel
@@ -77,7 +78,8 @@ XML validator for COLLADA files, based on the COLLADASaxFrameworkLoader.
%setup -q -n %{name}-svn%{AGE}
%patch0 -p1 -b .cmake
%patch1 -p1 -b .libs
-%patch2 -p1 -b .gcc47
+%patch2 -p1 -b .smp
+%patch3 -p1 -b .memcpy
# Remove unused bundled libraries
rm -rf Externals/{Cg,expat,lib3ds,LibXML,MayaDataModel,pcre,zlib,zziplib}
@@ -98,7 +100,7 @@ dos2unix -f -k README
find htdocs/ -name *.php -exec dos2unix -f {} \;
find htdocs/ -name *.css -exec dos2unix -f {} \;
-# Install ChangeLog
+# Install Changelog
install -p -m 0644 %{S:1} ./
@@ -111,10 +113,7 @@ rm -rf Build && mkdir -p Build && pushd Build
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
../
-# Note building with _smp_mflags does not work
-make
-
-#%{?_smp_mflags}
+make %{?_smp_mflags}
%install
@@ -125,6 +124,12 @@ make DESTDIR=%{buildroot} install
mkdir -p %{buildroot}%{_bindir}/
install -p -m 0755 bin/* %{buildroot}%{_bindir}/
+popd
+
+# Install MathMLSolver headers
+mkdir -p %{buildroot}%{_includedir}/MathMLSolver
+cp -a Externals/MathMLSolver/include/* %{buildroot}%{_includedir}/MathMLSolver/
+
%post -p /sbin/ldconfig
@@ -132,7 +137,7 @@ install -p -m 0755 bin/* %{buildroot}%{_bindir}/
%files
-%doc README LICENSE README.COLLADAStreamWriter COLLADAStreamWriter/AUTHORS ChangeLog
+%doc README LICENSE README.COLLADAStreamWriter COLLADAStreamWriter/AUTHORS Changelog
%{_libdir}/lib*.so.%{sover}
%files doc
@@ -147,6 +152,10 @@ install -p -m 0755 bin/* %{buildroot}%{_bindir}/
%changelog
+* Mon Jun 18 2012 Richard Shaw <hobbes1069 at gmail.com> - 0-12.svn871
+- Update to latest svn.
+- Add MathMLSolver includes.
+
* Fri Feb 10 2012 Petr Pisar <ppisar at redhat.com> - 0-11.svn864
- Rebuild against PCRE 8.30
diff --git a/sources b/sources
index aec9743..1e6f5d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3525cb1acfcaacefd938084f2aaba07f openCOLLADA-svn864.tar.xz
+216ace2a47c531639750e994a2577599 openCOLLADA-svn871.tar.xz
More information about the scm-commits
mailing list