summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2018-05-06 04:10:45 +0200
committerMaciej Mrozowski <reavertm@gentoo.org>2018-05-06 04:12:42 +0200
commit2aa0c15bc18645a3a4d7ad594d7a063533aa1d9b (patch)
treeede8ca196e79299d7ac41b2487f9bff4a87ae612 /dev-games
parentx11-libs/libqxt: Remove last-rited (diff)
downloadgentoo-2aa0c15bc18645a3a4d7ad594d7a063533aa1d9b.tar.gz
gentoo-2aa0c15bc18645a3a4d7ad594d7a063533aa1d9b.tar.bz2
gentoo-2aa0c15bc18645a3a4d7ad594d7a063533aa1d9b.zip
[games-simulation/flightgear] Version bump 2018.1.1, remove old.
Diffstat (limited to 'dev-games')
-rw-r--r--dev-games/simgear/Manifest6
-rw-r--r--dev-games/simgear/files/simgear-2017.2.1-boost-1.65-tr1-removal.patch47
-rw-r--r--dev-games/simgear/files/simgear-2017.2.1-gdal-underlinking.patch28
-rw-r--r--dev-games/simgear/simgear-2016.4.4.ebuild51
-rw-r--r--dev-games/simgear/simgear-2017.1.2.ebuild51
-rw-r--r--dev-games/simgear/simgear-2017.1.3.ebuild51
-rw-r--r--dev-games/simgear/simgear-2017.2.1.ebuild65
-rw-r--r--dev-games/simgear/simgear-2018.1.1.ebuild (renamed from dev-games/simgear/simgear-2017.3.1.ebuild)0
8 files changed, 1 insertions, 298 deletions
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 884cf4bd9b8b..79038a8ba4a8 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,5 +1 @@
-DIST simgear-2016.4.4.tar.bz2 1200320 BLAKE2B d6e3805a7e3255010c704634145d4a5dd8ee3a5aa21a0a1816c993417f11c2304dcf6c2d40775216ab0c2d4f83b6755b68fdfbc407f631a3f472777fb88901e1 SHA512 f7b9124e40dba347cd73304fc1b20a5b6d09eb476bc41949d5be615be968a6a66f64141b87819bfa357bd1fd376b2e1fc18334eb1d4df2d4f1e3f95ef4a1928d
-DIST simgear-2017.1.2.tar.bz2 1235662 BLAKE2B ec9555f66829d95b605b353435186f1d240d24c9450e54738bbd705d5efc81a0a25366ae4ce56ceecb06c1f6cd4d2c62c298b2fe1d98cf154d91adc25c061568 SHA512 5746262873f9ca9183bf5bcfbff1493637faa68c8d070a5683f991b414b69b0e432f181394db0c39c939b3d6e433288a143eb3489a407c38f3d26c9033027404
-DIST simgear-2017.1.3.tar.bz2 1235062 BLAKE2B 133f6a2875b085fa495a192751fe29aaa87ec221725fdf23b182648f567e3e2dae635b150dcee6fd379682705357536fd78ac8ea880a959ca8a9cf562d105b73 SHA512 600f883ad92d37bf76d5e6beb066da340c7af927b0f2d51ce290cccaf23d1f3289b1aa31d3aa6cc17a4b9bc57c7180f03e234e08601e4169f26624678bf551aa
-DIST simgear-2017.2.1.tar.bz2 1290780 BLAKE2B 45218a077a5d90b726a1a44d335e226f01e0d811223c4f0e5c63b6cafd867d5f6127b45fcc23c27521d5c7f10cdc6244bed2f5c97d3dc6c29b6a5708bb1aa2b0 SHA512 168f5e3eab7cdd44643a62e1970c6329ac1121ca98e36c4134d963237e70304a20b7c8df3b438e24c204d51569d6863ef8b16098462d850f72a5f11a10ccbfd5
-DIST simgear-2017.3.1.tar.bz2 1302704 BLAKE2B 457b2de4af253eb1299cf5974336f5684e37d045e60a134095fd480e6110846c6985614f8fffc4e347e74fe59f23834e32aaddf8e49e73dede97327d466f729e SHA512 339c9af78e8c0490caec69be34b54f947751a9677cbb1163e73917f6aaa8f3d965ccf8058222c48ca4249cba4bb509205143f846de84595e92abdcd93e64c901
+DIST simgear-2018.1.1.tar.bz2 1303653 BLAKE2B 44b98c2ba8ae292c3736d04813869df528d7ca14bbdc1773e1f4bd4b7b4899b5fd8605a7ada5dcc2d5e863e82ee2f1e1d2b980d3bd775c92325ad3ca834306c3 SHA512 3de7a15dc7b60e9e7466950c1b466d0daefea84b4730a9b8cf5e26c41cece5fd03ccf57b0f3cb977093482beb734560812e347003e19e0bb4b40d81820a11563
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
deleted file mode 100644
index a9ebe507cee4..000000000000
--- a/dev-games/simgear/files/simgear-2017.2.1-boost-1.65-tr1-removal.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- 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/files/simgear-2017.2.1-gdal-underlinking.patch b/dev-games/simgear/files/simgear-2017.2.1-gdal-underlinking.patch
deleted file mode 100644
index 63eb79ed35ce..000000000000
--- a/dev-games/simgear/files/simgear-2017.2.1-gdal-underlinking.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9971d517fdf351e40467c88915d3e30e56f999d4 Mon Sep 17 00:00:00 2001
-From: Maciej Mrozowski <reavertm@gmail.com>
-Date: Thu, 15 Jun 2017 04:58:03 +0200
-Subject: [PATCH] Link shared SimGearScene with libgdal when enabled
-
----
- simgear/CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/simgear/CMakeLists.txt b/simgear/CMakeLists.txt
-index 18c2e04c..6c7cb495 100644
---- a/simgear/CMakeLists.txt
-+++ b/simgear/CMakeLists.txt
-@@ -173,6 +173,11 @@ if(NOT SIMGEAR_HEADLESS)
- ${OPENGL_LIBRARY}
- ${JPEG_LIBRARY})
-
-+ if(ENABLE_GDAL)
-+ target_link_libraries(SimGearScene
-+ ${GDAL_LIBRARIES})
-+ endif()
-+
- # only actually needed by canvas/KeyboardEvent.cxx
- target_include_directories(SimGearScene PRIVATE ${PROJECT_SOURCE_DIR}/3rdparty/utf8/source)
- endif()
---
-2.13.0
-
diff --git a/dev-games/simgear/simgear-2016.4.4.ebuild b/dev-games/simgear/simgear-2016.4.4.ebuild
deleted file mode 100644
index f2c7c954e253..000000000000
--- a/dev-games/simgear/simgear-2016.4.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 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_SIMD=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-2017.1.2.ebuild b/dev-games/simgear/simgear-2017.1.2.ebuild
deleted file mode 100644
index d3914e9c36c0..000000000000
--- a/dev-games/simgear/simgear-2017.1.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~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_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-2017.1.3.ebuild b/dev-games/simgear/simgear-2017.1.3.ebuild
deleted file mode 100644
index d3914e9c36c0..000000000000
--- a/dev-games/simgear/simgear-2017.1.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~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_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-2017.2.1.ebuild b/dev-games/simgear/simgear-2017.2.1.ebuild
deleted file mode 100644
index 10aad3a8c38b..000000000000
--- a/dev-games/simgear/simgear-2017.2.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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"
-
-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 )
- gdal? ( sci-libs/gdal )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/boost-1.44
-"
-RDEPEND="${COMMON_DEPEND}
- subversion? ( dev-vcs/subversion )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2017.2.1-gdal-underlinking.patch
- "${FILESDIR}"/${PN}-2017.2.1-boost-1.65-tr1-removal.patch
-)
-
-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-2017.3.1.ebuild b/dev-games/simgear/simgear-2018.1.1.ebuild
index cca44548c832..cca44548c832 100644
--- a/dev-games/simgear/simgear-2017.3.1.ebuild
+++ b/dev-games/simgear/simgear-2018.1.1.ebuild