commit: 2bd3b8b5eecd7e3f8211190b8b859af885bfec3c Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Thu Aug 11 07:01:08 2022 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Thu Aug 11 07:37:10 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bd3b8b5
games-strategy/s25rttr: drop 0.9.1 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> games-strategy/s25rttr/Manifest | 1 - ....0_pre20200723-boost-1.77-missing-include.patch | 17 --- .../s25rttr/files/s25rttr-0.9.1-cxx-std.patch | 30 ------ .../files/s25rttr-0.9.1-libsamplerate.patch | 37 ------- games-strategy/s25rttr/s25rttr-0.9.1.ebuild | 115 --------------------- 5 files changed, 200 deletions(-) diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest index f479c8f76120..9fa2b734374c 100644 --- a/games-strategy/s25rttr/Manifest +++ b/games-strategy/s25rttr/Manifest @@ -1,2 +1 @@ -DIST s25client_src_v0.9.1.tar.gz 31042856 BLAKE2B 296e61467f5ba64f2a833e3f6627844db3757604d9b239d18f3a2b42afc7f46df09ff3b9e8d8a26865e5220f8996b6e78fd4d5fe6252510bbdf8fc238de40bfc SHA512 b7478f76e0246c52a219d9ef5293d56fe682dc87bcd1269d1647417d86c5174632bf05f1fe09e91a9bf9d6738f58e1cac51abdc54df47c00d228687767e19510 DIST s25client_src_v0.9.5.tar.gz 30305585 BLAKE2B 77857743b5a1693ed373cb048c40fed150a4bf3d59f1314ffbb268f3e03ba8db2f44c20962c390f3a8c5b5b443ee0465d5c7bf726998ddf0334a861304211db8 SHA512 4926653075c7ba01e1e4ca516c52ad1694b46557c40c418e2a1f18d0a8fac9d4b73c20adc5403365ad6ba643823ed23dff5296717b3e057c42b17f1c20feb802 diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch deleted file mode 100644 index 9a69797ea27a..000000000000 --- a/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://github.com/Return-To-The-Roots/s25client/pull/1431 - -From: Sam James <[email protected]> -Date: Thu, 19 Aug 2021 02:41:42 +0100 -Subject: [PATCH] Fix build with Boost 1.77 (missing <algorithm> include) - -Closes: https://bugs.gentoo.org/808767 ---- a/libs/s25main/convertSounds.cpp -+++ b/libs/s25main/convertSounds.cpp -@@ -20,6 +20,7 @@ - #include <libsiedler2/ArchivItem_Sound_Wave.h> - #include <libsiedler2/loadMapping.h> - #include <s25util/StringConversion.h> -+#include <algorithm> - #include <cmath> - #include <samplerate.hpp> - #include <sstream> diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.1-cxx-std.patch b/games-strategy/s25rttr/files/s25rttr-0.9.1-cxx-std.patch deleted file mode 100644 index cb5ecdf28220..000000000000 --- a/games-strategy/s25rttr/files/s25rttr-0.9.1-cxx-std.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5db419d044149ab3760c1588b44536febab5d657 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <[email protected]> -Date: Sat, 11 Sep 2021 08:41:57 +0100 -Subject: [PATCH] Set C++ standard (to C++14) using CMake - -Not adding the -std flag broke builds with GCC 11 until the code was -fixed up recently. This should prevent this sort of thing from -happening in future. It also ensures that the compiler is actually new -enough. ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8ab991c97..b55c545a2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -22,6 +22,9 @@ if(DEFINED CMAKE_TOOLCHAIN_FILE) - message(STATUS "Used Toolchain definition file '${CMAKE_TOOLCHAIN_FILE}'") - endif() - -+set(CMAKE_CXX_STANDARD 14) -+set(CXX_STANDARD_REQUIRED ON) -+ - list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules" "${CMAKE_SOURCE_DIR}/external/libutil/cmake") - if(CMAKE_VERSION VERSION_LESS 3.14) - list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/external/libutil/cmake/cmake_3.14") --- -2.32.0 - diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.1-libsamplerate.patch b/games-strategy/s25rttr/files/s25rttr-0.9.1-libsamplerate.patch deleted file mode 100644 index 41d6d90e5fd8..000000000000 --- a/games-strategy/s25rttr/files/s25rttr-0.9.1-libsamplerate.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 16cb06c99f78a21b1be2bc681c1f1d85a6caddca Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <[email protected]> -Date: Fri, 10 Sep 2021 22:59:51 +0100 -Subject: [PATCH] Fix bad channel count handling with libsamplerate 0.2.0 - -Since libsndfile/libsamplerate@26d92c369394bcd0b0cea488890edce1a0d757d5, -initialising libsamplerate with 0 channels or less causes a SIGABRT. We -therefore need to handle this in the C++ wrapper classes. ---- - libs/libsamplerate/include/samplerate.hpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/libs/libsamplerate/include/samplerate.hpp b/libs/libsamplerate/include/samplerate.hpp -index d0af34317..23e243d91 100644 ---- a/libs/libsamplerate/include/samplerate.hpp -+++ b/libs/libsamplerate/include/samplerate.hpp -@@ -152,6 +152,8 @@ class State : public detail::StateBase - { - static SRC_STATE* createOrThrow(Converter converter, int channels) - { -+ if (channels <= 0) -+ throw std::runtime_error("Channel count must be >= 1."); - int error; - auto* state = src_new(static_cast<int>(converter), channels, &error); - if(!state) -@@ -174,6 +176,8 @@ class StateCallback : public detail::StateBase - { - static SRC_STATE* createOrThrow(Converter converter, int channels, src_callback_t func, void* data) - { -+ if (channels <= 0) -+ throw std::runtime_error("Channel count must be >= 1."); - int error; - auto* state = src_callback_new(func, static_cast<int>(converter), channels, &error, data); - if(!state) --- -2.32.0 - diff --git a/games-strategy/s25rttr/s25rttr-0.9.1.ebuild b/games-strategy/s25rttr/s25rttr-0.9.1.ebuild deleted file mode 100644 index 1cf08d68bd4e..000000000000 --- a/games-strategy/s25rttr/s25rttr-0.9.1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-3 ) - -inherit desktop flag-o-matic lua-single toolchain-funcs xdg cmake - -MY_PN="s25client" -DESCRIPTION="Open source remake of The Settlers II: Gold Edition (needs original data files)" -HOMEPAGE="https://www.siedler25.org/"; -SRC_URI="https://github.com/Return-To-The-Roots/${MY_PN}/releases/download/v${PV}/${MY_PN}_src_v${PV}.tar.gz"; -LICENSE="GPL-2+ GPL-3 Boost-1.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" -REQUIRED_USE="${LUA_REQUIRED_USE}" - -RDEPEND="${LUA_DEPS} - app-arch/bzip2 - >=dev-libs/boost-1.73:0=[nls] - >=media-libs/libsamplerate-0.1.9 - >=media-libs/libsdl2-2.0.10-r2[opengl,sound,video] - media-libs/libsndfile - media-libs/sdl2-mixer[vorbis,wav] - net-libs/miniupnpc - virtual/opengl -" - -DEPEND=" - ${RDEPEND} - test? ( >=sys-devel/clang-5 ) -" - -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.9.0_pre20200723-boost-1.77-missing-include.patch - "${FILESDIR}"/${PN}-0.9.0_pre20200723-cmake_lua_version.patch - "${FILESDIR}"/${PN}-0.9.1-libsamplerate.patch - "${FILESDIR}"/${PN}-0.9.1-cxx-std.patch -) - -S="${WORKDIR}/${MY_PN}_v${PV}" - -# Build type is checked but blank is valid. -CMAKE_BUILD_TYPE= - -src_prepare() { - cmake_src_prepare - rm -v external/{kaguya,libutil}/cmake/FindLua.cmake || die -} - -src_configure() { - if [[ -f revision.txt ]]; then - local RTTR_REVISION="$(< revision.txt)" - elif [[ -n ${COMMIT} ]]; then - local RTTR_REVISION="${COMMIT}" - else - die "Could not determine RTTR_REVISION." - fi - - local mycmakeargs=( - -DBUILD_TESTING=$(usex test) - -DCCACHE_PROGRAM=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_ClangFormat=ON - -DCMAKE_SKIP_RPATH=ON - -DLUA_VERSION=$(lua_get_version) - -DRTTR_BUILD_UPDATER=OFF - -DRTTR_ENABLE_OPTIMIZATIONS=OFF - -DRTTR_ENABLE_SANITIZERS=$(usex test) - -DRTTR_ENABLE_WERROR=OFF - -DRTTR_INCLUDE_DEVTOOLS=OFF - -DRTTR_LIBDIR="$(get_libdir)" - -DRTTR_REVISION="${RTTR_REVISION}" - -DRTTR_USE_SYSTEM_LIBS=ON - -DRTTR_VERSION="${PV##*_pre}" # Tests expect a date for snapshots. - ) - - if use test && tc-is-gcc; then - # Work around libasan and libsandbox both wanting to be first. - append-ldflags -static-libasan - fi - - cmake_src_configure -} - -src_test() { - SDL_AUDIODRIVER=dummy \ - SDL_VIDEODRIVER=dummy \ - USER=$(whoami) \ - cmake_src_test -} - -src_install() { - cmake_src_install - - doicon -s 64 tools/release/debian/s25rttr.png - make_desktop_entry "${MY_PN}" "Return to the Roots" -} - -pkg_postinst() { - xdg_pkg_postinst - - if ! has_version -r games-strategy/settlers-2-gold-data; then - elog "Install games-strategy/settlers-2-gold-data or manually copy the DATA" - elog "and GFX directories from original data files into" - elog "${EPREFIX}/usr/share/${PN}/S2." - fi -}
