# 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
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX s25rttr-0.8-cmake.patch 5747 SHA256 e5d16fe757b04d3b5683f10727254d78d8a45a87a6c4ee7c1a52664dcb5e87b0 SHA512 e4f50a82edfcb5384be636784b718bb070ac44cbaee5e336a449105d8aaf70ffbcaec9025ebcdf978be4147d8e477ad0112bd2913ebc73825201a62f5e2b3afc WHIRLPOOL fe4659aeb7676de3cb491b05cf3726b64ee30bfae1d3c1b943e211f5ca44980f1f9ea6582465ff9ef548374c2bae223ac065555b220b8fece614a0d4c13a4738
-AUX s25rttr-0.8-soundconverter.patch 763 SHA256 a3a490b4efb2182400fc9b07a67f66c939a2fe8a58983e85f4cd5125bfc2de37 SHA512 0f16e86057cb1574b8dd2303c49547ce855897683de3af52a437da9304c7bc821bcd3278dae6652fb8a0a358e64c1fa4c0eaec88323ab2dc5a0c56da3ce61afe WHIRLPOOL 3d427181fa8354f5b01e4ebfe8a3d445099163bd705094ee43a7d1b6dcb0f2a873d8262e1a23816ba089b4efa0189c0a3c8c8ad5e5b89595337de9d2aad98163
AUX s25rttr-0.8.1-cmake.patch 5749 SHA256 d36d2a6d53b606690e79deba9ba8412834be0e69ed390008cd34c416d83965d0 SHA512 65ad53d8da6ee2c3cb7cc24cd423de599e7a4f678019abff6a00257fd7a6b3ab18efa90034fd2228f4166095848482eff7579370b7675c5909910c9ca64146de WHIRLPOOL 2e2c75b05366e3200c09002d10ef1db37c2238d2a71688515331974644626aeb494c5fbf7e464c506a4411d8576c183131bda2cd774c635fee4a9de213044463
AUX s25rttr-0.8.1-soundconverter.patch 763 SHA256 a3a490b4efb2182400fc9b07a67f66c939a2fe8a58983e85f4cd5125bfc2de37 SHA512 0f16e86057cb1574b8dd2303c49547ce855897683de3af52a437da9304c7bc821bcd3278dae6652fb8a0a358e64c1fa4c0eaec88323ab2dc5a0c56da3ce61afe WHIRLPOOL 3d427181fa8354f5b01e4ebfe8a3d445099163bd705094ee43a7d1b6dcb0f2a873d8262e1a23816ba089b4efa0189c0a3c8c8ad5e5b89595337de9d2aad98163
DIST s25rttr-0.8.1.tar.xz 39644940 SHA256 683282a1d7d0549bb3a9db64c14aea111fcef79212461a099a2fe2e3960263bf SHA512 31a7d640e1ecd5488ef02d0ed3adcaeb9b5ae5f6af5e006deb4100fde3eb8ec567e34519e9c2b82f38c9972d62790a6f6978d5da6c6dfca7f1c153fa65f22df2 WHIRLPOOL 6558b6235b805489b8bc16b51175c7f46cc4d4887a088d79680826542b65f73f93bcd5801847b6284390a2f0ddbb112cfdb5decd1fb89a8c6ed585280f2f7de4
-DIST s25rttr-0.8.tar.xz 39648588 SHA256 dc800097196ddf23ef974d51e394f596d915675614a51ada50fb412bd075805f SHA512 1d707fc2aa4aff4266c5e6667d5f94a7e4c5d571b6aadc156d68c11b15b0d8ade85d33723364589c90a60b0760e5e0794c25210f4a28005a64ff18d383d2ff52 WHIRLPOOL f54fccb8739203d6a65ed07dfefa150dd138b4bb73632b7a7646ae3b3e5ea96d1ca697d87b39d11f0bc9426cef953681692d5dbf223da4f9434fc1914b228ba1
EBUILD s25rttr-0.8.1.ebuild 2677 SHA256 4784f731671bc3cc37caf832605e0a4439459bbdcd87be1cfc6d5a63b964a1f8 SHA512 eff206b9dff9fd4f91abc68fb7736242fb0c6eaeeff6018d596d9cc80eccdd10765ab1a415de933987089f8788e21b7a7f387fc135013b57abde120b31d1944b WHIRLPOOL bf00b0d55c0799b79272cb5e4ea6c1d8a21625195c4d65270ab27037955365c22699a1347d6d90b1f51b94f3bde62a0130f6025a217ab0c96c19b1b0f2795075
-EBUILD s25rttr-0.8.ebuild 2618 SHA256 7c9506c3a39fdb3642371d0a5225a4fd0fb583ec1544b914b4a240df92f23978 SHA512 fbbccd83c313cd253b3cbf2d617fc4ec2461594f81e908eeda78fbff0fda3b7d376789636c37f2f0f929d6790292c8b77554c6bad4ae1532aeb3da30f92bb678 WHIRLPOOL 441ac3fcaf73898600f4de0c6dacb08a5d562375dcad387eb2b0fad657fa2fc1df9d30adf716feef2022d0d4847ed372017b2aff8f38c28d22d210f80b488eeb
-MISC ChangeLog 1472 SHA256 ca6af2bda1a9842aef839357d9aaea51657b8769b1965411c2d08fc3804721ad SHA512 1892776e0fe2ab5e21b454d1ba37bdbb2fcd1999bbf4ffafc85f7bf468b773cc1a802deacf4fa9c42fbbf8224d9b2b675b9e6f5096278c7352bff751b268d6a2 WHIRLPOOL bb95f6408400231af8d93d9debb8a00297e6818e49aa99f8bb664593f970435b88604eae4ece60c2568edabaa66cc26cf09f7c3decf0d9a42359fa792ef7b639
+MISC ChangeLog 1639 SHA256 d9919e0bdd04b2db741f6d87b1313fa17c693d197c631d04cb1f10eb3ef96445 SHA512 e5b0c9e35dfb5660575433b314b0ac76afd57ace40c6e128e6843e24d9b6a19428510c8caa8e605bf3f73dbb9e8868432e61bd5f0ff9d35ed9ecc143b8771e6d WHIRLPOOL a77a840f2537613a6c12d1e46f22565010e444792c690896ddfd4e83c0981ea9e68cdc6320e9cfa398ed54b0369610833d25a2631006e2ab2d095e479bf21543
MISC metadata.xml 490 SHA256 aaea283463f6f428fb3f2ed76ff3ccadd13b6fde0ae0d08b4a6a69b6d404c424 SHA512 09fb51c2b07b909d14e5be57acb0ee5a6a33e986a6373b7f7c0f4600ead465afa60412de36420872ee148375788848f0d13882b18d722789c996b3af2099f5b6 WHIRLPOOL 12708c8ab45f6a471df703681f31d65cebe7e6bd5918253eaf24d2e52381228c76ac4e8dce89952bd9ad2cb96d0ecbffad6986725f4e124eae70d2ee4936ea19
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJU7fC4AAoJELp701BxlEWfxWEP/2BQNsuVsy8Qv/Syk20x6df6
-fj623OFslFTuY8atdR0O+WQgEygQW9Ad6iYvx5PN1yEXSZZ+jS6eYc2JtmVSN0RO
-lMSFkdepipHdXIQmvzvTga9QNHgkqb/D/H9ABqHVV6WnFHGa6Bng03iY8+v2Geap
-cLLw5YG43CO1BAC8i2MpBy/0VejVLQf1By/EwRhdNKZNl/kaLYvgakxOSXW2OXmU
-QWVGEKwVXuY5hHahoUBwBAESZ93KgVFTbgef4igPXfB/VYzxvQ2uDnufyMaBQYCX
-peJfK4wPfsnPRWn+lzFfSyULVHzvOlRTEmRU7MZ6R/b+yf9FayoDOijcs9Hd/ZFy
-BhzuYkdz7wxCeLXwm2sX0tkvlHsomNfxj2ocAR3Xk0+2CCZ8YwpKjntyKwXjK+VU
-NxqxLQFwHImKL41W/b0k+JSo0H7aq3BGgqQ7pbEtXZRTMXbmjaFYTHjiRTjUH4Vt
-35nNYAifqHiA68QtV72l4k/l2E76+YIhTZIgrsBj9spP0Gvs+ZrjQD6BLq0IzzQz
-cRs1gifKtx3GuA0fiG4eZCoaLLwCGa7WhGT0TSbv13dxCI97c8SJyszGa9KJn5ng
-FqB0kcjKQDPnUgCnaSY+5tSAOreKjll7Q8Cbm6VI2gGLPBLXjlHFGbLuCimm9LF3
-IS19+JtzQb6ZyiT8o5tE
-=OJGO
------END PGP SIGNATURE-----
+++ /dev/null
-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"
+++ /dev/null
-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",
+++ /dev/null
-# 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
-}
projects / gentoo.git / commitdiff