diff options
Diffstat (limited to 'games-strategy/s25rttr/files')
7 files changed, 369 insertions, 0 deletions
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 000000000000..b7e9e424eb08 --- /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/files/s25rttr-0.8.1-cmake.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch new file mode 100644 index 000000000000..14f2edb52df5 --- /dev/null +++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch @@ -0,0 +1,160 @@ +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 new file mode 100644 index 000000000000..3d50543b9c0e --- /dev/null +++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..4a1d11ef1704 --- /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/files/s25rttr-0.8.1-gcc6.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-gcc6.patch new file mode 100644 index 000000000000..957ecf4ddf50 --- /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/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 000000000000..d2ff0ee1fe39 --- /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/files/s25rttr-0.8.1-soundconverter.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch new file mode 100644 index 000000000000..1cc7686b850d --- /dev/null +++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch @@ -0,0 +1,17 @@ +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", |