diff options
Diffstat (limited to 'games-simulation')
19 files changed, 225 insertions, 240 deletions
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz Binary files differindex b17478eee7c4..d6ac02b296cd 100644 --- a/games-simulation/Manifest.gz +++ b/games-simulation/Manifest.gz diff --git a/games-simulation/corsix-th/Manifest b/games-simulation/corsix-th/Manifest index f9f9a15bc3b3..467c225a0a11 100644 --- a/games-simulation/corsix-th/Manifest +++ b/games-simulation/corsix-th/Manifest @@ -1,4 +1,6 @@ AUX corsix-th-0.62-gcc-10.patch 241 BLAKE2B 78ab7aebd36fe16b63e111f459f324f3165a3df99f29771584c074fbd7fa29849e9e9d66b55592340b6292a48006ab003f2f09a767a58e5f40fe9630eae25075 SHA512 a85c8613ab94903db4b42f74c326620f81c6f9212a78b42e656b57e00c455fba7c457469e07c7ab9a144032e7d3aa244fdc269c3aa520fdbd9bf4c373fd766ed DIST corsix-th-0.63.tar.gz 4040119 BLAKE2B a700264c21377d53fb031c57428e5a50bbef426f32a3cd8bc4f83174a7f12b76d72050885ae257a6017a03f2f9611106cf9226c606ef726c1220b997eacbc5f1 SHA512 73a170bbf3da0e11ffe30fcbafb80f9e3852ce992dd6ecae2a2da332b9d4927a98efb0208e2056918a4100db54d1bdc564454cadae370cfab87625ca3f9889fd +DIST corsix-th-0.64.tar.gz 4062048 BLAKE2B 2b807a5c712a19cac80bae613065dd8c9e1219573a3c288c1433b6fa857c3a93632e9c51ba126a70626b4044d469ca1ebc815257f291fa9f86ea94491aae35fe SHA512 c02d07ae4fb9a1ce008f32c4b9ea12a949316feddca4e2a29e860e0d88efdfa0440d372b00b9d3eda5e5c3ca739085510ebe8650790d06a7e91255b7d0990e6c EBUILD corsix-th-0.63.ebuild 1314 BLAKE2B 7dbb0afc14be51a70fde1630be9c41249623019123d03008d65f2d163a884f4d81fcfb9738f51f34dafaef02d48566a08e6ffc23e82111746344109897c8abec SHA512 175d20ab2a78cec92982a4a337670243d1281ba0f5ce95e0c5f68240e3634fca20d4ccd9897739d87d46e821bee8e5e19f1ebbbb4bac0ef6231ad95cc7928f6b +EBUILD corsix-th-0.64.ebuild 1262 BLAKE2B dfc654c386e0fd18f4117c357d43652b75c2c152f59794d9ed20f84eb3604f51bd26503596819a26dfac31e3cda622bebe44c05a5733f31ef5220b64a09441e9 SHA512 5cc2438eb9a63d6ed3f2fb92d9a07f4587b3c3b187b9834edea1b2f3b4ce8bfe5e7538e8e839b23dc87be5af18253d4f6e1d8db079acd5be32dfcbe78b90cff9 MISC metadata.xml 716 BLAKE2B 16fe66f9f3fce58b6b17df3906fdcf4e9b7a9a49be872ba69cd5deeb47bffca495ff3a8b8c89fc71cbe8b3960954a462aff8c10c6afd34c18acef95931c382f8 SHA512 643ef59451c07fd3e61b22fb9891cc2478dff78c1e2a50ed455b15bf1c01e49d384af177c687e48b2bd6590278ac121458a94760a25bdc064ce309ff5ab3b868 diff --git a/games-simulation/corsix-th/corsix-th-0.64.ebuild b/games-simulation/corsix-th/corsix-th-0.64.ebuild new file mode 100644 index 000000000000..78a3d26cfd7a --- /dev/null +++ b/games-simulation/corsix-th/corsix-th-0.64.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake xdg + +MY_PN="CorsixTH" +MY_PV="$(ver_rs 2 -)" + +DESCRIPTION="Open source clone of Theme Hospital" +HOMEPAGE="http://corsixth.com" +SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="doc +midi +sound +truetype +videos" + +RDEPEND=" + >=dev-lang/lua-5.1:0 + >=dev-lua/luafilesystem-1.5 + >=dev-lua/lpeg-0.9 + >=dev-lua/luasocket-3.0_rc1-r4 + media-libs/libsdl2[opengl,video] + sound? ( media-libs/sdl2-mixer[midi?] ) + truetype? ( >=media-libs/freetype-2.5.3:2 ) + videos? ( >=media-video/ffmpeg-2.2.3:0= ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + virtual/pkgconfig + doc? ( + app-doc/doxygen[dot] + >=dev-lang/lua-5.1:0 + ) +" + +S="${WORKDIR}/${MY_PN}-${MY_PV}" + +src_prepare() { + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DWITH_AUDIO=$(usex sound) + -DWITH_FREETYPE2=$(usex truetype) + -DWITH_MOVIES=$(usex videos) + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && cmake_src_compile doc +} + +src_install() { + cmake_src_install + dodoc {changelog,CONTRIBUTING}.txt + + docinto html + use doc && dodoc -r "${BUILD_DIR}"/doc/* +} diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest index d835f179cb0c..1630764b69a1 100644 --- a/games-simulation/flightgear-data/Manifest +++ b/games-simulation/flightgear-data/Manifest @@ -1,4 +1,4 @@ -DIST FlightGear-2019.1.1-data.tar.bz2 1748213475 BLAKE2B 6be5021a666d8363fd97e777e0674d61875e1309a391647f6ecebcc4443d494821a737709c135dc45521ae30401479f6f74c28d7db8da992fa279ae461e16a2c SHA512 e5697f587c272036d3f5cfd7dcc7464e3eae7251e41425a91c80eabccbf711a6416a4746b5bf39a2806dc3d4f6839359483a0165899eb4ec812308b2b5da060a -EBUILD flightgear-data-2019.1.1.ebuild 413 BLAKE2B 32dab4a039b905eac166d7694ae7d5fc2859151bede845242ac0297369e6c0169d996721028e2a69770873945de97e98a5d38aa9173b3b275ee08c2ecc2e62d6 SHA512 b87017373187d3c7035b7d615a56b2bea612e716ba1efeb38b6f78d1ab6bd687761763728dc6dac0363d736ba2958ee19dab126d58f90636b36ecce63661aec7 -EBUILD flightgear-data-9999.ebuild 441 BLAKE2B 3b7ee68c01c42e28bef40f5aca34f9453b6fdcdf7fd25d4122a96c8436f4c4486d49f31376f936d407067ef866191e32a4a7729ee7ecb5a01a144e1d32399554 SHA512 0d0a2a49074e50aeb9660082af1851c71743ecb4f4388f937bea1ff5dfc2d7eff757f37ff0eae98a97b7a7b244e05d41b4c003a39959414a040b01984b6f29d8 +DIST FlightGear-2020.1.2-data.tar.bz2 1954932485 BLAKE2B e3f06ed6a36d2cfc6518f4a1cac4aaf28df2b7e1fb4720488dd38f3df7dfccb1cc9b48e0f216fa79db5fc3b380dcdd1161325ba0195cc14aadbc2d79fab39031 SHA512 16329d230f8cfd35dbd60aad0afc66225134e5c2f98abb89ca271837f04917f6aa876fc35868783a3a3d56c4ba1d25f429436de516a8086f4b7e296a0d352e03 +EBUILD flightgear-data-2020.1.2.ebuild 413 BLAKE2B f6358e3875cf11848406d92c0c5c98b1934ec83ba2decc9c67696328c7315b114cec9e6f06336662555b22aec7bca4ca5d971fe5968ea8a8dc7b74e0b01aec0a SHA512 9c596b8da0064d9758533fc8625901acea96cf16fa387a620ffe5e58455886c784a9c8586a5cdcd996180f3874e2a2319ebe37f555beaf0c5901fa275a98a033 +EBUILD flightgear-data-9999.ebuild 441 BLAKE2B abb508976894bf77fe2fa60c817920481a5dc0487a1379e71ff3104b9ca8cbe19953adc5f4a14ff5a74a0e6900fea89741b446137664104daf8eb119508225da SHA512 f0c40c5eff961a0d8680cf844a1fae4eff777469ae0fbbf9aed6ff088db1ae85a95b6494c7d06539b697d317a4567c534fd8bbe2173f6516e7747d58baded284 MISC metadata.xml 445 BLAKE2B a66be5a62283a2a7c8c086ad4d0cfbce8e1c7bdcd890e39fef504821b8eb01facc32f36afcdc4c62544bbc1b5c5b49e8a752f8b42dcbcf7adeb50b0cb5fd7afc SHA512 d68eedacc672f04b42ec6d6a9e0e8302dbe09283f73484945b9c8c277a1c65c02c19c1187dc18d4c9e68d56a26cd989d04df83e74ff44d48977fe3c24fb81466 diff --git a/games-simulation/flightgear-data/flightgear-data-2019.1.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2020.1.2.ebuild index 30bc1d192aa2..d5d9b4976641 100644 --- a/games-simulation/flightgear-data/flightgear-data-2019.1.1.ebuild +++ b/games-simulation/flightgear-data/flightgear-data-2020.1.2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="FlightGear data files" HOMEPAGE="https://www.flightgear.org/" diff --git a/games-simulation/flightgear-data/flightgear-data-9999.ebuild b/games-simulation/flightgear-data/flightgear-data-9999.ebuild index 387835083e95..27d27dcf76bf 100644 --- a/games-simulation/flightgear-data/flightgear-data-9999.ebuild +++ b/games-simulation/flightgear-data/flightgear-data-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit git-r3 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 diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest index 6e77f7f716ef..52794929788c 100644 --- a/games-simulation/openrct2/Manifest +++ b/games-simulation/openrct2/Manifest @@ -1,18 +1,16 @@ AUX README.gentoo 715 BLAKE2B c7e27f799a33a73dccd75bf2f28882bda609b3ba74fc98ca1b1fcdcbb91290a81a878d10fa1b9b15f0ebebe9ef496a7ac7b8fdfd3a455ca3ebad3dd3df908035 SHA512 c18d5b5950523e2abedd0f9218e71c1f7222615d34eb56c24c69f7dea446e17248086525603d1da63302db6e8c5b642086eb8b154fd531c26db611b9f799d4d8 -AUX openrct2-0.2.4-disable-desktop-and-icon-files-without-gui.patch 4709 BLAKE2B 0fb6abf56d278c978328ab75f0e332ca82ee0c26e9c6acbd3689839c516a9fa06ee9bc67b38c04c38dc09bf64d58744209f472734c971df3935af5218ba30455 SHA512 506c59e5c77fe7dcc7fd848cd0a73841bfc5da85717dd1795a434eb4dbd1d26a023c78fc496ce33ea0852204fd6f5fa737fda9def4f41c2a7a6128c6154eef53 -AUX openrct2-0.2.4-disable-optional-features.patch 4046 BLAKE2B d74445c36cfce90e89100d6d54ea7c4dc260ef0cb9555b144d404c27463e36764df0561b86018c6cce89eb9ea01b8be1b3d8de50a5edc2a2cdc9a339aab3f0f5 SHA512 0f0a777936b9b240e6b33ce60fc84b8856cd3f7fcc7e9a40e55392351dddd6b348bcfb9ebe29e6f507dfd7f5259aaea992fa1e5ce7f23acd7611802846dd4e8e AUX openrct2-0.2.4-include-additional-paths.patch 1583 BLAKE2B b21e59cfaa37b211501846e2afb14d9d6617c713e487ffd3ef079c8f75b3113252fbc401da25b53ff6498f01b66bd4e9c1b30c51483b4c32c4ae1b338885966c SHA512 945f00ea986ebcfcaa536a5abf1cab608c96fa211bb839e9d577e969b842eb757307b501740c6015623eb10604f7aa6f7e5c736669cbc46676abe1434296e8ae +AUX openrct2-0.2.6-gtest-1.10.patch 740 BLAKE2B b974fbf84765776018e13700f3c9151fa7613ed4aef76257b3d8d47bdc48d4e13314115ed5eb9e713a09213ca5c43906f13ce7929ef6795a5ab53a0c75000e3b SHA512 0d955664b28e68e39134438034c0559ee56a98fa7cd16dc5b90a1290f59defe700f4653ad053b4ca403f13f35cb822c0b063a0ff3777996c6049cd686a9a724f AUX openrct2.confd 415 BLAKE2B 08c22a6940f07d89b6414917d5438d2926b71397c1aa590db805fea67fe6857ccd7e00117edb0f8135fd055d741ec071e3cd439bd62f516142151ef3af76b2a4 SHA512 d2f6863c507389eab1117497edca2a21121c115b7fd06f59bc358f0a610ebf58b8df3be7683aaf105cc481c27647c4cfa36893c33b3a1da0624325927b5e3d9b AUX openrct2.initd 1424 BLAKE2B 0b5940000d0d7ebf0ad14d2326fc6342380fe9fd5266a49610d4c62686062ce2fbaca7c3211f0026d3c8bda6ad8bc7526838734571266da745e2d67ca8be9ec8 SHA512 3c1ebbe9874ecda50b9420d1cb27633a9ddec57f5afab39ceac0845e44c7fdfd0fd0dd9799a14b09f45d3c7e85a93cd994515d495c3b2f1d4e8012e5716f1409 -DIST openrct2-0.2.4.tar.gz 6805976 BLAKE2B 7860746d1705804682756097ff37d4584d0ebb20c450c08b88134795e9f3c375dfb888a67302f530cd55700eaa5cd13149c365c30a5d267d382b39225f06d210 SHA512 956044b5fa5e55256a33f352d2d1e8a4eb6738b98dc9894807b3628b5c5c08f3229c952fbf8b33ad867771f88c6d7e17ad1a8a4e050f8f269a6152d013afce03 DIST openrct2-0.2.6.tar.gz 11094308 BLAKE2B 4aed899fee4735a0237558c1c34f67f37ecc9b8138f8a66314a9abc013cf10ad3a9f80fd5159afc5860ded780d4c705fd9e394b38f981aac90c8cee883356996 SHA512 abe7c344b7588b169c95ffe0ab9028f72614d9b5783d81fa4f97f206d90d8cbaa0b91f04314c10926dbd5f68bba166558c428557f598abb343d306800611fb24 -DIST openrct2-objects-1.0.12.zip 2173875 BLAKE2B d344dde3dc376004b9e303a489c058a574c2f8babcce8c9998ef12f2b91e3fe7d3e22e1afc81aadd39637f3f91a5d36c4267aed06980686fd909cc515f4c8fde SHA512 d17d2197b66d22e33a246651a0c544a49a6d6a809612d26a851dc4b40bb9e1bf5079bbe5b1a3b7d41f541fc41ce41717d772a5579aa2cdc9ec1dfea72b5a3144 +DIST openrct2-0.3.0.tar.gz 11754657 BLAKE2B 66d956fd85829bc6b4825a59db9f3a3eebbb1e4565a4c8afdb8c05d9d7b3f339f75ff1d9fbc0a0f48d3c0673ac3fc335fb6bec5fe458513de2a0611ccfa3d48d SHA512 585bcd7a077114dc5332b95cb44f7c689e47fcbd7cff7c2ab32a24253a4fd87f50e79f40f9428c79ea6bc6d8cd88019b4edfce88509c03bc2d43854926d21317 DIST openrct2-objects-1.0.14.zip 2237331 BLAKE2B 39a0c92674abc0d16fc3dd463b68e2ee8f3f7dd1c2a944d5448173ca58e6c3c4a79092a40e66ac8e919f75be2d2d691a76dc046e41caf7237138815a4e6ad526 SHA512 66e7a55ca894f2ea11af1c6300f934ef00f659137dded06f54bf749f490ff6063f95da800ae3cbfbbffe1c3e7d995e307d1281d57e4454ded6fed5affde84f8e -DIST openrct2-replays-0.0.12.zip 1817941 BLAKE2B e000b005289db12b611c901e83ed785baefcee9eb34b2195f2b9679db9ff4d7c62b7b4fca072e90e464f1ecdbba685395a79889b366e04f7d28e257ecd8571a3 SHA512 d2136bbaf4f42decedcdd2f3546ffb80c93078b52325c5db80e86bfaf87548503ea941f511f905727a046d927464680f3bee3c9ec646ff286050be1ac31c7948 -DIST openrct2-replays-0.0.4.zip 1098833 BLAKE2B efe4f72b16285d8e6508313f16b892b02f1b124cf9b4d146731280f5090d071d3351834e6d4ab51122804fbbcb49044be4e681182141aac93795c3b1953b6590 SHA512 5c2469bfdaa94a6007f6788878f4e80d87fbbfd48b522e1bd2a22c2aa0c98583159b9559fd45f7f9450d544a99a59b6c17399d9ac91a171a86135f0e1a5b3e71 +DIST openrct2-objects-1.0.16.zip 3056214 BLAKE2B 7d8d938ba20ce612f7845dce1038134ec60d7e17e0f7d78a67480ae1ae2e6f8dd043f266742acd2dbd8539390349a2dcd7b8c73859a3caef3b5cd8565a4ec1c7 SHA512 2a8696467320f7894330d0fbb4894dd6effb2d6844fcf643e1f8e15a7b0b45411a7c205b75a9e9d7ea0627bc70b7a7e1e2213e0f7db1c7b489ae8b485670dba5 +DIST openrct2-replays-0.0.17.zip 1825315 BLAKE2B 9c22b52302c37abe5e802662eb4b6805fa3e229a71ab9f901b57eee30641ae4b86de9b1315476d158a3feb57c6be2a26c1ccca7c94328fe35bf57b46e2364c32 SHA512 103a8ba5b5b2dd76c18b642720d262553bb15ad26d59892f895327bf5e87b73e476b255af6556286faacb668aae49aa1ee29a14bcca2bb75d855383d12e60f4a DIST openrct2-replays-0.0.9.zip 1817119 BLAKE2B 3c63a0acf991487e667ae43ac987b8ee936ce77ad4eb75209d09e41f85b72550856c84d93bdbee1541a994ffbf9bc956b5366d77d760ebd7ed1dab0dffbf7885 SHA512 8066a664c12df047e64b9a049e39da6a4e366adfc60824a7a6c33e526c3a5a9afbc05d1dd11ff81eddbec0783445275d2be8cbe8141031fbeaefe8ea95cd1a7b DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e -EBUILD openrct2-0.2.4.ebuild 3892 BLAKE2B 8bf9ac2296ec22d239980c72214c6f0ed2d9313bcfe8e938292975cd449c3e59325a3a73b7f3f8180e88e24f83b6ff940343c1337889f361e86c0e348585e44d SHA512 130347410755599a8adcafc94637f8ae1d4adb0b915646ab98a5a31b3de89d8fd4ab8a5e6f9815c2555041e2b217f1869c7ae817aaa06821c919feaeae9f3edc -EBUILD openrct2-0.2.6.ebuild 3759 BLAKE2B 1e767e20f148414601aeafec9b651b6522406d052860206fc7ebd13af9eedfdf548bc9cbe759bad1b49e527fcbc40dc0f3dfaa023279a9efbdd03c59e89172ff SHA512 aca00ddd6a21fa66b7508d63661798634b818f14e34ea3227e23bce8ebbe78e9c20d34ee2f42ed0d9d3224add49ce5a55502d77ed5c9cd252ed12e33273f3488 -EBUILD openrct2-9999.ebuild 3745 BLAKE2B 798b12f1a57b4e776d94020183845c0d116b3594ca8ef39dc02cce025468b638ccc801ad22b9dc9619a2ce34aee1042d5bc1122f897e4383d3747b6cc6e033c9 SHA512 2fed369f4007a6e7a86fad71a6ff7a20c7e6fa2c74b4b9e090fefd14ed9a7fd684a01653e1fb37522144c4292b9a7d24cd57b293dc86b303e3036d679d364e21 -MISC metadata.xml 1235 BLAKE2B f2e799e2f41467a48bade824354c51b15743dc64931ca4626aa603c3243c07d0e07818bb48af9d2be8aa285f0d9f29108a5055ce59935a4da0e3d32ad7a9fd06 SHA512 513647150ed4c7bdc32278ba90ed75f758a762d6cddabecede66e0048dad623f8da8c6708e6f6a6105e8721f4b9eb5ed20ec6c8e8db41b54ef2bb26613d7a4cf +EBUILD openrct2-0.2.6.ebuild 3808 BLAKE2B 0e6f14d6e194d58d0247218158492ac5e4694c5c13187706845ed04ccd6bb2f02a7937463ddeba8c68561a5faf0d6936b722e92860a0081654a40e104fa30e87 SHA512 69c87253337dea795269486d7be95ba364508d3f7bebb915ac7193e894e567218f4c2163f73a1ea441d2cd7110e44caf1fc2e828649d1f4128c812942e6a56d2 +EBUILD openrct2-0.3.0.ebuild 3939 BLAKE2B 26751a126f2751c87bf34053d24cccb1a5a7f4ae7d410a97d9bd25a8b5f09cfb8e46fbe1f9acf8688532a4385c529819969a2c691cf547ba1443da6fc68622fa SHA512 9b06f0883fed8c6dce15292666c5645ff3b43e75c912ee7f00f1eed64c97dc43c6bb0813bb5e3f146e79f0eeea8a40237e29b8f046b69730063f55b139bd6173 +EBUILD openrct2-9999.ebuild 3899 BLAKE2B 227af822417f2961bda6e7eca0b2b90e3344b5addefc9e4245262c72fd322ae558b6f0d1ef8f3d6e1df7f6d810a250f4e9056cea9a7aecfeccb9079253942c71 SHA512 f9776de8b7c109549869a51e953d0d20bd1cc01746ec1047c7b0d4eaeeeefe8cf78669fa3f4b5214089b2a72867e9cd7e440ef487222fa68f6c9282d34a8d1d9 +MISC metadata.xml 1351 BLAKE2B 6ca9cf2f5109ad0af23bed39cfedcd77901a342ed4c5e85c79609f80a85792d8f203cabf96ceee46ba7aea47fad4c4713b38cd3712a2c2b820df3aca29ebf406 SHA512 5f0492cc2b92e4593398175db7d3604e2edaadfac95f8759341fbcd9b893025c18cd7666f9fe5c32d7c28900c1ee604858cd8d23a5863986fec853e23d47bc02 diff --git a/games-simulation/openrct2/files/openrct2-0.2.4-disable-desktop-and-icon-files-without-gui.patch b/games-simulation/openrct2/files/openrct2-0.2.4-disable-desktop-and-icon-files-without-gui.patch deleted file mode 100644 index cddbe7a93a32..000000000000 --- a/games-simulation/openrct2/files/openrct2-0.2.4-disable-desktop-and-icon-files-without-gui.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 9df66b1f1f56427d896263728c84009c8c3b842b Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki <conrad@kostecki.com> -Date: Sun, 10 Nov 2019 20:05:51 +0100 -Subject: [PATCH] CMakeLists.txt: don't install desktop and icon files without - GUI (#10206) - -If OpenRCT2 is compiled without GUI (for example as a dedicated server), -it does not make sense to install the desktop and icon files. - -Signed-off-by: Conrad Kostecki <conrad@kostecki.com> ---- - CMakeLists.txt | 28 +++++++++++++++------------- - 1 file changed, 15 insertions(+), 13 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7dda401bbdd..f6e4683c9b7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -319,18 +319,20 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/g2.dat" DESTINATION "${CMAKE_INSTALL_ - install(DIRECTORY "data/" DESTINATION "${CMAKE_INSTALL_DATADIR}/openrct2") - install(FILES ${DOC_FILES} DESTINATION "${CMAKE_INSTALL_DOCDIR}") - install(FILES "distribution/linux/openrct2.appdata.xml" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo") --install(FILES "resources/logo/icon_x16.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps" RENAME "openrct2.png") --install(FILES "resources/logo/icon_x24.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/24x24/apps" RENAME "openrct2.png") --install(FILES "resources/logo/icon_x32.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps" RENAME "openrct2.png") --install(FILES "resources/logo/icon_x48.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps" RENAME "openrct2.png") --install(FILES "resources/logo/icon_x64.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps" RENAME "openrct2.png") --install(FILES "resources/logo/icon_x96.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/96x96/apps" RENAME "openrct2.png") --install(FILES "resources/logo/icon_x128.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps" RENAME "openrct2.png") --install(FILES "resources/logo/icon_x256.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps" RENAME "openrct2.png") --install(FILES "resources/logo/icon_flag.svg" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps" RENAME "openrct2.svg") --install(FILES "distribution/linux/openrct2.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") --install(FILES "distribution/linux/openrct2-savegame.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") --install(FILES "distribution/linux/openrct2-scenario.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") --install(FILES "distribution/linux/openrct2-uri.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") -+if (NOT DISABLE_GUI) -+ install(FILES "resources/logo/icon_x16.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps" RENAME "openrct2.png") -+ install(FILES "resources/logo/icon_x24.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/24x24/apps" RENAME "openrct2.png") -+ install(FILES "resources/logo/icon_x32.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps" RENAME "openrct2.png") -+ install(FILES "resources/logo/icon_x48.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps" RENAME "openrct2.png") -+ install(FILES "resources/logo/icon_x64.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps" RENAME "openrct2.png") -+ install(FILES "resources/logo/icon_x96.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/96x96/apps" RENAME "openrct2.png") -+ install(FILES "resources/logo/icon_x128.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps" RENAME "openrct2.png") -+ install(FILES "resources/logo/icon_x256.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps" RENAME "openrct2.png") -+ install(FILES "resources/logo/icon_flag.svg" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps" RENAME "openrct2.svg") -+ install(FILES "distribution/linux/openrct2.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") -+ install(FILES "distribution/linux/openrct2-savegame.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") -+ install(FILES "distribution/linux/openrct2-scenario.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") -+ install(FILES "distribution/linux/openrct2-uri.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") -+endif() - install(FILES "distribution/linux/openrct2-mimeinfo.xml" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/mime/packages/" RENAME "openrct2.xml") - install(DIRECTORY "distribution/man/" DESTINATION "${CMAKE_INSTALL_MANDIR}/man6" FILES_MATCHING PATTERN "*.6") diff --git a/games-simulation/openrct2/files/openrct2-0.2.4-disable-optional-features.patch b/games-simulation/openrct2/files/openrct2-0.2.4-disable-optional-features.patch deleted file mode 100644 index 03d6496bf3ee..000000000000 --- a/games-simulation/openrct2/files/openrct2-0.2.4-disable-optional-features.patch +++ /dev/null @@ -1,87 +0,0 @@ -From fef1906d0d7050b1dfa3792f6e8d3a9b9632df68 Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki <conrad+github@kostecki.com> -Date: Sat, 9 Nov 2019 21:20:16 +0100 -Subject: [PATCH] CMakeLists.txt: make discord-rpc and google benchmark - optional (#10208) - -For a package maintainer, it should be possible to disable the support -for discord-rpc and google benchmark, as it currently always includes them, -when the library if found. ---- - CMakeLists.txt | 26 +++++++++++++++----------- - src/openrct2/CMakeLists.txt | 18 ++++++++++-------- - 2 files changed, 25 insertions(+), 19 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ea4bdfd8221..7dda401bbdd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,6 +42,8 @@ CMAKE_DEPENDENT_OPTION(DOWNLOAD_REPLAYS "Download replays during installation." - option(STATIC "Create a static build.") - option(USE_MMAP "Use mmap to try loading rct2's data segment into memory.") - -+option(DISABLE_DISCORD_RPC "Disable Discord-RPC support." OFF) -+option(DISABLE_GOOGLE_BENCHMARK "Disable Google Benchmarks support." OFF) - option(DISABLE_HTTP_TWITCH "Disable HTTP and Twitch support.") - option(DISABLE_NETWORK "Disable multiplayer functionality. Mainly for testing.") - option(DISABLE_TTF "Disable support for TTF provided by freetype2.") -@@ -125,17 +127,19 @@ if (CXX_WARN_SUGGEST_FINAL_METHODS) - add_definitions(-D__WARN_SUGGEST_FINAL_METHODS__) - endif () - --if(EXISTS "${ROOT_DIR}/discord-rpc") -- # Don't build discord's examples, some of which are in C and do not honour -- # the flags we set for C++. Also we don't use the provided examples. -- set(BUILD_EXAMPLES OFF CACHE BOOL "Build example apps") -- add_subdirectory("${ROOT_DIR}/discord-rpc") -- add_definitions(-D__ENABLE_DISCORD__) -- include_directories("${ROOT_DIR}/discord-rpc/include") -- set(HAVE_DISCORD_RPC TRUE) -- message("Building with discord-rpc support") --else() -- message("No discord-rpc detected, to enable clone discord-rpc to root directory: ${ROOT_DIR}") -+if (NOT DISABLE_DISCORD_RPC) -+ if(EXISTS "${ROOT_DIR}/discord-rpc") -+ # Don't build discord's examples, some of which are in C and do not honour -+ # the flags we set for C++. Also we don't use the provided examples. -+ set(BUILD_EXAMPLES OFF CACHE BOOL "Build example apps") -+ add_subdirectory("${ROOT_DIR}/discord-rpc") -+ add_definitions(-D__ENABLE_DISCORD__) -+ include_directories("${ROOT_DIR}/discord-rpc/include") -+ set(HAVE_DISCORD_RPC TRUE) -+ message("Building with discord-rpc support") -+ else() -+ message("No discord-rpc detected, to enable clone discord-rpc to root directory: ${ROOT_DIR}") -+ endif() - endif() - - # Copied from https://github.com/opencv/opencv/blob/dcdd6af5a856826fe62c95322145731e702e54c5/cmake/OpenCVDetectCXXCompiler.cmake#L63-L70 -diff --git a/src/openrct2/CMakeLists.txt b/src/openrct2/CMakeLists.txt -index 61be3d13c2a..97674911c0c 100644 ---- a/src/openrct2/CMakeLists.txt -+++ b/src/openrct2/CMakeLists.txt -@@ -73,14 +73,16 @@ if (NOT DISABLE_TTF) - endif () - endif () - --find_package(benchmark 1.4 QUIET) --if (benchmark_FOUND) -- message("Found Google benchmark, enabling support") -- set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS USE_BENCHMARK) -- target_link_libraries(${PROJECT_NAME} benchmark::benchmark) -- target_include_directories(${PROJECT_NAME} PRIVATE ${benchmark_INCLUDE_DIRS}) --else () -- message("Google benchmark not found, disabling support") -+if (NOT DISABLE_GOOGLE_BENCHMARK) -+ find_package(benchmark 1.4 QUIET) -+ if (benchmark_FOUND) -+ message("Found Google benchmark, enabling support") -+ set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_DEFINITIONS USE_BENCHMARK) -+ target_link_libraries(${PROJECT_NAME} benchmark::benchmark) -+ target_include_directories(${PROJECT_NAME} PRIVATE ${benchmark_INCLUDE_DIRS}) -+ else () -+ message("Google benchmark not found, disabling support") -+ endif () - endif () - - # Third party libraries diff --git a/games-simulation/openrct2/files/openrct2-0.2.6-gtest-1.10.patch b/games-simulation/openrct2/files/openrct2-0.2.6-gtest-1.10.patch new file mode 100644 index 000000000000..f0805f408552 --- /dev/null +++ b/games-simulation/openrct2/files/openrct2-0.2.6-gtest-1.10.patch @@ -0,0 +1,20 @@ +From 8feab6138724722146b1c6d521431556686068d3 Mon Sep 17 00:00:00 2001 +From: Conrad Kostecki <conrad@kostecki.com> +Date: Wed, 19 Aug 2020 22:56:51 +0200 +Subject: [PATCH] ReplayTests: Add support for >=gtest-1.10 + +Signed-off-by: Conrad Kostecki <conrad@kostecki.com> +--- + test/tests/ReplayTests.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/test/tests/ReplayTests.cpp b/test/tests/ReplayTests.cpp +index 653aa97657f..1443d1c862d 100644 +--- a/test/tests/ReplayTests.cpp ++++ b/test/tests/ReplayTests.cpp +@@ -117,4 +117,5 @@ struct PrintReplayParameter + } + }; + ++GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(ReplayTests); + INSTANTIATE_TEST_CASE_P(Replay, ReplayTests, testing::ValuesIn(GetReplayFiles()), PrintReplayParameter()); diff --git a/games-simulation/openrct2/metadata.xml b/games-simulation/openrct2/metadata.xml index 4e87269e0d52..533b34deeec8 100644 --- a/games-simulation/openrct2/metadata.xml +++ b/games-simulation/openrct2/metadata.xml @@ -16,6 +16,7 @@ </longdescription> <use> <flag name="lightfx">Enables LightFX for better lightning effects.</flag> + <flag name="scripting">Enable the <pkg>dev-lang/duktape</pkg> scripting engine for executing user scripts.</flag> <flag name="twitch">Enables streaming of ingame content to Twitch.</flag> </use> <upstream> diff --git a/games-simulation/openrct2/openrct2-0.2.6.ebuild b/games-simulation/openrct2/openrct2-0.2.6.ebuild index d18f745158a3..856708edc6e4 100644 --- a/games-simulation/openrct2/openrct2-0.2.6.ebuild +++ b/games-simulation/openrct2/openrct2-0.2.6.ebuild @@ -24,7 +24,7 @@ SRC_URI=" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="dedicated libressl +lightfx +opengl test +truetype twitch" COMMON_DEPEND=" @@ -73,6 +73,7 @@ S="${WORKDIR}/${MY_PN}-${PV}" PATCHES=( "${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch" + "${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch" ) src_unpack() { diff --git a/games-simulation/openrct2/openrct2-0.2.4.ebuild b/games-simulation/openrct2/openrct2-0.3.0.ebuild index 3d69a53c77e8..24c511c6a59b 100644 --- a/games-simulation/openrct2/openrct2-0.2.4.ebuild +++ b/games-simulation/openrct2/openrct2-0.3.0.ebuild @@ -3,14 +3,14 @@ EAPI=7 -inherit cmake-utils readme.gentoo-r1 xdg-utils +inherit cmake readme.gentoo-r1 xdg-utils MY_PN="OpenRCT2" MY_PN_OBJ="objects" MY_PN_RPL="replays" MY_PN_TS="title-sequences" -MY_PV_OBJ="1.0.12" -MY_PV_RPL="0.0.4" +MY_PV_OBJ="1.0.16" +MY_PV_RPL="0.0.17" MY_PV_TS="0.1.2c" DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2" @@ -24,25 +24,24 @@ SRC_URI=" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 x86" -IUSE="dedicated libressl +lightfx +opengl test +truetype twitch" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="dedicated libressl +lightfx +opengl scripting test +truetype" COMMON_DEPEND=" dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= + net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) - twitch? ( - net-misc/curl[ssl] - ) ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) + scripting? ( dev-lang/duktape ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 @@ -72,16 +71,15 @@ RESTRICT="!test? ( test )" S="${WORKDIR}/${MY_PN}-${PV}" PATCHES=( - "${FILESDIR}/${PN}-0.2.4-disable-desktop-and-icon-files-without-gui.patch" - "${FILESDIR}/${PN}-0.2.4-disable-optional-features.patch" "${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch" + "${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch" ) src_unpack() { unpack "${P}".tar.gz - mkdir -p "${S}"/data/title || die - cd "${S}"/data/title || die + mkdir -p "${S}"/data/sequence || die + cd "${S}"/data/sequence || die unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".zip mkdir -p "${S}"/data/object || die @@ -96,7 +94,7 @@ src_unpack() { } src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare # Don't treat warnings as errors. sed -e 's/-Werror//' -i CMakeLists.txt || die @@ -109,7 +107,7 @@ src_configure() { -DDISABLE_DISCORD_RPC=ON -DDISABLE_GOOGLE_BENCHMARK=ON -DDISABLE_GUI=$(usex dedicated) - -DDISABLE_HTTP_TWITCH=$(usex !twitch) + -DDISABLE_HTTP=OFF -DDISABLE_NETWORK=OFF $(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "") -DDISABLE_TTF=$(usex !truetype) @@ -117,6 +115,8 @@ src_configure() { -DDOWNLOAD_REPLAYS=OFF -DDOWNLOAD_TITLE_SEQUENCES=OFF -DENABLE_LIGHTFX=$(usex lightfx) + -DENABLE_SCRIPTING=$(usex scripting) + -DOPENRCT2_USE_CCACHE=OFF -DPORTABLE=OFF -DSTATIC=OFF $(usex test "-DSYSTEM_GTEST=ON" "") @@ -124,7 +124,7 @@ src_configure() { -DUSE_MMAP=ON ) - cmake-utils_src_configure + cmake_src_configure } src_test() { @@ -135,11 +135,13 @@ src_test() { # See: https://github.com/OpenRCT2/OpenRCT2/issues/6473 ln -s "${S}"/data "${BUILD_DIR}" || die - cmake-utils_src_test + cmake_src_test } src_install() { - cmake-utils_src_install + use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" ) + + cmake_src_install if use dedicated; then newinitd "${FILESDIR}"/openrct2.initd openrct2 diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild index a54869ba1345..f0a1d342c950 100644 --- a/games-simulation/openrct2/openrct2-9999.ebuild +++ b/games-simulation/openrct2/openrct2-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils git-r3 readme.gentoo-r1 xdg-utils +inherit cmake git-r3 readme.gentoo-r1 xdg-utils EGIT_REPO_URI="https://github.com/OpenRCT2/OpenRCT2.git" EGIT_BRANCH="develop" @@ -12,8 +12,8 @@ MY_PN="OpenRCT2" MY_PN_OBJ="objects" MY_PN_RPL="replays" MY_PN_TS="title-sequences" -MY_PV_OBJ="1.0.14" -MY_PV_RPL="0.0.12" +MY_PV_OBJ="1.0.16" +MY_PV_RPL="0.0.17" MY_PV_TS="0.1.2c" DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2" @@ -27,25 +27,23 @@ SRC_URI=" LICENSE="GPL-3" SLOT="0" KEYWORDS="" -IUSE="dedicated libressl +lightfx +opengl test +truetype twitch" +IUSE="dedicated libressl +lightfx +opengl scripting test +truetype" COMMON_DEPEND=" - dev-lang/duktape dev-libs/icu:= dev-libs/jansson dev-libs/libzip:= media-libs/libpng:0= + net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) - twitch? ( - net-misc/curl[ssl] - ) ) libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) + scripting? ( dev-lang/duktape ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 @@ -74,13 +72,14 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch" + "${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch" ) src_unpack() { git-r3_src_unpack - mkdir -p "${S}"/data/title || die - cd "${S}"/data/title || die + mkdir -p "${S}"/data/sequence || die + cd "${S}"/data/sequence || die unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".zip mkdir -p "${S}"/data/object || die @@ -95,7 +94,7 @@ src_unpack() { } src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare # Don't treat warnings as errors. sed -e 's/-Werror//' -i CMakeLists.txt || die @@ -108,7 +107,7 @@ src_configure() { -DDISABLE_DISCORD_RPC=ON -DDISABLE_GOOGLE_BENCHMARK=ON -DDISABLE_GUI=$(usex dedicated) - -DDISABLE_HTTP_TWITCH=$(usex !twitch) + -DDISABLE_HTTP=OFF -DDISABLE_NETWORK=OFF $(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "") -DDISABLE_TTF=$(usex !truetype) @@ -116,6 +115,8 @@ src_configure() { -DDOWNLOAD_REPLAYS=OFF -DDOWNLOAD_TITLE_SEQUENCES=OFF -DENABLE_LIGHTFX=$(usex lightfx) + -DENABLE_SCRIPTING=$(usex scripting) + -DOPENRCT2_USE_CCACHE=OFF -DPORTABLE=OFF -DSTATIC=OFF $(usex test "-DSYSTEM_GTEST=ON" "") @@ -123,7 +124,7 @@ src_configure() { -DUSE_MMAP=ON ) - cmake-utils_src_configure + cmake_src_configure } src_test() { @@ -134,11 +135,13 @@ src_test() { # See: https://github.com/OpenRCT2/OpenRCT2/issues/6473 ln -s "${S}"/data "${BUILD_DIR}" || die - cmake-utils_src_test + cmake_src_test } src_install() { - cmake-utils_src_install + use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" ) + + cmake_src_install if use dedicated; then newinitd "${FILESDIR}"/openrct2.initd openrct2 |