diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-games/openscenegraph/files/openscenegraph-3.2.1-gdal-2.0.patch | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-games/openscenegraph/files/openscenegraph-3.2.1-gdal-2.0.patch')
-rw-r--r-- | dev-games/openscenegraph/files/openscenegraph-3.2.1-gdal-2.0.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/dev-games/openscenegraph/files/openscenegraph-3.2.1-gdal-2.0.patch b/dev-games/openscenegraph/files/openscenegraph-3.2.1-gdal-2.0.patch new file mode 100644 index 000000000000..639cbc958258 --- /dev/null +++ b/dev-games/openscenegraph/files/openscenegraph-3.2.1-gdal-2.0.patch @@ -0,0 +1,49 @@ +--- OpenSceneGraph-3.2.1/src/osgPlugins/ogr/ReaderWriterOGR.cpp ++++ OpenSceneGraph-3.2.1/src/osgPlugins/ogr/ReaderWriterOGR.cpp +@@ -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; + } + |