Addd patch for gdal-2.0 compilation, fixes bug 554310.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xB1E955DB

4 files changed, 62 insertions, 7 deletions

diff --git a/dev-games/openscenegraph/ChangeLog b/dev-games/openscenegraph/ChangeLog
index f32eb9dd51b2..a5cb559fd305 100644
--- a/dev-games/openscenegraph/ChangeLog
+++ b/dev-games/openscenegraph/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/openscenegraph
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.63 2015/07/14 17:30:59 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.64 2015/07/20 19:24:57 reavertm Exp $
+
+  20 Jul 2015; Maciej Mrozowski <reavertm@gentoo.org>
+  +files/openscenegraph-3.2.1-gdal-2.0.patch, openscenegraph-3.2.1-r1.ebuild:
+  Addd patch for gdal-2.0 compilation, fixes bug 554310.
 
 *openscenegraph-3.2.1-r1 (14 Jul 2015)
 
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index fca3c96c7263..4fc9f15cd191 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -2,15 +2,16 @@
 Hash: SHA256
 
 AUX openscenegraph-3.2.1-cmake.patch 11002 SHA256 4a524a4ef4982f837f99fcb876b49373be40e142f6ba39b5758d8983665c0859 SHA512 d9ae3d5ef7840eddb972ead8a3d7cf03c3c78b7857e0c6f7c1893eacae4bd581aac9f85ffe4b17cdbc182686eaf0fac52f5985931c6fbeae2afc21f7e5e9d9eb WHIRLPOOL 40428cf1c80ffbbdd1926bee009c63b1b2eadd6c7336fd4e0c235f2c0b56d9f63d06679a2e8ad282d6e6c1c879e186a95a20c3120046a546675016832d01c64a
+AUX openscenegraph-3.2.1-gdal-2.0.patch 1646 SHA256 1b3009d10f3fc4f63167d964226aa59f29c713612ece91d6d118eecffbdf6594 SHA512 108aeccecdc8b043de6e998c4d8f36af21bc7257250c58010f17b01b4d87839aeb5b80c303501db704121bf3dc4b5462ed8d04bd684dc3355791d2b54753f193 WHIRLPOOL d4afca1e86a71436e02001d795e71ae16e71999094b64c2341e1488b2dcf606a7ff7aa0239659ff9d44a1a8915c506ae66369f929f6844d8ed5806f5b81ef097
 DIST OpenSceneGraph-3.2.1.zip 7219212 SHA256 d9ae72263d0191855b0f804d93c586d489f119aca0499292acc09bb0fa0b3e6d SHA512 f7bd9aedd3a1f48094a0ad95d267c2f2c946b042f7459d6b33e6038a4b16aeda9cfd69f339ea0a2a478dadadf1875313a4132564b8fcade5ad93511ecd8c1a9e WHIRLPOOL ef47a41a316fae86341cdebecaeceb41cf56b5f11fdf93e8218bb9aa9eaa28fc2fc9122efbeb8dce69fa01d8c8b6a2460fab69190714ca53abfa5d347a0ae1bc
-EBUILD openscenegraph-3.2.1-r1.ebuild 3810 SHA256 819ab6170259a0ed1b1e145c6b0c32025b100cc4064fe98c5e9b7dde415c9e72 SHA512 f4d08b2199765e3c8e46f03ba4cfe6a10becfe7c547e9e53a9efdfe6efa8439a5bf54c8ce2271dffc104849a3438b9b0de9e6b14bcba518d0ce6683f87a0ef52 WHIRLPOOL a91456cf30ca2fc5e764f673cb9ec453ce0c67c848b017597bdabe5dbdf908595dc1bf34defcb24effe666f49a127d36228b0f2036a32a5a11b08d255c3f6723
+EBUILD openscenegraph-3.2.1-r1.ebuild 3852 SHA256 5d6b901aaede3b468bcb1d03ec4a2fbd724ea2c172a012b0fe87285a7d3ea192 SHA512 f9a0d4e76bed4c5e2d40a85c3716bfe33c8d0d3ed0690b1898987886030a7d69fe929a6960654807b95bf29105bc4714733cc523159b2eaf5a6cb71bcbff568d WHIRLPOOL 6f3d5ee6b2dd1d76b44c881fcf3d417b963b32fe44a2454f03a80c14fd6cf6b228874cd16e2d55c0670a164370be7f006fc5cc672851208d8a8d5f60b6518ea7
 EBUILD openscenegraph-3.2.1.ebuild 3526 SHA256 36ebf98e446fbf10565ff3d3fea51829a64e8d1bfa685cd21f3f98a3d6d6c4b6 SHA512 711109bbaaa4287f65af0366ccd2fd98a91bf1f1a548919904695b5383822cf553b2a3ef1fd04ac8c98d4c8717604c48a40a7161b6d0df2adef37f7afea54c14 WHIRLPOOL daa97c1d2fa9c88a7c6b72e7503a60ebd70ad512b3ccaadec5db0a0b033ae90ade4e6f0fdda07ee80eb80c2faa83a2932f81b8769dda2ac3b6e79afe35ae43b6
