summaryrefslogtreecommitdiff
path: root/games-simulation/flightgear
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
commit3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
treec513fe68548b40365c1c2ebfe35c58ad431cdd77 /games-simulation/flightgear
parent05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
gentoo resync : 25.08.2020
Diffstat (limited to 'games-simulation/flightgear')
-rw-r--r--games-simulation/flightgear/Manifest8
-rw-r--r--games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch24
-rw-r--r--games-simulation/flightgear/files/flightgear-2020.1.2-cmake.patch45
-rw-r--r--games-simulation/flightgear/flightgear-2020.1.2.ebuild (renamed from games-simulation/flightgear/flightgear-2019.1.1.ebuild)32
-rw-r--r--games-simulation/flightgear/flightgear-9999.ebuild27
5 files changed, 83 insertions, 53 deletions
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index f38bed658847..c0fefdbc0472 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,7 +1,7 @@
AUX ac3d.vim 45 BLAKE2B 04a6e4c70a8be0f7d996f1192289cc05012d4b4cc82a56a14b5d6d2dd7aae8f23f1cd853d29d071a0b9691cf5b8e8b262355b40752f43bccaa318065992d709b SHA512 b691585c6772222525b7f2d67ed41431663400930d9c7deed843a6abe50f67b517bd3180026a0cfe949df29036a49bcaf33ab759dd958ae64d550c271150a7da
-AUX flightgear-2018.3.2-cmake.patch 1322 BLAKE2B 4b68e744cf0cd7ea9582025980d055f8def5d5d1c82cabf133d4d1f9e35d501e28fdba1fca51ed409caa6398043fa52a82f68f77ce8f34a3f0a3ce45fa526352 SHA512 5ae183a04df6f12e23e87649210249a0857d5915aba40198507d2e45ee6fba6b997575df40457cb8e214b9fe9f4b81f4bec8fadb3875f1bbebf0c3181ba4fce3
+AUX flightgear-2020.1.2-cmake.patch 2064 BLAKE2B ca5f3e0f2aae4b8ccc3ec6504826a045ada095db234cf98e593b0303b530d18d5c6199fd128702b72ec7b94fff3714ee567744b928fe4a02fb195fba6a0d66d8 SHA512 fd208f009d81827108dd2f0488152c63a7d1e4f53bdacd5b6ac29f6c4b8bcfac5a22bcb49bd88a21daf61cccf2cc3362072d0f98be41a59f29239fed3b3f3e0a
AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
-DIST flightgear-2019.1.1.tar.bz2 8440986 BLAKE2B da387456aaa6e8b86a8a865989f40c6bbcef4bf378175628c26fb172161cc3b278e4b16a3a270b7ed7fcf70329a88754c9a875a14f919fa90f284a485c909cce SHA512 edcc464af0bde4766e61137211276d77a6bb297567b0168dfaf3b97fdb9a595e5e8a0b84232680fcc975cf195261b9751edb79ae73123333feb31ab3d7215d8c
-EBUILD flightgear-2019.1.1.ebuild 4373 BLAKE2B afea502ee7e1ebc2dda52a53a89b66d5fe4db011d711cb9c4582fa2addc7cbb0c057f73c522708f2cf6fd11ffedc1e42e676e26c595bb52c0c1d43d9eb01c4fb SHA512 ca8d29f60f4a54085f1997ec5824f4bfb87537a390f1d4bcad66275a01a7f400675163059d91026450e80d92398dfa84005242db1a010bac31e67d429d13e9c9
-EBUILD flightgear-9999.ebuild 4404 BLAKE2B ffb54ae7eabdd3a14856a3fe990efe3413a3f095389f2bb4d711ddf931e44d66e50382e46e14f598b5889f94cb2724c87963bf45b4353f8f462bb59533e80f4b SHA512 a7bfc2131c1ba2de71ccaf3b9336d03ed33018e2724e0db676adf9550826264041c0915a9bd4be48234324375bfba53c0da413aeadbf575fcc089f8f6062ef4e
+DIST flightgear-2020.1.2.tar.bz2 8504580 BLAKE2B 699db9490e27b3de82bcf2903321c7ee24784e6a96285784bb449eb05fb23f3a0417d015ea10a55992c3783c0e42a2cda7e591d998532145213d1941811b1725 SHA512 a27897a1e23fe78c64717df1a86ef37dba047a1942af1dd2e4e3f3da05975bb5c524ee03444c8067551966d6a1bbfe36866f2617fa6fe1f6b957d5769c31058c
+EBUILD flightgear-2020.1.2.ebuild 4411 BLAKE2B 84df38dd2b90a49fdb7f1b1f4db63ca3e81487a983ea41e81f9d703268fc3ddc190c04dc823873035a3e0c20fd2e7eb1531a3cb793523e28e8fe451e41bb0659 SHA512 aeeb4695c6b2fe85306680edfcc2034748b307752ca2307b8ffd144554a25ba1168f1940b04f4af743e715ed4aec7742183a8c8a4041706dd64fa3dd1f38c540
+EBUILD flightgear-9999.ebuild 4461 BLAKE2B d66adce51f48fc462dadd2fe069d6b0696490614518f5d258c180f38546a103f7ee1df7df68f6b76612d072c6d4d04a4817edccbd5e8f54104d816dd2fcd981b SHA512 86fbff4a29c5a830b8178aa1501f70a3dc68f344fb0e62bfbce234be901a61d4e11b99351f1ed34b664c66e7032bb8903dded07bb08ee9fcb007363a7504b522
MISC metadata.xml 867 BLAKE2B b6bb892bffffec9fa00677768455fc49dd49164fae26b1c6ae70ac905feeaca79d670f4041294fb94e7c11d741a68bc6e3205e34aba5caf36da77fc808fdff8c SHA512 645a952785a101a8400be7a2608e7c71007c093c8f7cdbd0fab36f21b64ea1bbeb67e8f30404ab63841d41e5709a30570223732ebb586c780727ab0cfed0d943
diff --git a/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch b/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch
deleted file mode 100644
index 97747e8b7487..000000000000
--- a/games-simulation/flightgear/files/flightgear-2018.3.2-cmake.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN flightgear-2018.3.2/CMakeLists.txt my/CMakeLists.txt
---- flightgear-2018.3.2/CMakeLists.txt 2019-01-29 14:17:49.000000000 +0100
-+++ my/CMakeLists.txt 2019-08-18 05:29:04.762138013 +0200
-@@ -323,7 +323,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)
- if (Qt5Widgets_FOUND)
- message(STATUS "Will enable Qt launcher GUI")
- message(STATUS " Qt5Widgets version: ${Qt5Widgets_VERSION_STRING}")
-diff -ruN flightgear-2018.3.2/src/GUI/CMakeLists.txt my/src/GUI/CMakeLists.txt
---- flightgear-2018.3.2/src/GUI/CMakeLists.txt 2019-01-29 14:17:50.000000000 +0100
-+++ my/src/GUI/CMakeLists.txt 2019-08-18 05:38:19.607822998 +0200
-@@ -127,7 +127,7 @@
- ${qml_sources})
-
- set_property(TARGET fglauncher PROPERTY AUTOMOC ON)
-- 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
diff --git a/games-simulation/flightgear/files/flightgear-2020.1.2-cmake.patch b/games-simulation/flightgear/files/flightgear-2020.1.2-cmake.patch
new file mode 100644
index 000000000000..f463c458b5a0
--- /dev/null
+++ b/games-simulation/flightgear/files/flightgear-2020.1.2-cmake.patch
@@ -0,0 +1,45 @@
+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 @@
+ ## 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)
+ 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
+@@ -33,15 +33,8 @@
+
+ # PkgConfig::DBUS target
+
+- if(CMAKE_VERSION VERSION_LESS 3.6)
+- if(DBUS_FOUND)
+- target_link_libraries(${target} ${DBUS_LDFLAGS})
+- endif()
+- else()
+- # PkgConfig::DBUS target
+- if(TARGET PkgConfig::DBUS)
+- target_link_libraries(${target} PkgConfig::DBUS)
+- endif()
++ if(DBUS_FOUND)
++ target_link_libraries(${target} ${DBUS_LDFLAGS})
+ 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})
+
+ set_property(TARGET fglauncher PROPERTY AUTOMOC ON)
+- 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
diff --git a/games-simulation/flightgear/flightgear-2019.1.1.ebuild b/games-simulation/flightgear/flightgear-2020.1.2.ebuild
index a8847f1ad50a..3a428d9e25ad 100644
--- a/games-simulation/flightgear/flightgear-2019.1.1.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.1.2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit cmake-utils bash-completion-r1 toolchain-funcs
+inherit cmake bash-completion-r1 toolchain-funcs
DESCRIPTION="Open Source Flight Simulator"
HOMEPAGE="https://www.flightgear.org/"
@@ -63,7 +63,9 @@ RDEPEND="${COMMON_DEPEND}
~games-simulation/${PN}-data-${PV}
"
-PATCHES=("${FILESDIR}/${PN}-2018.3.2-cmake.patch")
+PATCHES=(
+ "${FILESDIR}/${PN}-2020.1.2-cmake.patch"
+)
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
@@ -73,13 +75,13 @@ pkg_pretend() {
src_configure() {
local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=OFF
-DENABLE_AUTOTESTING=OFF
-DENABLE_COMPOSITOR=OFF
-DENABLE_FGCOM=$(usex utils)
-DENABLE_FGELEV=$(usex utils)
-DENABLE_FGJS=$(usex utils)
-DENABLE_FGVIEWER=$(usex utils)
- -DENABLE_FLITE=OFF
-DENABLE_GDAL=$(usex gdal)
-DENABLE_GPSSMOOTH=$(usex utils)
-DENABLE_HID_INPUT=$(usex udev)
@@ -95,6 +97,7 @@ src_configure() {
-DENABLE_SIMD=OFF # see CPU_FLAGS
-DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2)
-DENABLE_STGMERGE=ON
+ -DENABLE_SWIFT=OFF # swift pilot client not packaged yet
-DENABLE_TERRASYNC=$(usex utils)
-DENABLE_TRAFFIC=$(usex utils)
-DENABLE_UIUC_MODEL=ON
@@ -106,8 +109,8 @@ src_configure() {
-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
-DSP_FDMS=ON
-DSYSTEM_CPPUNIT=OFF # NOTE we do not build tests anyway
- -DSYSTEM_FLITE=ON
- -DSYSTEM_HTS_ENGINE=ON
+ -DSYSTEM_FLITE=OFF
+ -DSYSTEM_HTS_ENGINE=OFF
-DSYSTEM_SPEEX=ON
-DSYSTEM_GSM=ON
-DSYSTEM_SQLITE=ON
@@ -129,11 +132,11 @@ src_configure() {
mycmakeargs+=(-DENABLE_FGQCANVAS=OFF)
fi
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
# Install bash completion (TODO zsh)
# Uncomment below when scripts stops writing files...
@@ -143,12 +146,13 @@ src_install() {
# Install examples and other misc files
if use examples; then
- insinto /usr/share/doc/"${PF}"/examples
- doins -r scripts/java scripts/perl scripts/python
- insinto /usr/share/doc/"${PF}"/examples/c++
- doins -r scripts/example/*
- insinto /usr/share/doc/"${PF}"/tools
- doins -r scripts/atis scripts/tools/*
+ docompress -x /usr/share/doc/"${PF}"/{examples,tools}
+ docinto examples
+ dodoc -r scripts/java scripts/perl scripts/python
+ docinto examples/c++
+ dodoc -r scripts/example/*
+ docinto tools
+ dodoc -r scripts/atis scripts/tools/*
fi
# Install nasal script syntax
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index ce6c889aeb77..85e77a5fdaa6 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit cmake-utils bash-completion-r1 toolchain-funcs git-r3
+inherit cmake bash-completion-r1 toolchain-funcs git-r3
DESCRIPTION="Open Source Flight Simulator"
HOMEPAGE="https://www.flightgear.org/"
@@ -65,7 +65,9 @@ RDEPEND="${COMMON_DEPEND}
~games-simulation/${PN}-data-${PV}
"
-PATCHES=("${FILESDIR}/${PN}-2018.3.2-cmake.patch")
+PATCHES=(
+ "${FILESDIR}/${PN}-2020.1.2-cmake.patch"
+)
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
@@ -75,6 +77,7 @@ pkg_pretend() {
src_configure() {
local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=OFF
-DENABLE_AUTOTESTING=OFF
-DENABLE_COMPOSITOR=OFF
-DENABLE_FGCOM=$(usex utils)
@@ -96,6 +99,7 @@ src_configure() {
-DENABLE_SIMD=OFF # see CPU_FLAGS
-DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2)
-DENABLE_STGMERGE=ON
+ -DENABLE_SWIFT=OFF # swift pilot client not packaged yet
-DENABLE_TERRASYNC=$(usex utils)
-DENABLE_TRAFFIC=$(usex utils)
-DENABLE_UIUC_MODEL=ON
@@ -130,11 +134,11 @@ src_configure() {
mycmakeargs+=(-DENABLE_FGQCANVAS=OFF)
fi
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
# Install bash completion (TODO zsh)
# Uncomment below when scripts stops writing files...
@@ -144,12 +148,13 @@ src_install() {
# Install examples and other misc files
if use examples; then
- insinto /usr/share/doc/"${PF}"/examples
- doins -r scripts/java scripts/perl scripts/python
- insinto /usr/share/doc/"${PF}"/examples/c++
- doins -r scripts/example/*
- insinto /usr/share/doc/"${PF}"/tools
- doins -r scripts/atis scripts/tools/*
+ docompress -x /usr/share/doc/"${PF}"/{examples,tools}
+ docinto examples
+ dodoc -r scripts/java scripts/perl scripts/python
+ docinto examples/c++
+ dodoc -r scripts/example/*
+ docinto tools
+ dodoc -r scripts/atis scripts/tools/*
fi
# Install nasal script syntax
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 21:22:19 +0000