commit openCOLLADA for openSUSE:Factory
Hello community,
here is the log from the commit of package openCOLLADA for openSUSE:Factory
checked in at 2020-08-21 19:08:16
Comparing /work/SRC/openSUSE:Factory/openCOLLADA (Old)
and /work/SRC/openSUSE:Factory/.openCOLLADA.new.3399 (New)
Package is "openCOLLADA"
Fri Aug 21 19:08:16 2020 rev:29 rq:828343 version:1.6.68
Changes:
--- /work/SRC/openSUSE:Factory/openCOLLADA/openCOLLADA.changes 2018-10-11
11:59:12.985736366 +0200
+++ /work/SRC/openSUSE:Factory/.openCOLLADA.new.3399/openCOLLADA.changes
2020-08-21 19:09:12.912535794 +0200
@@ -1,0 +2,6 @@
+Thu Aug 20 20:29:12 UTC 2020 - Dirk Mueller
+
+- update to 1.6.68:
+ * no upstream changelog available
+
+---
Old:
OpenCOLLADA-1.6.63.tar.gz
New:
OpenCOLLADA-1.6.68.tar.gz
Other differences:
--
++ openCOLLADA.spec ++
--- /var/tmp/diff_new_pack.Huh15r/_old 2020-08-21 19:09:15.604537393 +0200
+++ /var/tmp/diff_new_pack.Huh15r/_new 2020-08-21 19:09:15.608537396 +0200
@@ -1,7 +1,7 @@
#
# spec file for package openCOLLADA
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -23,14 +23,14 @@
%global upname OpenCOLLADA
%global libname libopenCOLLADA
Name: openCOLLADA
-Version:1.6.63
+Version:1.6.68
Release:0
#1_%%{shortcommit}
Summary:Collada 3D import and export libraries
#https://github.com/KhronosGroup/OpenCOLLADA/archive/v1.6.43.tar.gz
License:MIT
Group: Development/Libraries/C and C++
-Url:https://collada.org/mediawiki/index.php/OpenCOLLADA
+URL:https://collada.org/mediawiki/index.php/OpenCOLLADA
## https://github.com/KhronosGroup/OpenCOLLADA/archive/%%{commit}/
Source0:
https://github.com/KhronosGroup/%{upname}/archive/v%{version}.tar.gz#/%{upname}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM use proper paths in cmake for install
++ OpenCOLLADA-1.6.63.tar.gz -> OpenCOLLADA-1.6.68.tar.gz ++
/work/SRC/openSUSE:Factory/openCOLLADA/OpenCOLLADA-1.6.63.tar.gz
/work/SRC/openSUSE:Factory/.openCOLLADA.new.3399/OpenCOLLADA-1.6.68.tar.gz
differ: char 12, line 1
commit openCOLLADA for openSUSE:Factory
Hello community,
here is the log from the commit of package openCOLLADA for openSUSE:Factory
checked in at 2018-10-11 11:59:10
Comparing /work/SRC/openSUSE:Factory/openCOLLADA (Old)
and /work/SRC/openSUSE:Factory/.openCOLLADA.new (New)
Package is "openCOLLADA"
Thu Oct 11 11:59:10 2018 rev:28 rq:641078 version:1.6.63
Changes:
--- /work/SRC/openSUSE:Factory/openCOLLADA/openCOLLADA.changes 2018-01-30
15:43:43.820490985 +0100
+++ /work/SRC/openSUSE:Factory/.openCOLLADA.new/openCOLLADA.changes
2018-10-11 11:59:12.985736366 +0200
@@ -1,0 +2,11 @@
+Wed Oct 10 14:51:02 UTC 2018 - davejpla...@gmail.com
+
+- Update to version 1.6.63
+- Add openCOLLADA-pcre-redefined.patch to fix build against new pcre.
+- Upstream changes:
+ *Load images declared in profile_COMMON
+ *Corrected whitespace
+ *Subclass effect loaders from image loaders so that images
+ declared within effects are loaded properly
+
+---
Old:
OpenCOLLADA-1.6.62.tar.gz
New:
OpenCOLLADA-1.6.63.tar.gz
openCOLLADA-pcre-redefined.patch
Other differences:
--
++ openCOLLADA.spec ++
--- /var/tmp/diff_new_pack.JEu2kB/_old 2018-10-11 11:59:13.677735487 +0200
+++ /var/tmp/diff_new_pack.JEu2kB/_new 2018-10-11 11:59:13.681735481 +0200
@@ -23,7 +23,7 @@
%global upname OpenCOLLADA
%global libname libopenCOLLADA
Name: openCOLLADA
-Version:1.6.62
+Version:1.6.63
Release:0
#1_%%{shortcommit}
Summary:Collada 3D import and export libraries
@@ -43,6 +43,7 @@
#included openCOLLADA-signed-char.patch
# PATCH-FIX-OPENSUSE openCOLLADA-no-daevalidator.patch davejpla...@gmail.com -
Don't build DAEvalidator app.
Patch4: openCOLLADA-no-daevalidator.patch
+Patch5: openCOLLADA-pcre-redefined.patch
BuildRequires: cmake
BuildRequires: dos2unix
BuildRequires: gcc-c++
@@ -205,6 +206,7 @@
%patch0 -p0 -b .cmake
%patch1 -p0 -b .includes
%patch4
+%patch5
# Remove unused bundled libraries
rm -rf Externals/{Cg,expat,lib3ds,LibXML,MayaDataModel,pcre,zlib,zziplib}
++ OpenCOLLADA-1.6.62.tar.gz -> OpenCOLLADA-1.6.63.tar.gz ++
/work/SRC/openSUSE:Factory/openCOLLADA/OpenCOLLADA-1.6.62.tar.gz
/work/SRC/openSUSE:Factory/.openCOLLADA.new/OpenCOLLADA-1.6.63.tar.gz differ:
char 13, line 1
++ openCOLLADA-pcre-redefined.patch ++
From: Dave Plater
Date: 2018-10-10 16:47:00 +0200
Subject: pcre definition has changed
References: https://github.com/KhronosGroup/OpenCOLLADA/issues/570
Upstream: from
error: conflicting declaration 'typedef struct real_pcre8_or_16 pcre'
Index: COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
===
--- COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h.orig
2018-07-19 02:10:56.0 +0200
+++ COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h 2018-10-10
16:42:21.265706757 +0200
@@ -1,64 +1,62 @@
-/*
-Copyright (c) 2008-2009 NetAllied Systems GmbH
-
-This file is part of COLLADABaseUtils.
-
-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_PCRECOMPILEDPATTERN_H__
-#define __COLLADABU_PCRECOMPILEDPATTERN_H__
-
-#include "COLLADABUPrerequisites.h"
-
-struct real_pcre;
-typedef struct real_pcre pcre;
-
-
-namespace COLLADABU
-{
-
-/** Class to manage pre compiled pcre patterns. Depending on the
preprocessor flag COLLADABU_USE_PCRE_PRECOMPILED
- it either simple stores a precompiled pattern given to the constructor
or it compiles and deletes a pattern.
- If COLLADABU_USE_PCRE_PRECOMPILED is set, the version of pcre must fit
the version used to pre compile the pattern
- in OpenCOLLADA.
- */
- class PcreCompiledPattern
- {
- private:
- /** The compiled pattern.*/
- pcre *mCompiledPattern;
-
- /** True, if we need to free the pattern in the destructor,
false otherwise.*/
- bool mFreePattern;
-
- public:
-
- /** The compiled pattern is created by compiling @a pattern.
The behavior of this constructor is independent of
- COLLADABU_USE_PCRE_PRECOMPILED.*/
- PcreCompiledPattern( const char* pattern );
-
-/** Destructor. */
- virtual ~PcreCompiledPattern();
-
- /** Returns the compiled pattern. */
- pcre* getCompiledPattern() const;
-
- private:
-
-/** Disable default copy ctor. */
- PcreCompiledPattern( const PcreCompiledPattern& pre );
-
-/**
commit openCOLLADA for openSUSE:Factory
Hello community,
here is the log from the commit of package openCOLLADA for openSUSE:Factory
checked in at 2018-01-30 15:43:35
Comparing /work/SRC/openSUSE:Factory/openCOLLADA (Old)
and /work/SRC/openSUSE:Factory/.openCOLLADA.new (New)
Package is "openCOLLADA"
Tue Jan 30 15:43:35 2018 rev:27 rq:570622 version:1.6.62
Changes:
--- /work/SRC/openSUSE:Factory/openCOLLADA/openCOLLADA.changes 2017-06-16
10:53:46.404029632 +0200
+++ /work/SRC/openSUSE:Factory/.openCOLLADA.new/openCOLLADA.changes
2018-01-30 15:43:43.820490985 +0100
@@ -1,0 +2,17 @@
+Mon Jan 29 13:14:01 UTC 2018 - davejpla...@gmail.com
+
+- Update to version 1.6.62, removed incorporated
+ openCOLLADA-signed-char.patch.
+- Upstream changes:
+ *Add signed char keyword
+ *Expose COLLADASaxFWL::Loader string ID -> UniqueId map
+ *Export "Force to sleep" attribute.
+ *Consistent use of std::abs
+
+---
+Sun Jan 28 09:13:48 UTC 2018 - davejpla...@gmail.com
+
+- Remove conflicts with old libOpenCOLLADA0 to allow parallel
+ installation of different so versions.
+
+---
Old:
OpenCOLLADA-1.6.51.tar.gz
openCOLLADA-signed-char.patch
New:
OpenCOLLADA-1.6.62.tar.gz
Other differences:
--
++ openCOLLADA.spec ++
--- /var/tmp/diff_new_pack.8Klm0O/_old 2018-01-30 15:43:44.968437394 +0100
+++ /var/tmp/diff_new_pack.8Klm0O/_new 2018-01-30 15:43:44.980436834 +0100
@@ -1,7 +1,7 @@
#
# spec file for package openCOLLADA
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
%global upname OpenCOLLADA
%global libname libopenCOLLADA
Name: openCOLLADA
-Version:1.6.51
+Version:1.6.62
Release:0
#1_%%{shortcommit}
Summary:Collada 3D import and export libraries
@@ -40,7 +40,7 @@
# PATCH-FIX-UPSTREAM link to required libraries
# fixed in 1.6.51 Patch2: opencollada-no-undefined.patch
# PATCH-FIX-UPSTREAM openCOLLADA-signed-char.patch
gh#KhronosGroup/OpenCOLLADA#439 dims...@opensuse.org -- Use signed char; 'char'
by itself depends on arch implementation
-Patch3: openCOLLADA-signed-char.patch
+#included openCOLLADA-signed-char.patch
# PATCH-FIX-OPENSUSE openCOLLADA-no-daevalidator.patch davejpla...@gmail.com -
Don't build DAEvalidator app.
Patch4: openCOLLADA-no-daevalidator.patch
BuildRequires: cmake
@@ -69,7 +69,6 @@
%package -n libftoa%{sfx}
Summary:Collada 3D import and export libraries
Group: System/Libraries
-Conflicts: libOpenCOLLADA0
%description -n libftoa%{sfx}
COLLADA is a XML schema that enables digital asset exchange within
@@ -79,7 +78,6 @@
%package -n libbuffer%{sfx}
Summary:Collada 3D import and export libraries
Group: System/Libraries
-Conflicts: libOpenCOLLADA0
%description -n libbuffer%{sfx}
COLLADA is a XML schema that enables digital asset exchange within
@@ -89,7 +87,6 @@
%package -n libGeneratedSaxParser%{sfx}
Summary:Collada 3D import and export libraries
Group: System/Libraries
-Conflicts: libOpenCOLLADA0
%description -n libGeneratedSaxParser%{sfx}
COLLADA is a XML schema that enables digital asset exchange within
@@ -102,7 +99,6 @@
%package -n libMathMLSolver%{sfx}
Summary:Collada 3D import and export libraries
Group: System/Libraries
-Conflicts: libOpenCOLLADA0
%description -n libMathMLSolver%{sfx}
COLLADA is a XML schema that enables digital asset exchange within
@@ -112,7 +108,6 @@
%package -n libOpenCOLLADABaseUtils%{sfx}
Summary:Collada 3D import and export libraries
Group: System/Libraries
-Conflicts: libOpenCOLLADA0
%description -n libOpenCOLLADABaseUtils%{sfx}
COLLADA is a XML schema that enables digital asset exchange within
@@ -125,7 +120,6 @@
%package -n libOpenCOLLADAFramework%{sfx}
Summary:Collada 3D import and export libraries
Group: System/Libraries
-Conflicts: libOpenCOLLADA0
%description -n libOpenCOLLADAFramework%{sfx}
COLLADA is a XML schema that enables digital asset exchange within
@@ -137,7 +131,6 @@
%package -n libOpenCOLLADASaxFrameworkLoader%{sfx}
Summary:Collada 3D import and export libraries
Group: System/Libraries
-Conflicts: libOpenCOLLADA0
%description -n libOpenCOLLADASaxFrameworkLoader%{sfx}
COLLADA is a XML schema that enables digital asset exchange within
@@ -151,7 +144,6 @@
%package
commit openCOLLADA for openSUSE:Factory
Hello community,
here is the log from the commit of package openCOLLADA for openSUSE:Factory
checked in at 2017-06-16 10:53:38
Comparing /work/SRC/openSUSE:Factory/openCOLLADA (Old)
and /work/SRC/openSUSE:Factory/.openCOLLADA.new (New)
Package is "openCOLLADA"
Fri Jun 16 10:53:38 2017 rev:26 rq:502760 version:1.6.51
Changes:
--- /work/SRC/openSUSE:Factory/openCOLLADA/openCOLLADA.changes 2017-04-20
20:47:17.66292 +0200
+++ /work/SRC/openSUSE:Factory/.openCOLLADA.new/openCOLLADA.changes
2017-06-16 10:53:46.404029632 +0200
@@ -1,0 +2,24 @@
+Sat Jun 10 07:38:32 UTC 2017 - davejpla...@gmail.com
+
+- Update to release 1.6.51 to sync with blender.
+- Bumped minor soversion to 3 to for blender fixes.
+- Removed opencollada-no-undefined.patch.
+- Rebased openCOLLADA-no-daevalidator.patch.
+- Upstream changes from git log:
+ * Better platform detection of hash-related includes.
+ * CMAKE_VS_DEVENV_COMMAND variable not supported in older
+versions of cmake.
+ * Code coverage specific code disabled.
+ * Correctly link UTF (fixes opencollada-no-undefined.patch issue).
+ * libBuffer depends on UTF.
+ * PhysX schema.
+
+---
+Thu May 18 09:34:57 UTC 2017 - davejpla...@gmail.com
+
+- Update to version 1.6.47 Improved error handling (reporting
+ errors instead of terminating Blender).
+- For upstream changes see:
+ https://github.com/KhronosGroup/OpenCOLLADA/tree/v1.6.47
+
+---
Old:
OpenCOLLADA-1.6.43.tar.gz
opencollada-no-undefined.patch
New:
OpenCOLLADA-1.6.51.tar.gz
Other differences:
--
++ openCOLLADA.spec ++
--- /var/tmp/diff_new_pack.pEaSNH/_old 2017-06-16 10:53:47.223914215 +0200
+++ /var/tmp/diff_new_pack.pEaSNH/_new 2017-06-16 10:53:47.231913089 +0200
@@ -16,14 +16,14 @@
#
-%global sover 0.2
-%global sfx 0_2
+%global sover 0.3
+%global sfx 0_3
#3335ac164e68b2512a40914b14c74db260e6ff7d
#3335ac1
%global upname OpenCOLLADA
%global libname libopenCOLLADA
Name: openCOLLADA
-Version:1.6.43
+Version:1.6.51
Release:0
#1_%%{shortcommit}
Summary:Collada 3D import and export libraries
@@ -38,7 +38,7 @@
# PATCH-FIX-UPSTREAM add missing includes
Patch1: opencollada-includes.patch
# PATCH-FIX-UPSTREAM link to required libraries
-Patch2: opencollada-no-undefined.patch
+# fixed in 1.6.51 Patch2: opencollada-no-undefined.patch
# PATCH-FIX-UPSTREAM openCOLLADA-signed-char.patch
gh#KhronosGroup/OpenCOLLADA#439 dims...@opensuse.org -- Use signed char; 'char'
by itself depends on arch implementation
Patch3: openCOLLADA-signed-char.patch
# PATCH-FIX-OPENSUSE openCOLLADA-no-daevalidator.patch davejpla...@gmail.com -
Don't build DAEvalidator app.
@@ -213,7 +213,6 @@
%setup -q -n %{upname}-%{version}
%patch0 -p0 -b .cmake
%patch1 -p0 -b .includes
-%patch2 -p0 -b .undefined
%patch3 -p0
%patch4
++ OpenCOLLADA-1.6.43.tar.gz -> OpenCOLLADA-1.6.51.tar.gz ++
/work/SRC/openSUSE:Factory/openCOLLADA/OpenCOLLADA-1.6.43.tar.gz
/work/SRC/openSUSE:Factory/.openCOLLADA.new/OpenCOLLADA-1.6.51.tar.gz differ:
char 12, line 1
++ openCOLLADA-no-daevalidator.patch ++
--- /var/tmp/diff_new_pack.pEaSNH/_old 2017-06-16 10:53:47.295904081 +0200
+++ /var/tmp/diff_new_pack.pEaSNH/_new 2017-06-16 10:53:47.295904081 +0200
@@ -1,10 +1,10 @@
Index: CMakeLists.txt
===
CMakeLists.txt.orig2017-04-07 13:06:52.894187859 +0200
-+++ CMakeLists.txt 2017-04-07 13:16:11.357063874 +0200
+--- CMakeLists.txt.orig2017-06-10 09:27:48.575967729 +0200
CMakeLists.txt 2017-06-10 09:27:55.256229584 +0200
@@ -274,7 +274,7 @@ add_subdirectory(common/libftoa)
- add_subdirectory(common/libBuffer)
add_subdirectory(${EXTERNAL_LIBRARIES}/UTF)
+ add_subdirectory(common/libBuffer)
add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver)
-add_subdirectory(${EXTERNAL_LIBRARIES}/zlib)
+#add_subdirectory(${EXTERNAL_LIBRARIES}/zlib)
commit openCOLLADA for openSUSE:Factory
Hello community,
here is the log from the commit of package openCOLLADA for openSUSE:Factory
checked in at 2017-04-20 20:47:15
Comparing /work/SRC/openSUSE:Factory/openCOLLADA (Old)
and /work/SRC/openSUSE:Factory/.openCOLLADA.new (New)
Package is "openCOLLADA"
Thu Apr 20 20:47:15 2017 rev:25 rq:487486 version:1.6.43
Changes:
--- /work/SRC/openSUSE:Factory/openCOLLADA/openCOLLADA.changes 2016-08-18
10:20:32.0 +0200
+++ /work/SRC/openSUSE:Factory/.openCOLLADA.new/openCOLLADA.changes
2017-04-20 20:47:17.66292 +0200
@@ -1,0 +2,15 @@
+Tue Apr 11 10:39:50 UTC 2017 - jeng...@inai.de
+
+- RPM group fix
+
+---
+Fri Apr 7 11:45:13 UTC 2017 - davejpla...@gmail.com
+
+- Update to version 1.6.43
+- Rebased opencollada-no-undefined.patch
+- Added openCOLLADA-no-daevalidator.patch to prevent the building
+ of the app DAEvalidator which tries to use internal zlib.
+- For upstream changes see:
+ https://github.com/KhronosGroup/OpenCOLLADA/tree/v1.6.43
+
+---
Old:
OpenCOLLADA-1.6.25.tar.xz
New:
OpenCOLLADA-1.6.43.tar.gz
openCOLLADA-no-daevalidator.patch
Other differences:
--
++ openCOLLADA.spec ++
--- /var/tmp/diff_new_pack.2lhUyb/_old 2017-04-20 20:47:19.302745927 +0200
+++ /var/tmp/diff_new_pack.2lhUyb/_new 2017-04-20 20:47:19.302745927 +0200
@@ -1,7 +1,7 @@
#
# spec file for package openCOLLADA
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,16 +23,16 @@
%global upname OpenCOLLADA
%global libname libopenCOLLADA
Name: openCOLLADA
-Version:1.6.25
+Version:1.6.43
Release:0
#1_%%{shortcommit}
Summary:Collada 3D import and export libraries
+#https://github.com/KhronosGroup/OpenCOLLADA/archive/v1.6.43.tar.gz
License:MIT
Group: Development/Libraries/C and C++
-#https://github.com/KhronosGroup/OpenCOLLADA/releases
Url:https://collada.org/mediawiki/index.php/OpenCOLLADA
## https://github.com/KhronosGroup/OpenCOLLADA/archive/%%{commit}/
-Source0:%{upname}-%{version}.tar.xz
+Source0:
https://github.com/KhronosGroup/%{upname}/archive/v%{version}.tar.gz#/%{upname}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM use proper paths in cmake for install
Patch0: opencollada-cmake.patch
# PATCH-FIX-UPSTREAM add missing includes
@@ -41,6 +41,8 @@
Patch2: opencollada-no-undefined.patch
# PATCH-FIX-UPSTREAM openCOLLADA-signed-char.patch
gh#KhronosGroup/OpenCOLLADA#439 dims...@opensuse.org -- Use signed char; 'char'
by itself depends on arch implementation
Patch3: openCOLLADA-signed-char.patch
+# PATCH-FIX-OPENSUSE openCOLLADA-no-daevalidator.patch davejpla...@gmail.com -
Don't build DAEvalidator app.
+Patch4: openCOLLADA-no-daevalidator.patch
BuildRequires: cmake
BuildRequires: dos2unix
BuildRequires: gcc-c++
@@ -213,6 +215,7 @@
%patch1 -p0 -b .includes
%patch2 -p0 -b .undefined
%patch3 -p0
+%patch4
# Remove unused bundled libraries
rm -rf Externals/{Cg,expat,lib3ds,LibXML,MayaDataModel,pcre,zlib,zziplib}
++ openCOLLADA-no-daevalidator.patch ++
Index: CMakeLists.txt
===
--- CMakeLists.txt.orig 2017-04-07 13:06:52.894187859 +0200
+++ CMakeLists.txt 2017-04-07 13:16:11.357063874 +0200
@@ -274,7 +274,7 @@ add_subdirectory(common/libftoa)
add_subdirectory(common/libBuffer)
add_subdirectory(${EXTERNAL_LIBRARIES}/UTF)
add_subdirectory(${EXTERNAL_LIBRARIES}/MathMLSolver)
-add_subdirectory(${EXTERNAL_LIBRARIES}/zlib)
+#add_subdirectory(${EXTERNAL_LIBRARIES}/zlib)
# building OpenCOLLADA libs
add_subdirectory(COLLADABaseUtils)
@@ -286,8 +286,8 @@ add_subdirectory(COLLADAStreamWriter)
# building COLLADAValidator app
add_subdirectory(COLLADAValidator)
-# DAE validator app
-add_subdirectory(DAEValidator)
+# don't build DAE validator app
+#add_subdirectory(DAEValidator)
# Library export
install(EXPORT LibraryExport DESTINATION ${OPENCOLLADA_INST_CMAKECONFIG} FILE
OpenCOLLADATargets.cmake)
++ opencollada-no-undefined.patch ++
--- /var/tmp/diff_new_pack.2lhUyb/_old 2017-04-20 20:47:19.366736879 +0200
+++ /var/tmp/diff_new_pack.2lhUyb/_new 2017-04-20 20:47:19.366736879 +0200
@@ -1,7 +1,7 @@
Index: common/libBuffer/CMakeLists.txt
===
common/libBuffer/CMakeLists.txt.orig
-+++
commit openCOLLADA for openSUSE:Factory
Hello community,
here is the log from the commit of package openCOLLADA for openSUSE:Factory
checked in at 2016-08-18 10:20:30
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 2016-05-31
12:10:53.0 +0200
+++ /work/SRC/openSUSE:Factory/.openCOLLADA.new/openCOLLADA.changes
2016-08-18 10:20:32.0 +0200
@@ -1,0 +2,19 @@
+Tue Aug 16 13:48:09 UTC 2016 - jeng...@inai.de
+
+- Update rpm groups and descriptions
+
+---
+Sun Aug 14 15:28:36 UTC 2016 - davejpla...@gmail.com
+
+- Update to release version 1.6.25
+- Renamed openCOLLADA-devel to libopenCOLLADA-devel, openCOLLADA-doc
+ to libopenCOLLADA-doc and openCOLLADA-util to libopenCOLLADA-util
+ due to upstream having a correct versioning scheme and version
+ numbers derived from git are no longer neccessary. Conflicted,
+ provided and obsoleted the old packages.
+- Split libraries into separate sub packages.
+- Refreshed patches.
+- For upstream changes see:
+ https://github.com/KhronosGroup/OpenCOLLADA/tree/v1.6.25
+
+---
Old:
OpenCOLLADA-3335ac1.tar.bz2
New:
OpenCOLLADA-1.6.25.tar.xz
Other differences:
--
++ openCOLLADA.spec ++
--- /var/tmp/diff_new_pack.0NqFO8/_old 2016-08-18 10:20:34.0 +0200
+++ /var/tmp/diff_new_pack.0NqFO8/_new 2016-08-18 10:20:34.0 +0200
@@ -17,19 +17,22 @@
%global sover 0.2
-%global commit 3335ac164e68b2512a40914b14c74db260e6ff7d
-%global shortcommit 3335ac1
+%global sfx 0_2
+#3335ac164e68b2512a40914b14c74db260e6ff7d
+#3335ac1
%global upname OpenCOLLADA
-%global libname lib%{upname}0
+%global libname libopenCOLLADA
Name: openCOLLADA
-Version:1_%{shortcommit}
+Version:1.6.25
Release:0
+#1_%%{shortcommit}
Summary:Collada 3D import and export libraries
License:MIT
-Group: System/Libraries
+Group: Development/Libraries/C and C++
+#https://github.com/KhronosGroup/OpenCOLLADA/releases
Url:https://collada.org/mediawiki/index.php/OpenCOLLADA
## https://github.com/KhronosGroup/OpenCOLLADA/archive/%%{commit}/
-Source0:%{upname}-%{shortcommit}.tar.bz2
+Source0:%{upname}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM use proper paths in cmake for install
Patch0: opencollada-cmake.patch
# PATCH-FIX-UPSTREAM add missing includes
@@ -40,79 +43,176 @@
Patch3: openCOLLADA-signed-char.patch
BuildRequires: cmake
BuildRequires: dos2unix
-BuildRequires: fftw-devel
BuildRequires: gcc-c++
+BuildRequires: pkgconfig(fftw3)
BuildRequires: pkgconfig(libpcre)
BuildRequires: pkgconfig(libpcrecpp)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(zlib)
%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
+COLLADA is an XML schema that enables digital asset exchange within
+the interactive 3D industry. OpenCOLLADA is a 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
-GeneratedSaxParserLibrary used to load xml files in the way
+* GeneratedSaxParser - Library used to load xml files in the way
used by COLLADASaxFrameworkLoader
-%package -n %{libname}
+%package -n libftoa%{sfx}
Summary:Collada 3D import and export libraries
Group: System/Libraries
+Conflicts: libOpenCOLLADA0
-%description -n %{libname}
-COLLADA is a royalty-free XML schema that enables digital asset
-exchange within the interactive 3D
commit openCOLLADA for openSUSE:Factory
Hello community,
here is the log from the commit of package openCOLLADA for openSUSE:Factory
checked in at 2016-05-31 12:10:52
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 2015-08-05
19:14:24.0 +0200
+++ /work/SRC/openSUSE:Factory/.openCOLLADA.new/openCOLLADA.changes
2016-05-31 12:10:53.0 +0200
@@ -1,0 +2,7 @@
+Wed May 25 11:57:31 UTC 2016 - dims...@opensuse.org
+
+- Add openCOLLADA-signed-char.patch: Use signed char; 'char' by
+ itself depends on arch implementation
+ (gh#KhronosGroup/OpenCOLLADA#439).
+
+---
New:
openCOLLADA-signed-char.patch
Other differences:
--
++ openCOLLADA.spec ++
--- /var/tmp/diff_new_pack.6NBZ12/_old 2016-05-31 12:10:54.0 +0200
+++ /var/tmp/diff_new_pack.6NBZ12/_new 2016-05-31 12:10:54.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package openCOLLADA
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -36,6 +36,8 @@
Patch1: opencollada-includes.patch
# PATCH-FIX-UPSTREAM link to required libraries
Patch2: opencollada-no-undefined.patch
+# PATCH-FIX-UPSTREAM openCOLLADA-signed-char.patch
gh#KhronosGroup/OpenCOLLADA#439 dims...@opensuse.org -- Use signed char; 'char'
by itself depends on arch implementation
+Patch3: openCOLLADA-signed-char.patch
BuildRequires: cmake
BuildRequires: dos2unix
BuildRequires: fftw-devel
@@ -110,6 +112,7 @@
%patch0 -p1 -b .cmake
%patch1 -p0 -b .includes
%patch2 -p1 -b .undefined
+%patch3 -p1
# Remove unused bundled libraries
rm -rf Externals/{Cg,expat,lib3ds,LibXML,MayaDataModel,pcre,zlib,zziplib}
++ openCOLLADA-signed-char.patch ++
Index:
OpenCOLLADA-3335ac164e68b2512a40914b14c74db260e6ff7d/COLLADABaseUtils/src/COLLADABUURI.cpp
===
---
OpenCOLLADA-3335ac164e68b2512a40914b14c74db260e6ff7d.orig/COLLADABaseUtils/src/COLLADABUURI.cpp
+++
OpenCOLLADA-3335ac164e68b2512a40914b14c74db260e6ff7d/COLLADABaseUtils/src/COLLADABUURI.cpp
@@ -32,7 +32,7 @@ namespace COLLADABU
- const char HEX2DEC[256] =
+ const signed char HEX2DEC[256] =
{
/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
/* 0 */ -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
commit openCOLLADA for openSUSE:Factory
Hello community,
here is the log from the commit of package openCOLLADA for openSUSE:Factory
checked in at 2015-08-05 19:14:20
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 2015-01-03
22:01:43.0 +0100
+++ /work/SRC/openSUSE:Factory/.openCOLLADA.new/openCOLLADA.changes
2015-08-05 19:14:24.0 +0200
@@ -1,0 +2,7 @@
+Tue Aug 4 12:09:52 UTC 2015 - davejpla...@gmail.com
+
+- Update to version 1_3335ac1 to enable blender to build with
+ openCOLLADA again.
+- Reworked opencollada-includes.patch
+
+---
Old:
OpenCOLLADA-69b844d.tar.gz
New:
OpenCOLLADA-3335ac1.tar.bz2
Other differences:
--
++ openCOLLADA.spec ++
--- /var/tmp/diff_new_pack.QoA6ka/_old 2015-08-05 19:14:25.0 +0200
+++ /var/tmp/diff_new_pack.QoA6ka/_new 2015-08-05 19:14:25.0 +0200
@@ -17,18 +17,19 @@
%global sover 0.2
-%global commit 69b844dc9eea0a014326149c259e7810ecec4c8c
-%global shortcommit 69b844d
+%global commit 3335ac164e68b2512a40914b14c74db260e6ff7d
+%global shortcommit 3335ac1
%global upname OpenCOLLADA
%global libname lib%{upname}0
Name: openCOLLADA
-Version:0_%{shortcommit}
+Version:1_%{shortcommit}
Release:0
Summary:Collada 3D import and export libraries
License:MIT
Group: System/Libraries
Url:https://collada.org/mediawiki/index.php/OpenCOLLADA
-Source0:
https://github.com/KhronosGroup/OpenCOLLADA/archive/%{commit}/%{upname}-%{shortcommit}.tar.gz
+## https://github.com/KhronosGroup/OpenCOLLADA/archive/%%{commit}/
+Source0:%{upname}-%{shortcommit}.tar.bz2
# PATCH-FIX-UPSTREAM use proper paths in cmake for install
Patch0: opencollada-cmake.patch
# PATCH-FIX-UPSTREAM add missing includes
@@ -107,7 +108,7 @@
%prep
%setup -q -n %{upname}-%{commit}
%patch0 -p1 -b .cmake
-%patch1 -p1 -b .includes
+%patch1 -p0 -b .includes
%patch2 -p1 -b .undefined
# Remove unused bundled libraries
++ OpenCOLLADA-69b844d.tar.gz - OpenCOLLADA-3335ac1.tar.bz2 ++
/work/SRC/openSUSE:Factory/openCOLLADA/OpenCOLLADA-69b844d.tar.gz
/work/SRC/openSUSE:Factory/.openCOLLADA.new/OpenCOLLADA-3335ac1.tar.bz2 differ:
char 1, line 1
++ opencollada-includes.patch ++
--- /var/tmp/diff_new_pack.QoA6ka/_old 2015-08-05 19:14:25.0 +0200
+++ /var/tmp/diff_new_pack.QoA6ka/_new 2015-08-05 19:14:25.0 +0200
@@ -1,9 +1,10 @@
-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.0 +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
+Index: COLLADAFramework/include/COLLADAFWInstanceBindingBase.h
+===
+--- COLLADAFramework/include/COLLADAFWInstanceBindingBase.h.orig
2015-04-29 02:18:07.0 +0200
COLLADAFramework/include/COLLADAFWInstanceBindingBase.h2015-08-04
14:32:51.229635342 +0200
+@@ -20,6 +20,11 @@
+ #include vector
+
+#include COLLADABUURI.h
+
commit openCOLLADA for openSUSE:Factory
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.0 +0200
+++ /work/SRC/openSUSE:Factory/.openCOLLADA.new/openCOLLADA.changes
2015-01-03 22:01:43.0 +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.0 +0100
+++ /var/tmp/diff_new_pack.1PnEOp/_new 2015-01-03 22:01:44.0 +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
