games-simulation/flightgear: version bump, remove old

Signed-off-by: Maciej Mrozowski <reavertm@gentoo.org>

5 files changed, 21 insertions, 39 deletions

diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 2977ffa6f2d4..9b7fce3145ad 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1 +1 @@
-DIST flightgear-2020.1.2.tar.bz2 8504580 BLAKE2B 699db9490e27b3de82bcf2903321c7ee24784e6a96285784bb449eb05fb23f3a0417d015ea10a55992c3783c0e42a2cda7e591d998532145213d1941811b1725 SHA512 a27897a1e23fe78c64717df1a86ef37dba047a1942af1dd2e4e3f3da05975bb5c524ee03444c8067551966d6a1bbfe36866f2617fa6fe1f6b957d5769c31058c
+DIST flightgear-2020.3.5.tar.bz2 8831096 BLAKE2B 6648c52947642ee6d6d11d8bcb72cfc24ab3484e038d0136e1707936ab7db38a167ab221a67eaba47d3e507ce0c82612a47c574c37c17e2cbd8787fad46edb97 SHA512 7bd807daea330bf0e12fd0b797c54895dc9ceda98a67dbf36377bf6a4ab74c0e3cff218c4e9796c87fcac886436f1810848e0f4a8ab272fc516178f6d2d6fd0f
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.5.ebuild
index c472dcc0fa53..23f6c894ed34 100644
--- a/games-simulation/flightgear/flightgear-2020.1.2.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.3.5.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