diff options
Diffstat (limited to 'games-strategy')
-rw-r--r-- | games-strategy/s25rttr/ChangeLog | 7 | ||||
-rw-r--r-- | games-strategy/s25rttr/files/s25rttr-0.8-cmake.patch | 160 | ||||
-rw-r--r-- | games-strategy/s25rttr/files/s25rttr-0.8-soundconverter.patch | 17 | ||||
-rw-r--r-- | games-strategy/s25rttr/s25rttr-0.8.ebuild | 107 |
4 files changed, 6 insertions, 285 deletions
diff --git a/games-strategy/s25rttr/ChangeLog b/games-strategy/s25rttr/ChangeLog index 2639bbf3e2de..55aaa83aebcd 100644 --- a/games-strategy/s25rttr/ChangeLog +++ b/games-strategy/s25rttr/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-strategy/s25rttr # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/s25rttr/ChangeLog,v 1.9 2015/02/25 15:56:39 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/s25rttr/ChangeLog,v 1.10 2015/03/12 19:37:17 mr_bones_ Exp $ + + 12 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org> + -files/s25rttr-0.8-cmake.patch, -files/s25rttr-0.8-soundconverter.patch, + -s25rttr-0.8.ebuild: + old 25 Feb 2015; Agostino Sarubbo <ago@gentoo.org> s25rttr-0.8.1.ebuild: Stable for x86, wrt bug #540598 diff --git a/games-strategy/s25rttr/files/s25rttr-0.8-cmake.patch b/games-strategy/s25rttr/files/s25rttr-0.8-cmake.patch deleted file mode 100644 index 38913c893e69..000000000000 --- a/games-strategy/s25rttr/files/s25rttr-0.8-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 - ---- CMakeLists.txt -+++ 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 ---- driver/video/CMakeLists.txt -+++ 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) - - ################################################################################# ---- driver/video/SDL/src/CMakeLists.txt -+++ 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") ---- driver/video/GLFW/src/CMakeLists.txt -+++ driver/video/GLFW/src/CMakeLists.txt -@@ -2,7 +2,7 @@ - ### $Id: s25rttr-0.8-cmake.patch,v 1.1 2012/11/12 23:07:17 hasufell Exp $ - ################################################################################# - --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" ) - - ################################################################################# ---- driver/audio/SDL/src/CMakeLists.txt -+++ 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") ---- build_paths.h.cmake -+++ 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-soundconverter.patch b/games-strategy/s25rttr/files/s25rttr-0.8-soundconverter.patch deleted file mode 100644 index 493d7cb404be..000000000000 --- a/games-strategy/s25rttr/files/s25rttr-0.8-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 - ---- libutil/src/files.h -+++ 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/s25rttr-0.8.ebuild b/games-strategy/s25rttr/s25rttr-0.8.ebuild deleted file mode 100644 index ab701f715f29..000000000000 --- a/games-strategy/s25rttr/s25rttr-0.8.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/s25rttr/s25rttr-0.8.ebuild,v 1.5 2014/05/15 17:06:38 ulm Exp $ - -EAPI=4 -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="http://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 -} - -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 - - 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 -} |