summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2021-01-25 21:35:46 +0100
committerMaciej Mrozowski <reavertm@gentoo.org>2021-01-25 21:42:04 +0100
commit7b8b0cc55d8d1a659078cbd3552afd15ea03db3a (patch)
tree304a91f93baf9875b7ebccca34f9631ca91c58d8 /dev-games
parentnet-misc/zerotier: Removed old (diff)
downloadgentoo-7b8b0cc55d8d1a659078cbd3552afd15ea03db3a.tar.gz
gentoo-7b8b0cc55d8d1a659078cbd3552afd15ea03db3a.tar.bz2
gentoo-7b8b0cc55d8d1a659078cbd3552afd15ea03db3a.zip
games-simulation/flightgear: version bump, remove old
Signed-off-by: Maciej Mrozowski <reavertm@gentoo.org>
Diffstat (limited to 'dev-games')
-rw-r--r--dev-games/simgear/Manifest2
-rw-r--r--dev-games/simgear/files/simgear-2020.1.2-boost.patch11
-rw-r--r--dev-games/simgear/simgear-2020.3.5.ebuild (renamed from dev-games/simgear/simgear-2020.1.2.ebuild)9
-rw-r--r--dev-games/simgear/simgear-9999.ebuild9
4 files changed, 4 insertions, 27 deletions
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index 5662c13e1568..10404d80732a 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1 +1 @@
-DIST simgear-2020.1.2.tar.bz2 1393059 BLAKE2B 62fa15d88368177e23cf52edf51e8c56252399d8f2661e518911c1093a0d7f9f11069da8d65b479f2d4b45792dcd011194e57fa99ac3991f749e8196aaff9552 SHA512 c2e835de471f374a6c33cfd1769b7079d178ee66075bfe87cc9eb1f06dc2648db93c31f62f0ac7a664703406817cb1e909a531812cb76c99cd8751eb7e6782e7
+DIST simgear-2020.3.5.tar.bz2 1408888 BLAKE2B 8775d0ed869a64dd8fe353ce3b9412fc069ca62c619a3d2e25bf8732779f663dc1235f952d3698b1544cd1280256d0f1723152c0d933fac09ef22c7696bbaf5c SHA512 208a2ac38c9b2403624412c23949b73ae1a880f6423c431fe7ab56e8e2544478cefca2e4a0b77de2870f74f77f37da0ff2d9d37a1e7c476e65b63b053c3c1dad
diff --git a/dev-games/simgear/files/simgear-2020.1.2-boost.patch b/dev-games/simgear/files/simgear-2020.1.2-boost.patch
deleted file mode 100644
index d28853cb3811..000000000000
--- a/dev-games/simgear/files/simgear-2020.1.2-boost.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.3.5.ebuild
index c8ea38b80be6..27e64f9ebd30 100644
--- a/dev-games/simgear/simgear-2020.1.2.ebuild
+++ b/dev-games/simgear/simgear-2020.3.5.ebuild
@@ -35,7 +35,6 @@ 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"
)
@@ -54,8 +53,7 @@ src_configure() {
-DENABLE_OPENMP=$(usex openmp)
-DENABLE_PKGUTIL=ON
-DENABLE_RTI=OFF
- -DENABLE_SIMD=OFF # see CPU_FLAGS
- -DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2)
+ -DENABLE_SIMD=$(usex cpu_flags_x86_sse2)
-DENABLE_SOUND=ON
-DENABLE_TESTS=$(usex test)
-DSIMGEAR_HEADLESS=OFF
@@ -65,10 +63,5 @@ src_configure() {
-DUSE_AEONWAVE=OFF
-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
)
-
- if use cpu_flags_x86_sse2; then
- append-flags -msse2 -mfpmath=sse
- fi
-
cmake_src_configure
}
diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild
index e4fa4059f41d..edb882cd32f0 100644
--- a/dev-games/simgear/simgear-9999.ebuild
+++ b/dev-games/simgear/simgear-9999.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"
)
pkg_pretend() {
@@ -54,8 +55,7 @@ src_configure() {
-DENABLE_OPENMP=$(usex openmp)
-DENABLE_PKGUTIL=ON
-DENABLE_RTI=OFF
- -DENABLE_SIMD=OFF # see CPU_FLAGS
- -DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2)
+ -DENABLE_SIMD=$(usex cpu_flags_x86_sse2)
-DENABLE_SOUND=ON
-DENABLE_TESTS=$(usex test)
-DSIMGEAR_HEADLESS=OFF
@@ -65,10 +65,5 @@ src_configure() {
-DUSE_AEONWAVE=OFF
-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
)
-
- if use cpu_flags_x86_sse2; then
- append-flags -msse2 -mfpmath=sse
- fi
-
cmake_src_configure
}