Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (516b9d7940d86d201148ba6ec3f263f6d2fc5993)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (516b9d7940d86d201148ba6ec3f263f6d2fc5993)
  • Date: Sun, 11 Sep 2016 12:23:09 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

libs/openscenegraph/HISTORY | 1
libs/openscenegraph/PRE_BUILD | 2 -
libs/openscenegraph/gdal-2.patch | 49
---------------------------------------
3 files changed, 2 insertions(+), 50 deletions(-)

New commits:
commit 516b9d7940d86d201148ba6ec3f263f6d2fc5993
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/openscenegraph: remove obsolete patch

diff --git a/libs/openscenegraph/HISTORY b/libs/openscenegraph/HISTORY
index e8b64dc..9315e85 100644
--- a/libs/openscenegraph/HISTORY
+++ b/libs/openscenegraph/HISTORY
@@ -1,5 +1,6 @@
2016-09-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.3
+ * PRE_BUILD, gdal-2.patch: remove obsolete patch

2015-07-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.2.2-rc1
diff --git a/libs/openscenegraph/PRE_BUILD b/libs/openscenegraph/PRE_BUILD
index ce62781..b929196 100755
--- a/libs/openscenegraph/PRE_BUILD
+++ b/libs/openscenegraph/PRE_BUILD
@@ -1,4 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SPELL_DIRECTORY}/gdal-2.patch &&
+
glselect mesa
diff --git a/libs/openscenegraph/gdal-2.patch
b/libs/openscenegraph/gdal-2.patch
deleted file mode 100644
index 20f0997..0000000
--- a/libs/openscenegraph/gdal-2.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- OpenSceneGraph-3.2.1/src/osgPlugins/ogr/ReaderWriterOGR.cpp
2012-03-22 04:36:20.000000000 +1100
-+++ ../OpenSceneGraph-3.2.1/src/osgPlugins/ogr/ReaderWriterOGR.cpp
2015-06-26 21:53:33.349709134 +1000
-@@ -134,11 +134,21 @@
-
- virtual ReadResult readFile(const std::string& fileName, const
osgDB::ReaderWriter::Options* options) const
- {
-+#if GDAL_VERSION_MAJOR < 2
- if (OGRSFDriverRegistrar::GetRegistrar()->GetDriverCount() == 0)
- OGRRegisterAll();
-+#else
-+ if (GDALGetDriverCount() == 0)
-+ GDALAllRegister();
-+#endif
-
- // Try to open data source
-+#if GDAL_VERSION_MAJOR < 2
- OGRDataSource* file = OGRSFDriverRegistrar::Open(fileName.c_str());
-+#else
-+ GDALDataset *file;
-+ file = (GDALDataset*) GDALOpenEx( fileName.c_str(), GDAL_OF_VECTOR,
NULL, NULL, NULL );
-+#endif
- if (!file)
- return 0;
-
-@@ -156,6 +166,7 @@
-
- osg::Group* group = new osg::Group;
-
-+#if GDAL_VERSION_MAJOR < 2
- for (int i = 0; i < file->GetLayerCount(); i++)
- {
- osg::Group* node = readLayer(file->GetLayer(i),
file->GetName(), useRandomColorByFeature, addGroupPerFeature);
-@@ -163,6 +174,16 @@
- group->addChild( node );
- }
- OGRDataSource::DestroyDataSource( file );
-+#else
-+ for (int i = 0; i < file->GetLayerCount(); i++)
-+ {
-+ OGRLayer* layer = (OGRLayer *)GDALDatasetGetLayer(file, i);
-+ osg::Group* node = readLayer(layer, layer->GetName(),
useRandomColorByFeature, addGroupPerFeature);
-+ if (node)
-+ group->addChild( node );
-+ }
-+ GDALClose( file );
-+#endif
- return group;
- }
-



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (516b9d7940d86d201148ba6ec3f263f6d2fc5993), Florian Franzmann, 09/11/2016

Archive powered by MHonArc 2.6.24.

Top of Page