Source: openscenegraph Version: 3.2.1-7 Severity: important Tags: patch upstream User: debian-...@lists.debian.org Usertags: gdal-2.0
Dear Maintainer, openscenegraph (3.2.1-7) FTBFS due to missing compatibility with GDAL/OGR 2.0: error: 'Open' is not a member of 'OGRSFDriverRegistrar' This build failure needs to be resolved to unblock the rebuilds of osgearth & qgis as part of the gdal-2.0 transition. There is some discussion about GDAL 2.0 support on the OSG forum: http://forum.openscenegraph.org/viewtopic.php?t=14579 And this change in SVN fixes the OGRSFDriverRegistrar build failure: http://trac.openscenegraph.org/projects/osg/changeset/14926 The attached debdiff includes the changes from OSG SVN r14926 in gdal-2.0.patch, please consider including these changes in the next openscenegraph upload. The severity of this issue will be increased to serious when the GDAL 2.0 transition starts. There are no GDAL 2.0.1 packages available in experimental yet, because the transition to GDAL 1.11.3 (#802222) needs to start first. This issue was triaged using locally built GDAL 2.0.1 packages from the experimental-2.0 branch in git [1]. [0] https://lists.debian.org/debian-gis/2015/10/msg00022.html [1] http://anonscm.debian.org/cgit/pkg-grass/gdal.git/log/?h=experimental-2.0 Kind Regards, Bas
diff -Nru openscenegraph-3.2.1/debian/changelog openscenegraph-3.2.1/debian/changelog --- openscenegraph-3.2.1/debian/changelog 2015-08-30 16:53:50.000000000 +0200 +++ openscenegraph-3.2.1/debian/changelog 2015-10-18 20:52:39.000000000 +0200 @@ -1,3 +1,10 @@ +openscenegraph (3.2.1-7.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Add patch for GDAL 2.0 support. + + -- Bas Couwenberg <sebas...@debian.org> Sun, 18 Oct 2015 20:51:48 +0200 + openscenegraph (3.2.1-7) unstable; urgency=medium [ Martin Pitt ] diff -Nru openscenegraph-3.2.1/debian/patches/gdal-2.0.patch openscenegraph-3.2.1/debian/patches/gdal-2.0.patch --- openscenegraph-3.2.1/debian/patches/gdal-2.0.patch 1970-01-01 01:00:00.000000000 +0100 +++ openscenegraph-3.2.1/debian/patches/gdal-2.0.patch 2015-10-18 20:51:34.000000000 +0200 @@ -0,0 +1,53 @@ +Description: Add support for GDAL 2.0. + See also: https://svn.osgeo.org/gdal/branches/2.0/gdal/MIGRATION_GUIDE.TXT +Origin: http://trac.openscenegraph.org/projects/osg/changeset/14926 + +--- a/OpenSceneGraph/src/osgPlugins/ogr/ReaderWriterOGR.cpp ++++ b/OpenSceneGraph/src/osgPlugins/ogr/ReaderWriterOGR.cpp +@@ -134,11 +134,20 @@ public: + + virtual ReadResult readFile(const std::string& fileName, const osgDB::ReaderWriter::Options* options) const + { ++#if GDAL_VERSION_MAJOR<2 + if (OGRSFDriverRegistrar::GetRegistrar()->GetDriverCount() == 0) + OGRRegisterAll(); + + // Try to open data source + OGRDataSource* file = OGRSFDriverRegistrar::Open(fileName.c_str()); ++#else ++ if (GDALGetDriverCount() == 0) ++ GDALAllRegister(); ++ ++ // Try to open data source ++ GDALDataset* file = (GDALDataset*) GDALOpenEx( fileName.c_str(), GDAL_OF_VECTOR, NULL, NULL, NULL ); ++#endif ++ + if (!file) + return 0; + +@@ -156,6 +165,7 @@ public: + + 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 +173,17 @@ public: + group->addChild( node ); + } + OGRDataSource::DestroyDataSource( file ); ++#else ++ for (int i = 0; i < GDALDatasetGetLayerCount(file); 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; + } + diff -Nru openscenegraph-3.2.1/debian/patches/series openscenegraph-3.2.1/debian/patches/series --- openscenegraph-3.2.1/debian/patches/series 2015-02-04 11:25:06.000000000 +0100 +++ openscenegraph-3.2.1/debian/patches/series 2015-10-18 20:47:06.000000000 +0200 @@ -3,3 +3,4 @@ libav10.patch bug763818_fix_preprocessor_double_substitution bug765855_removecallback_use_after_free +gdal-2.0.patch
_______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
