From 46eedbedafdb0040c37884982d4c775ce277fb7b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Oct 2021 10:22:14 +0100 Subject: gentoo resync : 20.10.2021 --- .../EmptyEpsilon/EmptyEpsilon-2021.06.23.ebuild | 68 +++++++++++++++++++++ games-simulation/EmptyEpsilon/Manifest | 6 ++ ...yEpsilon-Make-CMake-call-find_package-glm.patch | 35 +++++++++++ .../files/SeriousProton-Unbundle-json11.patch | 27 ++++++++ games-simulation/EmptyEpsilon/metadata.xml | 8 +++ games-simulation/Manifest.gz | Bin 3745 -> 3918 bytes games-simulation/corsix-th/Manifest | 2 +- games-simulation/corsix-th/corsix-th-0.65.1.ebuild | 2 +- 8 files changed, 146 insertions(+), 2 deletions(-) create mode 100644 games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23.ebuild create mode 100644 games-simulation/EmptyEpsilon/Manifest create mode 100644 games-simulation/EmptyEpsilon/files/EmptyEpsilon-Make-CMake-call-find_package-glm.patch create mode 100644 games-simulation/EmptyEpsilon/files/SeriousProton-Unbundle-json11.patch create mode 100644 games-simulation/EmptyEpsilon/metadata.xml (limited to 'games-simulation') diff --git a/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23.ebuild b/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23.ebuild new file mode 100644 index 000000000000..5d9e67d4a9fb --- /dev/null +++ b/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake toolchain-funcs + +DESCRIPTION="A spaceship bridge simulator game." +HOMEPAGE="https://daid.github.io/EmptyEpsilon/" +# This bundles SeriousProton as the build system does not support using +# a separate SeriousProton instance (and currently EmptyEpsilon seems to +# be the only consumer). +SRC_URI="https://github.com/daid/EmptyEpsilon/archive/EE-${PV}.tar.gz -> EmptyEpsilon-${PV}.tar.gz + https://github.com/daid/SeriousProton/archive/EE-${PV}.tar.gz -> SeriousProton-${PV}.tar.gz" + +# EmptyEpsilon is mostly licensed under GPL, however the art ressources +# use Creative Commons and the bundled SeriousProton is MIT-licensed. +LICENSE="GPL-2 CC-BY-SA-3.0 MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + >=dev-cpp/json11-1.0.0 + media-libs/libglvnd + media-libs/libsfml + >=media-libs/glm-0.9.9.8 +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/EmptyEpsilon-EE-${PV}" + +pkg_pretend() { + if [[ ${MERGE_TYPE} == "binary" ]]; then + return + fi + + if tc-is-gcc; then + if [[ $(gcc-major-version) -lt 11 ]]; then + # ld: /usr/lib64/libsfml-audio.so: undefined reference to `std::__throw_bad_array_new_length()@GLIBCXX_3.a4.29' + eerror "${PN} requires GCC >= 11. Run gcc-config to switch your default compiler." + die "Need at least GCC >= 11" + fi + fi +} + +src_prepare() { + eapply "${FILESDIR}/${PN}-Make-CMake-call-find_package-glm.patch" + eapply --directory="${WORKDIR}/SeriousProton-EE-${PV}" \ + "${FILESDIR}/SeriousProton-Unbundle-json11.patch" + + eapply_user + + cmake_src_prepare +} + +src_configure() { + local version=( $(ver_rs 1- ' ') ) + local mycmakeargs=( + -DSERIOUS_PROTON_DIR="${WORKDIR}/SeriousProton-EE-${PV}/" + -DOpenGL_GL_PREFERENCE=GLVND + -DCPACK_PACKAGE_VERSION="${PV}" + -DCPACK_PACKAGE_VERSION_MAJOR="${version[0]}" + -DCPACK_PACKAGE_VERSION_MINOR="${version[1]}" + -DCPACK_PACKAGE_VERSION_PATCH="${version[2]}" + ) + + cmake_src_configure +} diff --git a/games-simulation/EmptyEpsilon/Manifest b/games-simulation/EmptyEpsilon/Manifest new file mode 100644 index 000000000000..1cd180e3724e --- /dev/null +++ b/games-simulation/EmptyEpsilon/Manifest @@ -0,0 +1,6 @@ +AUX EmptyEpsilon-Make-CMake-call-find_package-glm.patch 1056 BLAKE2B 9522b7e2b45531ebd82e1f454a889ccd4c688adcbcdb753ca3c0c23ee2f0b94ed9537956bbbd8faca8305065017daf178278d5c14661d68de24d9c008339d6f2 SHA512 c6ccddf2a9f6fc7342428d5c197bec6fc01f24e3c9c9aa19bbccedba3c16bd825f59566fb0239b64bdd3914abfd584382742544f79c4266eef6e4ee7aabf3238 +AUX SeriousProton-Unbundle-json11.patch 722 BLAKE2B ab12cf044d38bc78eac3d4fdd7f3c9db062784177e848ca62135b356fec88be9876fa98f23d1195e3c3a2ef791166cb3c0fe220bce9c53a667b628a2e3602eb4 SHA512 da912f148738a409dd1eee4a8a926930ed31220c9b6477eb8a89da797dd659e2a576ca44875410cbc46c86f7d5b6e44037ed3f44c8d7ecd5a4680f12f626f013 +DIST EmptyEpsilon-2021.06.23.tar.gz 285211647 BLAKE2B 813b7e02ff7f046b7f28139063441eb421861b720c7b55d25930d3a418211fefdce7ac0e6ab705b4afe52df58f85a9298ff3e6be883a841e6eb9f7037eca297b SHA512 209ea68d99ef5ef53f1e3484d6471cafc01d4cb6505609a5b41d468387147127b4b4bbc20af75404d2cdef3d3cfb37bbb7f6fb3ae336d2f7e264e9c470ad7764 +DIST SeriousProton-2021.06.23.tar.gz 1181117 BLAKE2B 433280b7f6994bed0b86ffc4135a1e91bd9521c508b875332d17dc041da6b77a4260de784b6b75e79aab072d6bc68108a8b6b4949d674670f1d13ed1abe90d7e SHA512 4519801c30cd87436704023090ce39299573b02637a86b0d5c6ac0f4e99b4bddc6724b2b660edfd29d33a908b67268409a8c47dab7b5d59958a5abd52d5610bf +EBUILD EmptyEpsilon-2021.06.23.ebuild 1957 BLAKE2B 9c88c669ee835bbf244392a85c334cac0cb9470605af2f196f9141476ebc6f7ca918a51025206b5b9bac3ee3ff93bb1e7250e1911bda3ccc213f1849fa6a17ee SHA512 bad61aca9a503fb24c47fdcdf7ce008e2c6ba6f92de4c8546dd1218e4991a365bf617db3f2bab9a0ebf366a8ef263cc91c7073705da9283c236701e8ce378de3 +MISC metadata.xml 246 BLAKE2B e270b04a529da44d267eaf5bfd160569fc99a3521dfc6495e0a4db19c98e5b9badf77774cc80c7be905f3e97b1c75784bc7b4cb6bfe659d726a47c7ae70e7bfb SHA512 7e2151bbca24beeefd585e18d6c1108442b2d9197679876bb180da3d4896602e83ea701432ff67fc61cccfa9bf642a01a62d87bacf32c55e0a54336c7c5a2c53 diff --git a/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Make-CMake-call-find_package-glm.patch b/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Make-CMake-call-find_package-glm.patch new file mode 100644 index 000000000000..da52f0267f77 --- /dev/null +++ b/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Make-CMake-call-find_package-glm.patch @@ -0,0 +1,35 @@ +From 7efb73d1a964f04646dba692323c1affcb25d16e Mon Sep 17 00:00:00 2001 +From: Florian Schmaus +Date: Fri, 8 Oct 2021 11:07:20 +0200 +Subject: [PATCH] Make CMake call find_package(glm) + +--- + CMakeLists.txt | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6fb5c88f6614..9d65d1ef2653 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -106,17 +106,7 @@ if(WITH_DISCORD) + endif() + + # GLM +-set(GLM_BASE_PATH "${EXTERNALS_DIR}") +- +-if(NOT EXISTS "${GLM_BASE_PATH}/glm/CMakeLists.txt") +- set(GLM_ZIP "${DOWNLOADS_DIR}/glm.zip") +- file(DOWNLOAD "https://github.com/g-truc/glm/releases/download/0.9.9.8/glm-0.9.9.8.zip" "${GLM_ZIP}" TIMEOUT 60 TLS_VERIFY ON) +- +- file(MAKE_DIRECTORY "${GLM_BASE_PATH}/glm") +- execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xf "${GLM_ZIP}" WORKING_DIRECTORY "${GLM_BASE_PATH}") +-endif() +- +-add_subdirectory("${GLM_BASE_PATH}/glm" "${PROJECT_BINARY_DIR}/glm" EXCLUDE_FROM_ALL) ++find_package(glm) + + set(SOURCES + src/main.cpp +-- +2.32.0 + diff --git a/games-simulation/EmptyEpsilon/files/SeriousProton-Unbundle-json11.patch b/games-simulation/EmptyEpsilon/files/SeriousProton-Unbundle-json11.patch new file mode 100644 index 000000000000..deb44e9aee00 --- /dev/null +++ b/games-simulation/EmptyEpsilon/files/SeriousProton-Unbundle-json11.patch @@ -0,0 +1,27 @@ +From ae5ea143e6a9f57c797a96b9024c8acc60f05828 Mon Sep 17 00:00:00 2001 +From: Florian Schmaus +Date: Fri, 8 Oct 2021 13:26:27 +0200 +Subject: [PATCH] Unbundle json11 + +--- + CMakeLists.txt | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4b57a4f6631a..0a06c3186ff5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -86,10 +86,6 @@ add_subdirectory(src/lua) + add_subdirectory(src/GL) + add_subdirectory(src/libopus) + +-if(SERIOUSPROTON_WITH_JSON) +- add_subdirectory(src/json11) +-endif() +- + #---------------------------------File lists----------------------------------- + set(source_files #All SeriousProton's objects to compile + src/clipboard.cpp +-- +2.32.0 + diff --git a/games-simulation/EmptyEpsilon/metadata.xml b/games-simulation/EmptyEpsilon/metadata.xml new file mode 100644 index 000000000000..87a759d410cf --- /dev/null +++ b/games-simulation/EmptyEpsilon/metadata.xml @@ -0,0 +1,8 @@ + + + + + Florian Schmaus + flow@gentoo.org + + diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz index 75c895d58e4f..56b2e2ee24f9 100644 Binary files a/games-simulation/Manifest.gz and b/games-simulation/Manifest.gz differ diff --git a/games-simulation/corsix-th/Manifest b/games-simulation/corsix-th/Manifest index 23268ef749d2..808ea87a15d1 100644 --- a/games-simulation/corsix-th/Manifest +++ b/games-simulation/corsix-th/Manifest @@ -2,5 +2,5 @@ AUX corsix-th-0.64-cmake_lua_detection.patch 288 BLAKE2B 90673498871c16f48c752c5 DIST corsix-th-0.64.tar.gz 4062048 BLAKE2B 2b807a5c712a19cac80bae613065dd8c9e1219573a3c288c1433b6fa857c3a93632e9c51ba126a70626b4044d469ca1ebc815257f291fa9f86ea94491aae35fe SHA512 c02d07ae4fb9a1ce008f32c4b9ea12a949316feddca4e2a29e860e0d88efdfa0440d372b00b9d3eda5e5c3ca739085510ebe8650790d06a7e91255b7d0990e6c DIST corsix-th-0.65.1.tar.gz 4163922 BLAKE2B c1d9255e41521876716b377579642ed46b9fc54823816dc431f7b56ffa532af7091ae0b1e291bb1c4fb74165ca07786e0991a990c90bc3a13e234ba31c6fa706 SHA512 b7e964c22517b94cb1dafb0529368c87a2e58cf1f784062b9f2f72749ba69523b63d4f846ebd582c71cf5ca7e7c437a34717ca3877ad3737139ba2fd6a316577 EBUILD corsix-th-0.64-r100.ebuild 1952 BLAKE2B 02649e3c0f2de55cb02e036e330080f36aa07dd4e170ac18ea391adbaf041e3cac9d02abee22541442ec5c4dc0649f881b558c18f4af4f488b4525a823682486 SHA512 8e0708ae6c2fc61a59c3951a556e9ce38ae24c24903cc282e4712f47f5f44892e34c02ff52134be5136c6e5809cfc0bd9796ae550826bdda69ae683f7480d22f -EBUILD corsix-th-0.65.1.ebuild 1923 BLAKE2B a7a1da03327d47ae76baca6f6db3d31595d4797209e9fcd63456e391071bf6ce930ac5b920addc0110825345cd24415133f5cb4bc33a82644ef648d0037bb834 SHA512 a16e7f70f62a92ffcca948d6c6c74a33b2d8e3b8b3cd38de95daf378dccb16852e8012a2a607f9eef9ca94cd00ec4f60f3607b8b63c691118eaec52d447beba6 +EBUILD corsix-th-0.65.1.ebuild 1930 BLAKE2B 03c8ea8fe8c05ce95ac543412c70e2d63ceb1bfebd3369f94ff566ea723466f744a485436adf31d270c40172f49a37dff1f1bcc407f3b730e0486cbc1173f39a SHA512 0c901db2b7f5bcfc5c846fea06654d0580357137e06ff27b3140db4b7b41c13303d72361980b0792a29d140cefe4b36600e3a6bac247fc481a38d31961d6983f MISC metadata.xml 717 BLAKE2B c32582188f6a89239fbec43977d4d126075de2d599c8496ebf01e0a7d919550739913d0290afb24544cc8ea4ff2177a89bbcdaa14ba5e4654d8a7f7db07be294 SHA512 3b3387491e7c51efcc777675e9b996c5648b8e0f5fc7319345a500e60aad08c2a5ca5a9fc0d46928fc60346151232daaf719e7a5ed5fb8a1bc03c40313652ca5 diff --git a/games-simulation/corsix-th/corsix-th-0.65.1.ebuild b/games-simulation/corsix-th/corsix-th-0.65.1.ebuild index 96f236c3d3d4..3ac363b27b5e 100644 --- a/games-simulation/corsix-th/corsix-th-0.65.1.ebuild +++ b/games-simulation/corsix-th/corsix-th-0.65.1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="doc +midi +sound +truetype +videos" REQUIRED_USE="${LUA_REQUIRED_USE}" -- cgit v1.2.3