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 <davejpla...@gmail.com>
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.000000000 +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 );
-
- /** Disable default assignment operator. */
- const PcreCompiledPattern& operator= ( const
PcreCompiledPattern& pre );
-
- /** Compiles the pattern.*/
- pcre* compilePattern( const char* pattern );
-
- };
-
-} // namespace COLLADABU
-
-#endif // __COLLADABU_PCRECOMPILEDPATTERN_H__
+/*
+ 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"
+
+#include "pcre.h"
+
+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 );
+
+ /** Disable default assignment operator. */
+ const PcreCompiledPattern& operator= ( const
PcreCompiledPattern& pre );
+
+ /** Compiles the pattern.*/
+ pcre* compilePattern( const char* pattern );
+
+ };
+
+} // namespace COLLADABU
+
+#endif // __COLLADABU_PCRECOMPILEDPATTERN_H__
