* [gentoo-commits] repo/gentoo:master commit in: games-strategy/s25rttr/, games-strategy/s25rttr/files/
@ 2016-04-20 18:40 Michael Sterrett
0 siblings, 0 replies; 6+ messages in thread
From: Michael Sterrett @ 2016-04-20 18:40 UTC (permalink / raw
To: gentoo-commits
commit: b631809ebee511cf95235b92ff32ee0808ebbcd0
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 18:39:48 2016 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 18:40:13 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b631809e
games-strategy/s25rttr: make cmake3 quieter with patch from tt_1 via bug #570716
Package-Manager: portage-2.2.26
.../s25rttr/files/s25rttr-0.8.1-cmake-3.patch | 23 ++++++++++++++++++++++
games-strategy/s25rttr/s25rttr-0.8.1-r1.ebuild | 3 ++-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake-3.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake-3.patch
new file mode 100644
index 0000000..b7e9e42
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake-3.patch
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fcbfb02..ae1c5f0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,12 +2,12 @@
+ ### $Id: CMakeLists.txt 8341 2012-09-30 12:09:04Z FloSoft $
+ ################################################################################
+
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
+-CMAKE_POLICY(SET CMP0003 OLD)
+-
+-IF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 7 AND ${CMAKE_PATCH_VERSION} GREATER 0)
+- CMAKE_POLICY(SET CMP0015 OLD)
+-ENDIF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 7 AND ${CMAKE_PATCH_VERSION} GREATER 0)
++CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)
++CMAKE_POLICY(SET CMP0003 NEW)
++CMAKE_POLICY(SET CMP0015 NEW)
++IF(NOT CMAKE_VERSION VERSION_LESS 3.1)
++ CMAKE_POLICY(SET CMP0053 NEW)
++ENDIF()
+
+ SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
+
diff --git a/games-strategy/s25rttr/s25rttr-0.8.1-r1.ebuild b/games-strategy/s25rttr/s25rttr-0.8.1-r1.ebuild
index 15d3098..b8d00d7 100644
--- a/games-strategy/s25rttr/s25rttr-0.8.1-r1.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.8.1-r1.ebuild
@@ -33,7 +33,8 @@ src_prepare() {
"${FILESDIR}"/${P}-soundconverter.patch \
"${FILESDIR}"/${P}-fpic.patch \
"${FILESDIR}"/${P}-format.patch \
- "${FILESDIR}"/${P}-miniupnpc-api-14.patch
+ "${FILESDIR}"/${P}-miniupnpc-api-14.patch \
+ "${FILESDIR}"/${P}-cmake-3.patch
}
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/s25rttr/, games-strategy/s25rttr/files/
@ 2017-07-30 9:10 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2017-07-30 9:10 UTC (permalink / raw
To: gentoo-commits
commit: 5b992a86ad44740a6a3509c8a6fd10d7c33db97b
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sat Jul 22 23:20:47 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jul 30 09:09:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b992a86
games-strategy/s25rttr: Fix building with GCC-6
Bug: https://bugs.gentoo.org/show_bug.cgi?id=610972
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/5177
.../s25rttr/files/s25rttr-0.8.1-gcc6.patch | 84 ++++++++++++++++++++++
games-strategy/s25rttr/s25rttr-0.8.1-r2.ebuild | 5 +-
2 files changed, 87 insertions(+), 2 deletions(-)
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-gcc6.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-gcc6.patch
new file mode 100644
index 00000000000..957ecf4ddf5
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-gcc6.patch
@@ -0,0 +1,84 @@
+Bug: https://bugs.gentoo.org/610972
+Commit: https://github.com/Return-To-The-Roots/mygettext/commit/3b902a46322b7e88e9d2cdf85ee0912c6565f9a2
+
+--- a/driver/audio/SDL/src/SDL.cpp
++++ b/driver/audio/SDL/src/SDL.cpp
+@@ -175,23 +175,23 @@
+
+ char file[512];
+ if(!tempname(file, 512))
+- return false;
++ return NULL;
+
+ strncat(file, ".wav", 512);
+
+ FILE *dat = fopen(file, "wb");
+ if(!dat)
+- return false;
++ return NULL;
+
+ if(fwrite(data, 1, size, dat) != size)
+- return false;
++ return NULL;
+
+ fclose(dat);
+
+ switch(data_type)
+ {
+ default:
+- return false;
++ return NULL;
+
+ case AudioDriver::AD_WAVE:
+ {
+@@ -233,12 +233,12 @@
+
+ char file[512];
+ if(!tempname(file, 512))
+- return false;
++ return NULL;
+
+ switch(data_type)
+ {
+ default:
+- return false;
++ return NULL;
+
+ case AudioDriver::AD_MIDI:
+ {
+@@ -266,10 +266,10 @@
+
+ FILE *dat = fopen(file, "wb");
+ if(!dat)
+- return false;
++ return NULL;
+
+ if(fwrite(data, 1, size, dat) != size)
+- return false;
++ return NULL;
+
+ fclose(dat);
+
+--- a/src/VideoDriverWrapper.cpp
++++ b/src/VideoDriverWrapper.cpp
+@@ -481,7 +481,7 @@
+ if(videodriver == NULL)
+ {
+ fatal_error("Kein Videotreiber ausgewaehlt!\n");
+- return false;
++ return NULL;
+ }
+
+ return videodriver->GetFunction(extension);
+--- a/mygettext/src/mygettext.h
++++ b/mygettext/src/mygettext.h
+@@ -21,6 +21,9 @@
+
+ #pragma once
+
++// necessarily here
++#include <locale>
++
+ const char *mysetlocale(int category, const char *locale);
+
+ #undef gettext
diff --git a/games-strategy/s25rttr/s25rttr-0.8.1-r2.ebuild b/games-strategy/s25rttr/s25rttr-0.8.1-r2.ebuild
index 33047efc962..9ecfd153901 100644
--- a/games-strategy/s25rttr/s25rttr-0.8.1-r2.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.8.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -32,7 +32,8 @@ src_prepare() {
"${FILESDIR}"/${P}-fpic.patch \
"${FILESDIR}"/${P}-format.patch \
"${FILESDIR}"/${P}-miniupnpc-api-14.patch \
- "${FILESDIR}"/${P}-cmake-3.patch
+ "${FILESDIR}"/${P}-cmake-3.patch \
+ "${FILESDIR}"/${P}-gcc6.patch
}
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/s25rttr/, games-strategy/s25rttr/files/
@ 2021-05-11 17:41 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-05-11 17:41 UTC (permalink / raw
To: gentoo-commits
commit: 314021bd92f94f189fb7d8e7f39d236f701ff0e6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 11 17:41:14 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 11 17:41:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=314021bd
games-strategy/s25rttr: fix GCC 11 build
Closes: https://bugs.gentoo.org/787299
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/s25rttr-0.9.0_pre20200723-gcc11-include.patch | 12 ++++++++++++
games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild | 6 +++++-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-gcc11-include.patch b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-gcc11-include.patch
new file mode 100644
index 00000000000..31cca620a3f
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-gcc11-include.patch
@@ -0,0 +1,12 @@
+https://github.com/Return-To-The-Roots/libsiedler2/commit/cb2994d5bb6407d4b12f681268e6b123d9b366f5.patch
+https://bugs.gentoo.org/787299
+--- a/external/libsiedler2/include/libsiedler2/XMIDI_TrackConverter.h
++++ b/external/libsiedler2/include/libsiedler2/XMIDI_TrackConverter.h
+@@ -18,6 +18,7 @@
+ #pragma once
+
+ #include <array>
++#include <cstddef>
+ #include <cstdint>
+ #include <vector>
+
diff --git a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild
index 001f1128ae1..dc54ef2deaf 100644
--- a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -59,6 +59,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-0.9.0_pre20200723-cmake_lua_version.patch
+ "${FILESDIR}"/${P}-gcc11-include.patch
)
S="${WORKDIR}/s25client-${COMMIT}"
@@ -102,6 +103,9 @@ src_configure() {
-DLUA_VERSION=$(lua_get_version)
)
+ # bug #787299
+ append-cxxflags -std=gnu++14
+
if use test && tc-is-gcc; then
# Work around libasan and libsandbox both wanting to be first.
append-ldflags -static-libasan
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/s25rttr/, games-strategy/s25rttr/files/
@ 2021-09-11 8:38 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2021-09-11 8:38 UTC (permalink / raw
To: gentoo-commits
commit: a036e0fc13782c8f6f3ab56c8c52e789058069d5
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 11 08:36:18 2021 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Sep 11 08:36:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a036e0fc
games-strategy/s25rttr: Drop old 0.9.0_pre20200723-r100
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-strategy/s25rttr/Manifest | 11 --
....0_pre20200723-boost-1.77-missing-include.patch | 17 ---
.../s25rttr-0.9.0_pre20200723-gcc11-include.patch | 12 --
.../s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild | 141 ---------------------
4 files changed, 181 deletions(-)
diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest
index d80aad01563..1ff5968c027 100644
--- a/games-strategy/s25rttr/Manifest
+++ b/games-strategy/s25rttr/Manifest
@@ -1,12 +1 @@
-DIST s25client-f0b97b120140c96bbeacae9c22633f899931db69.tar.gz 20184306 BLAKE2B 4204a62e0a57a614c5ae1a947741f8f92fd7cd75b203467716483baa6f68a7c608033f403337e66b00bc8c2851b03f04c25bf84cda124548cfe09a110478fc54 SHA512 c4f0b59a68a0d5ece57f06f51e7a977be0b41ae85ff57821b317c2bb822a2533a192e1dfaa1a738c6738e65505a70ec34b3e7b22a8bd6effc95a4279d5eb19da
DIST s25client_src_v0.9.1.tar.gz 31042856 BLAKE2B 296e61467f5ba64f2a833e3f6627844db3757604d9b239d18f3a2b42afc7f46df09ff3b9e8d8a26865e5220f8996b6e78fd4d5fe6252510bbdf8fc238de40bfc SHA512 b7478f76e0246c52a219d9ef5293d56fe682dc87bcd1269d1647417d86c5174632bf05f1fe09e91a9bf9d6738f58e1cac51abdc54df47c00d228687767e19510
-DIST s25rttr-kaguya-38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz 156126 BLAKE2B 05eeccc890549b8dd3fa004c61b73be65f1fcf20867b7f4a46d0963f80b4a76fca611915ea72a401bdc49a81997d3d4500c5f5378a7cd55cbbfab6bcf647261a SHA512 470414d41cb6bad4e428858114f3c91139abfb1bf3ae02bb322d51bfabba8c0aad6796e183ccbb57624ed3484fea3f463636561ac8a359b6be7b90cfd5c0696a
-DIST s25rttr-languages-6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz 698512 BLAKE2B 82bc98077ed18622083894a63044194f599375c93aa745e330ad8ba390e14d9829ebb7c8e62141758f41dff2b72d3afbe2a5b6ebb584c3293c244e6f0c88ff89 SHA512 47de2791a4d4707fa17344de8fff8a15dd4436dd6e8c75adbd95273739cf5022e39a1024edee228eb27294e4f1f0b2a91110a1249b3d4fe64641cace051e4544
-DIST s25rttr-libendian-dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz 17008 BLAKE2B 98486acff6e56581b5dd06bba9892da739bf1947151f036ade31354c340b6dd79e1b77cd42475bc38225515392062c4e5dbf9ab28349356368db0ca90a81ee65 SHA512 1827edf6470f20a4b6a1b991a31af411e2cc5ceae36a65d54dbd6927dcf46949c4ad729ac982242da9a8ec9d141531d6c99792af761370b2252872bdbb7da8f0
-DIST s25rttr-liblobby-9275cbfa2303cc8235e96f275829be0d84efd3a4.tar.gz 24127 BLAKE2B 841ddec14b88cb057978bad87a710bafe9a358bd31614f0c855343f148ff52485894771c5fde85e4f31a769e679307e5608db71e2365e5205de2b72ea5429ffd SHA512 5334e84ff0f7aecd666b4f3832131c9d82767304d705fd51ac1a1d90beb68e65f7d9b16d89c8af682960f6639aa5c3e61403278685dc7f240c5c94c6148a8100
-DIST s25rttr-libsiedler2-5cb9993a32504337c63fd894266991445e0dcd65.tar.gz 495357 BLAKE2B ef421becde207866e3d88a3978e56e2ba289dbe86d83b682051dd8776f865eb7ce57a4fc7af42ef581fddd1d816be0d087e282ea1ec27eca9f5d1be429c6adc6 SHA512 9c4fa600d89d859a8336b672f56b697538a6ca6f6fa411236e53b6d0d2972487feba5c0ba024242dc8be2e65464290f95926224d74fa3b75e1531e798561ebf4
-DIST s25rttr-libutil-6c2ee0fa897541ea766533e03ebd53344908cf16.tar.gz 92326 BLAKE2B 3245cd7d6e5828b6b69dc99b920d8682d1e33a5d32b0ff21ae9f20fa31f2f6019245f7919ba4c9d1da30b166c56c903e8aafca77da4216338c612b5b812fc252 SHA512 afdda736dcf4f848df171b806a9cc4f667187f5ce525894471791ab6bebe004a589865654c973df71788019c0a2ac4621bf47d7202b772e895e51df628f494d6
-DIST s25rttr-mygettext-b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz 19270 BLAKE2B 76cacab478205f45897a75a868114211d4cfcc08cbfa9fa694ac0011dc9e6272d9d0e63b34d60264e6923038f830c06dd32279233f9d0ca42732b3963152f6e3 SHA512 22ce4169feb5fa7e5567c66a245e71d98a02dd6eee9214b2387b70ff5a592cca8445fc4e95b5403b33215fe418ed3cfeee9fe6a7d96ecddc7661556cb718cc35
-DIST s25rttr-s25edit-677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz 198489 BLAKE2B 47ffced26f1cceb78c0137e31114e463f0f5ad15fdb47e6a2809080a7874ce484918a0527e97b33db98c4a0daa338712c1b1a8b4992ac47d96f4e3b7056ee5e8 SHA512 0f5b4a4eeb72a906c86dac74c1bb41f5d4756c58240f59403932e388e523bed7d841ffa1d18dfd87454ab8c60b33e74cef27aec93995e37539868148bbee9900
-DIST s25rttr-s25maps-5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz 8013451 BLAKE2B 042ab804f4ec9babf7c975629fa3bd6856fb1fa4de0c4715420bca7e0f2dd72cc0909134750ba70c69344985bdd7a3a74576536cee80d6dfaf688c8cf82da8c0 SHA512 3339ced1fcca0fc9a37382d23c3c43f46c5e51d4c14b2657a79cd15dbd79ba8025bf8133dbbe45eb125b5c88370c90422faf21b65d95f471af3bb43de54a3210
-DIST s25rttr-turtle-9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz 98611 BLAKE2B 6187ab3109f1c9c20524752920e7b9f0e1de2c882bb09ce8c4d2d29899fbaf8a0e2627afc475f6c1527428d77e9a7a7c7332136ba5a79e33cad9c570fbc19042 SHA512 ba85c03cb3e857c501fcec0223ccb7dfccb99a961dd6594820640e133523f14275e764e196197ead05b739f490003b412e16ca2d0fcae8263ef4c256d252570a
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 9a69797ea27..00000000000
--- 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 <sam@gentoo.org>
-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.0_pre20200723-gcc11-include.patch b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-gcc11-include.patch
deleted file mode 100644
index 31cca620a3f..00000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-gcc11-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://github.com/Return-To-The-Roots/libsiedler2/commit/cb2994d5bb6407d4b12f681268e6b123d9b366f5.patch
-https://bugs.gentoo.org/787299
---- a/external/libsiedler2/include/libsiedler2/XMIDI_TrackConverter.h
-+++ b/external/libsiedler2/include/libsiedler2/XMIDI_TrackConverter.h
-@@ -18,6 +18,7 @@
- #pragma once
-
- #include <array>
-+#include <cstddef>
- #include <cstdint>
- #include <vector>
-
diff --git a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild
deleted file mode 100644
index f15c62bc0c1..00000000000
--- a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} )
-
-inherit desktop flag-o-matic lua-single toolchain-funcs xdg cmake
-
-DESCRIPTION="Open source remake of The Settlers II: Gold Edition (needs original data files)"
-HOMEPAGE="https://www.siedler25.org/"
-
-# To generate from git repo:
-# echo -e "COMMIT=\"$(git rev-parse HEAD)\"\nSRC_URI=\"\n\thttps://github.com/Return-To-The-Roots/s25client/archive/\${COMMIT}.tar.gz -> s25client-\${COMMIT}.tar.gz" && git submodule --quiet foreach --recursive 'url=$(git remote get-url origin); gh=${url#*github.com[:/]}; gh=${gh%.git}; echo -e "\thttps://github.com/${gh}/archive/${sha1}.tar.gz -> \${PN}-${gh##*/}-${sha1}.tar.gz"' | egrep -v "/(dev-tools|libsamplerate|s25update)/" | sort && echo '"'
-COMMIT="f0b97b120140c96bbeacae9c22633f899931db69"
-SRC_URI="
- https://github.com/Return-To-The-Roots/s25client/archive/${COMMIT}.tar.gz -> s25client-${COMMIT}.tar.gz
- https://github.com/mat007/turtle/archive/9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz -> ${PN}-turtle-9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz
- https://github.com/Return-To-The-Roots/languages/archive/6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz -> ${PN}-languages-6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz
- https://github.com/Return-To-The-Roots/libendian/archive/dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz -> ${PN}-libendian-dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz
- https://github.com/Return-To-The-Roots/liblobby/archive/9275cbfa2303cc8235e96f275829be0d84efd3a4.tar.gz -> ${PN}-liblobby-9275cbfa2303cc8235e96f275829be0d84efd3a4.tar.gz
- https://github.com/Return-To-The-Roots/libsiedler2/archive/5cb9993a32504337c63fd894266991445e0dcd65.tar.gz -> ${PN}-libsiedler2-5cb9993a32504337c63fd894266991445e0dcd65.tar.gz
- https://github.com/Return-To-The-Roots/libutil/archive/6c2ee0fa897541ea766533e03ebd53344908cf16.tar.gz -> ${PN}-libutil-6c2ee0fa897541ea766533e03ebd53344908cf16.tar.gz
- https://github.com/Return-To-The-Roots/mygettext/archive/b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz -> ${PN}-mygettext-b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz
- https://github.com/Return-To-The-Roots/s25edit/archive/677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz -> ${PN}-s25edit-677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz
- https://github.com/Return-To-The-Roots/s25maps/archive/5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz -> ${PN}-s25maps-5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz
- https://github.com/satoren/kaguya/archive/38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz -> ${PN}-kaguya-38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz
-"
-
-LICENSE="GPL-2+ GPL-3 Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-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-cmake_lua_version.patch
- "${FILESDIR}"/${P}-gcc11-include.patch
- "${FILESDIR}"/${P}-boost-1.77-missing-include.patch
-)
-
-S="${WORKDIR}/s25client-${COMMIT}"
-
-# Build type is checked but blank is valid.
-CMAKE_BUILD_TYPE=
-
-src_unpack() {
- default
-
- local SRC DST
- for SRC in */; do
- case "${SRC}" in
- s25client-*)
- continue ;;
- s25maps-*)
- DST=data/RTTR/MAPS ;;
- *)
- DST=${SRC%-*}
- DST=external/${DST,,} ;;
- esac
-
- rmdir "${S}/${DST}" || die
- mv "${SRC}" "${S}/${DST}" || die
- done
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test)
- -DCCACHE_PROGRAM=OFF
- -DCMAKE_SKIP_RPATH=ON
- -DRTTR_BUILD_UPDATER=OFF
- -DRTTR_ENABLE_OPTIMIZATIONS=OFF
- -DRTTR_ENABLE_SANITIZERS=$(usex test)
- -DRTTR_INCLUDE_DEVTOOLS=OFF
- -DRTTR_LIBDIR="$(get_libdir)/${PN}"
- -DRTTR_REVISION="${COMMIT}"
- -DRTTR_USE_SYSTEM_LIBS=ON
- # Just to be ultra explicit.
- -DRTTR_USE_SYSTEM_LIBSAMPLERATE=ON
- -DRTTR_VERSION="${PV##*_pre}" # Tests expect a date.
- -DLUA_VERSION=$(lua_get_version)
- )
-
- # bug #787299
- append-cxxflags -std=gnu++14
-
- 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 \
- cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- doicon -s 64 tools/release/debian/s25rttr.png
- make_desktop_entry s25client "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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/s25rttr/, games-strategy/s25rttr/files/
@ 2024-06-09 21:02 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2024-06-09 21:02 UTC (permalink / raw
To: gentoo-commits
commit: c67607be465bfa87de0483891f47fa36d4fc58c8
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 9 21:01:29 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jun 9 21:02:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c67607be
games-strategy/s25rttr: Fix boost compatibility issues with patch
Closes: https://bugs.gentoo.org/933411
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../s25rttr/files/s25rttr-0.9.5-boost.patch | 56 ++++++++++++++++++++++
games-strategy/s25rttr/s25rttr-0.9.5.ebuild | 6 +--
2 files changed, 59 insertions(+), 3 deletions(-)
diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.5-boost.patch b/games-strategy/s25rttr/files/s25rttr-0.9.5-boost.patch
new file mode 100644
index 000000000000..ace37abf9627
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.9.5-boost.patch
@@ -0,0 +1,56 @@
+From d1c6739e93a788b7ea9da7915642b2c8d6ab0656 Mon Sep 17 00:00:00 2001
+From: Alexander Grund <alexander.grund@tu-dresden.de>
+Date: Fri, 3 Feb 2023 16:30:09 +0100
+Subject: [PATCH] Fix compatibility with Boost 1.74+
+
+This has turned into an error in Boost 1.81
+Fixes #1551
+---
+ libs/s25main/network/GameClient.cpp | 8 +++++++-
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/libs/s25main/network/GameClient.cpp b/libs/s25main/network/GameClient.cpp
+index 84e351c08..0989d5877 100644
+--- a/libs/s25main/network/GameClient.cpp
++++ b/libs/s25main/network/GameClient.cpp
+@@ -119,7 +119,13 @@ bool GameClient::HostGame(const CreateServerInfo& csi, const boost::filesystem::
+ if(playedMapPath != map_path)
+ {
+ boost::system::error_code ignoredEc;
+- copy_file(map_path, playedMapPath, boost::filesystem::copy_option::overwrite_if_exists, ignoredEc);
++ constexpr auto overwrite_existing =
++#if BOOST_VERSION >= 107400
++ boost::filesystem::copy_options::overwrite_existing;
++#else
++ boost::filesystem::copy_option::overwrite_if_exists;
++#endif
++ copy_file(map_path, playedMapPath, overwrite_existing, ignoredEc);
+ }
+ return GAMESERVER.Start(csi, map_path, map_type, hostPw)
+ && Connect("localhost", hostPw, csi.type, csi.port, true, csi.ipv6);
+
+From 96978da4aba9280217a5b36731c303c35819220b Mon Sep 17 00:00:00 2001
+From: Alexander Grund <Flamefire@users.noreply.github.com>
+Date: Thu, 23 May 2024 19:35:14 +0200
+Subject: [PATCH] Fix Boost.Filesystem include
+
+The directory iterator seems to have move to a different include.
+Just include all of it.
+---
+ callbacks.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/external/s25edit/callbacks.cpp b/external/s25edit/callbacks.cpp
+index 52ec86d..095c1d6 100644
+--- a/external/s25edit/callbacks.cpp
++++ b/external/s25edit/callbacks.cpp
+@@ -18,8 +18,7 @@
+ #include "CSurface.h"
+ #include "globals.h"
+ #include "helpers/format.hpp"
+-#include <boost/filesystem/operations.hpp>
+-#include <boost/filesystem/path.hpp>
++#include <boost/filesystem.hpp>
+ #include <algorithm>
+
+ namespace bfs = boost::filesystem;
diff --git a/games-strategy/s25rttr/s25rttr-0.9.5.ebuild b/games-strategy/s25rttr/s25rttr-0.9.5.ebuild
index 4986896fd623..1184da066c3a 100644
--- a/games-strategy/s25rttr/s25rttr-0.9.5.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,6 +11,7 @@ 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"
+S="${WORKDIR}/${MY_PN}_v${PV}"
LICENSE="GPL-2+ GPL-3 Boost-1.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
@@ -42,10 +43,9 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-0.9.0_pre20200723-cmake_lua_version.patch
"${FILESDIR}"/${PN}-0.9.5-gcc-13.patch
+ "${FILESDIR}"/${PN}-0.9.5-boost.patch
)
-S="${WORKDIR}/${MY_PN}_v${PV}"
-
# Build type is checked but blank is valid.
CMAKE_BUILD_TYPE=
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/s25rttr/, games-strategy/s25rttr/files/
@ 2024-06-16 20:34 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2024-06-16 20:34 UTC (permalink / raw
To: gentoo-commits
commit: 92aeba092b5b096a4db323465fc0620c25d610f0
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 20:27:40 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 20:34:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92aeba09
games-strategy/s25rttr: Fix compatibility with miniupnpc 2.2.8 with patch
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../s25rttr/files/s25rttr-0.9.5-miniupnpc.patch | 34 ++++++++++++++++++++++
...25rttr-0.9.5.ebuild => s25rttr-0.9.5-r1.ebuild} | 6 ++--
2 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.5-miniupnpc.patch b/games-strategy/s25rttr/files/s25rttr-0.9.5-miniupnpc.patch
new file mode 100644
index 000000000000..e09c258e2b41
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.9.5-miniupnpc.patch
@@ -0,0 +1,34 @@
+From c7b6e56337cbb03d9ed3aa601cb6e79e7858249a Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 16 Jun 2024 21:22:08 +0100
+Subject: [PATCH] Support miniupnpc API version 18 (release 2.2.8) and adjust
+ status check
+
+getValidIGD was treating non-zero return codes as successful, but only 1
+should really be considered successful in this context.
+
+This maintains compatibility with earlier versions.
+---
+ libs/network/src/UPnP_Other.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/external/libutil/libs/network/src/UPnP_Other.cpp b/libs/network/src/UPnP_Other.cpp
+index d684b9c..8fc9418 100644
+--- a/external/libutil/libs/network/src/UPnP_Other.cpp
++++ b/external/libutil/libs/network/src/UPnP_Other.cpp
+@@ -91,7 +91,11 @@ inline DeviceList discover(int delay, const char* multicastIf = nullptr, const c
+ inline bool getValidIGD(const DeviceList& deviceList, Urls& urls, IGDdatas& data, std::string& lanAddr)
+ {
+ lanAddr.resize(15); // Format: aaa.bbb.ccc.ddd
+- return UPNP_GetValidIGD(deviceList, &urls, &data, &lanAddr[0], lanAddr.size()) != 0;
++#if (MINIUPNPC_API_VERSION >= 18)
++ return UPNP_GetValidIGD(deviceList, &urls, &data, &lanAddr[0], lanAddr.size(), NULL, 0) == 1;
++#else
++ return UPNP_GetValidIGD(deviceList, &urls, &data, &lanAddr[0], lanAddr.size()) == 1;
++#endif
+ }
+
+ inline void addPortMapping(const char* controlURL, const char* servicetype, const std::string& extPort,
+--
+2.45.1
+
diff --git a/games-strategy/s25rttr/s25rttr-0.9.5.ebuild b/games-strategy/s25rttr/s25rttr-0.9.5-r1.ebuild
similarity index 96%
rename from games-strategy/s25rttr/s25rttr-0.9.5.ebuild
rename to games-strategy/s25rttr/s25rttr-0.9.5-r1.ebuild
index 1184da066c3a..439ea5525533 100644
--- a/games-strategy/s25rttr/s25rttr-0.9.5.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.9.5-r1.ebuild
@@ -19,14 +19,15 @@ IUSE="test"
RESTRICT="!test? ( test )"
REQUIRED_USE="${LUA_REQUIRED_USE}"
-RDEPEND="${LUA_DEPS}
+RDEPEND="
+ ${LUA_DEPS}
app-arch/bzip2
dev-libs/boost:=[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
+ net-libs/miniupnpc:=
virtual/opengl
"
@@ -44,6 +45,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.9.0_pre20200723-cmake_lua_version.patch
"${FILESDIR}"/${PN}-0.9.5-gcc-13.patch
"${FILESDIR}"/${PN}-0.9.5-boost.patch
+ "${FILESDIR}"/${PN}-0.9.5-miniupnpc.patch
)
# Build type is checked but blank is valid.
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-06-16 20:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-09 21:02 [gentoo-commits] repo/gentoo:master commit in: games-strategy/s25rttr/, games-strategy/s25rttr/files/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2024-06-16 20:34 James Le Cuirot
2021-09-11 8:38 James Le Cuirot
2021-05-11 17:41 Sam James
2017-07-30 9:10 David Seifert
2016-04-20 18:40 Michael Sterrett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox