Hello community,
here is the log from the commit of package openCOLLADA for openSUSE:Factory
checked in at 2015-01-03 22:01:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openCOLLADA (Old)
and /work/SRC/openSUSE:Factory/.openCOLLADA.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openCOLLADA"
Changes:
--------
--- /work/SRC/openSUSE:Factory/openCOLLADA/openCOLLADA.changes 2012-04-12
09:43:43.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.openCOLLADA.new/openCOLLADA.changes
2015-01-03 22:01:43.000000000 +0100
@@ -1,0 +2,14 @@
+Sat Jan 3 11:13:47 UTC 2015 - tchva...@suse.com
+
+- Update package to match what is done in Fedora + what is needed
+ for libreoffice. Move from svn snapshot to git snapshot
+- Added patches:
+ * opencollada-cmake.patch
+ * opencollada-includes.patch
+ * opencollada-no-undefined.patch
+- Obsoleted patches:
+ * openCOLLADA-COLLADABU_ASSERT.patch
+ * openCOLLADA-cmakelinuxbuild.patch
+ * openCOLLADA-gcc47.patch
+
+-------------------------------------------------------------------
Old:
----
CHANGES.txt
openCOLLADA-COLLADABU_ASSERT.patch
openCOLLADA-cmakelinuxbuild.patch
openCOLLADA-gcc47.patch
openCOLLADA-svn868.tar.bz2
New:
----
OpenCOLLADA-69b844d.tar.gz
opencollada-cmake.patch
opencollada-includes.patch
opencollada-no-undefined.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openCOLLADA.spec ++++++
--- /var/tmp/diff_new_pack.1PnEOp/_old 2015-01-03 22:01:44.000000000 +0100
+++ /var/tmp/diff_new_pack.1PnEOp/_new 2015-01-03 22:01:44.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package openCOLLADA
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,79 +16,102 @@
#
-%define CURRENT 0
-%define AGE 868
-%define REVISION 1
-
-%define libversion %{CURRENT}.%{AGE}.%{REVISION}
-
+%global sover 0.2
+%global commit 69b844dc9eea0a014326149c259e7810ecec4c8c
+%global shortcommit 69b844d
+%global upname OpenCOLLADA
+%global libname lib%{upname}0
Name: openCOLLADA
-Version: svn%{AGE}
+Version: 0_%{shortcommit}
Release: 0
Summary: Collada 3D import and export libraries
License: MIT
-Group: Productivity/Graphics/CAD
-Url: http://www.opencollada.org/
-Source0:
http://opencollada.googlecode.com/svn/trunk/%{name}-%{version}.tar.bz2
-Source1: CHANGES.txt
-# This patch will be submitted upstream either by the Fedora creator or myself
as I've added complete lib versioning to it.
-Patch0: openCOLLADA-cmakelinuxbuild.patch
-# This patch fixes error: there are no arguments to 'COLLADABU_ASSERT' that
depend on a template parameter,
-# so a declaration of 'COLLADABU_ASSERT' must be available only for svn 839+
-Patch1: openCOLLADA-COLLADABU_ASSERT.patch
-Patch2: openCOLLADA-gcc47.patch
+Group: System/Libraries
+Url: https://collada.org/mediawiki/index.php/OpenCOLLADA
+Source0:
https://github.com/KhronosGroup/OpenCOLLADA/archive/%{commit}/%{upname}-%{shortcommit}.tar.gz
+# PATCH-FIX-UPSTREAM use proper paths in cmake for install
+Patch0: opencollada-cmake.patch
+# PATCH-FIX-UPSTREAM add missing includes
+Patch1: opencollada-includes.patch
+# PATCH-FIX-UPSTREAM link to required libraries
+Patch2: opencollada-no-undefined.patch
BuildRequires: cmake
BuildRequires: dos2unix
-BuildRequires: fftw3-devel
+BuildRequires: fftw-devel
BuildRequires: gcc-c++
-BuildRequires: libxml2-devel
-BuildRequires: pcre-devel
-BuildRequires: zlib-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%global buildir %{_builddir}/%{name}-%{version}
+BuildRequires: pkgconfig(libpcre)
+BuildRequires: pkgconfig(libpcrecpp)
+BuildRequires: pkgconfig(libxml-2.0)
+BuildRequires: pkgconfig(zlib)
%description
-OpenCOLLADA is a stream based reader and writer library for COLLADA files
+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
-%package -n libOpenCOLLADA0
+%package -n %{libname}
Summary: Collada 3D import and export libraries
-Group: Productivity/Graphics/CAD
-Provides: %{name} = %{version}
+Group: System/Libraries
-%description -n libOpenCOLLADA0
+%description -n %{libname}
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.
+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.
+ like manner into the framework data model
COLLADAValidator XML validator for COLLADA files, based on
- the COLLADASaxFrameworkLoader.
+ the COLLADASaxFrameworkLoader
GeneratedSaxParser Library used to load xml files in the way
- used by COLLADASaxFrameworkLoader.
+ used by COLLADASaxFrameworkLoader
+
+%package doc
+Summary: Developer documentation for %{name}
+Group: Documentation
+Requires: %{libname} = %{version}
+BuildArch: noarch
+
+%description doc
+This package provides documentation for %{name}.
%package devel
Summary: Include files for openCOLLADA development
-Group: Development/Libraries/C and C++
-Requires: %{name} = %{version}
+Group: Development/Libraries
+Requires: %{libname} = %{version}
%description devel
This package provides the include files necessary to build and
-develop with the openCOLLADA export and import libraries.
+develop with the %{name} export and import libraries.
+
+%package utils
+Summary: XML validator for COLLADA files
+Group: Development/Tools
+Requires: %{libname} = %{version}
+
+%description utils
+XML validator for COLLADA files, based on the COLLADASaxFrameworkLoader.
%prep
-echo %{buildir}
-%setup -q
-%patch0
-#patch1
-%patch2
-# This section copied from Fedora spec with modidfications.
-# Remove unused bundled libraries and other directories that aren't built.
-rm -rf Externals/{Cg,expat,lib3ds,LibXML,MayaDataModel,pcre,zlib,zziplib} \
- dae23ds dae23ds_lib3ds dae2ma dae2ogre G3DWarehouseBrowser COLLADAMax
COLLADAMaya
+%setup -q -n %{upname}-%{commit}
+%patch0 -p1 -b .cmake
+%patch1 -p1 -b .includes
+%patch2 -p1 -b .undefined
+
+# 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
@@ -106,58 +129,46 @@
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
-#note. libOpenCOLLADASaxFrameworkLoader cannot build with -O2 only -O0
-#-Wall -fPIC is added by cmake and -O2 is added to all but
OpenCOLLADASaxFrameworkLoader.
-cmake ../ -G"Unix Makefiles" \
- -DLIB_INSTALL_DIR=%{_libdir} \
- -DINCLUDE_INSTALL_DIR=%{_includedir} \
+%cmake \
-DUSE_STATIC=OFF \
-DUSE_SHARED=ON \
- -Dsoversion=%{?CURRENT} \
- -Dsoage=%{?AGE} \
- -Dsorevision=%{?REVISION} \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_VERBOSE_MAKEFILE=ON \
- -DCMAKE_CXX_FLAGS:LIST="-fmessage-length=0 -D_FORTIFY_SOURCE=2
-fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -ggdb"
+ -Dsoversion=%{sover}
-#make -e %{?jobs:-j%{jobs}} all
-make -e all
-#
-popd
+make %{?_smp_mflags}
%install
-pushd Build
-%make_install
+%cmake_install
+# Manually install binary
mkdir -p %{buildroot}%{_bindir}/
-install -p -m 0755 bin/* %{buildroot}%{_bindir}/
+install -p -m 0755 build/bin/* %{buildroot}%{_bindir}/
+
+# Install MathMLSolver headers
+mkdir -p %{buildroot}%{_includedir}/MathMLSolver
+cp -a Externals/MathMLSolver/include/* %{buildroot}%{_includedir}/MathMLSolver/
-%post -n libOpenCOLLADA0 -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
-%postun -n libOpenCOLLADA0 -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
-%files -n libOpenCOLLADA0
-%defattr(-,root,root,-)
-%{_libdir}/lib*.so.0*
+%files -n %{libname}
+%defattr(-,root,root)
+%doc README LICENSE README.COLLADAStreamWriter COLLADAStreamWriter/AUTHORS
+%{_libdir}/lib*.so.%{sover}
+
+%files doc
+%defattr(-,root,root)
+%doc htdocs/
%files devel
-%defattr(-,root,root,-)
-%doc README htdocs/ LICENSE README.COLLADAStreamWriter
COLLADAStreamWriter/AUTHORS CHANGES.txt
-%{_bindir}/OpenCOLLADAValidator
+%defattr(-,root,root)
%{_libdir}/*.so
-%dir %{_includedir}/COLLADABaseUtils
-%dir %{_includedir}/COLLADAFramework
-%dir %{_includedir}/COLLADASaxFrameworkLoader
-%dir %{_includedir}/COLLADAStreamWriter
-%dir %{_includedir}/GeneratedSaxParser
+%{_libdir}/cmake/*
%{_includedir}/*
+%files utils
+%defattr(-,root,root)
+%{_bindir}/*
+
%changelog
++++++ opencollada-cmake.patch ++++++
diff -Naur OpenCOLLADA.orig/CMakeLists.txt OpenCOLLADA/CMakeLists.txt
--- OpenCOLLADA.orig/CMakeLists.txt 2013-08-10 02:00:51.000000000 -0500
+++ OpenCOLLADA/CMakeLists.txt 2013-08-28 10:34:50.122102989 -0500
@@ -77,7 +77,7 @@
message(${name} " WARNING: Shared library support
implemented for UNIX-like OS only")
endif ()
add_library(${name}_shared SHARED ${sources})
- set_target_properties(${name}_shared PROPERTIES OUTPUT_NAME
${name})
+ set_target_properties(${name}_shared PROPERTIES OUTPUT_NAME
${name} SOVERSION ${soversion})
foreach(target_lib ${target_libs})
if(TARGET ${target_lib}_shared)
target_link_libraries(${name}_shared
${target_lib}_shared)
@@ -178,8 +178,8 @@
#-----------------------------------------------------------------------------
# Install vars
-set(OPENCOLLADA_INST_INCLUDE ${CMAKE_INSTALL_PREFIX}/include/opencollada)
-set(OPENCOLLADA_INST_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/opencollada)
+set(OPENCOLLADA_INST_INCLUDE ${INCLUDE_INSTALL_DIR})
+set(OPENCOLLADA_INST_LIBRARY ${LIB_INSTALL_DIR})
set(OPENCOLLADA_INST_CMAKECONFIG ${OPENCOLLADA_INST_LIBRARY}/cmake)
++++++ opencollada-includes.patch ++++++
diff -rupN
OpenCOLLADA-69b844d/COLLADAFramework/include/COLLADAFWInstanceBindingBase.h
OpenCOLLADA-69b844d-new/COLLADAFramework/include/COLLADAFWInstanceBindingBase.h
--- OpenCOLLADA-69b844d/COLLADAFramework/include/COLLADAFWInstanceBindingBase.h
2014-08-28 05:30:44.000000000 +0200
+++
OpenCOLLADA-69b844d-new/COLLADAFramework/include/COLLADAFWInstanceBindingBase.h
2014-10-08 23:53:23.152124797 +0200
@@ -15,6 +15,11 @@
#include "COLLADAFWInstanceBase.h"
#include "COLLADAFWMaterialBinding.h"
+#include "COLLADABUURI.h"
+
+#include <vector>
+
+
namespace COLLADAFW
{
++++++ opencollada-no-undefined.patch ++++++
Index:
OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/common/libBuffer/CMakeLists.txt
===================================================================
---
OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c.orig/common/libBuffer/CMakeLists.txt
+++
OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/common/libBuffer/CMakeLists.txt
@@ -28,7 +28,10 @@ set(SRC
include/performanceTest/performanceTest.h
)
-set(TARGET_LIBS ftoa)
+set(TARGET_LIBS
+ ftoa
+ UTF
+)
include_directories(
${libBuffer_include_dirs}
Index: OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/CMakeLists.txt
===================================================================
--- OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c.orig/CMakeLists.txt
+++ OpenCOLLADA-69b844dc9eea0a014326149c259e7810ecec4c8c/CMakeLists.txt
@@ -244,10 +244,10 @@ else () # if pcre not found building it
endif ()
# building required libs
+add_subdirectory(${EXTERNAL_LIBRARIES}/UTF)
+add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver)
add_subdirectory(common/libftoa)
add_subdirectory(common/libBuffer)
-add_subdirectory(${EXTERNAL_LIBRARIES}/UTF)
-add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver)
# building OpenCOLLADA libs
add_subdirectory(COLLADABaseUtils)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
