[gentoo-commits] repo/gentoo:master commit in: games-strategy/s25rttr/files/, games-strategy/s25rttr/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/s25rttr/files/, games-strategy/s25rttr/
@ 2015-10-06 22:53 Michael Sterrett
  0 siblings, 0 replies; 11+ messages in thread
From: Michael Sterrett @ 2015-10-06 22:53 UTC (permalink / raw
  To: gentoo-commits

commit:     730007d33d8249af97817dd38d369e82d6bb5f3e
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  6 22:14:22 2015 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Tue Oct  6 22:14:42 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=730007d3

add patch to fix building shared libraries with patch from tt_1(bug #553746)

Package-Manager: portage-2.2.20.1

 .../s25rttr/files/s25rttr-0.8.1-fpic.patch         | 38 ++++++++++++++++++++++
 games-strategy/s25rttr/s25rttr-0.8.1.ebuild        |  3 +-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-fpic.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-fpic.patch
new file mode 100644
index 0000000..4a1d11e
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-fpic.patch
@@ -0,0 +1,38 @@
+From 2b4f956263864cebb1b9c5ce120c7cd30f512bdb Mon Sep 17 00:00:00 2001
+From: nE0sIghT <ykonotopov@gmail.com>
+Date: Sat, 18 Jul 2015 19:03:05 +0300
+Subject: [PATCH] Fixed build of sdl drivers
+
+---
+ driver/audio/SDL/src/CMakeLists.txt | 1 +
+ driver/video/SDL/src/CMakeLists.txt | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/driver/audio/SDL/src/CMakeLists.txt b/driver/audio/SDL/src/CMakeLists.txt
+index 5ad3f02..5a91cd5 100644
+--- a/driver/audio/SDL/src/CMakeLists.txt
++++ b/driver/audio/SDL/src/CMakeLists.txt
+@@ -20,6 +20,7 @@ IF (SDL_FOUND)
+         
+         ADD_LIBRARY(audioSDL SHARED SDL.cpp SDL.h main.h SoundSDL_Music.cpp SoundSDL_Music.h SoundSDL_Effect.cpp SoundSDL_Effect.h ${PROJECT_SOURCE_DIR}/build_version.cpp ../../../src/DriverInterface.cpp ../../../src/tempname.cpp ../../../src/tempname.h)
+     
++    	ADD_DEFINITIONS(-fPIC)
+         ADD_FLAGS(CMAKE_C_FLAGS -I${SDL_INCLUDE_DIR} -I${SDLMIXER_INCLUDE_DIR})
+         ADD_FLAGS(CMAKE_CXX_FLAGS -I${SDL_INCLUDE_DIR} -I${SDLMIXER_INCLUDE_DIR})
+ 
+diff --git a/driver/video/SDL/src/CMakeLists.txt b/driver/video/SDL/src/CMakeLists.txt
+index 83d10cf..ca67573 100644
+--- a/driver/video/SDL/src/CMakeLists.txt
++++ b/driver/video/SDL/src/CMakeLists.txt
+@@ -16,6 +16,7 @@ IF (SDL_FOUND)
+ 
+ 	ADD_LIBRARY(videoSDL SHARED SDL.cpp SDL.h main.h ../../../../build_version.cpp ../../../src/DriverInterface.cpp)
+ 
++	ADD_DEFINITIONS(-fPIC)
+ 	ADD_FLAGS(CMAKE_C_FLAGS -I${SDL_INCLUDE_DIR})
+ 	ADD_FLAGS(CMAKE_CXX_FLAGS -I${SDL_INCLUDE_DIR})
+ 
+-- 
+2.3.6
+
+

diff --git a/games-strategy/s25rttr/s25rttr-0.8.1.ebuild b/games-strategy/s25rttr/s25rttr-0.8.1.ebuild
index 0643f3a..202ecbc 100644
--- a/games-strategy/s25rttr/s25rttr-0.8.1.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.8.1.ebuild
@@ -30,7 +30,8 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-cmake.patch \
-		"${FILESDIR}"/${P}-soundconverter.patch
+		"${FILESDIR}"/${P}-soundconverter.patch \
+		"${FILESDIR}"/${P}-fpic.patch
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/s25rttr/files/, games-strategy/s25rttr/
@ 2016-01-10 20:37 David Seifert
  0 siblings, 0 replies; 11+ messages in thread
From: David Seifert @ 2016-01-10 20:37 UTC (permalink / raw
  To: gentoo-commits

commit:     245ec6adbd16742786282dd6a06814a24d1a7567
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 10 19:56:32 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 10 20:37:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=245ec6ad

Revbump, include patch for miniUPnPc API breakage

Package-Manager: portage-2.2.26

 .../files/s25rttr-0.8.1-miniupnpc-api-14.patch     |  36 +++++++
 games-strategy/s25rttr/s25rttr-0.8.1-r1.ebuild     | 110 +++++++++++++++++++++
 2 files changed, 146 insertions(+)

diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-miniupnpc-api-14.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-miniupnpc-api-14.patch
new file mode 100644
index 0000000..d2ff0ee
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-miniupnpc-api-14.patch
@@ -0,0 +1,36 @@
+From 3b08b907235c09ab84e3bb23d1e05fe5a1d1c00e Mon Sep 17 00:00:00 2001
+From: Manuel Zeise <mail@manuel-zeise.de>
+Date: Sun, 3 Jan 2016 16:54:05 +0100
+Subject: [PATCH] Switch for miniUPnPc API version 14 and above
+
+API version 14 of miniUPnPc has introduced a new TTL argument to
+upnpDiscover() with a recommended default value of 2. A new preprocessor
+statement evaluates the API version and selects the correct version of
+upnpDiscover() based on the API version.
+
+--- s25rttr-0.8.1/libutil/src/UPnP.cpp
++++ s25rttr-0.8.1/libutil/src/UPnP.cpp
+@@ -210,7 +210,11 @@
+ 	UPNPDev* devicelist = NULL;
+ #ifdef UPNPDISCOVER_SUCCESS
+ 	int upnperror = 0;
++#if (MINIUPNPC_API_VERSION >= 14) /* miniUPnPc API version 14 adds TTL parameter */
++	devicelist = upnpDiscover(2000, NULL, NULL, 0, 0 /* ipv6 */, 2, &upnperror);
++#else
+ 	devicelist = upnpDiscover(2000, NULL, NULL, 0, 0 /* ipv6 */, &upnperror);
++#endif
+ #else
+ 	devicelist = upnpDiscover(2000, NULL, NULL, 0);
+ #endif
+@@ -276,7 +280,11 @@
+ 	UPNPDev* devicelist = NULL;
+ #ifdef UPNPDISCOVER_SUCCESS
+ 	int upnperror = 0;
++#if (MINIUPNPC_API_VERSION >= 14) /* miniUPnPc API version 14 adds TTL parameter */
++	devicelist = upnpDiscover(2000, NULL, NULL, 0, 0 /* ipv6 */, 2, &upnperror);
++#else
+ 	devicelist = upnpDiscover(2000, NULL, NULL, 0, 0 /* ipv6 */, &upnperror);
++#endif
+ #else
+ 	devicelist = upnpDiscover(2000, NULL, NULL, 0);
+ #endif

diff --git a/games-strategy/s25rttr/s25rttr-0.8.1-r1.ebuild b/games-strategy/s25rttr/s25rttr-0.8.1-r1.ebuild
new file mode 100644
index 0000000..9f39e6b
--- /dev/null
+++ b/games-strategy/s25rttr/s25rttr-0.8.1-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils cmake-utils gnome2-utils games
+
+DESCRIPTION="Open Source remake of The Settlers II game (needs original game files)"
+HOMEPAGE="http://www.siedler25.org/"
+# no upstream source tarball yet
+# https://bugs.launchpad.net/s25rttr/+bug/1069546
+SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug glfw"
+
+RDEPEND="app-arch/bzip2
+	media-libs/libsamplerate
+	media-libs/libsdl[X,sound,opengl,video]
+	media-libs/libsndfile
+	media-libs/sdl-mixer[vorbis]
+	net-libs/miniupnpc
+	virtual/libiconv
+	virtual/opengl
+	glfw? ( <media-libs/glfw-3 )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cmake.patch \
+		"${FILESDIR}"/${P}-soundconverter.patch \
+		"${FILESDIR}"/${P}-fpic.patch \
+		"${FILESDIR}"/${P}-miniupnpc-api-14.patch
+}
+
+src_configure() {
+	local arch
+	case ${ARCH} in
+		amd64)
+			arch="x86_64" ;;
+		x86)
+			arch="i386" ;;
+		*) die "Architecture ${ARCH} not yet supported" ;;
+	esac
+
+	local mycmakeargs=(
+		-DCOMPILEFOR="linux"
+		-DCOMPILEARCH="${arch}"
+		-DCMAKE_SKIP_RPATH=YES
+		-DPREFIX="${GAMES_PREFIX}"
+		-DBINDIR="${GAMES_BINDIR}"
+		-DDATADIR="${GAMES_DATADIR}"
+		-DLIBDIR="$(games_get_libdir)/${PN}"
+		-DDRIVERDIR="$(games_get_libdir)/${PN}"
+		-DGAMEDIR="~/.${PN}/S2"
+		$(cmake-utils_use_build glfw GLFW_DRIVER)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# work around some relative paths (CMAKE_IN_SOURCE_BUILD not supported)
+	ln -s "${CMAKE_USE_DIR}"/RTTR "${CMAKE_BUILD_DIR}"/RTTR || die
+
+	cmake-utils_src_compile
+
+	mv "${CMAKE_USE_DIR}"/RTTR/{sound-convert,s-c_resample} "${T}"/ || die
+}
+
+src_install() {
+	cd "${CMAKE_BUILD_DIR}" || die
+
+	exeinto "$(games_get_libdir)"/${PN}
+	doexe "${T}"/{sound-convert,s-c_resample}
+	exeinto "$(games_get_libdir)"/${PN}/video
+	doexe driver/video/SDL/src/libvideoSDL.so
+	use glfw && doexe driver/video/GLFW/src/libvideoGLFW.so
+	exeinto "$(games_get_libdir)"/${PN}/audio
+	doexe driver/audio/SDL/src/libaudioSDL.so
+
+	insinto "${GAMES_DATADIR}"
+	doins -r "${CMAKE_USE_DIR}"/RTTR
+	dosym ./LSTS/splash.bmp "${GAMES_DATADIR}"/RTTR/splash.bmp
+
+	doicon -s 64 "${CMAKE_USE_DIR}"/debian/${PN}.png
+	dogamesbin src/s25client
+	make_desktop_entry "s25client" "Settlers RTTR" "${PN}"
+	dodoc RTTR/texte/{keyboardlayout.txt,readme.txt}
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	elog "Copy your Settlers2 game files into ~/.${PN}/S2"
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/s25rttr/files/, games-strategy/s25rttr/
@ 2016-02-16  6:47 Alfredo Tupone
  0 siblings, 0 replies; 11+ messages in thread
From: Alfredo Tupone @ 2016-02-16  6:47 UTC (permalink / raw
  To: gentoo-commits

commit:     ed039116374461922879b35078c79d84f0f88794
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 06:46:25 2016 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 06:47:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed039116

games-strategy/s25rttr: compile with format-security. Bug #540636

Package-Manager: portage-2.2.26

 games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch | 11 +++++++++++
 games-strategy/s25rttr/s25rttr-0.8.1-r1.ebuild          |  1 +
 2 files changed, 12 insertions(+)

diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch
new file mode 100644
index 0000000..588a755
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch
@@ -0,0 +1,11 @@
+--- src/dskGameInterface.cpp.old	2016-02-15 21:11:58.308899794 +0100
++++ src/dskGameInterface.cpp	2016-02-15 21:12:24.564433584 +0100
+@@ -1349,7 +1349,7 @@
+ 			snprintf(text, sizeof(text), _("Team victory! '%s' and '%s' and '%s' and '%s' are the winners!"), GameClient::inst().GetPlayer(winners[0])->name.c_str(),GameClient::inst().GetPlayer(winners[1])->name.c_str(),GameClient::inst().GetPlayer(winners[2])->name.c_str(),GameClient::inst().GetPlayer(winners[3])->name.c_str());
+ 			break;
+ 		default:
+-			snprintf(text, sizeof(text), _("Team victory!"));
++			snprintf(text, sizeof(text), "%s", _("Team victory!"));
+ 			break;
+ 	}
+ 	messenger.AddMessage("", 0, CD_SYSTEM, text, COLOR_ORANGE);

diff --git a/games-strategy/s25rttr/s25rttr-0.8.1-r1.ebuild b/games-strategy/s25rttr/s25rttr-0.8.1-r1.ebuild
index 46d2365..15d3098 100644
--- a/games-strategy/s25rttr/s25rttr-0.8.1-r1.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.8.1-r1.ebuild
@@ -32,6 +32,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-cmake.patch \
 		"${FILESDIR}"/${P}-soundconverter.patch \
 		"${FILESDIR}"/${P}-fpic.patch \
+		"${FILESDIR}"/${P}-format.patch \
 		"${FILESDIR}"/${P}-miniupnpc-api-14.patch
 }
 


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/s25rttr/files/, games-strategy/s25rttr/
@ 2018-07-01  0:03 Andreas Sturmlechner
  0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2018-07-01  0:03 UTC (permalink / raw
  To: gentoo-commits

commit:     e0078976f674e5584e44b6a470191a048f1c59d6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 30 23:11:32 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul  1 00:03:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0078976

games-strategy/s25rttr: EAPI-6 bump

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 .../s25rttr/files/s25rttr-0.8.1-cmake.patch        | 24 +++++++++++-----------
 .../s25rttr/files/s25rttr-0.8.1-format.patch       |  4 ++--
 .../files/s25rttr-0.8.1-soundconverter.patch       |  4 ++--
 games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild     | 17 ++++++++-------
 4 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch
index d8cdfedbb9a..14f2edb52df 100644
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch
@@ -4,8 +4,8 @@ Date: Fri Oct  5 13:33:05 UTC 2012
 make build system gentoo-compatible
 provide options for SDL and GLFW video drivers
 
---- CMakeLists.txt
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -19,12 +19,19 @@
  
  ################################################################################
@@ -83,8 +83,8 @@ provide options for SDL and GLFW video drivers
  INSTALL(CODE "INCLUDE(src/cmake_install.cmake)")
  
  # and then dont let him install anything
---- driver/video/CMakeLists.txt
-+++ driver/video/CMakeLists.txt
+--- a/driver/video/CMakeLists.txt
++++ b/driver/video/CMakeLists.txt
 @@ -3,7 +3,11 @@
  #################################################################################
  
@@ -99,8 +99,8 @@ provide options for SDL and GLFW video drivers
 +ENDIF(BUILD_SDL_DRIVER)
  
  #################################################################################
---- driver/video/SDL/src/CMakeLists.txt
-+++ driver/video/SDL/src/CMakeLists.txt
+--- a/driver/video/SDL/src/CMakeLists.txt
++++ b/driver/video/SDL/src/CMakeLists.txt
 @@ -30,9 +30,9 @@
  	ADD_CUSTOM_COMMAND(TARGET videoSDL POST_BUILD COMMAND ln -fvs SDL/src/${SL_PREFIX}videoSDL${CMAKE_SHARED_LIBRARY_SUFFIX} ../../videoSDL${CMAKE_SHARED_LIBRARY_SUFFIX})
  	
@@ -114,8 +114,8 @@ provide options for SDL and GLFW video drivers
  	)
  ELSE (SDL_FOUND)
  	MESSAGE(WARNING ": SDL library not found: Not building SDL videodriver")
