From d26b2bc7ecc7df646f16a8fab913adeb922f2d9c Mon Sep 17 00:00:00 2001 From: Tristan Heaven Date: Fri, 2 Feb 2007 00:26:14 +0000 Subject: [PATCH] Patch from FreeBSD for bug #162592 Package-Manager: portage-2.1.2-r5 --- games-fps/warsow/ChangeLog | 10 +- games-fps/warsow/Manifest | 27 +++- games-fps/warsow/files/digest-warsow-0.21-r1 | 6 + .../files/warsow-0.21-inverted-mouse.patch | 15 ++ games-fps/warsow/warsow-0.21-r1.ebuild | 151 ++++++++++++++++++ 5 files changed, 199 insertions(+), 10 deletions(-) create mode 100644 games-fps/warsow/files/digest-warsow-0.21-r1 create mode 100644 games-fps/warsow/files/warsow-0.21-inverted-mouse.patch create mode 100644 games-fps/warsow/warsow-0.21-r1.ebuild diff --git a/games-fps/warsow/ChangeLog b/games-fps/warsow/ChangeLog index d41c1c0fba2e..afdbb2007276 100644 --- a/games-fps/warsow/ChangeLog +++ b/games-fps/warsow/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for games-fps/warsow -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.2 2006/11/18 19:17:26 peper Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.3 2007/02/02 00:26:13 nyhm Exp $ + +*warsow-0.21-r1 (02 Feb 2007) + + 02 Feb 2007; Tristan Heaven + +files/warsow-0.21-inverted-mouse.patch, +warsow-0.21-r1.ebuild: + Patch from FreeBSD for bug #162592 18 Nov 2006; Piotr Jaroszyński warsow-0.21.ebuild: Add ~amd64 wrt bug #154362. diff --git a/games-fps/warsow/Manifest b/games-fps/warsow/Manifest index 992280e6fb53..7d462c3fb9ec 100644 --- a/games-fps/warsow/Manifest +++ b/games-fps/warsow/Manifest @@ -1,16 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX warsow-0.21-inverted-mouse.patch 391 RMD160 4d0ca4bf10c204094f515c0778d1a720a880855d SHA1 214e1fb973c5f5cc54a78eaca501c66dbf70aaee SHA256 0884a4f7e5ed6e8a1b8abc6ede5ca4399d7e3b498c9f04d2dc0dcba55a9b7bec +MD5 00fe31a34c66171353d61364a4b98c40 files/warsow-0.21-inverted-mouse.patch 391 +RMD160 4d0ca4bf10c204094f515c0778d1a720a880855d files/warsow-0.21-inverted-mouse.patch 391 +SHA256 0884a4f7e5ed6e8a1b8abc6ede5ca4399d7e3b498c9f04d2dc0dcba55a9b7bec files/warsow-0.21-inverted-mouse.patch 391 DIST warsow_0.21_linux.tar.gz 80219586 RMD160 1d4e5672a79bb38c594e9bcfcad09b6a1a59c47d SHA1 9faf775721ee88c3db98aa186aa8e805ff4edb7b SHA256 fa927e2559620bea8926eed141106815c28099c8fff227f21463ebb1be9748d4 DIST warsow_0.21_sdk.zip 7469755 RMD160 416e646463fd4a4bc51bf84eebceed725dab1744 SHA1 a79b50dfb7e0ab83337371d9ef1eecc812dd2053 SHA256 81b9fd550d826cb0b466b05106bff1729270ceb7682debb4c0a333b8b8dfa3f7 +EBUILD warsow-0.21-r1.ebuild 4054 RMD160 c97070e86a98c69b15f7d1026a02dbd51a1cdfef SHA1 9a13c9d22599dd7bea9312394a9189766e590a0b SHA256 ae612bf6e44547252d45f57ea1ecaf9790f4319c5ca0af85e97ff5be1a5ec36c +MD5 085f7ba2967fc54fd103f46e7cc3fa33 warsow-0.21-r1.ebuild 4054 +RMD160 c97070e86a98c69b15f7d1026a02dbd51a1cdfef warsow-0.21-r1.ebuild 4054 +SHA256 ae612bf6e44547252d45f57ea1ecaf9790f4319c5ca0af85e97ff5be1a5ec36c warsow-0.21-r1.ebuild 4054 EBUILD warsow-0.21.ebuild 4004 RMD160 e06abaeb9a021733258f94d0d3e68cb6cfb90b24 SHA1 76c430d23a5fd2ac53ffe6b43358f8e7cc6f8855 SHA256 d10e0638f0885a5c4c02cd1c4a340b065cb870500225de0c6f5964a999bba4cc MD5 862e790d02ff52c57f2e8d52ec6a4905 warsow-0.21.ebuild 4004 RMD160 e06abaeb9a021733258f94d0d3e68cb6cfb90b24 warsow-0.21.ebuild 4004 SHA256 d10e0638f0885a5c4c02cd1c4a340b065cb870500225de0c6f5964a999bba4cc warsow-0.21.ebuild 4004 -MISC ChangeLog 469 RMD160 5035342724342a9d05683abf136b631516a52704 SHA1 e60d7c75e6a93771fa3027ed24efea761d1aa9ad SHA256 939eb7b2eb11706e733dab3235c9f1dc9a9954d92adc38fd10120f2c2a1bc972 -MD5 520a7711f3563c65bf6e9ddf9c182596 ChangeLog 469 -RMD160 5035342724342a9d05683abf136b631516a52704 ChangeLog 469 -SHA256 939eb7b2eb11706e733dab3235c9f1dc9a9954d92adc38fd10120f2c2a1bc972 ChangeLog 469 +MISC ChangeLog 652 RMD160 2ab167305611493e1cf4087690eb2b3284e2a5fc SHA1 ac066c8bde58968bf2e2da4f35c68d710dea1490 SHA256 7d027a269761678d66e693fce1ef8db94e36bbf7c9cfb0fc9628648051cc782b +MD5 874199162af840da07e4c5dab342c793 ChangeLog 652 +RMD160 2ab167305611493e1cf4087690eb2b3284e2a5fc ChangeLog 652 +SHA256 7d027a269761678d66e693fce1ef8db94e36bbf7c9cfb0fc9628648051cc782b ChangeLog 652 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 @@ -18,10 +26,13 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata MD5 49ee91b0d73835723e0df47a505cfd5d files/digest-warsow-0.21 500 RMD160 c62e208455dea7faa087739cb8a19920edfad6af files/digest-warsow-0.21 500 SHA256 84f51f0e02d127a3ea3809c0ce12c4ab5932bacacda14d3a22e2d35cdcdafd57 files/digest-warsow-0.21 500 +MD5 49ee91b0d73835723e0df47a505cfd5d files/digest-warsow-0.21-r1 500 +RMD160 c62e208455dea7faa087739cb8a19920edfad6af files/digest-warsow-0.21-r1 500 +SHA256 84f51f0e02d127a3ea3809c0ce12c4ab5932bacacda14d3a22e2d35cdcdafd57 files/digest-warsow-0.21-r1 500 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFX1xRppoStNGKGywRApoAAJ91wHW834yJsLtgp/kAgsrYB9EXxgCgvjeG -//h1DF1aE9O1lsfAkZLfYec= -=Rmvu +iD8DBQFFwoUudz7hIScOURERAqktAJ9OWWA8va8Qc5/qSKaBEZ5nArj85ACdH3GW +d/ylviEz25AmjpvVxVTWJBY= +=YWLk -----END PGP SIGNATURE----- diff --git a/games-fps/warsow/files/digest-warsow-0.21-r1 b/games-fps/warsow/files/digest-warsow-0.21-r1 new file mode 100644 index 000000000000..99a42184c662 --- /dev/null +++ b/games-fps/warsow/files/digest-warsow-0.21-r1 @@ -0,0 +1,6 @@ +MD5 0ee0835a1fe9092c9562113253d0f79a warsow_0.21_linux.tar.gz 80219586 +RMD160 1d4e5672a79bb38c594e9bcfcad09b6a1a59c47d warsow_0.21_linux.tar.gz 80219586 +SHA256 fa927e2559620bea8926eed141106815c28099c8fff227f21463ebb1be9748d4 warsow_0.21_linux.tar.gz 80219586 +MD5 ce66288c5d345c8cf3985cbb1e51e199 warsow_0.21_sdk.zip 7469755 +RMD160 416e646463fd4a4bc51bf84eebceed725dab1744 warsow_0.21_sdk.zip 7469755 +SHA256 81b9fd550d826cb0b466b05106bff1729270ceb7682debb4c0a333b8b8dfa3f7 warsow_0.21_sdk.zip 7469755 diff --git a/games-fps/warsow/files/warsow-0.21-inverted-mouse.patch b/games-fps/warsow/files/warsow-0.21-inverted-mouse.patch new file mode 100644 index 000000000000..5d39e2ef01b7 --- /dev/null +++ b/games-fps/warsow/files/warsow-0.21-inverted-mouse.patch @@ -0,0 +1,15 @@ +--- source/linux/in_x11.c ++++ source/linux/in_x11.c +@@ -589,10 +589,8 @@ + } + else + { +- mx = -((int)event.xmotion.x - mwx); +- my = -((int)event.xmotion.y - mwy); +- mwx = event.xmotion.x; +- mwy = event.xmotion.y; ++ mx += ((int)event.xmotion.x - mwx); ++ my += ((int)event.xmotion.y - mwy); + + if (mx || my) + dowarp = qtrue; diff --git a/games-fps/warsow/warsow-0.21-r1.ebuild b/games-fps/warsow/warsow-0.21-r1.ebuild new file mode 100644 index 000000000000..93fab6a47d96 --- /dev/null +++ b/games-fps/warsow/warsow-0.21-r1.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-0.21-r1.ebuild,v 1.1 2007/02/02 00:26:13 nyhm Exp $ + +inherit eutils toolchain-funcs games + +MY_PV=${PV/_/} +F=${PN}_${MY_PV}_linux.tar.gz +SDK=${PN}_${MY_PV}_sdk.zip +DESCRIPTION="Multiplayer FPS based on the QFusion engine (evolved from Quake 2)" +HOMEPAGE="http://www.warsow.net/" +SRC_URI="ftp://ftp.club-internet.fr/pub/games/nofrag/${PN}/${F} + ftp://ftp.club-internet.fr/pub/games/nofrag/${PN}/${SDK} + http://www.bef-warsow.de/files/${F} + http://www.bef-warsow.de/files/${SDK} + http://wsw.surreal-xenotronic.com/${F} + http://wsw.surreal-xenotronic.com/${SDK} + http://ik.spinther.com/${PN}/${F} + http://warsow.routed-gaming.co.uk/downloads/${F} + http://warsownews.game-server.cc/${F} + http://warsownews.game-server.cc/${SDK}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug dedicated irc openal sdl" + +UIRDEPEND="media-libs/jpeg + media-libs/libogg + media-libs/libvorbis + net-misc/curl + virtual/opengl + >=media-libs/libsdl-1.2.8-r1 + >=media-libs/sdl-sound-1.0.1-r1 + openal? ( media-libs/openal ) + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext" +UIDEPEND="x11-proto/xf86dgaproto + x11-proto/xf86vidmodeproto" +RDEPEND="sdl? ( ${UIRDEPEND} ) + !sdl? ( !dedicated? ( ${UIRDEPEND} ) )" +DEPEND="${RDEPEND} + sdl? ( ${UIDEPEND} ) + !sdl? ( !dedicated? ( ${UIDEPEND} ) ) + app-arch/unzip" + +S=${WORKDIR}/source +SDATA=${WORKDIR}/${PN} +dir=${GAMES_DATADIR}/${PN} +libdir=${GAMES_LIBDIR}/${PN} + +src_unpack() { + unpack ${A} + cd "${S}" + + # Make fs_usehomedir default to 1, so the game will write to ~/.warsow/ + # Make fs_basepath default to correct path. + # Add libdir as game directory. + sed -i qcommon/files.c \ + -e 's:"fs_usehomedir", "0":"fs_usehomedir", "1":' \ + -e "s:\"fs_basepath\", \"\.\":\"fs_basepath\", \"${dir}\":" \ + || die "sed files.c failed" + + # Remove pre-compiled binaries, because they are compiled in src_compile() + # Also remove the startup scripts. + rm "${SDATA}"/{${PN}*,wsw_server*} + rm -r "${SDATA}"/libs/*.so + + # Remove copy of licence. + rm "${SDATA}"/docs/gnu.txt + + # Move docs to a convenient directory, away from the files to be installed. + mv "${SDATA}"/docs "${S}" + + sed -i Makefile \ + -e '/^CFLAGS_RELEASE/s/=.* \(-fno.* \).* .* /=\1/' \ + -e '/^CFLAGS_DEBUG/s/-O0 -ggdb/-fno-strict-aliasing/' \ + || die "sed Makefile failed" + + epatch "${FILESDIR}"/${P}-inverted-mouse.patch +} + +src_compile() { + yesno() { useq $1 && echo YES || echo NO ; } + + local client="NO" + + if use sdl || ! use dedicated ; then + client="YES" + fi + + emake \ + BUILD_CLIENT=${client} \ + BUILD_SERVER=$(yesno dedicated) \ + BUILD_IRC=$(yesno irc) \ + BUILD_SND_QF=${client} \ + BUILD_SND_OPENAL=$(yesno openal) \ + DEBUG_BUILD=$(yesno debug) \ + BINDIR=release \ + SERVER_EXE=${PN}-ded \ + CLIENT_EXE=${PN} \ + CC="$(tc-getCC)" \ + LD="$(tc-getCC)" \ + || die "emake failed" + + mv -f release/basewsw/*.so "${WORKDIR}" || die "mv *.so failed" + cp -rf release/basewsw "${SDATA}" || die "cp basewsw failed" +} + +src_install() { + cd "${SDATA}" + + if use sdl || use openal || ! use dedicated ; then + # Install client-only components. + dogamesbin "${S}/release/${PN}" \ + || die "dogamesbin ${PN} failed" + make_desktop_entry ${PN} "Warsow" + fi + + if use dedicated ; then + # Install server-only components. + dogamesbin "${S}/release/${PN}-ded" \ + || die "dogamesbin ${PN}-ded failed" + fi + + # Install common components. + insinto "${dir}" + doins -r * || die "doins -r failed" + + # Game libraries. + exeinto "${libdir}"/basewsw + local lib + for lib in $(cd "${WORKDIR}" && ls -A *.so) ; do + doexe "${WORKDIR}/${lib}" || die "doexe ${lib} failed" + dosym "${libdir}/basewsw/${lib}" "${dir}"/basewsw/ + done + + # "Shared" Libraries. + exeinto "${libdir}" + local lib2 + for lib2 in $(cd "${S}"/release/libs/ && ls -A *.so) ; do + doexe "${S}"/release/libs/"${lib2}" || die "doexe ${lib2} failed" + dosym "${libdir}/${lib2}" "${dir}"/libs/ + done + + dodoc "${S}"/docs/* + + prepgamesdirs +} -- 2.26.2