-MISC ChangeLog 9952 SHA256 debe025f855084020d690c74a8e1341825c2c79398ac766b6a2d1584b5677186 SHA512 6a807539f5a7c811a00f55992a76dc08f064104fc854e24e1132b7dab1763b10967ca73986f2de1aa424b03ee1336dc47f99026d5d1f488ad81a8bc615a83fbf WHIRLPOOL 693a2d8fcfe7755c2699b7cb4286beb4609647a467bf5592cac6be3cbb4a6435c9b77e29b1195e5b56a0eb65d9eb33e4549715a8dd5e5ed693cc84afdc35963b
+MISC ChangeLog 10142 SHA256 ff597543138ec3a854e7e8e58ae00893f47806b96524d2e249d05425e8ec76e2 SHA512 f80e9a15257386618583a2e00980a9a64dae800fba58ce58191fc93514613d89c5050cefb2974161c53901cfb9536da4e3caf6df7be2cf2f74d56339d86f1bb3 WHIRLPOOL cdd586cd1de3bb2a4919ca248eef5d3ed81099f222c173f1ae9d60f8b575118b41c1076981987587ca3ddd87fcfa121d43cfc7d901639c9afa4429952e9fe0b3
 MISC metadata.xml 1289 SHA256 d681ed8d7d4c8393f9fea6af276e50e8a93063a2860ca36012779de27705ecd7 SHA512 864cd81ae0b7e87a4599d8cb0910512e6b1c9ad5e953f560fff501734d368f5434edb6a681867e948cd9cbc2fb363ecf59948cf8c0dcc26c296a32840dbb8108 WHIRLPOOL 34a648e86d06762c417fa7dd977ddc5db426e2f5558c672d6eb3a3581cc0f63a4a5415d8cf2c5d93760bce6021c747e48816b9f3d591b7527515e74a9edd2491
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWlR3AACgkQFuHa/bHpVdtmHQCcD0/IeRnEtW/2Xvo+lHssF63m
-o+QAoKI89X8cv9Zzw3AtVepTii0s3pvi
-=VnXE
+iEYEAREIAAYFAlWtSyYACgkQFuHa/bHpVdtoGwCgv2ZdbuR47h4sk6OPs3YbONCI
+YMcAnRcjqtcGA82eF2BnHf5OmBW5r6xh
+=l3+z
 -----END PGP SIGNATURE-----
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;
+     }
+ 
diff --git a/dev-games/openscenegraph/openscenegraph-3.2.1-r1.ebuild b/dev-games/openscenegraph/openscenegraph-3.2.1-r1.ebuild
index 9ffe903f0357..b4b94637c373 100644
--- a/dev-games/openscenegraph/openscenegraph-3.2.1-r1.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-3.2.1-r1.ebuild,v 1.1 2015/07/14 17:30:59 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-3.2.1-r1.ebuild,v 1.2 2015/07/20 19:24:57 reavertm Exp $
 
 EAPI=5
 
@@ -89,6 +89,7 @@ DOCS=(AUTHORS.txt ChangeLog NEWS.txt)
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.2.1-cmake.patch
+	"${FILESDIR}"/${PN}-3.2.1-gdal-2.0.patch
 )
 
 src_configure() {