Skip to Content.
Sympa Menu

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

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 (717fd70c913045aad94d519ab05411cb3c706fe6)
  • Date: Mon, 13 Jul 2015 16:44:26 +0000

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

dev/null |binary
libs/mpfr/DETAILS | 4 +--
libs/mpfr/HISTORY | 5 +++
libs/mpfr/allpatches-3.1.3-p2.xz |binary
libs/openscenegraph/DETAILS | 4 +--
libs/openscenegraph/HISTORY | 4 +++
libs/openscenegraph/PRE_BUILD | 2 +
libs/openscenegraph/gdal-2.patch | 49
+++++++++++++++++++++++++++++++++++++++
8 files changed, 64 insertions(+), 4 deletions(-)

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

libs/mpfr: version 3.1.3-p2

commit edc65e656e7abede671d83c390c54251e31bb46f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/openscenegraph: version 4.2.2-rc1

diff --git a/libs/mpfr/DETAILS b/libs/mpfr/DETAILS
index d844516..69ff9a9 100755
--- a/libs/mpfr/DETAILS
+++ b/libs/mpfr/DETAILS
@@ -1,6 +1,6 @@
SPELL=mpfr
- PVERSION=11
- XVERSION=3.1.2
+ PVERSION=2
+ XVERSION=3.1.3
VERSION=$XVERSION-p$PVERSION

SOURCE_HASH=sha512:8d594206afb2637ed39ad564d42c8c4d02b042b95925f5c6ec891e5cb87f7155195559c7ff477256a088ecaaa3c2b0d35a9d11a74ed526a1080d49b2950e5587
SECURITY_PATCH=2
diff --git a/libs/mpfr/HISTORY b/libs/mpfr/HISTORY
index 533d6e6..ff0f8d0 100644
--- a/libs/mpfr/HISTORY
+++ b/libs/mpfr/HISTORY
@@ -1,3 +1,8 @@
+2015-07-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.1.3-p2
+ * allpatches-3.1.2-p11.xz: removed
+ * allpatches-3.1.3-p2.xz: added
+
2015-04-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, PRE_BUILD, allpatches-3.1.2-p11.xz: update to upstream
patch level 3.1.2-p11
diff --git a/libs/mpfr/allpatches-3.1.2-p11.xz
b/libs/mpfr/allpatches-3.1.2-p11.xz
deleted file mode 100644
index 33cd2b1..0000000
Binary files a/libs/mpfr/allpatches-3.1.2-p11.xz and /dev/null differ
diff --git a/libs/mpfr/allpatches-3.1.3-p2.xz
b/libs/mpfr/allpatches-3.1.3-p2.xz
new file mode 100644
index 0000000..2e6ebf9
Binary files /dev/null and b/libs/mpfr/allpatches-3.1.3-p2.xz differ
diff --git a/libs/openscenegraph/DETAILS b/libs/openscenegraph/DETAILS
index 6349f94..61ee35f 100755
--- a/libs/openscenegraph/DETAILS
+++ b/libs/openscenegraph/DETAILS
@@ -1,10 +1,10 @@
SPELL=openscenegraph
- VERSION=3.2.1
+ VERSION=3.2.2-rc1
BRANCH=${VERSION/%.?/}
SOURCE=OpenSceneGraph-$VERSION.zip
SOURCE_DIRECTORY=$BUILD_DIRECTORY/OpenSceneGraph-${VERSION}

SOURCE_URL[0]=http://www.openscenegraph.org/downloads/developer_releases/$SOURCE
-
SOURCE_HASH=sha512:f7bd9aedd3a1f48094a0ad95d267c2f2c946b042f7459d6b33e6038a4b16aeda9cfd69f339ea0a2a478dadadf1875313a4132564b8fcade5ad93511ecd8c1a9e
+
SOURCE_HASH=sha512:4f5369c1e3f69a68729aa282c838334c840936d1207ca128ed7bf66cec82ef8f8e6b44766c155b88266c55dff2d72ec4b0484646a94be845462afa4a5a99cd8a
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
WEB_SITE=http://www.openscenegraph.org/
ENTERED=20021102
diff --git a/libs/openscenegraph/HISTORY b/libs/openscenegraph/HISTORY
index 3235fa1..d739b38 100644
--- a/libs/openscenegraph/HISTORY
+++ b/libs/openscenegraph/HISTORY
@@ -1,3 +1,7 @@
+2015-07-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 4.2.2-rc1
+ * PRE_BUILD, gdal-2.patch: fix compile error with gdal 2
+
2015-06-24 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: ffmpeg => LIBAVCODEC

diff --git a/libs/openscenegraph/PRE_BUILD b/libs/openscenegraph/PRE_BUILD
index 28e97b5..ce62781 100755
--- a/libs/openscenegraph/PRE_BUILD
+++ b/libs/openscenegraph/PRE_BUILD
@@ -1,2 +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
new file mode 100644
index 0000000..20f0997
--- /dev/null
+++ b/libs/openscenegraph/gdal-2.patch
@@ -0,0 +1,49 @@
+--- 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 (717fd70c913045aad94d519ab05411cb3c706fe6), Florian Franzmann, 07/13/2015

Archive powered by MHonArc 2.6.24.

Top of Page