---- driver/video/GLFW/src/CMakeLists.txt
-+++ driver/video/GLFW/src/CMakeLists.txt
+--- a/driver/video/GLFW/src/CMakeLists.txt
++++ b/driver/video/GLFW/src/CMakeLists.txt
 @@ -2,7 +2,7 @@
  ### $Id$
  #################################################################################
@@ -133,8 +133,8 @@ provide options for SDL and GLFW video drivers
 +ENDIF ("${COMPILEFOR}" STREQUAL "linux" )
  
  #################################################################################
---- driver/audio/SDL/src/CMakeLists.txt
-+++ driver/audio/SDL/src/CMakeLists.txt
+--- a/driver/audio/SDL/src/CMakeLists.txt
++++ b/driver/audio/SDL/src/CMakeLists.txt
 @@ -34,9 +34,9 @@
          ADD_CUSTOM_COMMAND(TARGET audioSDL POST_BUILD COMMAND ln -fvs SDL/src/${SL_PREFIX}audioSDL${CMAKE_SHARED_LIBRARY_SUFFIX} ../../audioSDL${CMAKE_SHARED_LIBRARY_SUFFIX})
  
@@ -148,8 +148,8 @@ provide options for SDL and GLFW video drivers
          )
      ELSE (SDLMIXER_FOUND)
          MESSAGE(WARNING ": SDL_mixer library not found: Not building SDL audiodriver")
---- build_paths.h.cmake
-+++ build_paths.h.cmake
+--- a/build_paths.h.cmake
++++ b/build_paths.h.cmake
 @@ -41,6 +41,7 @@
  
  //	set game directory (normal $(datadir)/s25rttr/S2)

diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch
index 588a755e829..3d50543b9c0 100644
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch
@@ -1,5 +1,5 @@
---- src/dskGameInterface.cpp.old	2016-02-15 21:11:58.308899794 +0100
-+++ src/dskGameInterface.cpp	2016-02-15 21:12:24.564433584 +0100
+--- a/src/dskGameInterface.cpp.old	2016-02-15 21:11:58.308899794 +0100
++++ b/src/dskGameInterface.cpp	2016-02-15 21:12:24.564433584 +0100
 @@ -1349,7 +1349,7 @@
  			snprintf(text, sizeof(text), _("Team victory! '%s' and '%s' and '%s' and '%s' are the winners!"), GameClient::inst().GetPlayer(winners[0])->name.c_str(),GameClient::inst().GetPlayer(winners[1])->name.c_str(),GameClient::inst().GetPlayer(winners[2])->name.c_str(),GameClient::inst().GetPlayer(winners[3])->name.c_str());
  			break;

diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch
index 493d7cb404b..1cc7686b850 100644
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch
@@ -4,8 +4,8 @@ Date: Mon Apr 30 20:42:28 UTC 2012
 relocate executables sound-convert and s-c_resample which get installed
 into datadir by default
 
---- libutil/src/files.h
-+++ libutil/src/files.h
+--- a/libutil/src/files.h
++++ b/libutil/src/files.h
 @@ -140,7 +140,7 @@
  	/* 54 */RTTRDIR "",                               // unbenutzt
  	/* 55 */SETTINGSDIR "/LSTS/SOUND.LST",            // Die konvertierte sound.lst

