* [gentoo-commits] repo/gentoo:master commit in: dev-games/simgear/files/, dev-games/simgear/
@ 2016-01-11 13:25 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2016-01-11 13:25 UTC (permalink / raw
To: gentoo-commits
commit: 20832fb6ed033ff27b5b75391b8056e6c9506867
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 8 15:04:17 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jan 11 13:22:31 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20832fb6
dev-games/simgear: Fixed compilation with >=openscenegraph-3.4.0
Package-Manager: portage-2.2.26
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../simgear/files/simgear-3.4.0-osg340_fixes.patch | 203 +++++++++++++++++++++
dev-games/simgear/simgear-3.4.0.ebuild | 4 +-
2 files changed, 206 insertions(+), 1 deletion(-)
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
new file mode 100644
index 0000000..97ca64a
--- /dev/null
+++ b/dev-games/simgear/files/simgear-3.4.0-osg340_fixes.patch
@@ -0,0 +1,203 @@
+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-3.4.0.ebuild b/dev-games/simgear/simgear-3.4.0.ebuild
index 579b727..49fdf6f 100644
--- a/dev-games/simgear/simgear-3.4.0.ebuild
+++ b/dev-games/simgear/simgear-3.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -31,6 +31,8 @@ RDEPEND="${COMMON_DEPEND}
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+PATCHES=( "${FILESDIR}/${P}-osg340_fixes.patch" )
+
src_configure() {
local mycmakeargs=(
-ENABLE_PKGUTIL=OFF
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/simgear/files/, dev-games/simgear/
@ 2019-05-25 20:59 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-05-25 20:59 UTC (permalink / raw
To: gentoo-commits
commit: 15251ba9c43dbb9661083f2c65000c9219006d3f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 17:56:04 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 25 20:54:37 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15251ba9
dev-games/simgear: Fix build with >=boost-1.69
Closes: https://bugs.gentoo.org/684026
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/simgear-2018.3.2-boost-1.69.patch | 24 ++++++++++++++++++++++
dev-games/simgear/simgear-2018.3.2.ebuild | 2 ++
2 files changed, 26 insertions(+)
diff --git a/dev-games/simgear/files/simgear-2018.3.2-boost-1.69.patch b/dev-games/simgear/files/simgear-2018.3.2-boost-1.69.patch
new file mode 100644
index 00000000000..2372c8c58ad
--- /dev/null
+++ b/dev-games/simgear/files/simgear-2018.3.2-boost-1.69.patch
@@ -0,0 +1,24 @@
+From c1ac1fb93dace81b2a60f9d1f5d6d20298c8b9bb Mon Sep 17 00:00:00 2001
+From: Fabrice Bellet <fabrice@bellet.info>
+Date: Fri, 1 Feb 2019 09:29:40 +0100
+Subject: [PATCH] fix for boost 1.69
+
+---
+ simgear/nasal/cppbind/NasalHash.hxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/simgear/nasal/cppbind/NasalHash.hxx b/simgear/nasal/cppbind/NasalHash.hxx
+index aac672fd..2ee7d044 100644
+--- a/simgear/nasal/cppbind/NasalHash.hxx
++++ b/simgear/nasal/cppbind/NasalHash.hxx
+@@ -23,6 +23,7 @@
+ #include "to_nasal.hxx"
+
+ #include <simgear/structure/map.hxx>
++#include <boost/core/enable_if.hpp>
+ #include <boost/iterator/iterator_facade.hpp>
+
+ namespace nasal
+--
+2.20.1
+
diff --git a/dev-games/simgear/simgear-2018.3.2.ebuild b/dev-games/simgear/simgear-2018.3.2.ebuild
index a65b51665aa..ead30a3c496 100644
--- a/dev-games/simgear/simgear-2018.3.2.ebuild
+++ b/dev-games/simgear/simgear-2018.3.2.ebuild
@@ -31,6 +31,8 @@ RDEPEND="${COMMON_DEPEND}
subversion? ( dev-vcs/subversion )
"
+PATCHES=( "${FILESDIR}/${P}-boost-1.69.patch" )
+
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/simgear/files/, dev-games/simgear/
@ 2020-02-01 1:02 Maciej Mrozowski
0 siblings, 0 replies; 6+ messages in thread
From: Maciej Mrozowski @ 2020-02-01 1:02 UTC (permalink / raw
To: gentoo-commits
commit: bde616536a8acb3f2ea508dd16c92b1a7fe11b14
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 1 00:50:34 2020 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 1 00:58:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bde61653
dev-games/simgear: Version bump, remove old
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>
dev-games/simgear/Manifest | 3 +-
.../files/simgear-2018.3.2-boost-1.69.patch | 24 ---------
dev-games/simgear/simgear-2018.3.1.ebuild | 61 ----------------------
...ear-2018.3.2.ebuild => simgear-2019.1.1.ebuild} | 7 ++-
dev-games/simgear/simgear-9999.ebuild | 5 +-
5 files changed, 7 insertions(+), 93 deletions(-)
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index ae0736f5723..7e80f426ea0 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,2 +1 @@
-DIST simgear-2018.3.1.tar.bz2 1330322 BLAKE2B 5b350ddce726d8ea15c4a1a64a28b9e4307647378c52989231daa7b4a0e53730dc754c239660d0f5ec33189ece6629448b37f61ca7578c21c3aa4147d4565a26 SHA512 673ee76e9f4f9c9adb25a2523bad5b70a079d821391cb8fc9f9e651ad6c195356ac9a8ba18a65df365dc66990406de287099fb249ca23eefc111ebba884f7289
-DIST simgear-2018.3.2.tar.bz2 1329982 BLAKE2B cc4ee90e0a76db5212ca3bb8f422376d9fd91c261c4aaee1aa0c2dc7438ed589866bdde009fd44c727ae87d7365d4aea67da0cfd32ff26d47e81eb9c027ddf0b SHA512 3f60df34f22ea84bdb3e0aa0e2c0b73b2fddf15d17ea985aee254bf4c269b7447976629a7e4b022c460c7c406940d0b2669b723c6b899499d064cfe91546f0ba
+DIST simgear-2019.1.1.tar.bz2 1370523 BLAKE2B 2f61b2b4b7716b7f15852ff68bee6b749b7daa04caa27927a53eb6d6e4346c46c835938c95436250da767efd2e8043aacc0cb444b37dacde78acada98ffdb4e8 SHA512 83fe4330cf27b9298719f53f2fccde2af77bacdc6f430cc22c8bdfb475fe9b6e01578c1225af21e4e1433c7d2f2b00427454064f942359ba4c1e9896e7fe05d2
diff --git a/dev-games/simgear/files/simgear-2018.3.2-boost-1.69.patch b/dev-games/simgear/files/simgear-2018.3.2-boost-1.69.patch
deleted file mode 100644
index 2372c8c58ad..00000000000
--- a/dev-games/simgear/files/simgear-2018.3.2-boost-1.69.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c1ac1fb93dace81b2a60f9d1f5d6d20298c8b9bb Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice@bellet.info>
-Date: Fri, 1 Feb 2019 09:29:40 +0100
-Subject: [PATCH] fix for boost 1.69
-
----
- simgear/nasal/cppbind/NasalHash.hxx | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/simgear/nasal/cppbind/NasalHash.hxx b/simgear/nasal/cppbind/NasalHash.hxx
-index aac672fd..2ee7d044 100644
---- a/simgear/nasal/cppbind/NasalHash.hxx
-+++ b/simgear/nasal/cppbind/NasalHash.hxx
-@@ -23,6 +23,7 @@
- #include "to_nasal.hxx"
-
- #include <simgear/structure/map.hxx>
-+#include <boost/core/enable_if.hpp>
- #include <boost/iterator/iterator_facade.hpp>
-
- namespace nasal
---
-2.20.1
-
diff --git a/dev-games/simgear/simgear-2018.3.1.ebuild b/dev-games/simgear/simgear-2018.3.1.ebuild
deleted file mode 100644
index e962b042089..00000000000
--- a/dev-games/simgear/simgear-2018.3.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+dns debug gdal openmp subversion test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- dev-libs/expat
- <dev-games/openscenegraph-3.5.6:=
- media-libs/openal
- net-misc/curl
- sys-libs/zlib
- virtual/opengl
- dns? ( net-libs/udns )
- gdal? ( sci-libs/gdal )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.44
-"
-RDEPEND="${COMMON_DEPEND}
- subversion? ( dev-vcs/subversion )
-"
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_DNS=$(usex dns)
- -DENABLE_GDAL=$(usex gdal)
- -DENABLE_OPENMP=$(usex openmp)
- -DENABLE_PKGUTIL=ON
- -DENABLE_RTI=OFF
- -DENABLE_SIMD=ON
- -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-2018.3.2.ebuild b/dev-games/simgear/simgear-2019.1.1.ebuild
similarity index 92%
rename from dev-games/simgear/simgear-2018.3.2.ebuild
rename to dev-games/simgear/simgear-2019.1.1.ebuild
index ddfbba35e91..e4f8accb9c6 100644
--- a/dev-games/simgear/simgear-2018.3.2.ebuild
+++ b/dev-games/simgear/simgear-2019.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,9 +15,10 @@ SLOT="0"
IUSE="cpu_flags_x86_sse2 +dns debug gdal openmp subversion test"
RESTRICT="!test? ( test )"
+# TODO aeonwave
COMMON_DEPEND="
dev-libs/expat
- <dev-games/openscenegraph-3.5.6:=
+ dev-games/openscenegraph
media-libs/openal
net-misc/curl
sys-libs/zlib
@@ -32,8 +33,6 @@ RDEPEND="${COMMON_DEPEND}
subversion? ( dev-vcs/subversion )
"
-PATCHES=( "${FILESDIR}/${P}-boost-1.69.patch" )
-
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild
index 0c7c4ce703b..14feded1bd5 100644
--- a/dev-games/simgear/simgear-9999.ebuild
+++ b/dev-games/simgear/simgear-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,9 +17,10 @@ SLOT="0"
IUSE="cpu_flags_x86_sse2 +dns debug gdal openmp subversion test"
RESTRICT="!test? ( test )"
+# TODO aeonwave
COMMON_DEPEND="
dev-libs/expat
- <dev-games/openscenegraph-3.5.6:=
+ dev-games/openscenegraph
media-libs/openal
net-misc/curl
sys-libs/zlib
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/simgear/files/, dev-games/simgear/
@ 2020-02-06 1:45 Maciej Mrozowski
0 siblings, 0 replies; 6+ messages in thread
From: Maciej Mrozowski @ 2020-02-06 1:45 UTC (permalink / raw
To: gentoo-commits
commit: cd0a651403cba5edd2fb89c622b4de953c96af83
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 6 01:37:08 2020 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 6 01:43:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd0a6514
dev-games/simgear: Build against sci-libs/gdal:3, bug 688130
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>
dev-games/simgear/files/simgear-2019.1.1-gdal3.patch | 12 ++++++++++++
dev-games/simgear/simgear-2019.1.1.ebuild | 4 ++++
dev-games/simgear/simgear-9999.ebuild | 4 ++++
3 files changed, 20 insertions(+)
diff --git a/dev-games/simgear/files/simgear-2019.1.1-gdal3.patch b/dev-games/simgear/files/simgear-2019.1.1-gdal3.patch
new file mode 100644
index 00000000000..6d48994224c
--- /dev/null
+++ b/dev-games/simgear/files/simgear-2019.1.1-gdal3.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8a2f59f..5916c4c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -308,6 +308,7 @@ endif(ENABLE_RTI)
+ if(ENABLE_GDAL)
+ find_package(GDAL 2.0.0 REQUIRED)
+ if (GDAL_FOUND)
++ add_compile_definitions(USE_DEPRECATED_SRS_WKT_WGS84)
+ include_directories(${GDAL_INCLUDE_DIR})
+ endif(GDAL_FOUND)
+ endif(ENABLE_GDAL)
diff --git a/dev-games/simgear/simgear-2019.1.1.ebuild b/dev-games/simgear/simgear-2019.1.1.ebuild
index 61da9b322ad..be0ff641626 100644
--- a/dev-games/simgear/simgear-2019.1.1.ebuild
+++ b/dev-games/simgear/simgear-2019.1.1.ebuild
@@ -33,6 +33,10 @@ RDEPEND="${COMMON_DEPEND}
subversion? ( dev-vcs/subversion )
"
+PATCHES=(
+ "${FILESDIR}/${PN}-2019.1.1-gdal3.patch"
+)
+
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild
index a06b4dfb3de..d5d56055482 100644
--- a/dev-games/simgear/simgear-9999.ebuild
+++ b/dev-games/simgear/simgear-9999.ebuild
@@ -35,6 +35,10 @@ RDEPEND="${COMMON_DEPEND}
subversion? ( dev-vcs/subversion )
"
+PATCHES=(
+ "${FILESDIR}/${PN}-2019.1.1-gdal3.patch"
+)
+
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/simgear/files/, dev-games/simgear/
@ 2020-10-17 13:58 Maciej Mrozowski
0 siblings, 0 replies; 6+ messages in thread
From: Maciej Mrozowski @ 2020-10-17 13:58 UTC (permalink / raw
To: gentoo-commits
commit: b3ed56bd4d8ab75b0ab3c7021bfc42d18675f9e7
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 13:57:34 2020 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 13:58:04 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3ed56bd
dev-games/simgear: do not assume libc++ is used for clang
Closes: https://bugs.gentoo.org/735854
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org>
.../files/simgear-2020.1.2-do-not-assume-libc++-clang.patch | 12 ++++++++++++
dev-games/simgear/simgear-2020.1.2.ebuild | 1 +
2 files changed, 13 insertions(+)
diff --git a/dev-games/simgear/files/simgear-2020.1.2-do-not-assume-libc++-clang.patch b/dev-games/simgear/files/simgear-2020.1.2-do-not-assume-libc++-clang.patch
new file mode 100644
index 00000000000..3ff70aeebdc
--- /dev/null
+++ b/dev-games/simgear/files/simgear-2020.1.2-do-not-assume-libc++-clang.patch
@@ -0,0 +1,12 @@
+diff -ruN simgear-2020.1.2/CMakeLists.txt simgear-my/CMakeLists.txt
+--- simgear-2020.1.2/CMakeLists.txt 2020-05-24 17:13:35.000000000 +0200
++++ simgear-my/CMakeLists.txt 2020-10-17 15:48:58.375116913 +0200
+@@ -442,8 +442,6 @@
+ set(WARNING_FLAGS_CXX "-Wall -fPIC -Wno-overloaded-virtual -Wno-redeclared-class-member")
+ set(WARNING_FLAGS_C "-Wall -fPIC")
+ set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
+- # fix Boost compilation :(
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+
+ # override CMake default RelWithDebInfo flags.
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG")
diff --git a/dev-games/simgear/simgear-2020.1.2.ebuild b/dev-games/simgear/simgear-2020.1.2.ebuild
index 2408384dadb..c8ea38b80be 100644
--- a/dev-games/simgear/simgear-2020.1.2.ebuild
+++ b/dev-games/simgear/simgear-2020.1.2.ebuild
@@ -36,6 +36,7 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-2019.1.1-gdal3.patch"
"${FILESDIR}/${P}-boost.patch"
+ "${FILESDIR}/${PN}-2020.1.2-do-not-assume-libc++-clang.patch"
)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/simgear/files/, dev-games/simgear/
@ 2022-12-30 6:33 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-12-30 6:33 UTC (permalink / raw
To: gentoo-commits
commit: 7d9cd3bc1b691164e98e8dcb974075670700c3b2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 30 04:50:23 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 04:50:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d9cd3bc
dev-games/simgear: fix build w/ boost 1.81
Closes: https://bugs.gentoo.org/887431
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-games/simgear/files/simgear-2020.3.17-boost-1.81.patch | 11 +++++++++++
dev-games/simgear/simgear-2020.3.17-r1.ebuild | 1 +
2 files changed, 12 insertions(+)
diff --git a/dev-games/simgear/files/simgear-2020.3.17-boost-1.81.patch b/dev-games/simgear/files/simgear-2020.3.17-boost-1.81.patch
new file mode 100644
index 000000000000..6edcafcea031
--- /dev/null
+++ b/dev-games/simgear/files/simgear-2020.3.17-boost-1.81.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/887431
+--- a/simgear/scene/viewer/Compositor.hxx
++++ b/simgear/scene/viewer/Compositor.hxx
+@@ -17,6 +17,7 @@
+ #ifndef SG_COMPOSITOR_HXX
+ #define SG_COMPOSITOR_HXX
+
++#include <array>
+ #include <unordered_map>
+ #include <vector>
+
diff --git a/dev-games/simgear/simgear-2020.3.17-r1.ebuild b/dev-games/simgear/simgear-2020.3.17-r1.ebuild
index e4f9e4c4b3c9..d6d0a2a4d7b7 100644
--- a/dev-games/simgear/simgear-2020.3.17-r1.ebuild
+++ b/dev-games/simgear/simgear-2020.3.17-r1.ebuild
@@ -37,6 +37,7 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-2019.1.1-gdal3.patch"
"${FILESDIR}/${PN}-2020.1.2-do-not-assume-libc++-clang.patch"
+ "${FILESDIR}/${PN}-2020.3.17-boost-1.81.patch"
)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-12-30 6:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-25 20:59 [gentoo-commits] repo/gentoo:master commit in: dev-games/simgear/files/, dev-games/simgear/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-12-30 6:33 Sam James
2020-10-17 13:58 Maciej Mrozowski
2020-02-06 1:45 Maciej Mrozowski
2020-02-01 1:02 Maciej Mrozowski
2016-01-11 13:25 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox