From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- games-strategy/s25rttr/Manifest | 1 + .../s25rttr/files/s25rttr-0.8.1-cmake.patch | 160 +++++++++++++++++++++ .../files/s25rttr-0.8.1-soundconverter.patch | 17 +++ games-strategy/s25rttr/metadata.xml | 13 ++ games-strategy/s25rttr/s25rttr-0.8.1.ebuild | 108 ++++++++++++++ 5 files changed, 299 insertions(+) create mode 100644 games-strategy/s25rttr/Manifest create mode 100644 games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch create mode 100644 games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch create mode 100644 games-strategy/s25rttr/metadata.xml create mode 100644 games-strategy/s25rttr/s25rttr-0.8.1.ebuild (limited to 'games-strategy/s25rttr') diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest new file mode 100644 index 000000000000..c4abcc387b66 --- /dev/null +++ b/games-strategy/s25rttr/Manifest @@ -0,0 +1 @@ +DIST s25rttr-0.8.1.tar.xz 39644940 SHA256 683282a1d7d0549bb3a9db64c14aea111fcef79212461a099a2fe2e3960263bf SHA512 31a7d640e1ecd5488ef02d0ed3adcaeb9b5ae5f6af5e006deb4100fde3eb8ec567e34519e9c2b82f38c9972d62790a6f6978d5da6c6dfca7f1c153fa65f22df2 WHIRLPOOL 6558b6235b805489b8bc16b51175c7f46cc4d4887a088d79680826542b65f73f93bcd5801847b6284390a2f0ddbb112cfdb5decd1fb89a8c6ed585280f2f7de4 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..d8cdfedbb9a0 --- /dev/null +++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch @@ -0,0 +1,160 @@ +From: Julian Ospald +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$ + ################################################################################# + +-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.1-soundconverter.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch new file mode 100644 index 000000000000..493d7cb404be --- /dev/null +++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch @@ -0,0 +1,17 @@ +From: hasufell +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/metadata.xml b/games-strategy/s25rttr/metadata.xml new file mode 100644 index 000000000000..d916cbb4d0ce --- /dev/null +++ b/games-strategy/s25rttr/metadata.xml @@ -0,0 +1,13 @@ + + + + games + + http://www.siedler25.org/index.php?com=dynamic&mod=9&PHPSESSID=e5fa4f90c4db5df0cb1e417e128300b5 + https://bugs.launchpad.net/s25rttr + + + Compile another video driver based on media-libs/glfw. + + + diff --git a/games-strategy/s25rttr/s25rttr-0.8.1.ebuild b/games-strategy/s25rttr/s25rttr-0.8.1.ebuild new file mode 100644 index 000000000000..799f46d953c0 --- /dev/null +++ b/games-strategy/s25rttr/s25rttr-0.8.1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2015 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="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? (