* [gentoo-commits] repo/gentoo:master commit in: dev-games/simgear/, dev-games/simgear/files/
@ 2017-01-14 1:33 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2017-01-14 1:33 UTC (permalink / raw
To: gentoo-commits
commit: d57e2633cf40bec897c0baa75b9cb58225caa2f2
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 14 01:32:57 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 01:33:22 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d57e2633
dev-games/simgear: Security cleanup (bug #602658).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-games/simgear/Manifest | 3 -
.../simgear/files/simgear-3.4.0-osg340_fixes.patch | 203 ---------------------
dev-games/simgear/simgear-2016.3.1.ebuild | 51 ------
dev-games/simgear/simgear-2016.4.3.ebuild | 51 ------
dev-games/simgear/simgear-3.4.0.ebuild | 47 -----
5 files changed, 355 deletions(-)
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index d5b71bc..068e5f6 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,4 +1 @@
-DIST simgear-2016.3.1.tar.bz2 1199016 SHA256 ae46e1273673be41028ee912d1826e87185ab594053c493707f9dbdeea5159dd SHA512 5c0e260da8b09e815cd6607f3e977b5827f450e9fbe10bfaef019d7489506905fde56a5ab6748165431088bbae7fa61d4bccc27e4d7828c8bc6a05247b450716 WHIRLPOOL c349848d7e85166d7161272d722bebed7b387e6cd4c9db6cd405e3d042ee212b4448231eb92e0a86b8dc00c497af2c69455edd7d7d1cd4007d9ca09e91e575a7
-DIST simgear-2016.4.3.tar.bz2 1201326 SHA256 6933550215818c2043b84df01b6bf5f7adef218c8648b510b8202e394003d2bd SHA512 aaf56f195fed9957ba4bd8b17deb1985596ed793e131723a6f81f85a4d4f178a923c5f2df3d53dca88957fc46f887b086353b99500c3f56952a70ae34f734b5e WHIRLPOOL 190e642919fb3ac519f683743b090729be410f06b5f4129abe43e8c542aed68a34e186d612c3760552d658e52060cf33735e653014f8a5171d3c825904a148e0
DIST simgear-2016.4.4.tar.bz2 1200320 SHA256 5514fd0006bbfcdbdc0e2dab7da41eae491ea03a6246cc6a009590032b2fc1dc SHA512 f7b9124e40dba347cd73304fc1b20a5b6d09eb476bc41949d5be615be968a6a66f64141b87819bfa357bd1fd376b2e1fc18334eb1d4df2d4f1e3f95ef4a1928d WHIRLPOOL 3fb4d580d84633a6a852f6a8ab5e708afde9616b636bb5b49d30b56ed232d9938606f602d473e51855605d2544b364691ae362ec974f56b34e32507a37752221
-DIST simgear-3.4.0.tar.bz2 1057455 SHA256 927d66fe72aacb9dacced4506430bd5fc7726bc8d3d07d6f1866bc4cb11a5894 SHA512 9ebf49ea2f024f0e52a4d18ba6f77361e7b9f51a0e7238661b4b2fd9db0176bdd948612d9b4aec3ae4d8210676e7533dfc0308b9c71bdeb22e99a68b90d81320 WHIRLPOOL bb48b6640409a96816ade77c22a91f88c452d339165dd0241354c26ff27572a14538ecfd91265c239def4621657be8766c081cffc237711a691d7ef54461b548
diff --git a/dev-games/simgear/files/simgear-3.4.0-osg340_fixes.patch b/dev-games/simgear/files/simgear-3.4.0-osg340_fixes.patch
deleted file mode 100644
index 97ca64a..00000000
--- a/dev-games/simgear/files/simgear-3.4.0-osg340_fixes.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-commit 51ff30f386ac098f477ff16c71756bcd089dcfae
-Author: Tim Moore <timoore33@gmail.com>
-Date: Sun Apr 19 17:11:49 2015 +0200
-
- changes for OSG 3.3.4 and later
-
- The public interfaces to osgText and osg::GLExtensions changed.
-
-diff --git a/simgear/canvas/elements/CanvasText.cxx b/simgear/canvas/elements/CanvasText.cxx
-index 4b7600f..ead600b 100644
---- a/simgear/canvas/elements/CanvasText.cxx
-+++ b/simgear/canvas/elements/CanvasText.cxx
-@@ -159,8 +159,12 @@ namespace canvas
-
- if( empty() )
- return pos;
--
-+#if OSG_VERSION_LESS_THAN(3,3,4)
- GlyphQuads::Coords2 const& coords = _quads->_coords;
-+#else
-+ GlyphQuads::Coords2 refCoords = _quads->_coords;
-+ GlyphQuads::Coords2::element_type &coords = *refCoords.get();
-+#endif
- size_t global_i = _begin + i;
-
- if( global_i == _begin )
-@@ -194,7 +198,12 @@ namespace canvas
- return cursorPos(0);
-
- GlyphQuads::Glyphs const& glyphs = _quads->_glyphs;
-+ #if OSG_VERSION_LESS_THAN(3,3,4)
- GlyphQuads::Coords2 const& coords = _quads->_coords;
-+#else
-+ GlyphQuads::Coords2 refCoords = _quads->_coords;
-+ GlyphQuads::Coords2::element_type &coords = *refCoords.get();
-+#endif
-
- float const HIT_FRACTION = 0.6;
- float const character_width = _text->getCharacterHeight()
-@@ -627,7 +636,13 @@ namespace canvas
-
- const GlyphQuads& quads = _textureGlyphQuadMap.begin()->second;
- const GlyphQuads::Glyphs& glyphs = quads._glyphs;
-- const GlyphQuads::Coords2& coords = quads._coords;
-+#if OSG_VERSION_LESS_THAN(3,3,4)
-+ GlyphQuads::Coords2 const& coords = quads._coords;
-+#else
-+ GlyphQuads::Coords2 refCoords = quads._coords;
-+ GlyphQuads::Coords2::element_type &coords = *refCoords.get();
-+#endif
-+
- const GlyphQuads::LineNumbers& line_numbers = quads._lineNumbers;
-
- float wr = _characterHeight / getCharacterAspectRatio();
-diff --git a/simgear/scene/material/Technique.cxx b/simgear/scene/material/Technique.cxx
-index 93a17b8..96856cd 100644
---- a/simgear/scene/material/Technique.cxx
-+++ b/simgear/scene/material/Technique.cxx
-@@ -326,9 +326,15 @@ public:
- = GL2Extensions::Get(static_cast<unsigned>(contextId), true);
- if (!extensions)
- return;
-+#if OSG_VERSION_LESS_THAN(3,3,3)
- if (!extensions->isGlslSupported())
- return;
- value = extensions->getLanguageVersion();
-+#else
-+ if (!extensions->isGlslSupported)
-+ return;
-+ value = extensions->glslLanguageVersion;
-+#endif
- }
- };
-
-@@ -357,7 +363,11 @@ public:
- = GL2Extensions::Get(static_cast<unsigned>(contextId), true);
- if (!extensions)
- return;
-+#if OSG_VERSION_LESS_THAN(3,3,3)
- value = extensions->isGlslSupported();
-+#else
-+ value = extensions->isGlslSupported;
-+#endif
- }
- };
-
-diff --git a/simgear/scene/sky/CloudShaderGeometry.cxx b/simgear/scene/sky/CloudShaderGeometry.cxx
-index 8b4ea16..7800839 100644
---- a/simgear/scene/sky/CloudShaderGeometry.cxx
-+++ b/simgear/scene/sky/CloudShaderGeometry.cxx
-@@ -127,8 +127,12 @@ void CloudShaderGeometry::drawImplementation(RenderInfo& renderInfo) const
-
- sortData.frameSorted = frameNumber;
- }
--
-+
-+#if OSG_VERSION_LESS_THAN(3,3,3)
- const Extensions* extensions = getExtensions(state.getContextID(),true);
-+#else
-+ const GLExtensions* extensions = GLExtensions::Get(state.getContextID(), true);
-+#endif
- GLfloat ua1[3] = { (GLfloat) alpha_factor,
- (GLfloat) shade_factor,
- (GLfloat) cloud_height };
-diff --git a/simgear/scene/tgdb/ShaderGeometry.cxx b/simgear/scene/tgdb/ShaderGeometry.cxx
-index 5d286c3..ac9ec93 100644
---- a/simgear/scene/tgdb/ShaderGeometry.cxx
-+++ b/simgear/scene/tgdb/ShaderGeometry.cxx
-@@ -47,7 +47,11 @@ void ShaderGeometry::addObject(const Vec3& position, float scale,
- void ShaderGeometry::drawImplementation(osg::RenderInfo& renderInfo) const
- {
- State& state = *renderInfo.getState();
-+#if OSG_VERSION_LESS_THAN(3,3,3)
- const Extensions* extensions = getExtensions(state.getContextID(), true);
-+#else
-+ const GLExtensions* extensions = GLExtensions::Get(state.getContextID(), true);
-+#endif
- Vec4Array::const_iterator citer = _posScaleArray->begin();
- Vec4Array::const_iterator cend = _posScaleArray->end();
- FloatArray::const_iterator viter = _vertexAttribArray->begin();
-diff --git a/simgear/scene/util/SGSceneFeatures.cxx b/simgear/scene/util/SGSceneFeatures.cxx
-index 4367e45..79f182f 100644
---- a/simgear/scene/util/SGSceneFeatures.cxx
-+++ b/simgear/scene/util/SGSceneFeatures.cxx
-@@ -25,11 +25,13 @@
-
- #include "SGSceneFeatures.hxx"
-
-+#include <osg/Version>
- #include <osg/FragmentProgram>
- #include <osg/VertexProgram>
- #include <osg/Point>
- #include <osg/PointSprite>
- #include <osg/Texture>
-+#include <osg/GLExtensions>
-
- #include <OpenThreads/Mutex>
- #include <OpenThreads/ScopedLock>
-@@ -84,12 +86,18 @@ SGSceneFeatures::setTextureCompression(osg::Texture* texture) const
- bool
- SGSceneFeatures::getHavePointSprites(unsigned contextId) const
- {
-+#if OSG_VERSION_LESS_THAN(3,3,3)
- return osg::PointSprite::isPointSpriteSupported(contextId);
-+#else
-+ const osg::GLExtensions* ex = osg::GLExtensions::Get(contextId, true);
-+ return ex && ex->isPointSpriteSupported;
-+#endif
- }
-
- bool
- SGSceneFeatures::getHaveFragmentPrograms(unsigned contextId) const
- {
-+#if OSG_VERSION_LESS_THAN(3,3,3)
- const osg::FragmentProgram::Extensions* fpe;
- fpe = osg::FragmentProgram::getExtensions(contextId, true);
- if (!fpe)
-@@ -98,11 +106,16 @@ SGSceneFeatures::getHaveFragmentPrograms(unsigned contextId) const
- return false;
-
- return true;
-+#else
-+ const osg::GLExtensions* ex = osg::GLExtensions::Get(contextId, true);
-+ return ex && ex->isFragmentProgramSupported;
-+#endif
- }
-
- bool
- SGSceneFeatures::getHaveVertexPrograms(unsigned contextId) const
- {
-+#if OSG_VERSION_LESS_THAN(3,3,3)
- const osg::VertexProgram::Extensions* vpe;
- vpe = osg::VertexProgram::getExtensions(contextId, true);
- if (!vpe)
-@@ -111,6 +124,10 @@ SGSceneFeatures::getHaveVertexPrograms(unsigned contextId) const
- return false;
-
- return true;
-+#else
-+ const osg::GLExtensions* ex = osg::GLExtensions::Get(contextId, true);
-+ return ex && ex->isVertexProgramSupported;
-+#endif
- }
-
- bool
-@@ -124,6 +141,7 @@ SGSceneFeatures::getHaveShaderPrograms(unsigned contextId) const
- bool
- SGSceneFeatures::getHavePointParameters(unsigned contextId) const
- {
-+#if OSG_VERSION_LESS_THAN(3,3,3)
- const osg::Point::Extensions* pe;
- pe = osg::Point::getExtensions(contextId, true);
- if (!pe)
-@@ -131,5 +149,9 @@ SGSceneFeatures::getHavePointParameters(unsigned contextId) const
- if (!pe->isPointParametersSupported())
- return false;
- return true;
-+#else
-+ const osg::GLExtensions* ex = osg::GLExtensions::Get(contextId, true);
-+ return ex && ex->isPointParametersSupported;
-+#endif
- }
-
diff --git a/dev-games/simgear/simgear-2016.3.1.ebuild b/dev-games/simgear/simgear-2016.3.1.ebuild
deleted file mode 100644
index 18dac11..00000000
--- a/dev-games/simgear/simgear-2016.3.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Development library for simulation games"
-HOMEPAGE="http://www.simgear.org/"
-SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
-SLOT="0"
-IUSE="+dns debug subversion test"
-
-COMMON_DEPEND="
- dev-libs/expat
- >=dev-games/openscenegraph-3.2.0
- media-libs/openal
- net-misc/curl
- sys-libs/zlib
- virtual/opengl
- dns? ( net-libs/udns )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.44
-"
-RDEPEND="${COMMON_DEPEND}
- subversion? ( dev-vcs/subversion )
-"
-
-DOCS=(AUTHORS ChangeLog NEWS README Thanks)
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_DNS=$(usex dns)
- -DENABLE_PKGUTIL=ON
- -DENABLE_RTI=OFF
- -DENABLE_SOUND=ON
- -DENABLE_TESTS=$(usex test)
- -DSIMGEAR_HEADLESS=OFF
- -DSIMGEAR_SHARED=ON
- -DSYSTEM_EXPAT=ON
- -DSYSTEM_UDNS=ON
- -DUSE_AEONWAVE=OFF
- -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
- )
- cmake-utils_src_configure
-}
diff --git a/dev-games/simgear/simgear-2016.4.3.ebuild b/dev-games/simgear/simgear-2016.4.3.ebuild
deleted file mode 100644
index 39f6c59..00000000
--- a/dev-games/simgear/simgear-2016.4.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Development library for simulation games"
-HOMEPAGE="http://www.simgear.org/"
-SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-IUSE="+dns debug subversion test"
-
-COMMON_DEPEND="
- dev-libs/expat
- >=dev-games/openscenegraph-3.2.0
- media-libs/openal
- net-misc/curl
- sys-libs/zlib
- virtual/opengl
- dns? ( net-libs/udns )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.44
-"
-RDEPEND="${COMMON_DEPEND}
- subversion? ( dev-vcs/subversion )
-"
-
-DOCS=(AUTHORS ChangeLog NEWS README Thanks)
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_DNS=$(usex dns)
- -DENABLE_PKGUTIL=ON
- -DENABLE_RTI=OFF
- -DENABLE_SOUND=ON
- -DENABLE_TESTS=$(usex test)
- -DSIMGEAR_HEADLESS=OFF
- -DSIMGEAR_SHARED=ON
- -DSYSTEM_EXPAT=ON
- -DSYSTEM_UDNS=ON
- -DUSE_AEONWAVE=OFF
- -DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
- )
- cmake-utils_src_configure
-}
diff --git a/dev-games/simgear/simgear-3.4.0.ebuild b/dev-games/simgear/simgear-3.4.0.ebuild
deleted file mode 100644
index d2a2f4b..00000000
--- a/dev-games/simgear/simgear-3.4.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Development library for simulation games"
-HOMEPAGE="http://www.simgear.org/"
-SRC_URI="http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
-SLOT="0"
-IUSE="debug subversion test"
-
-COMMON_DEPEND="
- dev-libs/expat
- >=dev-games/openscenegraph-3.2.0
- media-libs/openal
- sys-libs/zlib
- virtual/opengl
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.44
-"
-RDEPEND="${COMMON_DEPEND}
- subversion? ( dev-vcs/subversion )
-"
-
-DOCS=(AUTHORS ChangeLog NEWS README Thanks)
-
-PATCHES=( "${FILESDIR}/${P}-osg340_fixes.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_PKGUTIL=ON
- -DENABLE_RTI=OFF
- -DENABLE_SOUND=ON
- -DSIMGEAR_HEADLESS=OFF
- -DSIMGEAR_SHARED=ON
- -DSYSTEM_EXPAT=ON
- $(cmake-utils_use_enable test TESTS)
- )
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/simgear/, dev-games/simgear/files/
@ 2017-09-16 12:37 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2017-09-16 12:37 UTC (permalink / raw
To: gentoo-commits
commit: 4535ab51db127d0875f29075366e46e849f81656
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 16 12:35:56 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 12:37:24 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4535ab51
dev-games/simgear: Fix boost TR1 header include
Closes: https://bugs.gentoo.org/630234
Package-Manager: Portage-2.3.8, Repoman-2.3.3
.../simgear-2017.2.1-boost-1.65-tr1-removal.patch | 47 ++++++++++++++++++++++
dev-games/simgear/simgear-2017.2.1.ebuild | 17 +++++---
2 files changed, 58 insertions(+), 6 deletions(-)
diff --git a/dev-games/simgear/files/simgear-2017.2.1-boost-1.65-tr1-removal.patch b/dev-games/simgear/files/simgear-2017.2.1-boost-1.65-tr1-removal.patch
new file mode 100644
index 00000000000..a9ebe507cee
--- /dev/null
+++ b/dev-games/simgear/files/simgear-2017.2.1-boost-1.65-tr1-removal.patch
@@ -0,0 +1,47 @@
+--- a/simgear/scene/material/Effect.cxx
++++ b/simgear/scene/material/Effect.cxx
+@@ -32,7 +32,7 @@
+ #include <map>
+ #include <queue>
+ #include <utility>
+-#include <boost/tr1/unordered_map.hpp>
++#include <boost/unordered_map.hpp>
+
+ #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 boost::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 boost::unordered_map<ShaderKey, ref_ptr<Shader>, boost::hash<ShaderKey> >
+ ShaderMap;
+ ShaderMap shaderMap;
+
+--- a/simgear/scene/material/Effect.hxx
++++ b/simgear/scene/material/Effect.hxx
+@@ -19,7 +19,7 @@
+
+ #include <vector>
+ #include <string>
+-#include <boost/tr1/unordered_map.hpp>
++#include <boost/unordered_map.hpp>
+
+ #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 boost::unordered_map<Key, osg::observer_ptr<Effect>,
+ boost::hash<Key>, Key::EqualTo> Cache;
+ Cache* getCache()
+ {
diff --git a/dev-games/simgear/simgear-2017.2.1.ebuild b/dev-games/simgear/simgear-2017.2.1.ebuild
index fcdd831b304..10aad3a8c38 100644
--- a/dev-games/simgear/simgear-2017.2.1.ebuild
+++ b/dev-games/simgear/simgear-2017.2.1.ebuild
@@ -3,15 +3,15 @@
EAPI=6
-inherit eutils cmake-utils toolchain-funcs
+inherit cmake-utils toolchain-funcs
DESCRIPTION="Development library for simulation games"
HOMEPAGE="http://www.simgear.org/"
SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
SLOT="0"
+KEYWORDS="~amd64 ~x86"
IUSE="+dns debug gdal openmp subversion test"
COMMON_DEPEND="
@@ -31,12 +31,17 @@ RDEPEND="${COMMON_DEPEND}
subversion? ( dev-vcs/subversion )
"
-PATCHES=( "${FILESDIR}/simgear-2017.2.1-gdal-underlinking.patch" )
-
-DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+PATCHES=(
+ "${FILESDIR}"/${PN}-2017.2.1-gdal-underlinking.patch
+ "${FILESDIR}"/${PN}-2017.2.1-boost-1.65-tr1-removal.patch
+)
pkg_pretend() {
- use openmp && tc-check-openmp
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
src_configure() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/simgear/, dev-games/simgear/files/
@ 2020-09-27 0:32 Maciej Mrozowski
0 siblings, 0 replies; 3+ messages in thread
From: Maciej Mrozowski @ 2020-09-27 0:32 UTC (permalink / raw
To: gentoo-commits
commit: 66544855b91f4862cad89525c1956f15ca1a3561
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 27 00:25:40 2020 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 27 00:31:05 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66544855
dev-games/simgear: fix compilation against >boost-1.73
Closes: https://bugs.gentoo.org/722900
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>
dev-games/simgear/files/simgear-2020.1.2-boost.patch | 11 +++++++++++
dev-games/simgear/simgear-2020.1.2.ebuild | 1 +
2 files changed, 12 insertions(+)
diff --git a/dev-games/simgear/files/simgear-2020.1.2-boost.patch b/dev-games/simgear/files/simgear-2020.1.2-boost.patch
new file mode 100644
index 00000000000..d28853cb381
--- /dev/null
+++ b/dev-games/simgear/files/simgear-2020.1.2-boost.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -227,7 +227,7 @@
+ endif()
+
+ find_package(Boost REQUIRED)
+-set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION")
++set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION -DBOOST_NO_STDLIB_CONFIG")
+ include(BoostTestTargets)
+
+ if(SIMGEAR_HEADLESS)
diff --git a/dev-games/simgear/simgear-2020.1.2.ebuild b/dev-games/simgear/simgear-2020.1.2.ebuild
index 0b85c837275..2408384dadb 100644
--- a/dev-games/simgear/simgear-2020.1.2.ebuild
+++ b/dev-games/simgear/simgear-2020.1.2.ebuild
@@ -35,6 +35,7 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-2019.1.1-gdal3.patch"
+ "${FILESDIR}/${P}-boost.patch"
)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-09-27 0:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-16 12:37 [gentoo-commits] repo/gentoo:master commit in: dev-games/simgear/, dev-games/simgear/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2020-09-27 0:32 Maciej Mrozowski
2017-01-14 1:33 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox