diff options
| author | martymac <martymac@FreeBSD.org> | 2017-07-17 20:25:09 +0800 |
|---|---|---|
| committer | martymac <martymac@FreeBSD.org> | 2017-07-17 20:25:09 +0800 |
| commit | b1bc6b378efbfe0850790c8ea244a78061f745e7 (patch) | |
| tree | 1b558e6d1a816e204d7f76909886f748dde669d4 /devel/simgear | |
| parent | c35c95cbfffa098561fea01b00d3ef12d07c7091 (diff) | |
| download | freebsd-ports-gnome-b1bc6b378efbfe0850790c8ea244a78061f745e7.tar.gz freebsd-ports-gnome-b1bc6b378efbfe0850790c8ea244a78061f745e7.tar.zst freebsd-ports-gnome-b1bc6b378efbfe0850790c8ea244a78061f745e7.zip | |
Remove tr1 dependency to prepare for Boost 1.65
PR: 220718
Submitted by: jbeich
Diffstat (limited to 'devel/simgear')
| -rw-r--r-- | devel/simgear/Makefile | 2 | ||||
| -rw-r--r-- | devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.cxx | 27 | ||||
| -rw-r--r-- | devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.hxx | 20 |
3 files changed, 48 insertions, 1 deletions
diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile index 7cfcd87a8a5a..950a3094ac39 100644 --- a/devel/simgear/Makefile +++ b/devel/simgear/Makefile @@ -2,7 +2,7 @@ PORTNAME= simgear PORTVERSION= 2017.1.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel games MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} diff --git a/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.cxx b/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.cxx new file mode 100644 index 000000000000..5f7636158c6e --- /dev/null +++ b/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.cxx @@ -0,0 +1,27 @@ +--- simgear/scene/material/Effect.cxx.orig 2017-04-04 09:24:44.000000000 +0200 ++++ simgear/scene/material/Effect.cxx 2017-07-16 21:55:10.888904000 +0200 +@@ -32,7 +32,7 @@ + #include <map> + #include <queue> + #include <utility> +-#include <boost/tr1/unordered_map.hpp> ++#include <unordered_map> + + #include <boost/bind.hpp> + #include <boost/foreach.hpp> +@@ -832,13 +832,13 @@ + + // XXX Should these be protected by a mutex? Probably + +-typedef tr1::unordered_map<ProgramKey, ref_ptr<Program>, ++typedef std::unordered_map<ProgramKey, ref_ptr<Program>, + boost::hash<ProgramKey>, ProgramKey::EqualTo> + ProgramMap; + ProgramMap programMap; + ProgramMap resolvedProgramMap; // map with resolved shader file names + +-typedef tr1::unordered_map<ShaderKey, ref_ptr<Shader>, boost::hash<ShaderKey> > ++typedef std::unordered_map<ShaderKey, ref_ptr<Shader>, boost::hash<ShaderKey> > + ShaderMap; + ShaderMap shaderMap; + diff --git a/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.hxx b/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.hxx new file mode 100644 index 000000000000..3d6b87137864 --- /dev/null +++ b/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.hxx @@ -0,0 +1,20 @@ +--- simgear/scene/material/Effect.hxx.orig 2017-04-04 09:24:44.000000000 +0200 ++++ simgear/scene/material/Effect.hxx 2017-07-16 21:55:33.247324000 +0200 +@@ -19,7 +19,7 @@ + + #include <vector> + #include <string> +-#include <boost/tr1/unordered_map.hpp> ++#include <unordered_map> + + #include <boost/functional/hash.hpp> + +@@ -127,7 +127,7 @@ + bool operator()(const Key& lhs, const Key& rhs) const; + }; + }; +- typedef std::tr1::unordered_map<Key, osg::observer_ptr<Effect>, ++ typedef std::unordered_map<Key, osg::observer_ptr<Effect>, + boost::hash<Key>, Key::EqualTo> Cache; + Cache* getCache() + { |