From 86b507ff5b5809ade979b43960dfcc8462a93068 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 27 May 2012 20:27:13 +0000 Subject: version bump wrt #396203 Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64 --- games-strategy/wargus/ChangeLog | 8 ++- games-strategy/wargus/Manifest | 19 +++++- .../wargus/files/wargus-2.2.6-build.patch | 77 ++++++++++++++++++++++ games-strategy/wargus/wargus-2.2.6.ebuild | 74 +++++++++++++++++++++ 4 files changed, 176 insertions(+), 2 deletions(-) create mode 100644 games-strategy/wargus/files/wargus-2.2.6-build.patch create mode 100644 games-strategy/wargus/wargus-2.2.6.ebuild (limited to 'games-strategy/wargus') diff --git a/games-strategy/wargus/ChangeLog b/games-strategy/wargus/ChangeLog index e84901f1164f..4f890a96765b 100644 --- a/games-strategy/wargus/ChangeLog +++ b/games-strategy/wargus/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for games-strategy/wargus # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/ChangeLog,v 1.15 2012/05/17 18:06:23 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/ChangeLog,v 1.16 2012/05/27 20:27:13 hasufell Exp $ + +*wargus-2.2.6 (27 May 2012) + + 27 May 2012; Julian Ospald +wargus-2.2.6.ebuild, + +files/wargus-2.2.6-build.patch: + version bump wrt #396203 17 May 2012; Michael Sterrett wargus-2.2.5.5.ebuild: Add media-video/ffmpeg2theora dep (bug #416425) diff --git a/games-strategy/wargus/Manifest b/games-strategy/wargus/Manifest index 4e6236d9fc75..ec3030a2477a 100644 --- a/games-strategy/wargus/Manifest +++ b/games-strategy/wargus/Manifest @@ -1,6 +1,23 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX wargus-2.2.5.5-libpng.patch 974 RMD160 fe10e98e1e358aac9954fdba745011fbe903eb0e SHA1 7e79bee2ac19730e1a47e1cf4893232fe0e0ade1 SHA256 b48b53ee2f18abc5e4a76f72eca6702baf39ac129765f906ce1e33985b442c15 +AUX wargus-2.2.6-build.patch 3111 RMD160 5671287ff70c3d8b9d504983bb2f7c7bcece7f99 SHA1 9953e300777f8a756a8366f34d8d42cb23c13c11 SHA256 07cba37dac4cf94ee6e84cd00b9b7f5424bde1854980b9fe8945248de2e020ec DIST wargus.png 7561 RMD160 b8ce62f3a60045b8b32a0f459df1849496d2402e SHA1 eb14c74b682fdeb6014f5951a56c7f66ede79f23 SHA256 f8190a41f5131c45c76cb6d91c97e7fcf48c4fcd26cb231802c224c7e19ac0bd DIST wargus_2.2.5.5.orig.tar.gz 3605444 RMD160 3da58129f9a3221e306afe019655072fa25e230a SHA1 a34511c50d1f0ac838558780daa790f7585113d1 SHA256 561d0ac5e88abcd5663fca1f7793ee20739aa0d641420bf0a6b7424ebd4ab14f +DIST wargus_2.2.6.orig.tar.gz 3655036 RMD160 4319b1a658e460687257bf1f9bba75fe9c4d8167 SHA1 2373af8f23f14056f56065e5cfdc7a1ebf9665b7 SHA256 88c300661836d6eb6f5c7859ef8ba292455a5cf3dae274e2b6ac9bc3497622fe EBUILD wargus-2.2.5.5.ebuild 1072 RMD160 7701a1cb9a171dc1a2c587e43519e42591d9f2a8 SHA1 8cce49e40e88a7aa8ca6b496ca5082d157b23a9d SHA256 3cda518b6f6ddc1799adab244bd88fcf3f5f07662366d5a24fe2fc237379a98d -MISC ChangeLog 2860 RMD160 61bb76462d9cebd9bf869da9d0ce62fa371fc362 SHA1 ac12e81bd0ecd86eae3b3a0e56448888afc5fe34 SHA256 eed9654c8399134731f2a0f4d06bcdf2b2b454af50f127991dd66a9fe3999bc2 +EBUILD wargus-2.2.6.ebuild 1634 RMD160 1e2cc1d04ce273c6a9b8e089cd9fd16ae7abff2d SHA1 306b0d0a030dbe0f9f5a72da7e72668586c286df SHA256 9a61b8ee4eec668fb790e05fb8ebd20678e2e281b69f56de42325fd23f802a79 +MISC ChangeLog 3024 RMD160 d0accae22bd5b78ce1ca6d4c4f6b0c852dd9676d SHA1 e7f234952d485be8a4dbca89ad430cdfa30fe0fd SHA256 26340528986ea25b32a01b101a29cf50e3efcd7d5f2391f4f6656a3655dfc3e4 MISC metadata.xml 160 RMD160 f839c00d9f25c1f873f95ab899fb64060c1d0bf5 SHA1 08c3d180cf8dbef87e40c42a18b457516a5d7ffe SHA256 5ac0a3647e8149d52ce55d391cf1680ac52d6f0330be21c3bca4790b971b5e5d +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQEcBAEBAgAGBQJPwo2LAAoJEFpvPKfnPDWzWpUIALPyOQxGebfpg0nBtiFYYv29 +iyVLhifB5r+rl+9/7Uui55WLS5JQFdI47+VAq2g50+xihBbSMpQ286Nkv7jXWxQx +fxP5T/m3fI1d0ONlUWrHjvHTyrtoZX72UM79axOhjlrsvoaNN2mHxpADHqhZNKdv +Uv7g92awyVMAJJOgLd8c7cqLeTUSZa4ErwYoumbB7oPSeZ7+rbScPlb45ukjnJS5 +72lQj0D5h6e/pSUBSQ7IonL/o7u5wRA7EFxajMO9RDr2UsvbGeLlv/xvo/jz6+av +KHYzsgsVP/tt5h92/LXVEhAbFQrnPaT86pkfrGPppZTykzhoUHCZNja3TGDw/c8= +=76pg +-----END PGP SIGNATURE----- diff --git a/games-strategy/wargus/files/wargus-2.2.6-build.patch b/games-strategy/wargus/files/wargus-2.2.6-build.patch new file mode 100644 index 000000000000..4825b341e646 --- /dev/null +++ b/games-strategy/wargus/files/wargus-2.2.6-build.patch @@ -0,0 +1,77 @@ +From: Julian Ospald +Date: Sun May 27 18:28:48 UTC 2012 +Subject: build system + +make paths modifiable +respect LDFLAGs + +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -30,6 +30,13 @@ + cmake_minimum_required(VERSION 2.6) + set(WARGUS_VERSION 2.2.6) + ++########### PATH OPTIONS ############### ++set(BINDIR "bin" CACHE PATH "Where to install binaries") ++set(SHAREDIR "share/games/stratagus/wargus" CACHE PATH "Where to install data files") ++set(DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share" CACHE PATH "Sets the root of data directories to a non-default location") ++set(ICONDIR "${DATAROOTDIR}/pixmaps" CACHE PATH "Sets the icon directory for desktop entry to a non-default location.") ++set(DESKTOPDIR "${DATAROOTDIR}/applications" CACHE PATH "Sets the desktop file directory for desktop entry to a non-default location.") ++ + # Wargus sources + + set(pudconvert_SRCS +@@ -154,8 +161,13 @@ + endif() + + if (NOT WIN32 AND NOT MAEMO) +- add_definitions(-DDATA_PATH="${CMAKE_INSTALL_PREFIX}/share/games/stratagus/wargus") +- add_definitions(-DSCRIPTS_PATH="${CMAKE_INSTALL_PREFIX}/share/games/stratagus/wargus") ++ if(NOT IS_ABSOLUTE "${SHAREDIR}") ++ set(var "${CMAKE_INSTALL_PREFIX}/${SHAREDIR}") ++ else() ++ set(var "${SHAREDIR}") ++ endif() ++ add_definitions(-DDATA_PATH="${var}") ++ add_definitions(-DSCRIPTS_PATH="${var}") + add_definitions(-DSTRATAGUS_BIN="${STRATAGUS}") + endif() + +@@ -169,9 +181,7 @@ + endif() + + if(ENABLE_STRIP) +- set(CMAKE_EXE_LINKER_FLAGS "-s") +-else() +- set(CMAKE_EXE_LINKER_FLAGS "") ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s") + endif() + + # Compile Wargus +@@ -232,16 +242,16 @@ + + ########### install files ############### + +-install(TARGETS wargus DESTINATION games) +-install(TARGETS pudconvert wartool DESTINATION bin) +-install(FILES wargus.png DESTINATION share/pixmaps) +-install(FILES wargus.desktop DESTINATION share/applications) +- +-install(DIRECTORY campaigns maps scripts DESTINATION share/games/stratagus/wargus) +-install(FILES contrib/red_cross.png DESTINATION share/games/stratagus/wargus/graphics/missiles) +-install(FILES contrib/cross.png DESTINATION share/games/stratagus/wargus/graphics/ui/cursors) +-install(FILES contrib/food.png contrib/health.png contrib/health2.png contrib/mana.png contrib/mana2.png contrib/ore,stone,coal.png contrib/score.png DESTINATION share/games/stratagus/wargus/graphics/ui) ++install(TARGETS wargus DESTINATION ${BINDIR}) ++install(TARGETS pudconvert wartool DESTINATION ${BINDIR}) ++install(FILES wargus.png DESTINATION ${ICONDIR}) ++install(FILES wargus.desktop DESTINATION ${DESKTOPDIR}) ++ ++install(DIRECTORY campaigns maps scripts DESTINATION ${SHAREDIR}) ++install(FILES contrib/red_cross.png DESTINATION ${SHAREDIR}/graphics/missiles) ++install(FILES contrib/cross.png DESTINATION ${SHAREDIR}/graphics/ui/cursors) ++install(FILES contrib/food.png contrib/health.png contrib/health2.png contrib/mana.png contrib/mana2.png contrib/ore,stone,coal.png contrib/score.png DESTINATION ${SHAREDIR}/graphics/ui) + + if(MAEMO) +- install(TARGETS warextract DESTINATION bin) ++ install(TARGETS warextract DESTINATION ${BINDIR}) + endif() diff --git a/games-strategy/wargus/wargus-2.2.6.ebuild b/games-strategy/wargus/wargus-2.2.6.ebuild new file mode 100644 index 000000000000..130b30e6c83d --- /dev/null +++ b/games-strategy/wargus/wargus-2.2.6.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/wargus-2.2.6.ebuild,v 1.1 2012/05/27 20:27:13 hasufell Exp $ + +EAPI=2 +inherit eutils cdrom cmake-utils gnome2-utils games + +DESCRIPTION="Warcraft II for the Stratagus game engine (Needs WC2 DOS CD)" +HOMEPAGE="http://wargus.sourceforge.net/" +SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${PN}_${PV}.orig.tar.gz + mirror://gentoo/${PN}.png" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="=games-engines/stratagus-${PV}*[theora] + media-libs/freetype + media-libs/libpng:0 + sys-libs/zlib + x11-libs/gtk+:2" +DEPEND="${RDEPEND} + media-sound/timidity++ + media-video/ffmpeg2theora + virtual/pkgconfig" + +S=${WORKDIR}/${PN}_${PV}.orig + +src_prepare() { + cdrom_get_cds data/rezdat.war + epatch "${FILESDIR}/${PN}-2.2.5.5-libpng.patch" \ + "${FILESDIR}/${P}-build.patch" +} + +src_configure() { + local mycmakeargs=( + -DBINDIR="${GAMES_BINDIR}" + -DSTRATAGUS="${GAMES_BINDIR}"/stratagus + -DICONDIR=/usr/share/icons/hicolor/64x64/apps + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_install() { + cmake-utils_src_install + + local dir=${GAMES_DATADIR}/stratagus/${PN} + + "${D}"/usr/games/bin/wartool -m -v "${CDROM_ROOT}"/data "${D}/${dir}" \ + || die "Failed to extract data" + + prepgamesdirs +} + +pkg_preinst() { + games_pkg_preinst + gnome2_icon_savelist +} + +pkg_postinst() { + elog "Enabling OpenGL ingame seems to cause segfaults/crashes." + games_pkg_postinst + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} -- cgit v1.2.3-65-gdbad