Your message dated Thu, 22 Oct 2015 09:38:27 +0000
with message-id <[email protected]>
and subject line Bug#802266: fixed in openscenegraph 3.2.1-8
has caused the Debian Bug report #802266,
regarding openscenegraph: Fails to build with GDAL 2.0
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
802266: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=802266
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: openscenegraph
Version: 3.2.1-7
Severity: important
Tags: patch upstream
User: [email protected]
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 <[email protected]> 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
--- End Message ---
--- Begin Message ---
Source: openscenegraph
Source-Version: 3.2.1-8
We believe that the bug you reported is fixed in the latest version of
openscenegraph, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Alberto Luaces Fernández <[email protected]> (supplier of updated openscenegraph
package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Mon, 19 Oct 2015 13:51:23 +0200
Source: openscenegraph
Binary: libopenthreads-dev libopenthreads20 libopenscenegraph-dev
libopenscenegraph100v5 openscenegraph-doc openscenegraph openscenegraph-examples
Architecture: source amd64 all
Version: 3.2.1-8
Distribution: unstable
Urgency: medium
Maintainer: Loic Dachary (OuoU) <[email protected]>
Changed-By: Alberto Luaces Fernández <[email protected]>
Description:
libopenscenegraph-dev - 3D scene graph, development files
libopenscenegraph100v5 - 3D scene graph, shared libs
libopenthreads-dev - Object-Oriented (OO) thread interface for C++,
development files
libopenthreads20 - Object-Oriented (OO) thread interface for C++, shared libs
openscenegraph - 3D scene graph, utilities and examples (binaries)
openscenegraph-doc - 3D scene graph, documentation
openscenegraph-examples - 3D scene graph, examples (sources)
Closes: 792320 802266
Changes:
openscenegraph (3.2.1-8) unstable; urgency=medium
.
* Adding upstream patch for GDAL 2.0 support, needed by upcoming
transition. Thanks to Bas Couwenberg. (Closes: 802266)
.
[ Matthias Klose ]
* Re-add a copy of the xine_xmalloc_aligned function, removed in
newer upstream versions. (Closes: 792320)
Checksums-Sha1:
76335c1692418bb0dd52a13668902f1efc2afe85 2856 openscenegraph_3.2.1-8.dsc
d453339c233b0946e0b7f8d61f827c4354e384b4 21252
openscenegraph_3.2.1-8.debian.tar.xz
5355dbe1d9a0e1c1809f00dfae16d87a4699ce53 450936
libopenscenegraph-dev_3.2.1-8_amd64.deb
c24f060e873de9e90bad88b32ac80d1357830a0e 5578294
libopenscenegraph100v5_3.2.1-8_amd64.deb
df28823f800fd33219b802c223906b1cd8a6bdf4 20100
libopenthreads-dev_3.2.1-8_amd64.deb
40b6473773f066807a3bd6670be2db8b6fb39081 20870
libopenthreads20_3.2.1-8_amd64.deb
a47a25544ce9bbcd4fccd45a2d9e8219566a0184 125258
openscenegraph-doc_3.2.1-8_all.deb
fac582c750eae1f4310453cbabcc9fe6d2441d99 466626
openscenegraph-examples_3.2.1-8_all.deb
4a5ef65248a240d05d84e580cad1c37013a7e65a 1583874
openscenegraph_3.2.1-8_amd64.deb
Checksums-Sha256:
cca3b352016f637c2998381d624e1be9d6c0e557bf9f35734766b0375f733199 2856
openscenegraph_3.2.1-8.dsc
f46adb77890e724c92ef0a79b4e80d7816164034ccdd7b3486c41ceb2eb8b2e0 21252
openscenegraph_3.2.1-8.debian.tar.xz
c3b98bd2d29306641115026ae9ea3d5255a6c136f436abe018c6f29ef7a37f1d 450936
libopenscenegraph-dev_3.2.1-8_amd64.deb
41beb9ef4036bedc5ad91bc850945aa9bb90335b64ca89483d5fe5cab1fb0b45 5578294
libopenscenegraph100v5_3.2.1-8_amd64.deb
773291cdc2dea99e225dcf64a7cb2de891710252647f91f1e8d3c30edeb78933 20100
libopenthreads-dev_3.2.1-8_amd64.deb
849fc5a691e53da008472330ee4a18d3df84b7b5181d78cd084d8febf27e2846 20870
libopenthreads20_3.2.1-8_amd64.deb
50961ae8717909d832ea6b649949b74960b6da28a969f9ac4a59cdf725c33c24 125258
openscenegraph-doc_3.2.1-8_all.deb
139868c598d3926bb1555818a33470b5701bf2ece5f034a0aa10e8b952f46d94 466626
openscenegraph-examples_3.2.1-8_all.deb
7c83591bae5bd16f25f15f181e441034b748b3f4bb85296e19306da5cff48d92 1583874
openscenegraph_3.2.1-8_amd64.deb
Files:
6bd3fe1dc71d1e78332d5fa7cc41446c 2856 devel optional openscenegraph_3.2.1-8.dsc
d523612f53139fb8e1c4227bed425014 21252 devel optional
openscenegraph_3.2.1-8.debian.tar.xz
95a39077428f9822ca889310915f2df0 450936 libdevel optional
libopenscenegraph-dev_3.2.1-8_amd64.deb
1e8bf9429707eb615e671ac1b6834cbd 5578294 libs optional
libopenscenegraph100v5_3.2.1-8_amd64.deb
6d17788fe930a1392cda8d75c98a9c4f 20100 libdevel optional
libopenthreads-dev_3.2.1-8_amd64.deb
11ce2b49a3abe740bb8563f995d5aefc 20870 libs optional
libopenthreads20_3.2.1-8_amd64.deb
ed073efa2caa8a5b3d4f1c686646d28e 125258 doc optional
openscenegraph-doc_3.2.1-8_all.deb
b71dae22732bd50dec96819b42f875ab 466626 devel optional
openscenegraph-examples_3.2.1-8_all.deb
43d49ee1564e9312add98ecc7cbbb05e 1583874 devel optional
openscenegraph_3.2.1-8_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBCAAGBQJWKKdNAAoJEJsua4J1LbA7WHwP/2a/qT7xJ3A7hSdYlBFUC/vJ
8XrUFufbO5onvKz0QIivJ/IXO+/rqJPDUxWfWAC7RqkN+ufGcWnll+Qz0onHjv1A
D0i4pdYSIXd3UA0SrSQ+bHXlTdoJR7CaE3oX+0OycOs7hNXYzSajdErMmdSIFdAs
cK0z8Bscw0saMl4/nGLXt31Jn0+7/di4D7l8LtFwAh9dJB938/V4vdrQLF3sqalH
QXPsxOGbDDpoZ2Rn4/Ovsfuxey8iR8O7kFWj61HaxWszitIqzVSyTPKOAEo1BIh7
sAzvWTn4STHiglzzn0tc8rjv8t6W8/QAAf7mE2+qFnSnYgTqgTUwo9i8IQB+fkLr
YMWva/nyX8SKxDLZDp0CrlBuq4xOpGFlI7+GibkSnpPSgmVWJJVsozt4l77eX/k/
ep7/44AEZ7hyoAZPv692qSWkhKpJbsYzUg6j5BvJmQzIow6KIFqCTO2XA3hg/owP
43UMpxYNqWVCSkMB2O6PC+13ZWClmtcxTN+MxYhOoa3715WXA8DpC1uV9E0Jts4v
whqJdZf8EApLQ/gLvgksFnTqIowHO9xRk1RS3oWH9lJfN5uDoaFhxg04hLQ6j3Cw
iuRpKdYv/sRTvTMOgYg2JVQPpwzYgsBltqS6TvlHrFOUnzAMldW6yLwapX/kqTpJ
jhh282NsN/85QgDewn3N
=sLs3
-----END PGP SIGNATURE-----
--- End Message ---
