Hello community,
here is the log from the commit of package SimGear for openSUSE:Factory checked in at 2019-02-19 11:59:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/SimGear (Old)
and /work/SRC/openSUSE:Factory/.SimGear.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "SimGear"
Tue Feb 19 11:59:17 2019 rev:9 rq:676834 version:2018.3.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/SimGear/SimGear.changes 2019-01-08 12:26:32.172399664 +0100
+++ /work/SRC/openSUSE:Factory/.SimGear.new.28833/SimGear.changes 2019-02-19 12:00:07.541147076 +0100
@@ -1,0 +2,6 @@
+Mon Feb 11 22:45:29 UTC 2019 - Stefan Brüns
+
+- Update to 2018.3.2
+ * changelog: http://wiki.flightgear.org/Changelog_2018.3#2018.3.2_point_release
+
+-------------------------------------------------------------------
Old:
----
simgear-2018.3.1.tar.bz2
New:
----
simgear-2018.3.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ SimGear.spec ++++++
--- /var/tmp/diff_new_pack.tULLqT/_old 2019-02-19 12:00:08.417146615 +0100
+++ /var/tmp/diff_new_pack.tULLqT/_new 2019-02-19 12:00:08.421146612 +0100
@@ -20,10 +20,10 @@
# in our requirements, i.e. the same version we have built against
%define openscenegraph_version %(rpm -qa --nosignature --nodigest libOpenSceneGraph\*-devel | sed 's/.*-devel-\\(.*\\)-.*/\\1/')
-%define libname libSimGearCore-2018_3_1
+%define libname libSimGearCore-2018_3_2
%define main_version 2018.3
Name: SimGear
-Version: %{main_version}.1
+Version: %{main_version}.2
Release: 0
Summary: Simulator Construction Gear
# https://sourceforge.net/p/flightgear/codetickets/1940/
++++++ simgear-2018.3.1.tar.bz2 -> simgear-2018.3.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simgear-2018.3.1/CMakeLists.txt new/simgear-2018.3.2/CMakeLists.txt
--- old/simgear-2018.3.1/CMakeLists.txt 2018-12-03 16:41:22.000000000 +0100
+++ new/simgear-2018.3.2/CMakeLists.txt 2019-01-29 14:17:36.000000000 +0100
@@ -125,9 +125,14 @@
option(USE_AEONWAVE "Set to ON to use AeonWave instead of OpenAL" ON)
option(ENABLE_PKGUTIL "Set to ON to build the sg_pkgutil application (default)" ON)
option(ENABLE_DNS "Set to ON to use udns library and DNS service resolver" ON)
-option(ENABLE_SIMD "Enable SSE/SSE2 support for x86 compilers" ON)
+option(ENABLE_SIMD "Enable SSE/SSE2 support for compilers" ON)
+option(ENABLE_SIMD_CODE "Enable SSE/SSE2 support code for compilers" OFF)
option(ENABLE_OPENMP "Enable OpenMP compiler support" OFF)
+if (NOT ENABLE_SIMD AND ENABLE_SIMD_CODE)
+ set(ENABLE_SIMD_CODE OFF)
+endif()
+
include (DetectArch)
# until the fstream fix is applied and generally available in OSG,
@@ -412,8 +417,8 @@
"${CMAKE_CXX_FLAGS} -O0 -fno-omit-frame-pointer -fno-inline")
elseif (ENABLE_SIMD)
if (X86 OR X86_64)
- set(CMAKE_C_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse")
- set(CMAKE_CXX_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse")
+ set(CMAKE_C_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize")
+ set(CMAKE_CXX_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize")
endif()
endif()
@@ -440,8 +445,8 @@
"${CMAKE_CXX_FLAGS} -O0 -fno-omit-frame-pointer -fno-inline-functions")
elseif (ENABLE_SIMD)
if (X86 OR X86_64)
- set(CMAKE_C_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse")
- set(CMAKE_CXX_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse")
+ set(CMAKE_C_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize")
+ set(CMAKE_CXX_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize")
endif()
endif()
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simgear-2018.3.1/simgear/math/simd.hxx new/simgear-2018.3.2/simgear/math/simd.hxx
--- old/simgear-2018.3.1/simgear/math/simd.hxx 2018-12-03 16:41:22.000000000 +0100
+++ new/simgear-2018.3.2/simgear/math/simd.hxx 2019-01-29 14:17:36.000000000 +0100
@@ -309,7 +309,7 @@
return v;
}
-#ifdef ENABLE_SIMD
+#ifdef ENABLE_SIMD_CODE
# ifdef __SSE__
namespace simd4
@@ -1305,7 +1305,7 @@
# endif
-#endif /* ENABLE_SIMD */
+#endif /* ENABLE_SIMD_CODE */
#endif /* __SIMD_H__ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simgear-2018.3.1/simgear/math/simd4x4.hxx new/simgear-2018.3.2/simgear/math/simd4x4.hxx
--- old/simgear-2018.3.1/simgear/math/simd4x4.hxx 2018-12-03 16:41:22.000000000 +0100
+++ new/simgear-2018.3.2/simgear/math/simd4x4.hxx 2019-01-29 14:17:36.000000000 +0100
@@ -289,7 +289,7 @@
}
-#ifdef ENABLE_SIMD
+#ifdef ENABLE_SIMD_CODE
# ifdef __SSE__
template<>
@@ -1191,7 +1191,7 @@
} /* namespace simd4x */
# endif
-#endif /* ENABLE_SIMD */
+#endif /* ENABLE_SIMD_CODE */
#endif /* __SIMD4X4_H__ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simgear-2018.3.1/simgear/scene/material/TextureBuilder.cxx new/simgear-2018.3.2/simgear/scene/material/TextureBuilder.cxx
--- old/simgear-2018.3.1/simgear/scene/material/TextureBuilder.cxx 2018-12-03 16:41:22.000000000 +0100
+++ new/simgear-2018.3.2/simgear/scene/material/TextureBuilder.cxx 2019-01-29 14:17:36.000000000 +0100
@@ -257,7 +257,8 @@
return false;
osgDB::ReaderWriter::ReadResult result;
- result = osgDB::readImageFile(imageName, options);
+
+ result = osgDB::readRefImageFile(imageName, options);
osg::ref_ptrosg::Image image;
if (result.success())
image = result.getImage();
@@ -590,27 +591,27 @@
osg::Image* image = result.getImage();
cubeTexture->setImage(TextureCubeMap::POSITIVE_X, image);
}
- result = osgDB::readImageFile(_tuple.get<1>(), options);
+ result = osgDB::readRefImageFile(_tuple.get<1>(), options);
if(result.success()) {
osg::Image* image = result.getImage();
cubeTexture->setImage(TextureCubeMap::NEGATIVE_X, image);
}
- result = osgDB::readImageFile(_tuple.get<2>(), options);
+ result = osgDB::readRefImageFile(_tuple.get<2>(), options);
if(result.success()) {
osg::Image* image = result.getImage();
cubeTexture->setImage(TextureCubeMap::POSITIVE_Y, image);
}
- result = osgDB::readImageFile(_tuple.get<3>(), options);
+ result = osgDB::readRefImageFile(_tuple.get<3>(), options);
if(result.success()) {
osg::Image* image = result.getImage();
cubeTexture->setImage(TextureCubeMap::NEGATIVE_Y, image);
}
- result = osgDB::readImageFile(_tuple.get<4>(), options);
+ result = osgDB::readRefImageFile(_tuple.get<4>(), options);
if(result.success()) {
osg::Image* image = result.getImage();
cubeTexture->setImage(TextureCubeMap::POSITIVE_Z, image);
}
- result = osgDB::readImageFile(_tuple.get<5>(), options);
+ result = osgDB::readRefImageFile(_tuple.get<5>(), options);
if(result.success()) {
osg::Image* image = result.getImage();
cubeTexture->setImage(TextureCubeMap::NEGATIVE_Z, image);
@@ -634,7 +635,7 @@
return cubeTexture.release();
osgDB::ReaderWriter::ReadResult result;
- result = osgDB::readImageFile(texname, options);
+ result = osgDB::readRefImageFile(texname, options);
if(result.success()) {
osg::Image* image = result.getImage();
image->flipVertical(); // Seems like the image coordinates are somewhat funny, flip to get better ones
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simgear-2018.3.1/simgear/scene/material/mat.cxx new/simgear-2018.3.2/simgear/scene/material/mat.cxx
--- old/simgear-2018.3.1/simgear/scene/material/mat.cxx 2018-12-03 16:41:22.000000000 +0100
+++ new/simgear-2018.3.2/simgear/scene/material/mat.cxx 2019-01-29 14:17:36.000000000 +0100
@@ -227,7 +227,7 @@
}
else
{
- osg::Image* image = osgDB::readImageFile(fullMaskPath, options);
+ osg::Image* image = osgDB::readRefImageFile(fullMaskPath, options);
if (image && image->valid())
{
Texture2DRef object_mask = new osg::Texture2D;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simgear-2018.3.1/simgear/scene/model/ModelRegistry.cxx new/simgear-2018.3.2/simgear/scene/model/ModelRegistry.cxx
--- old/simgear-2018.3.1/simgear/scene/model/ModelRegistry.cxx 2018-12-03 16:41:22.000000000 +0100
+++ new/simgear-2018.3.2/simgear/scene/model/ModelRegistry.cxx 2019-01-29 14:17:36.000000000 +0100
@@ -280,19 +280,21 @@
}
-osg::Node* DefaultCachePolicy::find(const string& fileName,
- const Options* opt)
+osg::ref_ptrosg::Node DefaultCachePolicy::find(const string& fileName, const Options* opt)
{
Registry* registry = Registry::instance();
- osg::Node* cached
- = dynamic_cast(registry->getFromObjectCache(fileName));
- if (cached)
- SG_LOG(SG_IO, SG_BULK, "Got cached model \""
- << fileName << "\"");
+#if OSG_VERSION_LESS_THAN(3,4,0)
+ osg::ref_ptrosg::Object cachedObject = registry->getFromObjectCache(fileName);
+#else
+ osg::ref_ptrosg::Object cachedObject = registry->getRefFromObjectCache(fileName);
+#endif
+
+ ref_ptrosg::Node cachedNode = dynamic_castosg::Node*(cachedObject.get());
+ if (cachedNode.valid())
+ SG_LOG(SG_IO, SG_BULK, "Got cached model \"" << fileName << "\"");
else
- SG_LOG(SG_IO, SG_BULK, "Reading model \""
- << fileName << "\"");
- return cached;
+ SG_LOG(SG_IO, SG_BULK, "Reading model \"" << fileName << "\"");
+ return cachedNode;
}
void DefaultCachePolicy::addToCache(const string& fileName,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simgear-2018.3.1/simgear/scene/model/ModelRegistry.hxx new/simgear-2018.3.2/simgear/scene/model/ModelRegistry.hxx
--- old/simgear-2018.3.1/simgear/scene/model/ModelRegistry.hxx 2018-12-03 16:41:22.000000000 +0100
+++ new/simgear-2018.3.2/simgear/scene/model/ModelRegistry.hxx 2019-01-29 14:17:36.000000000 +0100
@@ -132,7 +132,7 @@
struct DefaultCachePolicy {
DefaultCachePolicy(const std::string& extension) {}
- osg::Node* find(const std::string& fileName,
+ osg::ref_ptrosg::Node find(const std::string& fileName,
const osgDB::Options* opt);
void addToCache(const std::string& filename, osg::Node* node);
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simgear-2018.3.1/simgear/scene/model/SGReaderWriterXML.cxx new/simgear-2018.3.2/simgear/scene/model/SGReaderWriterXML.cxx
--- old/simgear-2018.3.1/simgear/scene/model/SGReaderWriterXML.cxx 2018-12-03 16:41:22.000000000 +0100
+++ new/simgear-2018.3.2/simgear/scene/model/SGReaderWriterXML.cxx 2019-01-29 14:17:36.000000000 +0100
@@ -335,7 +335,7 @@
options->setDatabasePath(texturepath.local8BitStr());
osgDB::ReaderWriter::ReadResult modelResult;
- modelResult = osgDB::readNodeFile(modelpath.local8BitStr(), options.get());
+ modelResult = osgDB::readRefNodeFile(modelpath.local8BitStr(), options.get());
if (!modelResult.validNode())
throw sg_io_exception("Failed to load 3D model:" + modelResult.message(),
modelpath);
@@ -481,7 +481,7 @@
}
}
- if (dbOptions->getPluginStringData("SimGear::PARTICLESYSTEM") != "OFF") {
+ if (GlobalParticleCallback::getEnabled()){//dbOptions->getPluginStringData("SimGear::PARTICLESYSTEM") != "OFF") {
std::vector particle_nodes;
particle_nodes = props->getChildren("particlesystem");
for (unsigned i = 0; i < particle_nodes.size(); ++i) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simgear-2018.3.1/simgear/scene/model/model.cxx new/simgear-2018.3.2/simgear/scene/model/model.cxx
--- old/simgear-2018.3.1/simgear/scene/model/model.cxx 2018-12-03 16:41:22.000000000 +0100
+++ new/simgear-2018.3.2/simgear/scene/model/model.cxx 2019-01-29 14:17:36.000000000 +0100
@@ -43,9 +43,9 @@
{
osg::Image* image;
if (options)
- image = osgDB::readImageFile(path, options);
+ image = osgDB::readRefImageFile(path, options);
else
- image = osgDB::readImageFile(path);
+ image = osgDB::readRefImageFile(path);
osg::ref_ptrosg::Texture2D texture = new osg::Texture2D;
texture->setImage(image);
if (staticTexture)
@@ -141,7 +141,7 @@
// If it is empty or they are identical then there is nothing to do
if (fullLiveryFile.empty() || fullLiveryFile == *fullFilePath)
return 0;
- Image* newImage = readImageFile(fullLiveryFile);
+ Image* newImage = readRefImageFile(fullLiveryFile);
if (!newImage)
return 0;
CopyOp copyOp(CopyOp::DEEP_COPY_ALL & ~CopyOp::DEEP_COPY_IMAGES);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simgear-2018.3.1/simgear/scene/sky/cloud.cxx new/simgear-2018.3.2/simgear/scene/sky/cloud.cxx
--- old/simgear-2018.3.1/simgear/scene/sky/cloud.cxx 2018-12-03 16:41:22.000000000 +0100
+++ new/simgear-2018.3.2/simgear/scene/sky/cloud.cxx 2019-01-29 14:17:36.000000000 +0100
@@ -485,9 +485,11 @@
// repaint the cloud layer colors
bool SGCloudLayer::repaint( const SGVec3f& fog_color ) {
osg::Vec4f combineColor(toOsg(fog_color), cloud_alpha);
- osg::TexEnvCombine* combiner
- = dynamic_castosg::TexEnvCombine*(layer_root->getStateSet()
- ->getTextureAttribute(1, osg::StateAttribute::TEXENV));
+ osg::StateAttribute* textureAtt = layer_root->getStateSet()->getTextureAttribute(1, osg::StateAttribute::TEXENV);
+ osg::TexEnvCombine* combiner = dynamic_castosg::TexEnvCombine*(textureAtt);
+
+ if (combiner == nullptr)
+ return false;
combiner->setConstantColor(combineColor);
// Set the fog color for the 3D clouds too.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simgear-2018.3.1/simgear/scene/tgdb/ReaderWriterSPT.cxx new/simgear-2018.3.2/simgear/scene/tgdb/ReaderWriterSPT.cxx
--- old/simgear-2018.3.1/simgear/scene/tgdb/ReaderWriterSPT.cxx 2018-12-03 16:41:22.000000000 +0100
+++ new/simgear-2018.3.2/simgear/scene/tgdb/ReaderWriterSPT.cxx 2019-01-29 14:17:36.000000000 +0100
@@ -208,7 +208,7 @@
imageFileName = osgDB::concatPaths(imageFileName, "Globe");
imageFileName = osgDB::concatPaths(imageFileName, "world.topo.bathy.200407.3x4096x2048.png");
}
- if (osg::Image* image = osgDB::readImageFile(imageFileName, options)) {
+ if (osg::Image* image = osgDB::readRefImageFile(imageFileName, options)) {
osg::Texture2D* texture = new osg::Texture2D;
texture->setImage(image);
texture->setWrap(osg::Texture2D::WRAP_S, osg::Texture2D::REPEAT);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simgear-2018.3.1/simgear/simgear_config_cmake.h.in new/simgear-2018.3.2/simgear/simgear_config_cmake.h.in
--- old/simgear-2018.3.1/simgear/simgear_config_cmake.h.in 2018-12-03 16:41:22.000000000 +0100
+++ new/simgear-2018.3.2/simgear/simgear_config_cmake.h.in 2019-01-29 14:17:36.000000000 +0100
@@ -27,4 +27,5 @@
#cmakedefine ENABLE_SOUND
#cmakedefine USE_AEONWAVE
#cmakedefine ENABLE_SIMD
+#cmakedefine ENABLE_SIMD_CODE
#cmakedefine ENABLE_GDAL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simgear-2018.3.1/simgear/sound/soundmgr_aeonwave.cxx new/simgear-2018.3.2/simgear/sound/soundmgr_aeonwave.cxx
--- old/simgear-2018.3.1/simgear/sound/soundmgr_aeonwave.cxx 2018-12-03 16:41:22.000000000 +0100
+++ new/simgear-2018.3.2/simgear/sound/soundmgr_aeonwave.cxx 2019-01-29 14:17:36.000000000 +0100
@@ -8,7 +8,7 @@
// Modified for the new SoundSystem by Erik Hofman, October 2009
//
// Copyright (C) 2001 Curtis L. Olson - http://www.flightgear.org/~curt
-// Copyright (C) 2009 Erik Hofman
+// Copyright (C) 2009-2019 Erik Hofman
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License as
@@ -418,8 +418,8 @@
{
aax::Emitter& emitter = source_it->second;
enum aaxState state = emitter.state();
- if (state == AAX_PLAYING || state == AAX_SUSPENDED) {
- TRY( emitter.set(AAX_STOPPED) );
+ if (state != AAX_PROCESSED) {
+ TRY( emitter.set(AAX_PROCESSED) );
TRY( d->_aax.remove(emitter) );
}
TRY( emitter.remove_buffer() );
@@ -555,7 +555,6 @@
if (bufid == SGSoundMgr::FAILED_BUFFER ||
bufid == SGSoundMgr::NO_BUFFER)
{
-printf("A: release: %i, bufid: %i (%i, %i)\n", sample->get_source(), bufid, SGSoundMgr::FAILED_BUFFER, SGSoundMgr::NO_BUFFER);
release_source(sample->get_source());
return;
}
@@ -590,8 +589,7 @@
if ( sample->is_looping() && !stopped) {
#ifdef ENABLE_SOUND
aax::Emitter& emitter = d->get_emitter(source);
- TRY( emitter.set(AAX_STOPPED) );
- TRY( d->_aax.remove(emitter) );
+ TRY( emitter.set(AAX_PROCESSED) );
#endif
stopped = is_sample_stopped(sample);
}
@@ -610,8 +608,7 @@
unsigned int source = sample->get_source();
if ( sample->is_playing() ) {
aax::Emitter& emitter = d->get_emitter(source);
- TRY( emitter.set(AAX_STOPPED) );
- TRY( d->_aax.remove(emitter) );
+ TRY( emitter.set(AAX_PROCESSED) );
}
release_source( source );
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/simgear-2018.3.1/version new/simgear-2018.3.2/version
--- old/simgear-2018.3.1/version 2018-12-03 16:41:22.000000000 +0100
+++ new/simgear-2018.3.2/version 2019-01-29 14:17:36.000000000 +0100
@@ -1 +1 @@
-2018.3.1
+2018.3.2