diff --git a/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild b/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild
index 00187684759..47531d7e1d9 100644
--- a/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils cmake-utils gnome2-utils readme.gentoo-r1
+EAPI=6
+
+inherit cmake-utils desktop gnome2-utils readme.gentoo-r1
 
 DESCRIPTION="Open Source remake of The Settlers II game (needs original game files)"
 HOMEPAGE="https://www.siedler25.org/"
@@ -29,6 +30,10 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 "
 
+DOCS=( RTTR/texte/{keyboardlayout.txt,readme.txt} )
+
+DOC_CONTENTS="Copy your Settlers2 game files into ~/.${PN}/S2"
+
 PATCHES=(
 	"${FILESDIR}"/${P}-cmake.patch
 	"${FILESDIR}"/${P}-soundconverter.patch
@@ -39,8 +44,6 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc6.patch
 )
 
-DOC_CONTENTS="Copy your Settlers2 game files into ~/.${PN}/S2"
-
 src_configure() {
 	local arch
 	case ${ARCH} in
@@ -94,14 +97,10 @@ src_install() {
 	dobin src/s25client
 	make_desktop_entry "s25client" "Settlers RTTR" "${PN}"
 
-	dodoc RTTR/texte/{keyboardlayout.txt,readme.txt}
+	einstalldocs
 	readme.gentoo_create_doc
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	gnome2_icon_cache_update
 	readme.gentoo_print_elog


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/s25rttr/files/, games-strategy/s25rttr/
@ 2020-04-18 20:47 James Le Cuirot
  0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2020-04-18 20:47 UTC (permalink / raw
  To: gentoo-commits

commit:     13a72df5b3472115eb008623bfd75ddbf2985760
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 18 20:42:40 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Apr 18 20:46:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13a72df5

games-strategy/s25rttr: Bump to pure SDL2 snapshot

As of today, the game no longer uses SDL1 at all.

Closes: https://bugs.gentoo.org/713196
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-strategy/s25rttr/Manifest                    |  11 ++
 .../s25rttr/files/s25rttr-loosen-libs.patch        |  13 +++
 games-strategy/s25rttr/metadata.xml                |   3 +-
 .../s25rttr/s25rttr-0.9.0_pre20200418.ebuild       | 129 +++++++++++++++++++++
 4 files changed, 154 insertions(+), 2 deletions(-)

diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest
index 1e164c6f90f..acca2d02473 100644
--- a/games-strategy/s25rttr/Manifest
+++ b/games-strategy/s25rttr/Manifest
@@ -1 +1,12 @@
+DIST s25client-784eb58fc1eb42751042d82f16cc92617fc6c2ae.tar.gz 20212703 BLAKE2B e7e73dda1f95d92578f17c68015ef71f58f4c3f96a45f0fc199a93852aa7a3efcd22d4d09ee3a2a9fcf054f2cda1f237f153ad5b1aa4f5d19b894a4f5d73e549 SHA512 f6634ad3b38530c537cd79e79a759228ff25cfad4552b07d9957a04dc29819e501c606dc9a9366da52102addf6c66e9eeaa92e8ebedbb0c8bea2fb6627068f86
 DIST s25rttr-0.8.1.tar.xz 39644940 BLAKE2B 80268ac6ee20da983b4c3a90d8a9ebd5903734547fb48036963f435498a3395964afba990498a306a89009da50d023982a1dbd502e1ed618734c6a8d44ba2368 SHA512 31a7d640e1ecd5488ef02d0ed3adcaeb9b5ae5f6af5e006deb4100fde3eb8ec567e34519e9c2b82f38c9972d62790a6f6978d5da6c6dfca7f1c153fa65f22df2
+DIST s25rttr-kaguya-38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz 156126 BLAKE2B 05eeccc890549b8dd3fa004c61b73be65f1fcf20867b7f4a46d0963f80b4a76fca611915ea72a401bdc49a81997d3d4500c5f5378a7cd55cbbfab6bcf647261a SHA512 470414d41cb6bad4e428858114f3c91139abfb1bf3ae02bb322d51bfabba8c0aad6796e183ccbb57624ed3484fea3f463636561ac8a359b6be7b90cfd5c0696a
+DIST s25rttr-languages-b1978170473bbf39a24254814e1b1f967a51ef4c.tar.gz 663317 BLAKE2B 71bb99b3ab6b4ce4bfbb97a7a5ceaf4fb9d1de561f62b42a14e0755d564b1fc7fff0ae66e25414f70fa92bb321e35c6088cd0366ecbef484f3eb598ba8357eb2 SHA512 ec21edcbd35ac3aa5935a19a1735b7af84230f0551850f15f16d40ea5d3409ef9f14a55fc665e203b267886290e2f158ae807bb51f87492004c4a81b22ee6bfe
+DIST s25rttr-libendian-dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz 17008 BLAKE2B 98486acff6e56581b5dd06bba9892da739bf1947151f036ade31354c340b6dd79e1b77cd42475bc38225515392062c4e5dbf9ab28349356368db0ca90a81ee65 SHA512 1827edf6470f20a4b6a1b991a31af411e2cc5ceae36a65d54dbd6927dcf46949c4ad729ac982242da9a8ec9d141531d6c99792af761370b2252872bdbb7da8f0
+DIST s25rttr-liblobby-7d85ec40f03af619a6734f20edb28d991b3d61f2.tar.gz 23394 BLAKE2B d3ed80917665165d839a5b607d8793b238335b1b6afabe9eaa403188797ba821b949699b58126d50619820f694104b005f92b948ce09e18d6629b9b6dff85baa SHA512 c2cc34c78acf04f0e0eee7a9a9a11564cb49d98cdaaa0bf36f3adda980beefa1831ec70dd1b0b0cf10841325f3ac0fc7e9a0564255156c76b8c98b1ffded34ae
+DIST s25rttr-libsiedler2-800d58ea072c35d3cf9832d2f6a5cdae92fc0445.tar.gz 490533 BLAKE2B f71a5d19b9aa2ae268c3b658d96c1efc4784c223cfa050962df4b9fc75b96d939769e72391f9d2354887e3aba106043be3f365b2d695ffd66df2d2877ada01c5 SHA512 38629c532332b257f1c09e8a592c937d795ae39c16696614d50ec2cfd212d35db0110a8d1d561f0f17c875228e4de4e6f2b83cd2c8c00fc7c9320c75f88e13b3
+DIST s25rttr-libutil-c91488e4d2f0079a864c4be80eaba24a871e9772.tar.gz 112761 BLAKE2B 47d563877960f234a5d5547d08b426f9c97f234d09a5def11b67c578f734afeeb0309e40b1b5d2d9a11080dd2f10ad9d73d41481bf0f1489db9d785a02513966 SHA512 1b2480d84cd00a40c7f6df0162505c123859b350d8c241631046e5a91bde6d668667af64803e015234ae13a69e7f0e97aff5c08858396c0d298a2bd033262d35
+DIST s25rttr-mygettext-7e46bbb3e24891348f5629887efb0173690e83b8.tar.gz 18869 BLAKE2B 63cf0ab2f62ab17b9078aaa7ab9f6f56326cf21b4292de5086de053f1e6ba62e23931eb63bb4494855a61a5e8d971b067a42819c12d4363a5c0ad624f9dabfaa SHA512 f049f9a4500f00b0e1159f1110ddfde752055de09d62a0d07a466cdfe5cfd0e564b89f2b9dd8f2a9adc30e619690008e8dda9fe1cd4f7ec1d541018f9fe680b4
+DIST s25rttr-s25edit-04b5e725036a0568e8da15447167c240563dbaba.tar.gz 198454 BLAKE2B 9fb488a03ddd3ca5b476cc48b8629935f41c41b1b0bd2674adc048e674c1102d5e74dc8232df01956fb6db6451697e1d9bc5a4da4825dd9ce2c83608c366fd39 SHA512 ca5d79bdaeac08334aa47a08f8a550f09a8cc6507f86a05e0e90d49b6c181247e9d6cc880d5c05a926da82562e946d7fbd3abc339e178cab32891474e42bef60
+DIST s25rttr-s25maps-11a5f3e95405b7cf8088641efb4939eba9639cbc.tar.gz 8014338 BLAKE2B 793bbcf0f068c41585376990b9fe13137010f43fe3e91d82beda8c7fd8939f987d778a74de6695e4ebe86893234e419382e1e48d1737a144116de9cc63a212aa SHA512 099fd10ceabaf5284fdb686f1d281d8c3eb07351215bff9785323370b1c40101a9350c81f06f6c6592e63e5e680566777aa52559d8fe6087501c1eaafec43d8f
+DIST s25rttr-turtle-5f8421b1d270665347280d4cab1caf159d6858de.tar.gz 98238 BLAKE2B 854f765aee17328e818b806b69b529376f6f5a89a55b9d84dd7f41adc57314cbbd1844f3125ea750e7ac9ebcfeaa4c08d7c95fc8802bb4cc657ddd738a2370e8 SHA512 0b74b37ef28b1a2acf433491749d498e4de43567bc526faddb677953b5aa5e7ca74fab659d81a2cf4a29e440463150e7b5ac15d0e87f2ecad47523c44f629d25

diff --git a/games-strategy/s25rttr/files/s25rttr-loosen-libs.patch b/games-strategy/s25rttr/files/s25rttr-loosen-libs.patch
new file mode 100644
index 00000000000..421cde2cd74
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-loosen-libs.patch
@@ -0,0 +1,13 @@
+diff --git a/libs/libGamedata/CMakeLists.txt b/libs/libGamedata/CMakeLists.txt
+index b09569530..3d908226c 100644
+--- a/libs/libGamedata/CMakeLists.txt
++++ b/libs/libGamedata/CMakeLists.txt
+@@ -12,7 +12,7 @@ FILE(GLOB SOURCES_OTHER *.cpp *.h)
+ SOURCE_GROUP(other FILES ${SOURCES_OTHER})
+ 
+ # CMake < 3.2 treats version 5.2.x as not equal to 5.2 but we want to allow all 5.2 versions
+-find_package(Lua 5.2 EXACT REQUIRED)
++find_package(Lua 5.1 REQUIRED)
+ 
+ include(GatherDll)
+ gather_dll(Lua)

diff --git a/games-strategy/s25rttr/metadata.xml b/games-strategy/s25rttr/metadata.xml
index 7603c5eda30..f33c5b74bd9 100644
--- a/games-strategy/s25rttr/metadata.xml
+++ b/games-strategy/s25rttr/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
-		<changelog>http://www.siedler25.org/index.php?com=dynamic&amp;mod=9&amp;PHPSESSID=e5fa4f90c4db5df0cb1e417e128300b5</changelog>
-		<bugs-to>https://bugs.launchpad.net/s25rttr</bugs-to>
+		<remote-id type="github">Return-To-The-Roots/s25client</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200418.ebuild b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200418.ebuild
new file mode 100644
index 00000000000..af2612613ba
--- /dev/null
+++ b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200418.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop 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="784eb58fc1eb42751042d82f16cc92617fc6c2ae"
+SRC_URI="
+	https://github.com/Return-To-The-Roots/s25client/archive/${COMMIT}.tar.gz -> s25client-${COMMIT}.tar.gz
+	https://github.com/mat007/turtle/archive/5f8421b1d270665347280d4cab1caf159d6858de.tar.gz -> ${PN}-turtle-5f8421b1d270665347280d4cab1caf159d6858de.tar.gz
+	https://github.com/Return-To-The-Roots/languages/archive/b1978170473bbf39a24254814e1b1f967a51ef4c.tar.gz -> ${PN}-languages-b1978170473bbf39a24254814e1b1f967a51ef4c.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/7d85ec40f03af619a6734f20edb28d991b3d61f2.tar.gz -> ${PN}-liblobby-7d85ec40f03af619a6734f20edb28d991b3d61f2.tar.gz
+	https://github.com/Return-To-The-Roots/libsiedler2/archive/800d58ea072c35d3cf9832d2f6a5cdae92fc0445.tar.gz -> ${PN}-libsiedler2-800d58ea072c35d3cf9832d2f6a5cdae92fc0445.tar.gz
+	https://github.com/Return-To-The-Roots/libutil/archive/c91488e4d2f0079a864c4be80eaba24a871e9772.tar.gz -> ${PN}-libutil-c91488e4d2f0079a864c4be80eaba24a871e9772.tar.gz
+	https://github.com/Return-To-The-Roots/mygettext/archive/7e46bbb3e24891348f5629887efb0173690e83b8.tar.gz -> ${PN}-mygettext-7e46bbb3e24891348f5629887efb0173690e83b8.tar.gz
+	https://github.com/Return-To-The-Roots/s25edit/archive/04b5e725036a0568e8da15447167c240563dbaba.tar.gz -> ${PN}-s25edit-04b5e725036a0568e8da15447167c240563dbaba.tar.gz
+	https://github.com/Return-To-The-Roots/s25maps/archive/11a5f3e95405b7cf8088641efb4939eba9639cbc.tar.gz -> ${PN}-s25maps-11a5f3e95405b7cf8088641efb4939eba9639cbc.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 ~x86"
+IUSE="test"
+
+RDEPEND="
+	app-arch/bzip2
+	>=dev-lang/lua-5.1:=
+	>=dev-libs/boost-1.64: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
+"
+
+S="${WORKDIR}/s25client-${COMMIT}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-loosen-libs.patch
+)
+
+# 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_SAMPLERATE=ON
+		-DRTTR_VERSION="${PV}"
+	)
+
+	if use test ; then
+		einfo "Forcing clang due to USE=test."
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+	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] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/s25rttr/files/, games-strategy/s25rttr/
@ 2020-07-26 21:19 James Le Cuirot
  0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2020-07-26 21:19 UTC (permalink / raw
  To: gentoo-commits

commit:     74b059ca8832b31d915490e46e0c07f60c31d6c4
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 26 21:19:15 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 26 21:19:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74b059ca

games-strategy/s25rttr: Drop old versions

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-strategy/s25rttr/Manifest                    |  10 --
 .../s25rttr/files/s25rttr-0.8.1-cmake-3.patch      |  23 ---
 .../s25rttr/files/s25rttr-0.8.1-cmake.patch        | 160 ---------------------
 .../s25rttr/files/s25rttr-0.8.1-format.patch       |  11 --
 .../s25rttr/files/s25rttr-0.8.1-fpic.patch         |  38 -----
 .../s25rttr/files/s25rttr-0.8.1-gcc6.patch         |  84 -----------
 .../files/s25rttr-0.8.1-miniupnpc-api-14.patch     |  36 -----
 .../files/s25rttr-0.8.1-soundconverter.patch       |  17 ---
 .../s25rttr/files/s25rttr-loosen-libs.patch        |  13 --
 games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild     | 101 -------------
 .../s25rttr/s25rttr-0.9.0_pre20200418.ebuild       | 129 -----------------
 11 files changed, 622 deletions(-)

diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest
index 745a35a73cc..246f9787269 100644
--- a/games-strategy/s25rttr/Manifest
+++ b/games-strategy/s25rttr/Manifest
@@ -1,21 +1,11 @@
-DIST s25client-784eb58fc1eb42751042d82f16cc92617fc6c2ae.tar.gz 20212703 BLAKE2B e7e73dda1f95d92578f17c68015ef71f58f4c3f96a45f0fc199a93852aa7a3efcd22d4d09ee3a2a9fcf054f2cda1f237f153ad5b1aa4f5d19b894a4f5d73e549 SHA512 f6634ad3b38530c537cd79e79a759228ff25cfad4552b07d9957a04dc29819e501c606dc9a9366da52102addf6c66e9eeaa92e8ebedbb0c8bea2fb6627068f86
 DIST s25client-f0b97b120140c96bbeacae9c22633f899931db69.tar.gz 20184306 BLAKE2B 4204a62e0a57a614c5ae1a947741f8f92fd7cd75b203467716483baa6f68a7c608033f403337e66b00bc8c2851b03f04c25bf84cda124548cfe09a110478fc54 SHA512 c4f0b59a68a0d5ece57f06f51e7a977be0b41ae85ff57821b317c2bb822a2533a192e1dfaa1a738c6738e65505a70ec34b3e7b22a8bd6effc95a4279d5eb19da
-DIST s25rttr-0.8.1.tar.xz 39644940 BLAKE2B 80268ac6ee20da983b4c3a90d8a9ebd5903734547fb48036963f435498a3395964afba990498a306a89009da50d023982a1dbd502e1ed618734c6a8d44ba2368 SHA512 31a7d640e1ecd5488ef02d0ed3adcaeb9b5ae5f6af5e006deb4100fde3eb8ec567e34519e9c2b82f38c9972d62790a6f6978d5da6c6dfca7f1c153fa65f22df2
 DIST s25rttr-kaguya-38ca7e1d894c138e454bbe5c89048bdd5091545a.tar.gz 156126 BLAKE2B 05eeccc890549b8dd3fa004c61b73be65f1fcf20867b7f4a46d0963f80b4a76fca611915ea72a401bdc49a81997d3d4500c5f5378a7cd55cbbfab6bcf647261a SHA512 470414d41cb6bad4e428858114f3c91139abfb1bf3ae02bb322d51bfabba8c0aad6796e183ccbb57624ed3484fea3f463636561ac8a359b6be7b90cfd5c0696a
 DIST s25rttr-languages-6906b7ce9cb64242ba406eda34a404fa8eb1e33d.tar.gz 698512 BLAKE2B 82bc98077ed18622083894a63044194f599375c93aa745e330ad8ba390e14d9829ebb7c8e62141758f41dff2b72d3afbe2a5b6ebb584c3293c244e6f0c88ff89 SHA512 47de2791a4d4707fa17344de8fff8a15dd4436dd6e8c75adbd95273739cf5022e39a1024edee228eb27294e4f1f0b2a91110a1249b3d4fe64641cace051e4544
-DIST s25rttr-languages-b1978170473bbf39a24254814e1b1f967a51ef4c.tar.gz 663317 BLAKE2B 71bb99b3ab6b4ce4bfbb97a7a5ceaf4fb9d1de561f62b42a14e0755d564b1fc7fff0ae66e25414f70fa92bb321e35c6088cd0366ecbef484f3eb598ba8357eb2 SHA512 ec21edcbd35ac3aa5935a19a1735b7af84230f0551850f15f16d40ea5d3409ef9f14a55fc665e203b267886290e2f158ae807bb51f87492004c4a81b22ee6bfe
 DIST s25rttr-libendian-dd2c11498f679247530b6b7cf7bd5964f539ddfd.tar.gz 17008 BLAKE2B 98486acff6e56581b5dd06bba9892da739bf1947151f036ade31354c340b6dd79e1b77cd42475bc38225515392062c4e5dbf9ab28349356368db0ca90a81ee65 SHA512 1827edf6470f20a4b6a1b991a31af411e2cc5ceae36a65d54dbd6927dcf46949c4ad729ac982242da9a8ec9d141531d6c99792af761370b2252872bdbb7da8f0
-DIST s25rttr-liblobby-7d85ec40f03af619a6734f20edb28d991b3d61f2.tar.gz 23394 BLAKE2B d3ed80917665165d839a5b607d8793b238335b1b6afabe9eaa403188797ba821b949699b58126d50619820f694104b005f92b948ce09e18d6629b9b6dff85baa SHA512 c2cc34c78acf04f0e0eee7a9a9a11564cb49d98cdaaa0bf36f3adda980beefa1831ec70dd1b0b0cf10841325f3ac0fc7e9a0564255156c76b8c98b1ffded34ae
 DIST s25rttr-liblobby-9275cbfa2303cc8235e96f275829be0d84efd3a4.tar.gz 24127 BLAKE2B 841ddec14b88cb057978bad87a710bafe9a358bd31614f0c855343f148ff52485894771c5fde85e4f31a769e679307e5608db71e2365e5205de2b72ea5429ffd SHA512 5334e84ff0f7aecd666b4f3832131c9d82767304d705fd51ac1a1d90beb68e65f7d9b16d89c8af682960f6639aa5c3e61403278685dc7f240c5c94c6148a8100
 DIST s25rttr-libsiedler2-5cb9993a32504337c63fd894266991445e0dcd65.tar.gz 495357 BLAKE2B ef421becde207866e3d88a3978e56e2ba289dbe86d83b682051dd8776f865eb7ce57a4fc7af42ef581fddd1d816be0d087e282ea1ec27eca9f5d1be429c6adc6 SHA512 9c4fa600d89d859a8336b672f56b697538a6ca6f6fa411236e53b6d0d2972487feba5c0ba024242dc8be2e65464290f95926224d74fa3b75e1531e798561ebf4
-DIST s25rttr-libsiedler2-800d58ea072c35d3cf9832d2f6a5cdae92fc0445.tar.gz 490533 BLAKE2B f71a5d19b9aa2ae268c3b658d96c1efc4784c223cfa050962df4b9fc75b96d939769e72391f9d2354887e3aba106043be3f365b2d695ffd66df2d2877ada01c5 SHA512 38629c532332b257f1c09e8a592c937d795ae39c16696614d50ec2cfd212d35db0110a8d1d561f0f17c875228e4de4e6f2b83cd2c8c00fc7c9320c75f88e13b3
 DIST s25rttr-libutil-6c2ee0fa897541ea766533e03ebd53344908cf16.tar.gz 92326 BLAKE2B 3245cd7d6e5828b6b69dc99b920d8682d1e33a5d32b0ff21ae9f20fa31f2f6019245f7919ba4c9d1da30b166c56c903e8aafca77da4216338c612b5b812fc252 SHA512 afdda736dcf4f848df171b806a9cc4f667187f5ce525894471791ab6bebe004a589865654c973df71788019c0a2ac4621bf47d7202b772e895e51df628f494d6
-DIST s25rttr-libutil-c91488e4d2f0079a864c4be80eaba24a871e9772.tar.gz 112761 BLAKE2B 47d563877960f234a5d5547d08b426f9c97f234d09a5def11b67c578f734afeeb0309e40b1b5d2d9a11080dd2f10ad9d73d41481bf0f1489db9d785a02513966 SHA512 1b2480d84cd00a40c7f6df0162505c123859b350d8c241631046e5a91bde6d668667af64803e015234ae13a69e7f0e97aff5c08858396c0d298a2bd033262d35
-DIST s25rttr-mygettext-7e46bbb3e24891348f5629887efb0173690e83b8.tar.gz 18869 BLAKE2B 63cf0ab2f62ab17b9078aaa7ab9f6f56326cf21b4292de5086de053f1e6ba62e23931eb63bb4494855a61a5e8d971b067a42819c12d4363a5c0ad624f9dabfaa SHA512 f049f9a4500f00b0e1159f1110ddfde752055de09d62a0d07a466cdfe5cfd0e564b89f2b9dd8f2a9adc30e619690008e8dda9fe1cd4f7ec1d541018f9fe680b4
 DIST s25rttr-mygettext-b2fc5db651542a7fcc069223904f7debc27ec235.tar.gz 19270 BLAKE2B 76cacab478205f45897a75a868114211d4cfcc08cbfa9fa694ac0011dc9e6272d9d0e63b34d60264e6923038f830c06dd32279233f9d0ca42732b3963152f6e3 SHA512 22ce4169feb5fa7e5567c66a245e71d98a02dd6eee9214b2387b70ff5a592cca8445fc4e95b5403b33215fe418ed3cfeee9fe6a7d96ecddc7661556cb718cc35
-DIST s25rttr-s25edit-04b5e725036a0568e8da15447167c240563dbaba.tar.gz 198454 BLAKE2B 9fb488a03ddd3ca5b476cc48b8629935f41c41b1b0bd2674adc048e674c1102d5e74dc8232df01956fb6db6451697e1d9bc5a4da4825dd9ce2c83608c366fd39 SHA512 ca5d79bdaeac08334aa47a08f8a550f09a8cc6507f86a05e0e90d49b6c181247e9d6cc880d5c05a926da82562e946d7fbd3abc339e178cab32891474e42bef60
 DIST s25rttr-s25edit-677e4b39eaa7f6ecb701e7b50637a0f05fc691db.tar.gz 198489 BLAKE2B 47ffced26f1cceb78c0137e31114e463f0f5ad15fdb47e6a2809080a7874ce484918a0527e97b33db98c4a0daa338712c1b1a8b4992ac47d96f4e3b7056ee5e8 SHA512 0f5b4a4eeb72a906c86dac74c1bb41f5d4756c58240f59403932e388e523bed7d841ffa1d18dfd87454ab8c60b33e74cef27aec93995e37539868148bbee9900
-DIST s25rttr-s25maps-11a5f3e95405b7cf8088641efb4939eba9639cbc.tar.gz 8014338 BLAKE2B 793bbcf0f068c41585376990b9fe13137010f43fe3e91d82beda8c7fd8939f987d778a74de6695e4ebe86893234e419382e1e48d1737a144116de9cc63a212aa SHA512 099fd10ceabaf5284fdb686f1d281d8c3eb07351215bff9785323370b1c40101a9350c81f06f6c6592e63e5e680566777aa52559d8fe6087501c1eaafec43d8f
 DIST s25rttr-s25maps-5efbd103b19335828cab6e757224e87456c4a1e4.tar.gz 8013451 BLAKE2B 042ab804f4ec9babf7c975629fa3bd6856fb1fa4de0c4715420bca7e0f2dd72cc0909134750ba70c69344985bdd7a3a74576536cee80d6dfaf688c8cf82da8c0 SHA512 3339ced1fcca0fc9a37382d23c3c43f46c5e51d4c14b2657a79cd15dbd79ba8025bf8133dbbe45eb125b5c88370c90422faf21b65d95f471af3bb43de54a3210
-DIST s25rttr-turtle-5f8421b1d270665347280d4cab1caf159d6858de.tar.gz 98238 BLAKE2B 854f765aee17328e818b806b69b529376f6f5a89a55b9d84dd7f41adc57314cbbd1844f3125ea750e7ac9ebcfeaa4c08d7c95fc8802bb4cc657ddd738a2370e8 SHA512 0b74b37ef28b1a2acf433491749d498e4de43567bc526faddb677953b5aa5e7ca74fab659d81a2cf4a29e440463150e7b5ac15d0e87f2ecad47523c44f629d25
 DIST s25rttr-turtle-9dcdcf9061b929a03f188531ea5cbd530b6234ab.tar.gz 98611 BLAKE2B 6187ab3109f1c9c20524752920e7b9f0e1de2c882bb09ce8c4d2d29899fbaf8a0e2627afc475f6c1527428d77e9a7a7c7332136ba5a79e33cad9c570fbc19042 SHA512 ba85c03cb3e857c501fcec0223ccb7dfccb99a961dd6594820640e133523f14275e764e196197ead05b739f490003b412e16ca2d0fcae8263ef4c256d252570a

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
deleted file mode 100644
index b7e9e424eb0..00000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake-3.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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/files/s25rttr-0.8.1-cmake.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch
deleted file mode 100644
index 14f2edb52df..00000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Oct  5 13:33:05 UTC 2012
-
-make build system gentoo-compatible
-provide options for SDL and GLFW video drivers
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -19,12 +19,19 @@
- 
- ################################################################################
- 
--INCLUDE(cmake/crosscompile.cmake)
--
- PROJECT(s25client)
- 
- ################################################################################
- 
-+# options
-+OPTION(BUILD_GLFW_DRIVER "Build the GLFW video driver" 0)
-+OPTION(BUILD_SDL_DRIVER "Build the sdl video driver" 1)
-+IF (UNIX)
-+	IF (NOT BUILD_SDL_DRIVER AND NOT BUILD_GLFW_DRIVER)
-+		MESSAGE(FATAL_ERROR "No video driver selected! Either use SDL or GLFW.")
-+	ENDIF (NOT BUILD_SDL_DRIVER AND NOT BUILD_GLFW_DRIVER)
-+ENDIF (UNIX)
-+
- SET(PREFIX ${PREFIX} CACHE STRING "Path prefix")
- SET(BINDIR ${BINDIR} CACHE STRING "Directory for the binaries")
- SET(DATADIR ${DATADIR} CACHE STRING "Data directory")
-@@ -106,38 +113,6 @@
- 			   build_paths.h)
- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/build_version.h.cmake"
- 			   build_version.h)
--CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/build/preinstall.sh.cmake"
--			   preinstall.sh @ONLY)
--CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/build/postinstall.sh.cmake"
--			   postinstall.sh @ONLY)
--
--################################################################################
--
--ADD_SUBDIRECTORY(version)
--
--ADD_CUSTOM_TARGET(updateversion ALL
--				  COMMAND "${CMAKE_BINARY_DIR}/version/src/version" "${CMAKE_SOURCE_DIR}"
--				  DEPENDS version
--				  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
--)
--
--ADD_CUSTOM_TARGET(mrproper
--				  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/build/cleanup.sh"
--				  WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
--)
--
--ADD_CUSTOM_TARGET(create_nightly
--				  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/release/create_release.sh" "nightly" "${CMAKE_SOURCE_DIR}"
--				  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
--)
--
--ADD_CUSTOM_TARGET(create_stable
--				  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/release/create_release.sh" "stable" "${CMAKE_SOURCE_DIR}"
--				  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
--)
--
--# preinstall script
--INSTALL(SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/cmake/preinstall.cmake")
- 
- ################################################################################
- 
-@@ -148,7 +123,6 @@
- ADD_SUBDIRECTORY(libutil)
- ADD_SUBDIRECTORY(liblobby)
- ADD_SUBDIRECTORY(s-c)
--ADD_SUBDIRECTORY(s25update)
- ADD_SUBDIRECTORY(src)
- 
- ################################################################################
-@@ -157,7 +131,6 @@
- INSTALL(CODE "INCLUDE(driver/cmake_install.cmake)")
- INSTALL(CODE "INCLUDE(libsiedler2/cmake_install.cmake)")
- INSTALL(CODE "INCLUDE(s-c/cmake_install.cmake)")
--INSTALL(CODE "INCLUDE(s25update/cmake_install.cmake)")
- INSTALL(CODE "INCLUDE(src/cmake_install.cmake)")
- 
- # and then dont let him install anything
---- a/driver/video/CMakeLists.txt
-+++ b/driver/video/CMakeLists.txt
-@@ -3,7 +3,11 @@
- #################################################################################
- 
- ADD_SUBDIRECTORY( WinAPI )
--ADD_SUBDIRECTORY( GLFW )
--ADD_SUBDIRECTORY( SDL )
-+IF(BUILD_GLFW_DRIVER)
-+	ADD_SUBDIRECTORY( GLFW )
-+ENDIF(BUILD_GLFW_DRIVER)
-+IF(BUILD_SDL_DRIVER)
-+	ADD_SUBDIRECTORY( SDL )
-+ENDIF(BUILD_SDL_DRIVER)
- 
- #################################################################################
---- a/driver/video/SDL/src/CMakeLists.txt
-+++ b/driver/video/SDL/src/CMakeLists.txt
-@@ -30,9 +30,9 @@
- 	ADD_CUSTOM_COMMAND(TARGET videoSDL POST_BUILD COMMAND ln -fvs SDL/src/${SL_PREFIX}videoSDL${CMAKE_SHARED_LIBRARY_SUFFIX} ../../videoSDL${CMAKE_SHARED_LIBRARY_SUFFIX})
- 	
- 	INSTALL(TARGETS videoSDL 
--		RUNTIME DESTINATION ${LIBDIR}/driver/video 
--		LIBRARY DESTINATION ${LIBDIR}/driver/video
--		ARCHIVE DESTINATION ${LIBDIR}/driver/video
-+		RUNTIME DESTINATION ${LIBDIR} 
-+		LIBRARY DESTINATION ${LIBDIR}
-+		ARCHIVE DESTINATION ${LIBDIR}
- 	)
- ELSE (SDL_FOUND)
- 	MESSAGE(WARNING ": SDL library not found: Not building SDL videodriver")
---- a/driver/video/GLFW/src/CMakeLists.txt
-+++ b/driver/video/GLFW/src/CMakeLists.txt
-@@ -2,7 +2,7 @@
- ### $Id$
- #################################################################################
- 
--IF ("${COMPILEFOR}/${COMPILEARCH}" STREQUAL "linux/i386" )
-+IF ("${COMPILEFOR}" STREQUAL "linux" )
- 	FIND_LIBRARY(GLFW_LIBRARY glfw) 
- 	
- 	IF (GLFW_LIBRARY)
-@@ -21,6 +21,6 @@
- 	ELSE (GLFW_LIBRARY)
- 		MESSAGE(WARNING ": GLFW library not found: Not building GLFW videodriver")
- 	ENDIF (GLFW_LIBRARY)
--ENDIF ("${COMPILEFOR}/${COMPILEARCH}" STREQUAL "linux/i386" )
-+ENDIF ("${COMPILEFOR}" STREQUAL "linux" )
- 
- #################################################################################
---- a/driver/audio/SDL/src/CMakeLists.txt
-+++ b/driver/audio/SDL/src/CMakeLists.txt
-@@ -34,9 +34,9 @@
-         ADD_CUSTOM_COMMAND(TARGET audioSDL POST_BUILD COMMAND ln -fvs SDL/src/${SL_PREFIX}audioSDL${CMAKE_SHARED_LIBRARY_SUFFIX} ../../audioSDL${CMAKE_SHARED_LIBRARY_SUFFIX})
- 
-         INSTALL(TARGETS audioSDL 
--            RUNTIME DESTINATION ${LIBDIR}/driver/audio 
--            LIBRARY DESTINATION ${LIBDIR}/driver/audio
--            ARCHIVE DESTINATION ${LIBDIR}/driver/audio
-+            RUNTIME DESTINATION ${LIBDIR} 
-+            LIBRARY DESTINATION ${LIBDIR}
-+            ARCHIVE DESTINATION ${LIBDIR}
-         )
-     ELSE (SDLMIXER_FOUND)
-         MESSAGE(WARNING ": SDL_mixer library not found: Not building SDL audiodriver")
---- a/build_paths.h.cmake
-+++ b/build_paths.h.cmake
-@@ -41,6 +41,7 @@
- 
- //	set game directory (normal $(datadir)/s25rttr/S2)
- //#define GAMEDIR DATADIR"/S2"
-+#cmakedefine GAMEDIR "${GAMEDIR}"
- 
- //	set driver directory (normal $(libdir)/driver)
- //#define DRIVERDIR LIBDIR"/driver"

diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch
deleted file mode 100644
index 3d50543b9c0..00000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/dskGameInterface.cpp.old	2016-02-15 21:11:58.308899794 +0100
-+++ b/src/dskGameInterface.cpp	2016-02-15 21:12:24.564433584 +0100
-@@ -1349,7 +1349,7 @@
- 			snprintf(text, sizeof(text), _("Team victory! '%s' and '%s' and '%s' and '%s' are the winners!"), GameClient::inst().GetPlayer(winners[0])->name.c_str(),GameClient::inst().GetPlayer(winners[1])->name.c_str(),GameClient::inst().GetPlayer(winners[2])->name.c_str(),GameClient::inst().GetPlayer(winners[3])->name.c_str());
- 			break;
- 		default:
--			snprintf(text, sizeof(text), _("Team victory!"));
-+			snprintf(text, sizeof(text), "%s", _("Team victory!"));
- 			break;
- 	}
- 	messenger.AddMessage("", 0, CD_SYSTEM, text, COLOR_ORANGE);

diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-fpic.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-fpic.patch
deleted file mode 100644
index 4a1d11ef170..00000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-fpic.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2b4f956263864cebb1b9c5ce120c7cd30f512bdb Mon Sep 17 00:00:00 2001
-From: nE0sIghT <ykonotopov@gmail.com>
-Date: Sat, 18 Jul 2015 19:03:05 +0300
-Subject: [PATCH] Fixed build of sdl drivers
-
----
- driver/audio/SDL/src/CMakeLists.txt | 1 +
- driver/video/SDL/src/CMakeLists.txt | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/driver/audio/SDL/src/CMakeLists.txt b/driver/audio/SDL/src/CMakeLists.txt
-index 5ad3f02..5a91cd5 100644
---- a/driver/audio/SDL/src/CMakeLists.txt
-+++ b/driver/audio/SDL/src/CMakeLists.txt
-@@ -20,6 +20,7 @@ IF (SDL_FOUND)
-         
-         ADD_LIBRARY(audioSDL SHARED SDL.cpp SDL.h main.h SoundSDL_Music.cpp SoundSDL_Music.h SoundSDL_Effect.cpp SoundSDL_Effect.h ${PROJECT_SOURCE_DIR}/build_version.cpp ../../../src/DriverInterface.cpp ../../../src/tempname.cpp ../../../src/tempname.h)
-     
-+    	ADD_DEFINITIONS(-fPIC)
-         ADD_FLAGS(CMAKE_C_FLAGS -I${SDL_INCLUDE_DIR} -I${SDLMIXER_INCLUDE_DIR})
-         ADD_FLAGS(CMAKE_CXX_FLAGS -I${SDL_INCLUDE_DIR} -I${SDLMIXER_INCLUDE_DIR})
- 
-diff --git a/driver/video/SDL/src/CMakeLists.txt b/driver/video/SDL/src/CMakeLists.txt
-index 83d10cf..ca67573 100644
---- a/driver/video/SDL/src/CMakeLists.txt
-+++ b/driver/video/SDL/src/CMakeLists.txt
-@@ -16,6 +16,7 @@ IF (SDL_FOUND)
- 
- 	ADD_LIBRARY(videoSDL SHARED SDL.cpp SDL.h main.h ../../../../build_version.cpp ../../../src/DriverInterface.cpp)
- 
-+	ADD_DEFINITIONS(-fPIC)
- 	ADD_FLAGS(CMAKE_C_FLAGS -I${SDL_INCLUDE_DIR})
- 	ADD_FLAGS(CMAKE_CXX_FLAGS -I${SDL_INCLUDE_DIR})
- 
--- 
-2.3.6
-
-

diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-gcc6.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-gcc6.patch
deleted file mode 100644
index 957ecf4ddf5..00000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-gcc6.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-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/files/s25rttr-0.8.1-miniupnpc-api-14.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-miniupnpc-api-14.patch
deleted file mode 100644
index d2ff0ee1fe3..00000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-miniupnpc-api-14.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3b08b907235c09ab84e3bb23d1e05fe5a1d1c00e Mon Sep 17 00:00:00 2001
-From: Manuel Zeise <mail@manuel-zeise.de>
-Date: Sun, 3 Jan 2016 16:54:05 +0100
-Subject: [PATCH] Switch for miniUPnPc API version 14 and above
-
-API version 14 of miniUPnPc has introduced a new TTL argument to
-upnpDiscover() with a recommended default value of 2. A new preprocessor
-statement evaluates the API version and selects the correct version of
-upnpDiscover() based on the API version.
-
---- s25rttr-0.8.1/libutil/src/UPnP.cpp
-+++ s25rttr-0.8.1/libutil/src/UPnP.cpp
-@@ -210,7 +210,11 @@
- 	UPNPDev* devicelist = NULL;
- #ifdef UPNPDISCOVER_SUCCESS
- 	int upnperror = 0;
-+#if (MINIUPNPC_API_VERSION >= 14) /* miniUPnPc API version 14 adds TTL parameter */
-+	devicelist = upnpDiscover(2000, NULL, NULL, 0, 0 /* ipv6 */, 2, &upnperror);
-+#else
- 	devicelist = upnpDiscover(2000, NULL, NULL, 0, 0 /* ipv6 */, &upnperror);
-+#endif
- #else
- 	devicelist = upnpDiscover(2000, NULL, NULL, 0);
- #endif
-@@ -276,7 +280,11 @@
- 	UPNPDev* devicelist = NULL;
- #ifdef UPNPDISCOVER_SUCCESS
- 	int upnperror = 0;
-+#if (MINIUPNPC_API_VERSION >= 14) /* miniUPnPc API version 14 adds TTL parameter */
-+	devicelist = upnpDiscover(2000, NULL, NULL, 0, 0 /* ipv6 */, 2, &upnperror);
-+#else
- 	devicelist = upnpDiscover(2000, NULL, NULL, 0, 0 /* ipv6 */, &upnperror);
-+#endif
- #else
- 	devicelist = upnpDiscover(2000, NULL, NULL, 0);
- #endif

diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch
deleted file mode 100644
index 1cc7686b850..00000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: hasufell <julian.ospald@googlemail.com>
-Date: Mon Apr 30 20:42:28 UTC 2012
-
-relocate executables sound-convert and s-c_resample which get installed
-into datadir by default
-
---- a/libutil/src/files.h
-+++ b/libutil/src/files.h
-@@ -140,7 +140,7 @@
- 	/* 54 */RTTRDIR "",                               // unbenutzt
- 	/* 55 */SETTINGSDIR "/LSTS/SOUND.LST",            // Die konvertierte sound.lst
- 	/* 56 */RTTRDIR "/sound.scs",                     // Das konvertier-script
--	/* 57 */RTTRDIR "",                               // Basispfad fürn Soundconverter
-+	/* 57 */DRIVERDIR "",                             // Basispfad fürn Soundconverter
- 	/* 58 */GAMEDIR "/DATA/MIS0BOBS.LST",
- 	/* 59 */GAMEDIR "/DATA/MIS1BOBS.LST",
- 	/* 60 */GAMEDIR "/DATA/MIS2BOBS.LST",

diff --git a/games-strategy/s25rttr/files/s25rttr-loosen-libs.patch b/games-strategy/s25rttr/files/s25rttr-loosen-libs.patch
deleted file mode 100644
index 421cde2cd74..00000000000
--- a/games-strategy/s25rttr/files/s25rttr-loosen-libs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/libs/libGamedata/CMakeLists.txt b/libs/libGamedata/CMakeLists.txt
-index b09569530..3d908226c 100644
---- a/libs/libGamedata/CMakeLists.txt
-+++ b/libs/libGamedata/CMakeLists.txt
-@@ -12,7 +12,7 @@ FILE(GLOB SOURCES_OTHER *.cpp *.h)
- SOURCE_GROUP(other FILES ${SOURCES_OTHER})
- 
- # CMake < 3.2 treats version 5.2.x as not equal to 5.2 but we want to allow all 5.2 versions
--find_package(Lua 5.2 EXACT REQUIRED)
-+find_package(Lua 5.1 REQUIRED)
- 
- include(GatherDll)
- gather_dll(Lua)

diff --git a/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild b/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild
deleted file mode 100644
index 01cef6dff65..00000000000
--- a/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop gnome2-utils readme.gentoo-r1
-
-DESCRIPTION="Open Source remake of The Settlers II game (needs original game files)"
-HOMEPAGE="https://www.siedler25.org/"
-# no upstream source tarball yet
-# https://bugs.launchpad.net/s25rttr/+bug/1069546
-SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	app-arch/bzip2
-	media-libs/libsamplerate
-	media-libs/libsdl[X,sound,opengl,video]
-	media-libs/libsndfile
-	media-libs/sdl-mixer[vorbis]
-	net-libs/miniupnpc
-	virtual/libiconv
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-DOCS=( RTTR/texte/{keyboardlayout.txt,readme.txt} )
-
-DOC_CONTENTS="Copy your Settlers2 game files into ~/.${PN}/S2"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cmake.patch
-	"${FILESDIR}"/${P}-soundconverter.patch
-	"${FILESDIR}"/${P}-fpic.patch
-	"${FILESDIR}"/${P}-format.patch
-	"${FILESDIR}"/${P}-miniupnpc-api-14.patch
-	"${FILESDIR}"/${P}-cmake-3.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCOMPILEFOR="linux"
-		-DCMAKE_SKIP_RPATH=YES
-		-DPREFIX="/usr/"
-		-DBINDIR="/usr/bin"
-		-DDATADIR="/usr/share"
-		-DLIBDIR="/usr/$(get_libdir)/${PN}"
-		-DDRIVERDIR="/usr/$(get_libdir)/${PN}"
-		-DGAMEDIR="~/.${PN}/S2"
-		-DBUILD_GLFW_DRIVER=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# work around some relative paths (CMAKE_IN_SOURCE_BUILD not supported)
-	ln -s "${CMAKE_USE_DIR}"/RTTR "${CMAKE_BUILD_DIR}"/RTTR || die
-
-	cmake-utils_src_compile
-
-	mv "${CMAKE_USE_DIR}"/RTTR/{sound-convert,s-c_resample} "${T}"/ || die
-}
-
-src_install() {
-	cd "${CMAKE_BUILD_DIR}" || die
-
-	exeinto /usr/"$(get_libdir)"/${PN}
-	doexe "${T}"/{sound-convert,s-c_resample}
-	exeinto /usr/"$(get_libdir)"/${PN}/video
-	doexe driver/video/SDL/src/libvideoSDL.so
-	exeinto /usr/"$(get_libdir)"/${PN}/audio
-	doexe driver/audio/SDL/src/libaudioSDL.so
-
-	insinto /usr/share
-	doins -r "${CMAKE_USE_DIR}"/RTTR
-	dosym ./LSTS/splash.bmp /usr/share/RTTR/splash.bmp
-
-	doicon -s 64 "${CMAKE_USE_DIR}"/debian/${PN}.png
-	dobin src/s25client
-	make_desktop_entry "s25client" "Settlers RTTR" "${PN}"
-
-	einstalldocs
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

diff --git a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200418.ebuild b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200418.ebuild
deleted file mode 100644
index 01daa6e3ffc..00000000000
--- a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200418.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic 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="784eb58fc1eb42751042d82f16cc92617fc6c2ae"
-SRC_URI="
-	https://github.com/Return-To-The-Roots/s25client/archive/${COMMIT}.tar.gz -> s25client-${COMMIT}.tar.gz
-	https://github.com/mat007/turtle/archive/5f8421b1d270665347280d4cab1caf159d6858de.tar.gz -> ${PN}-turtle-5f8421b1d270665347280d4cab1caf159d6858de.tar.gz
-	https://github.com/Return-To-The-Roots/languages/archive/b1978170473bbf39a24254814e1b1f967a51ef4c.tar.gz -> ${PN}-languages-b1978170473bbf39a24254814e1b1f967a51ef4c.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/7d85ec40f03af619a6734f20edb28d991b3d61f2.tar.gz -> ${PN}-liblobby-7d85ec40f03af619a6734f20edb28d991b3d61f2.tar.gz
-	https://github.com/Return-To-The-Roots/libsiedler2/archive/800d58ea072c35d3cf9832d2f6a5cdae92fc0445.tar.gz -> ${PN}-libsiedler2-800d58ea072c35d3cf9832d2f6a5cdae92fc0445.tar.gz
-	https://github.com/Return-To-The-Roots/libutil/archive/c91488e4d2f0079a864c4be80eaba24a871e9772.tar.gz -> ${PN}-libutil-c91488e4d2f0079a864c4be80eaba24a871e9772.tar.gz
-	https://github.com/Return-To-The-Roots/mygettext/archive/7e46bbb3e24891348f5629887efb0173690e83b8.tar.gz -> ${PN}-mygettext-7e46bbb3e24891348f5629887efb0173690e83b8.tar.gz
-	https://github.com/Return-To-The-Roots/s25edit/archive/04b5e725036a0568e8da15447167c240563dbaba.tar.gz -> ${PN}-s25edit-04b5e725036a0568e8da15447167c240563dbaba.tar.gz
-	https://github.com/Return-To-The-Roots/s25maps/archive/11a5f3e95405b7cf8088641efb4939eba9639cbc.tar.gz -> ${PN}-s25maps-11a5f3e95405b7cf8088641efb4939eba9639cbc.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 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-arch/bzip2
-	>=dev-lang/lua-5.1:=
-	>=dev-libs/boost-1.64: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
-"
-
-S="${WORKDIR}/s25client-${COMMIT}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-loosen-libs.patch
-)
-
-# 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_SAMPLERATE=ON
-		-DRTTR_VERSION="${PV}"
-	)
-
-	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] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/s25rttr/files/, games-strategy/s25rttr/
@ 2021-08-19  2:00 Sam James
  0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2021-08-19  2:00 UTC (permalink / raw
  To: gentoo-commits

commit:     f0f6de3c704ea0849ed8b41e1cf7d7222ccb6193
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 19 01:52:51 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 19 02:00:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0f6de3c

games-strategy/s25rttr: fix build with Boost 1.77

Closes: https://bugs.gentoo.org/808767
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...r-0.9.0_pre20200723-boost-1.77-missing-include.patch | 17 +++++++++++++++++
 .../s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild       |  3 +++
 2 files changed, 20 insertions(+)

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
new file mode 100644
index 00000000000..9a69797ea27
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch
@@ -0,0 +1,17 @@
+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/s25rttr-0.9.0_pre20200723-r100.ebuild b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild
index dc54ef2deaf..f15c62bc0c1 100644
--- a/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.9.0_pre20200723-r100.ebuild
@@ -60,6 +60,7 @@ BDEPEND="
 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}"
@@ -98,6 +99,8 @@ src_configure() {
 		-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)


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/s25rttr/files/, games-strategy/s25rttr/
@ 2021-09-11  8:38 James Le Cuirot
  0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2021-09-11  8:38 UTC (permalink / raw
  To: gentoo-commits

commit:     0b52435579ce5e9941a9f2a6102674bb7ce1b0ad
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 11 08:34:16 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Sep 11 08:34:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b524355

games-strategy/s25rttr: Bump to 0.9.1, EAPI 8

Closes: https://bugs.gentoo.org/750512
Closes: https://bugs.gentoo.org/778587
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-strategy/s25rttr/Manifest                    |   1 +
 .../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        | 114 +++++++++++++++++++++
 4 files changed, 182 insertions(+)

diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest
index 246f9787269..d80aad01563 100644
--- a/games-strategy/s25rttr/Manifest
+++ b/games-strategy/s25rttr/Manifest
@@ -1,4 +1,5 @@
 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

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
new file mode 100644
index 00000000000..cb5ecdf2822
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.9.1-cxx-std.patch
@@ -0,0 +1,30 @@
+From 5db419d044149ab3760c1588b44536febab5d657 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+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
new file mode 100644
index 00000000000..41d6d90e5fd
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.9.1-libsamplerate.patch
@@ -0,0 +1,37 @@
+From 16cb06c99f78a21b1be2bc681c1f1d85a6caddca Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+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
new file mode 100644
index 00000000000..4aa4156d566
--- /dev/null
+++ b/games-strategy/s25rttr/s25rttr-0.9.1.ebuild
@@ -0,0 +1,114 @@
+# 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-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
+}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/s25rttr/files/, games-strategy/s25rttr/
@ 2021-09-11 17:44 James Le Cuirot
  0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2021-09-11 17:44 UTC (permalink / raw
  To: gentoo-commits

commit:     93e1192d84d813b10f3b5f75f431660be11ee9dd
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 11 17:44:34 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Sep 11 17:44:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93e1192d

games-strategy/s25rttr: Restore missing include patch

This issue only happens with Boost 1.77 so I didn't realise the patch
was still needed.

Closes: https://bugs.gentoo.org/812659
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 ...r-0.9.0_pre20200723-boost-1.77-missing-include.patch | 17 +++++++++++++++++
 games-strategy/s25rttr/s25rttr-0.9.1.ebuild             |  1 +
 2 files changed, 18 insertions(+)

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
new file mode 100644
index 00000000000..9a69797ea27
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.9.0_pre20200723-boost-1.77-missing-include.patch
@@ -0,0 +1,17 @@
+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/s25rttr-0.9.1.ebuild b/games-strategy/s25rttr/s25rttr-0.9.1.ebuild
index 4aa4156d566..1cf08d68bd4 100644
--- a/games-strategy/s25rttr/s25rttr-0.9.1.ebuild
+++ b/games-strategy/s25rttr/s25rttr-0.9.1.ebuild
@@ -40,6 +40,7 @@ BDEPEND="
 "
 
 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


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/s25rttr/files/, games-strategy/s25rttr/
@ 2022-08-11  7:37 Ionen Wolkens
  0 siblings, 0 replies; 11+ messages in thread
From: Ionen Wolkens @ 2022-08-11  7:37 UTC (permalink / raw
  To: gentoo-commits

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 <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.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 <chewi@gentoo.org>
-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 <chewi@gentoo.org>
-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
-}


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: games-strategy/s25rttr/files/, games-strategy/s25rttr/
@ 2023-01-23  2:40 Sam James
  0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-01-23  2:40 UTC (permalink / raw
  To: gentoo-commits

commit:     e4dcbf5e60b24ec0d33884abc026068cc3b94faf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 01:54:33 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 02:32:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4dcbf5e

games-strategy/s25rttr: fix build w/ gcc 13

Closes: https://bugs.gentoo.org/891713
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../s25rttr/files/s25rttr-0.9.5-gcc-13.patch       | 50 ++++++++++++++++++++++
 games-strategy/s25rttr/s25rttr-0.9.5.ebuild        |  3 +-
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/games-strategy/s25rttr/files/s25rttr-0.9.5-gcc-13.patch b/games-strategy/s25rttr/files/s25rttr-0.9.5-gcc-13.patch
new file mode 100644
index 000000000000..117c2645cc40
--- /dev/null
+++ b/games-strategy/s25rttr/files/s25rttr-0.9.5-gcc-13.patch
@@ -0,0 +1,50 @@
+https://bugs.gentoo.org/891713
+https://github.com/Return-To-The-Roots/s25client/pull/1548
+https://github.com/Return-To-The-Roots/libsiedler2/pull/21
+
+From d59abd4b565cd6f11dd64f6e4f497c9797e52c5a Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 23 Jan 2023 01:49:47 +0000
+Subject: [PATCH] LanGameInfo: Add missing <cstdint> include
+
+GCC 13 (as usual for new compiler releases) shuffles around some
+internal includes and so <cstdint> etc is no longer transitively included.
+
+See https://www.gnu.org/software/gcc/gcc-13/porting_to.html.
+
+Closes: https://github.com/Return-To-The-Roots/libsiedler2/issues/20
+Bug: https://bugs.gentoo.org/891713
+--- a/libs/s25main/gameTypes/LanGameInfo.h
++++ b/libs/s25main/gameTypes/LanGameInfo.h
+@@ -4,6 +4,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ 
+ class Serializer;
+
+From 6a289fa3a3f50f0967a072292f3e0c628144ab8d Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 23 Jan 2023 01:47:19 +0000
+Subject: [PATCH] oem: Add missing <cstdint> include
+
+GCC 13 (as usual for new compiler releases) shuffles around some
+internal includes and so <cstdint> etc is no longer transitively included.
+
+See https://www.gnu.org/software/gcc/gcc-13/porting_to.html.
+
+Closes: https://github.com/Return-To-The-Roots/libsiedler2/issues/20
+Bug: https://bugs.gentoo.org/891713
+--- a/external/libsiedler2/src/oem.cpp
++++ b/external/libsiedler2/src/oem.cpp
+@@ -4,6 +4,7 @@
+ 
+ #include "oem.h"
+ #include <array>
++#include <cstdint>
+ 
+ namespace libsiedler2 {
+ 
+

diff --git a/games-strategy/s25rttr/s25rttr-0.9.5.ebuild b/games-strategy/s25rttr/s25rttr-0.9.5.ebuild
index e5f8470614a6..4986896fd623 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-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -41,6 +41,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.9.0_pre20200723-cmake_lua_version.patch
+	"${FILESDIR}"/${PN}-0.9.5-gcc-13.patch
 )
 
 S="${WORKDIR}/${MY_PN}_v${PV}"


^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2023-01-23  2:40 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-23  2:40 [gentoo-commits] repo/gentoo:master commit in: games-strategy/s25rttr/files/, games-strategy/s25rttr/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2022-08-11  7:37 Ionen Wolkens
2021-09-11 17:44 James Le Cuirot
2021-09-11  8:38 James Le Cuirot
2021-08-19  2:00 Sam James
2020-07-26 21:19 James Le Cuirot
2020-04-18 20:47 James Le Cuirot
2018-07-01  0:03 Andreas Sturmlechner
2016-02-16  6:47 Alfredo Tupone
2016-01-10 20:37 David Seifert
2015-10-06 22:53 Michael Sterrett

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox