summaryrefslogtreecommitdiff
path: root/games-simulation/flightgear
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-01-29 18:03:51 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-01-29 18:03:51 +0000
commitd7ed2b01311f15ba54fe8ea872aab7d59ab2b193 (patch)
tree1814dd2b5bbf2e7639fdafbeef48d228cfaf5e9b /games-simulation/flightgear
parentabaa75b10f899ada8dd05b23cc03205064394bc6 (diff)
gentoo resync : 29.01.2021
Diffstat (limited to 'games-simulation/flightgear')
-rw-r--r--games-simulation/flightgear/Manifest9
-rw-r--r--games-simulation/flightgear/files/flightgear-2020.1.2-boost.patch11
-rw-r--r--games-simulation/flightgear/files/flightgear-2020.3.5-cmake.patch (renamed from games-simulation/flightgear/files/flightgear-2020.1.2-cmake.patch)32
-rw-r--r--games-simulation/flightgear/flightgear-2020.3.6.ebuild (renamed from games-simulation/flightgear/flightgear-2020.1.2.ebuild)8
-rw-r--r--games-simulation/flightgear/flightgear-9999.ebuild7
5 files changed, 24 insertions, 43 deletions
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 0762a32699de..45cdf91389eb 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,8 +1,7 @@
AUX ac3d.vim 45 BLAKE2B 04a6e4c70a8be0f7d996f1192289cc05012d4b4cc82a56a14b5d6d2dd7aae8f23f1cd853d29d071a0b9691cf5b8e8b262355b40752f43bccaa318065992d709b SHA512 b691585c6772222525b7f2d67ed41431663400930d9c7deed843a6abe50f67b517bd3180026a0cfe949df29036a49bcaf33ab759dd958ae64d550c271150a7da
-AUX flightgear-2020.1.2-boost.patch 302 BLAKE2B 8abe7fc003ec905ed15983ab68672235ffd5f69a411ad4dd62f2f02dea9a72144d4e807e770fee6108bee865f5020da7e21c1b4a683a197e7f18072932347dfb SHA512 62ff4c8b77ea006ea881e8ff1b691a0f67c564859db52ab213ae833d41ae1fb71b73982a5ccc3ff0aa8d37b57679c70cae6521200b0432489471c151769b9538
-AUX flightgear-2020.1.2-cmake.patch 2064 BLAKE2B ca5f3e0f2aae4b8ccc3ec6504826a045ada095db234cf98e593b0303b530d18d5c6199fd128702b72ec7b94fff3714ee567744b928fe4a02fb195fba6a0d66d8 SHA512 fd208f009d81827108dd2f0488152c63a7d1e4f53bdacd5b6ac29f6c4b8bcfac5a22bcb49bd88a21daf61cccf2cc3362072d0f98be41a59f29239fed3b3f3e0a
+AUX flightgear-2020.3.5-cmake.patch 2031 BLAKE2B 2e0bfefca54a43db8b1053d1798de84594fcc58bc442df7c3bf0347f5ed458cbe966ce35af3e57f2982f6f7bb23943e04c4c21d421ca076d101ee0dc223b764d SHA512 bc06cd08564032f88206acb5cabb1c07e666aee72c2a0d5e19aaa82ca49ff4347a3a17b3e2d0f158398d6fb0006a0ab8deb9eac38d4269e0bbd9ed9b2e7e2724
AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
-DIST flightgear-2020.1.2.tar.bz2 8504580 BLAKE2B 699db9490e27b3de82bcf2903321c7ee24784e6a96285784bb449eb05fb23f3a0417d015ea10a55992c3783c0e42a2cda7e591d998532145213d1941811b1725 SHA512 a27897a1e23fe78c64717df1a86ef37dba047a1942af1dd2e4e3f3da05975bb5c524ee03444c8067551966d6a1bbfe36866f2617fa6fe1f6b957d5769c31058c
-EBUILD flightgear-2020.1.2.ebuild 4408 BLAKE2B fe573ff0479c98b739f0c36e9fb6b4ef6a8fa40ef5fbc5224cfe2b36a206b1e9a049c78c27a088c50adb40f88932823fb9b7156ac91a2a78db63b48dcbbc7d86 SHA512 a498f4fffd802ee58f2dab0fcefa6813c8b347a7d1fcbdabf727a6d8890d39d908a5472de751e7b0cac5cf8ca515e65489e9d271ac462f195e14369db1b53aa2
-EBUILD flightgear-9999.ebuild 4427 BLAKE2B d4d37beab755c928663f8c162a4b2bf46027f020e18507eddfc1038b93ac90f1419f125694acd619d106213f484d978f38e54be5e5f5e601544c4ed9bee18a0e SHA512 528945be4b75b80b297850b1b160e45568271183ca463d0794ad21060c69b5715b1c92d5406f84e0b00998247bb90cd37dc45b152a7408951ef8c7e0e6ee4be9
+DIST flightgear-2020.3.6.tar.bz2 8837251 BLAKE2B 28b8032bd2b6da91f72ae19d4c0c3a6d38122ec2ce7e2e8d1bc3022003551c6c5887711d67868fd9546d79eb6def6c0f0571e62361e73deb6f0edc9c3159c8fa SHA512 b0bfa6e02cf5c2e64aea85fb7433e583141471e15a7dff69dbc12c227835c6e52dcf5b2947a30847c2b291442878eee6265217311e441abb32c5f95bbf7df990
+EBUILD flightgear-2020.3.6.ebuild 4311 BLAKE2B 3541b75b3207f3797731eb34b4e66c58ecc91dc9c0032f2bc87df8229699fad84cb05716d974b11dc52013ca745ac03971346ac3dba3a595047db765a44569fa SHA512 fb000a0b52607725a1036ef4b934c013fd96a2c3391bf71fbda89fd3004fb4676d4920839fbefee0b00b6e2c159ae8599688dedffe9583146586092b739546f3
+EBUILD flightgear-9999.ebuild 4361 BLAKE2B 280da54950e30e196699998d2e7476463c456f0a8856b73a49fce5c72635c5d3c526d5dfdbc9f8cda98cba27328609cb7382aca9f60ecaae768d023728cee84e SHA512 c77ef924e0c401183ec31993bc6556ee515526147cbfc316250d9eef0f17fac4600b0221a9a4b6db88c7ba68920536dd4e9b5e74da6b6660610f86056626c571
MISC metadata.xml 867 BLAKE2B b6bb892bffffec9fa00677768455fc49dd49164fae26b1c6ae70ac905feeaca79d670f4041294fb94e7c11d741a68bc6e3205e34aba5caf36da77fc808fdff8c SHA512 645a952785a101a8400be7a2608e7c71007c093c8f7cdbd0fab36f21b64ea1bbeb67e8f30404ab63841d41e5709a30570223732ebb586c780727ab0cfed0d943
diff --git a/games-simulation/flightgear/files/flightgear-2020.1.2-boost.patch b/games-simulation/flightgear/files/flightgear-2020.1.2-boost.patch
deleted file mode 100644
index 43e2a7d0cb13..000000000000
--- a/games-simulation/flightgear/files/flightgear-2020.1.2-boost.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -515,7 +515,7 @@
- set(NOMINMAX 1)
- endif(WIN32)
-
--set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION")
-+set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION -DBOOST_NO_STDLIB_CONFIG")
-
- # append the SIMD flags if requested
- if (ENABLE_SIMD)
diff --git a/games-simulation/flightgear/files/flightgear-2020.1.2-cmake.patch b/games-simulation/flightgear/files/flightgear-2020.3.5-cmake.patch
index f463c458b5a0..0af961beacdf 100644
--- a/games-simulation/flightgear/files/flightgear-2020.1.2-cmake.patch
+++ b/games-simulation/flightgear/files/flightgear-2020.3.5-cmake.patch
@@ -1,18 +1,18 @@
-diff -ruN flightgear-2020.1.2/CMakeLists.txt fgfs-my/CMakeLists.txt
---- flightgear-2020.1.2/CMakeLists.txt 2020-05-24 17:14:48.000000000 +0200
-+++ fgfs-my/CMakeLists.txt 2020-05-31 13:56:41.745941586 +0200
-@@ -367,7 +367,7 @@
+diff -ruN flightgear-2020.3.5/CMakeLists.txt fgfs-my/CMakeLists.txt
+--- flightgear-2020.3.5/CMakeLists.txt 2020-12-18 12:43:09.000000000 +0100
++++ fgfs-my/CMakeLists.txt 2021-01-24 01:36:57.547695230 +0100
+@@ -373,7 +373,7 @@
## Qt5 setup setup
if (ENABLE_QT)
message(STATUS "Qt launcher enabled, checking for Qt >= 5.4 / qmake")
-- find_package(Qt5 5.4 COMPONENTS Widgets Network Qml Quick Svg)
-+ find_package(Qt5 5.4 COMPONENTS Widgets Network Qml Quick)
+- find_package(Qt5 5.4 COMPONENTS Widgets Gui Network Qml Quick Svg)
++ find_package(Qt5 5.4 COMPONENTS Widgets Gui Network Qml Quick)
if (Qt5Widgets_FOUND)
message(STATUS "Will enable Qt launcher GUI")
set(HAVE_QT 1)
-diff -ruN flightgear-2020.1.2/CMakeModules/SetupFGFSLibraries.cmake fgfs-my/CMakeModules/SetupFGFSLibraries.cmake
---- flightgear-2020.1.2/CMakeModules/SetupFGFSLibraries.cmake 2020-05-24 17:14:48.000000000 +0200
-+++ fgfs-my/CMakeModules/SetupFGFSLibraries.cmake 2020-05-31 13:55:33.484421108 +0200
+diff -ruN flightgear-2020.3.5/CMakeModules/SetupFGFSLibraries.cmake fgfs-my/CMakeModules/SetupFGFSLibraries.cmake
+--- flightgear-2020.3.5/CMakeModules/SetupFGFSLibraries.cmake 2020-12-18 12:43:09.000000000 +0100
++++ fgfs-my/CMakeModules/SetupFGFSLibraries.cmake 2021-01-24 01:35:31.298263659 +0100
@@ -33,15 +33,8 @@
# PkgConfig::DBUS target
@@ -31,15 +31,15 @@ diff -ruN flightgear-2020.1.2/CMakeModules/SetupFGFSLibraries.cmake fgfs-my/CMak
endif()
if(FG_HAVE_GPERFTOOLS)
-diff -ruN flightgear-2020.1.2/src/GUI/CMakeLists.txt fgfs-my/src/GUI/CMakeLists.txt
---- flightgear-2020.1.2/src/GUI/CMakeLists.txt 2020-05-24 17:14:48.000000000 +0200
-+++ fgfs-my/src/GUI/CMakeLists.txt 2020-05-31 13:56:41.745941586 +0200
-@@ -137,7 +137,7 @@
- ${qml_sources})
+diff -ruN flightgear-2020.3.5/src/GUI/CMakeLists.txt fgfs-my/src/GUI/CMakeLists.txt
+--- flightgear-2020.3.5/src/GUI/CMakeLists.txt 2020-12-18 12:43:09.000000000 +0100
++++ fgfs-my/src/GUI/CMakeLists.txt 2021-01-24 01:40:02.008618256 +0100
+@@ -142,7 +142,7 @@
set_property(TARGET fglauncher PROPERTY AUTOMOC ON)
+ target_include_directories(fglauncher PRIVATE ${PROJECT_BINARY_DIR}/src/GUI)
- target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick Qt5::Svg SimGearCore)
+ target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick SimGearCore)
- target_include_directories(fglauncher PRIVATE ${PROJECT_BINARY_DIR}/src/GUI)
- add_library(fgqmlui QQuickDrawable.cxx
+ if (ENABLE_QQ_UI)
+ set(QQUI_SOURCES
diff --git a/games-simulation/flightgear/flightgear-2020.1.2.ebuild b/games-simulation/flightgear/flightgear-2020.3.6.ebuild
index c472dcc0fa53..23f6c894ed34 100644
--- a/games-simulation/flightgear/flightgear-2020.1.2.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.3.6.ebuild
@@ -64,8 +64,7 @@ RDEPEND="${COMMON_DEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-2020.1.2-cmake.patch"
- "${FILESDIR}/${P}-boost.patch"
+ "${FILESDIR}/${PN}-2020.3.5-cmake.patch"
)
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
@@ -95,7 +94,7 @@ src_configure() {
-DENABLE_PROFILE=OFF
-DENABLE_QT=$(usex qt5)
-DENABLE_RTI=OFF
- -DENABLE_SIMD=OFF # see CPU_FLAGS
+ -DENABLE_SIMD=$(usex cpu_flags_x86_sse2)
-DENABLE_STGMERGE=ON
-DENABLE_SWIFT=OFF # swift pilot client not packaged yet
-DENABLE_TERRASYNC=$(usex utils)
@@ -118,9 +117,6 @@ src_configure() {
-DUSE_DBUS=$(usex dbus)
-DWITH_FGPANEL=$(usex utils)
)
- if use cpu_flags_x86_sse2; then
- append-flags -msse2 -mfpmath=sse
- fi
if use gdal && use utils; then
mycmakeargs+=(-DENABLE_DEMCONVERT=ON)
else
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 2eea53f95a81..551102d90c57 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -66,7 +66,7 @@ RDEPEND="${COMMON_DEPEND}
"
PATCHES=(
-# "${FILESDIR}/${PN}-2020.1.2-cmake.patch"
+ "${FILESDIR}/${PN}-2020.3.5-cmake.patch"
)
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
@@ -96,7 +96,7 @@ src_configure() {
-DENABLE_PROFILE=OFF
-DENABLE_QT=$(usex qt5)
-DENABLE_RTI=OFF
- -DENABLE_SIMD=OFF # see CPU_FLAGS
+ -DENABLE_SIMD=$(usex cpu_flags_x86_sse2)
-DENABLE_STGMERGE=ON
-DENABLE_SWIFT=OFF # swift pilot client not packaged yet
-DENABLE_TERRASYNC=$(usex utils)
@@ -119,9 +119,6 @@ src_configure() {
-DUSE_DBUS=$(usex dbus)
-DWITH_FGPANEL=$(usex utils)
)
- if use cpu_flags_x86_sse2; then
- append-flags -msse2 -mfpmath=sse
- fi
if use gdal && use utils; then
mycmakeargs+=(-DENABLE_DEMCONVERT=ON)
else
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 22:47:26 +0000