<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fae4f909ebb0c4ceb279ac22ec61ec88b47c5e28">https://github.com/macports/macports-ports/commit/fae4f909ebb0c4ceb279ac22ec61ec88b47c5e28</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fae4f909ebb0c4ceb279ac22ec61ec88b47c5e28
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Aug 9 05:11:44 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> VirtualPlanetBuilder: Update to 0.9.13
</span>---
graphics/VirtualPlanetBuilder/Portfile | 53 +++++++++-------------
.../files/BuildOptionsIO.cpp.patch | 14 ++++++
...ch-CMakeLists.txt.diff => CMakeLists.txt.patch} | 30 ++++++------
.../files/DatabaseBuilderIO.cpp.patch | 31 +++++++++++++
graphics/VirtualPlanetBuilder/files/Version.patch | 15 ++++++
graphics/VirtualPlanetBuilder/files/bool.patch | 25 ++++++++++
6 files changed, 121 insertions(+), 47 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/VirtualPlanetBuilder/Portfile b/graphics/VirtualPlanetBuilder/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 822dbd7110c..a179f79034e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/VirtualPlanetBuilder/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/VirtualPlanetBuilder/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +1,18 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name VirtualPlanetBuilder
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.9.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers ryandesign openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup openscenegraph VirtualPlanetBuilder 0.9.13 VirtualPlanetBuilder-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 078e0b0d99b8b985f2f10aff5aaa558968434fad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0e23fc772ff348ea0be2b6f6468ee9f6f0e4c4c907581b4518313033e2777263 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 228406
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} openmaintainer
</span> license wxWidgets-3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> categories graphics
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_zip yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.openscenegraph.org/projects/VirtualPlanetBuilder
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}/attachment/wiki/WikiStart/${distfiles}?format=raw&foo=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${name}
</span>
description terrain database creation tool
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,29 +25,18 @@ long_description ${name} is a terrain database creation tool that can \
</span> or kept on local disks for high-speed access for \
professional flight simulator applications.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 e084fec6150c31b01412dfb4d2a9959f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 632e352f53b9c62a3df733e507aae5286b673840 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 ccf764c679c36cb4ae4cd3f2e1efeeac3074dcaa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build path:bin/cmake:cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:OpenSceneGraph
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args -DCMAKE_INSTALL_PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args -DCMAKE_BUILD_TYPE=Release \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_APPLICATIONS=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles bool.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BuildOptionsIO.cpp.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMakeLists.txt.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DatabaseBuilderIO.cpp.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Version.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch-CMakeLists.txt.diff removes the built-in universal support. We need a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# MacPorts-controlled universal build, but this universal variant is untested.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#variant universal {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.args-append -DCMAKE_OSX_ARCHITECTURES="${configure.universal_archs}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -DCMAKE_CXX_FLAGS="${configure.universal_cxxflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:gdal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:OpenSceneGraph
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url http://www.openscenegraph.org/svn/VirtualPlanetBuilder/tags/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${name}-(\[0-9.\]+)/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# gdal and OpenSceneGraph require C++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -std=c++11
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/VirtualPlanetBuilder/files/BuildOptionsIO.cpp.patch b/graphics/VirtualPlanetBuilder/files/BuildOptionsIO.cpp.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e29a204b983
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/VirtualPlanetBuilder/files/BuildOptionsIO.cpp.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build error due to change in OSG API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/openscenegraph/VirtualPlanetBuilder/commit/b5aa52a84f7c9311468ddd921da27e25857141fa?w=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/vpb/BuildOptionsIO.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/vpb/BuildOptionsIO.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -538,7 +538,8 @@ static bool readLayerImageOptions( osgDB::InputStream& is, vpb::BuildOptions& bo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int size = 0; is >> size >> IS_BEGIN_BRACKET;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for ( unsigned int i=0; i<size; ++i )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vpb::ImageOptions* imageOptions = dynamic_cast<vpb::ImageOptions*>( is.readObject() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ osg::ref_ptr<osg::Object> obj = is.readObject();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vpb::ImageOptions* imageOptions = dynamic_cast<vpb::ImageOptions*>( obj.get() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( imageOptions ) bo.setLayerImageOptions( i, imageOptions );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ is >> IS_END_BRACKET;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/VirtualPlanetBuilder/files/patch-CMakeLists.txt.diff b/graphics/VirtualPlanetBuilder/files/CMakeLists.txt.patch
</span>similarity index 83%
rename from graphics/VirtualPlanetBuilder/files/patch-CMakeLists.txt.diff
rename to graphics/VirtualPlanetBuilder/files/CMakeLists.txt.patch
<span style='display:block; white-space:pre;color:#808080;'>index 97f55625e4c..0d8213f31f7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/VirtualPlanetBuilder/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/VirtualPlanetBuilder/files/CMakeLists.txt.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +1,27 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt 2007-08-07 05:52:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2008-07-27 01:09:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -182,40 +182,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2015-07-01 12:05:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2023-08-09 05:14:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -329,40 +329,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_SUBDIRECTORY(applications)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Set defaults for Universal Binaries. We want 32-bit Intel/PPC on 10.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Set defaults for Universal Binaries. We want 32-bit Intel/PPC on 10.4
</span> -# and 32/64-bit Intel/PPC on >= 10.5. Anything <= 10.3 doesn't support.
-IF(APPLE)
- # These are just defaults/recommendations, but how we want to build
- # out of the box. But the user needs to be able to change these options.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- # So we must only set the values the first time CMake is run, or we
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # So we must only set the values the first time CMake is run, or we
</span> - # will overwrite any changes the user sets.
- # FORCE is used because the options are not reflected in the UI otherwise.
- # Seems like a good place to add version specific compiler flags too.
- IF(NOT VPB_CONFIG_HAS_BEEN_RUN_BEFORE)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- # This is really fragile, but CMake doesn't provide the OS system
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # version information we need. (Darwin versions can be changed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # This is really fragile, but CMake doesn't provide the OS system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # version information we need. (Darwin versions can be changed
</span> - # independently of OS X versions.)
- # It does look like CMake handles the CMAKE_OSX_SYSROOT automatically.
- IF(EXISTS /Developer/SDKs/10.5.sdk)
- SET(CMAKE_OSX_ARCHITECTURES "ppc;i386;ppc64;x86_64" CACHE STRING "Build architectures for OSX" FORCE)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.5 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- ELSE(EXISTS /Developer/SDKs/10.5.sdk)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ELSE()
</span> - IF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
- SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "Build architectures for OSX" FORCE)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.4 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,13 +29,13 @@
</span> - # No Universal Binary support
- # Should break down further to set the -mmacosx-version-min,
- # but the SDK detection is too unreliable here.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- ENDIF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ENDIF(EXISTS /Developer/SDKs/10.5.sdk)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ENDIF(NOT VPB_CONFIG_HAS_BEEN_RUN_BEFORE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> - OPTION(VPB_BUILD_APPLICATION_BUNDLES "Enable the building of applications and examples as OSX Bundles" OFF)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ENDIF(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ENDIF()
</span> -
-
# This needs to be run very last so other parts of the scripts can take
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/VirtualPlanetBuilder/files/DatabaseBuilderIO.cpp.patch b/graphics/VirtualPlanetBuilder/files/DatabaseBuilderIO.cpp.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1b7aeb26cb2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/VirtualPlanetBuilder/files/DatabaseBuilderIO.cpp.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Update to map to modern versions of the OSG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/openscenegraph/VirtualPlanetBuilder/commit/4158a64cb0983286c10a2f76ccfb4a6e8fb0e928
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/vpb/DatabaseBuilderIO.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/vpb/DatabaseBuilderIO.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -121,7 +121,7 @@ class VPBReaderWriter : public osgDB::ReaderWriter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtual ReadResult readNode(const std::string& file, const Options* opt) const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OSG_INFO<<"VPBReaderWriter::readNode()"<<std::endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ OSG_INFO<<"VPBReaderWriter::readNode() "<<file<<std::endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string ext = osgDB::getFileExtension(file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!acceptsExtension(ext)) return ReadResult::FILE_NOT_HANDLED;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -157,7 +157,7 @@ class VPBReaderWriter : public osgDB::ReaderWriter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OSG_INFO<<"readNode_new()"<<std::endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- osgDB::ReaderWriter* rw = osgDB::Registry::instance()->getReaderWriterForExtension("osg2");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ osgDB::ReaderWriter* rw = osgDB::Registry::instance()->getReaderWriterForExtension("osg");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!rw) return ReadResult::FILE_NOT_HANDLED;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OSG_INFO<<" found ReaderWriter, readNode_new()"<<std::endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -235,7 +235,7 @@ class VPBReaderWriter : public osgDB::ReaderWriter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ osgDB::ofstream fout( fileName.c_str(), std::ios::out );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( !fout ) return WriteResult::ERROR_IN_WRITING_FILE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- osgDB::ReaderWriter* rw = osgDB::Registry::instance()->getReaderWriterForExtension("osg2");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ osgDB::ReaderWriter* rw = osgDB::Registry::instance()->getReaderWriterForExtension("osg");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!rw) return WriteResult::FILE_NOT_HANDLED;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result = rw->writeNode( node, fout, local_opt.get() );
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/VirtualPlanetBuilder/files/Version.patch b/graphics/VirtualPlanetBuilder/files/Version.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c5fcb897d10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/VirtualPlanetBuilder/files/Version.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix version in header to match CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/openscenegraph/VirtualPlanetBuilder/issues/5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/vpb/Version.orig 2015-07-01 12:05:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/vpb/Version 2023-08-09 07:06:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,8 +20,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define VPB_VERSION_MAJOR 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define VPB_VERSION_MINOR 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define VPB_VERSION_PATCH 11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define VPB_VERSION_SOVERSION 11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define VPB_VERSION_PATCH 13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define VPB_VERSION_SOVERSION 13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * vpbGetVersion() returns the library version number.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/VirtualPlanetBuilder/files/bool.patch b/graphics/VirtualPlanetBuilder/files/bool.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..cd88777602b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/VirtualPlanetBuilder/files/bool.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix erroneous bool usage
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/openscenegraph/VirtualPlanetBuilder/commit/58fc4595f3548dd174640c27e901b9d3adedf14e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/openscenegraph/VirtualPlanetBuilder/commit/22bf67f5a0d948b0c788652381d163a914e2fde3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/vpb/MachinePool.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/vpb/MachinePool.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -630,7 +630,7 @@ bool MachinePool::read(const std::string& filename)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (fr.read("file",readFilename))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ read(readFilename);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ++itrAdvanced;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ itrAdvanced = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (fr.matchSequence("Machine {"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/vpb/TaskManager.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/vpb/TaskManager.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -854,7 +854,7 @@ bool TaskManager::readTasks(const std::string& filename)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nextTaskSet();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ readTasks(readFilename);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ++itrAdvanced;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ itrAdvanced = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Task* task = readTask(fr, itrAdvanced);
</span></pre><pre style='margin:0'>
</pre>