From 5fe0afad4cf7d292dcb2f303acb551fde061e4ff Mon Sep 17 00:00:00 2001 From: Alfredo Tupone Date: Sun, 14 Jan 2007 14:34:59 +0000 Subject: [PATCH] Fix for console_client fails. Bug #93880 Package-Manager: portage-2.1.1-r2 --- games-fps/quakeforge/ChangeLog | 10 +- games-fps/quakeforge/Manifest | 27 ++-- .../files/digest-quakeforge-0.5.5-r1 | 3 + .../files/quakeforge-0.5.5-keys.patch | 103 ++++++++++++++ .../quakeforge/quakeforge-0.5.5-r1.ebuild | 132 ++++++++++++++++++ 5 files changed, 265 insertions(+), 10 deletions(-) create mode 100644 games-fps/quakeforge/files/digest-quakeforge-0.5.5-r1 create mode 100644 games-fps/quakeforge/files/quakeforge-0.5.5-keys.patch create mode 100644 games-fps/quakeforge/quakeforge-0.5.5-r1.ebuild diff --git a/games-fps/quakeforge/ChangeLog b/games-fps/quakeforge/ChangeLog index 556e8fc21d13..322b6d1759e1 100644 --- a/games-fps/quakeforge/ChangeLog +++ b/games-fps/quakeforge/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for games-fps/quakeforge -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/ChangeLog,v 1.14 2006/12/05 17:24:01 wolf31o2 Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/ChangeLog,v 1.15 2007/01/14 14:34:59 tupone Exp $ + +*quakeforge-0.5.5-r1 (14 Jan 2007) + + 14 Jan 2007; +files/quakeforge-0.5.5-keys.patch, + +quakeforge-0.5.5-r1.ebuild: + Fix for console_client fails. Bug #93880 by Jordan 05 Dec 2006; Chris Gianelloni quakeforge-0.5.5.ebuild: diff --git a/games-fps/quakeforge/Manifest b/games-fps/quakeforge/Manifest index 097a2b79a616..1b1015b78cfb 100644 --- a/games-fps/quakeforge/Manifest +++ b/games-fps/quakeforge/Manifest @@ -9,15 +9,23 @@ AUX quakeforge-0.5.5-gcc41.patch 11887 RMD160 927ccee1af7ce986317c5a865dd67caf1b MD5 84da17ca227ffe373c5870acf6fc5135 files/quakeforge-0.5.5-gcc41.patch 11887 RMD160 927ccee1af7ce986317c5a865dd67caf1bb2f489 files/quakeforge-0.5.5-gcc41.patch 11887 SHA256 a8409922b14d1690f3a0f58a7961371944f1c96798f5e5f85ee8247ea1bab20d files/quakeforge-0.5.5-gcc41.patch 11887 +AUX quakeforge-0.5.5-keys.patch 2732 RMD160 e12fe9e7738294130b2efc6f47287e9c0d05b6d1 SHA1 1af9524474c8c4cf00d327c5d741f1c8ec133975 SHA256 4e43f001fdb31822d6c97fb7414f1515c1d1b5f3f92231405df46e7c9bc05acb +MD5 83eea014a026dddf3080115a55c8ba2f files/quakeforge-0.5.5-keys.patch 2732 +RMD160 e12fe9e7738294130b2efc6f47287e9c0d05b6d1 files/quakeforge-0.5.5-keys.patch 2732 +SHA256 4e43f001fdb31822d6c97fb7414f1515c1d1b5f3f92231405df46e7c9bc05acb files/quakeforge-0.5.5-keys.patch 2732 DIST quakeforge-0.5.5.tar.bz2 1954072 RMD160 1caf8d7b272c9e588708ac39841d46aac2c5df79 SHA1 680e47a189de508f8cc7c5c525537f0aa2dafb05 SHA256 9ff29340f571fc26d19992a32f58e767e1b811248688f383083bc2ccb263ec6a +EBUILD quakeforge-0.5.5-r1.ebuild 3880 RMD160 102aa7291e98e2b3e84a6800a20243e54695dad7 SHA1 395f14bbf67048446136d5e87499de7b5549c7e2 SHA256 dfe79c7b8aae52bd4a0bb3f81386955aeae3d0899e74b478170b0a657ebe20e7 +MD5 aa19c214c4cd6543cc5698c51d84d3b8 quakeforge-0.5.5-r1.ebuild 3880 +RMD160 102aa7291e98e2b3e84a6800a20243e54695dad7 quakeforge-0.5.5-r1.ebuild 3880 +SHA256 dfe79c7b8aae52bd4a0bb3f81386955aeae3d0899e74b478170b0a657ebe20e7 quakeforge-0.5.5-r1.ebuild 3880 EBUILD quakeforge-0.5.5.ebuild 3834 RMD160 54d2d26ec8312982f6db79102af41b890291ef35 SHA1 0d08ff3d4817ab8ef983ceaa58da2c449fcff004 SHA256 96eea6fe472755a687db9339aecc1b8ec32ad909739ecd634bb942a6a8fe9ae7 MD5 6c1c75c20bf8c3df3e4cf980efd6ec62 quakeforge-0.5.5.ebuild 3834 RMD160 54d2d26ec8312982f6db79102af41b890291ef35 quakeforge-0.5.5.ebuild 3834 SHA256 96eea6fe472755a687db9339aecc1b8ec32ad909739ecd634bb942a6a8fe9ae7 quakeforge-0.5.5.ebuild 3834 -MISC ChangeLog 2901 RMD160 b7fee9f3ddf97687a10d107a6a6e8e8739693a5d SHA1 4ddf326b2a6334bca0f19e0eaa925d60bf4097c1 SHA256 0e80b131cee1110ca87b0bae1995dcb102fab294bbaa2db438873a1ba68ac9f5 -MD5 9e5dac468767c44b00c920502172b242 ChangeLog 2901 -RMD160 b7fee9f3ddf97687a10d107a6a6e8e8739693a5d ChangeLog 2901 -SHA256 0e80b131cee1110ca87b0bae1995dcb102fab294bbaa2db438873a1ba68ac9f5 ChangeLog 2901 +MISC ChangeLog 3091 RMD160 3eb553ece756796c6575e9cae852bdcb56263cb8 SHA1 1f6f711374b6fcb90ff539f1d66ef81d738e6c79 SHA256 123da769e08c43cac8fc7ce33af552a62faec5989c2991f3337aa9170bea0a57 +MD5 8855ca75fcf5e018e2415113b7bc99bb ChangeLog 3091 +RMD160 3eb553ece756796c6575e9cae852bdcb56263cb8 ChangeLog 3091 +SHA256 123da769e08c43cac8fc7ce33af552a62faec5989c2991f3337aa9170bea0a57 ChangeLog 3091 MISC metadata.xml 1396 RMD160 b7e31184f0351596c32f9014e0c0b6b9a31ad4f1 SHA1 2ff09d93c6d3c1a1f5947ad4039d9160d9b0df48 SHA256 21be4035c9338cf0635afcaf8b23e1a0e98affcabbddd47f6a7663b2afa0d2bb MD5 9f8e89d5bb6023c22bd6e5868bd72257 metadata.xml 1396 RMD160 b7e31184f0351596c32f9014e0c0b6b9a31ad4f1 metadata.xml 1396 @@ -25,10 +33,13 @@ SHA256 21be4035c9338cf0635afcaf8b23e1a0e98affcabbddd47f6a7663b2afa0d2bb metadata MD5 8e0ded9bacd00a5ada85e067ec836730 files/digest-quakeforge-0.5.5 256 RMD160 08c8b29e2db4c3a9a9445ae0b6b1f9fcfe3a5a78 files/digest-quakeforge-0.5.5 256 SHA256 f756f5e7c5537b16c33fa21f6f68c997e00c6a724e074d483423256a0805ab97 files/digest-quakeforge-0.5.5 256 +MD5 8e0ded9bacd00a5ada85e067ec836730 files/digest-quakeforge-0.5.5-r1 256 +RMD160 08c8b29e2db4c3a9a9445ae0b6b1f9fcfe3a5a78 files/digest-quakeforge-0.5.5-r1 256 +SHA256 f756f5e7c5537b16c33fa21f6f68c997e00c6a724e074d483423256a0805ab97 files/digest-quakeforge-0.5.5-r1 256 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFdas3kT4lNIS36YERAn2WAJ4rnYBHR8NEq1YiX3ijc27MbhLNEACaAjos -g0ChlEPEuFUS5ohB8lS9Yf0= -=dEqy +iD8DBQFFqj+ebfN2jvlVAhwRAi82AKCJFukAXeYoZeTiguib4Kv0YtgRFACgn8RB +4gy56NxAbZAkDcB8OF9lRZo= +=jDCD -----END PGP SIGNATURE----- diff --git a/games-fps/quakeforge/files/digest-quakeforge-0.5.5-r1 b/games-fps/quakeforge/files/digest-quakeforge-0.5.5-r1 new file mode 100644 index 000000000000..e2b268f899bc --- /dev/null +++ b/games-fps/quakeforge/files/digest-quakeforge-0.5.5-r1 @@ -0,0 +1,3 @@ +MD5 b750b491ce24135f1a4a1360029de3a2 quakeforge-0.5.5.tar.bz2 1954072 +RMD160 1caf8d7b272c9e588708ac39841d46aac2c5df79 quakeforge-0.5.5.tar.bz2 1954072 +SHA256 9ff29340f571fc26d19992a32f58e767e1b811248688f383083bc2ccb263ec6a quakeforge-0.5.5.tar.bz2 1954072 diff --git a/games-fps/quakeforge/files/quakeforge-0.5.5-keys.patch b/games-fps/quakeforge/files/quakeforge-0.5.5-keys.patch new file mode 100644 index 000000000000..fb027dd03c04 --- /dev/null +++ b/games-fps/quakeforge/files/quakeforge-0.5.5-keys.patch @@ -0,0 +1,103 @@ +--- nq/source/sys_sdl.c.old 2007-01-14 12:34:48.000000000 +0100 ++++ nq/source/sys_sdl.c 2007-01-14 12:35:43.000000000 +0100 +@@ -63,6 +63,7 @@ + #include "QF/console.h" + #include "QF/qargs.h" + #include "QF/sys.h" ++#include "QF/progs.h" + + #include "client.h" + #include "compat.h" +@@ -107,6 +108,9 @@ + #endif + } + ++extern void Key_Progs_Init (progs_t *pr); ++void (*x)() = Key_Progs_Init; ++ + #ifndef SDL_main + # define SDL_main main + #endif +--- qw/source/cl_sys_sdl.c.old 2007-01-14 12:29:25.000000000 +0100 ++++ qw/source/cl_sys_sdl.c 2007-01-14 12:30:50.000000000 +0100 +@@ -63,6 +63,7 @@ + #include "QF/console.h" + #include "QF/qargs.h" + #include "QF/sys.h" ++#include "QF/progs.h" + + #include "client.h" + #include "compat.h" +@@ -108,6 +109,9 @@ + #endif + } + ++extern void Key_Progs_Init (progs_t *pr); ++void (*x)() = Key_Progs_Init; ++ + #ifndef SDL_main + # define SDL_main main + #endif +--- qw/source/cl_sys_unix.c.old 2007-01-14 12:33:15.000000000 +0100 ++++ qw/source/cl_sys_unix.c 2007-01-14 12:34:02.000000000 +0100 +@@ -56,6 +56,7 @@ + #include "QF/console.h" + #include "QF/qargs.h" + #include "QF/sys.h" ++#include "QF/progs.h" + + #include "host.h" + #include "netchan.h" +@@ -73,6 +74,9 @@ + + int skipframes; + ++extern void Key_Progs_Init (progs_t *pr); ++void (*x)() = Key_Progs_Init; ++ + int + main (int c, const char *v[]) + { +--- nq/source/sys_unix.c.old 2007-01-14 13:01:20.000000000 +0100 ++++ nq/source/sys_unix.c 2007-01-14 13:01:38.000000000 +0100 +@@ -69,6 +69,9 @@ + fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK); + } + ++extern void Key_Progs_Init (progs_t *pr); ++void (*x)() = Key_Progs_Init; ++ + int + main (int c, const char *v[]) + { +--- configure.old 2007-01-14 14:06:22.000000000 +0100 ++++ configure 2007-01-14 14:06:43.000000000 +0100 +@@ -22733,7 +22733,7 @@ + int + main () + { +-void *(*foo)(size_t) = alloca; ++void *foo = alloca(sizeof(void)); + ; + return 0; + } +@@ -32304,7 +32304,7 @@ + + + if test "x$BUILD_SW" = xyes; then +- VID_REND_NOINST_TARGETS="$VID_REND_NOINST_TARGETS libQFrenderer_sw.la" ++ VID_REND_TARGETS="$VID_REND_TARGETS libQFrenderer_sw.la" + VID_MODEL_TARGETS="$VID_MODEL_TARGETS libQFmodels_sw.la" + fi + if test "x$BUILD_SW32" = xyes; then +--- libs/video/renderer/Makefile.in.old 2007-01-14 15:00:14.000000000 +0100 ++++ libs/video/renderer/Makefile.in 2007-01-14 15:02:08.000000000 +0100 +@@ -409,7 +409,7 @@ + libQFrenderer_gl_la_LIBADD = gl/libgl.la + libQFrenderer_gl_la_SOURCES = $(common_sources) + libQFrenderer_gl_la_DEPENDENCIES = gl/libgl.la +-libQFrenderer_sw_la_LDFLAGS = @STATIC@ ++libQFrenderer_sw_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir) + libQFrenderer_sw_la_LIBADD = sw/libsw.la + libQFrenderer_sw_la_SOURCES = $(common_sources) + libQFrenderer_sw_la_DEPENDENCIES = sw/libsw.la diff --git a/games-fps/quakeforge/quakeforge-0.5.5-r1.ebuild b/games-fps/quakeforge/quakeforge-0.5.5-r1.ebuild new file mode 100644 index 000000000000..8953056959eb --- /dev/null +++ b/games-fps/quakeforge/quakeforge-0.5.5-r1.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/quakeforge-0.5.5-r1.ebuild,v 1.1 2007/01/14 14:34:59 tupone Exp $ + +inherit eutils autotools games + +DESCRIPTION="A new 3d engine based off of id Softwares's legendary Quake and QuakeWorld game engine" +HOMEPAGE="http://www.quakeforge.net/" +SRC_URI="mirror://sourceforge/quake/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~ppc ~x86" +IUSE="cdinstall debug 3dfx fbcon opengl sdl svga X ncurses vorbis zlib ipv6 xv dga alsa oss" +RESTRICT="userpriv" + +RDEPEND="3dfx? ( media-libs/glide-v3 ) + opengl? ( virtual/opengl ) + sdl? ( media-libs/libsdl ) + svga? ( media-libs/svgalib ) + X? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXxf86vm ) + ncurses? ( sys-libs/ncurses ) + vorbis? ( media-libs/libogg media-libs/libvorbis ) + zlib? ( sys-libs/zlib ) + xv? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXxf86vm ) + dga? ( x11-libs/libXxf86dga ) + alsa? ( media-libs/alsa-lib )" +DEPEND="${RDEPEND} + cdinstall? ( games-fps/quake1-data ) + sys-devel/bison + sys-devel/flex" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${PV}"-ipv6.patch \ + "${FILESDIR}/${P}"-gcc41.patch \ + "${FILESDIR}/${P}"-keys.patch +} + +src_compile() { + #i should do this at some point :x ... i guess if you disable all shared stuff + #and enable all the static options explicitly, static works ... (or so ive been told) + #if ! use static ; then + # myconf="${myconf} --enable-shared=yes --enable-static=no" + #else + # myconf="${myconf} --enable-shared=no --enable-static=yes" + #fi + + local debugopts + use debug \ + && debugopts="--enable-debug --disable-optimize --enable-profile" \ + || debugopts="--disable-debug --disable-profile" + + local clients=${QF_CLIENTS} + use 3dfx && clients="${clients},3dfx" + use fbcon && clients="${clients},fbdev" + use opengl && clients="${clients},glx" + use sdl && clients="${clients},sdl,sdl32" + use sdl && use opengl && clients="${clients},sgl" + use svga && clients="${clients},svga" + use X && clients="${clients},x11" + use X && use opengl && clients="${clients},wgl" + [ "${clients:0:1}" == "," ] && clients=${clients:1} + + local servers=${QF_SERVERS:-master,nq,qw,qtv} + + local tools=${QF_TOOLS:-all} + + local svgaconf # use old school way for broken conf opts + use svga \ + && svgaconf="--with-svga=/usr" \ + || svgaconf="--without-svga" + + addpredict ${GAMES_LIBDIR} + egamesconf \ + $(use_enable ncurses curses) \ + $(use_enable vorbis) \ + $(use_enable zlib) \ + $(use_with ipv6) \ + $(use_with fbcon fbdev) \ + ${svgaconf} \ + $(use_with X x) \ + $(use_enable xv vidmode) \ + $(use_enable dga) \ + $(use_enable sdl) \ + --disable-xmms \ + $(use_enable alsa) \ + $(use_enable oss) \ + --enable-sound \ + --disable-optimize \ + ${debugopts} \ + --with-global-cfg=${GAMES_SYSCONFDIR}/quakeforge.conf \ + --with-sharepath=${GAMES_DATADIR}/quake1 \ + --with-clients=${clients} \ + --with-servers=${servers} \ + --with-tools=${tools} \ + || die + make || die "make failed" +} + +src_install() { + make DESTDIR=${D} install || die "install failed" + mv ${D}/${GAMES_PREFIX}/include ${D}/usr/ + dodoc ChangeLog NEWS TODO doc/* + prepgamesdirs +} + +pkg_postinst() { + # same warning used in quake1 / quakeforge / nprquake-sdl + games_pkg_postinst + echo + einfo "Before you can play, you must make sure" + einfo "${PN} can find your Quake .pak files" + echo + einfo "You have 2 choices to do this" + einfo "1 Copy pak*.pak files to ${GAMES_DATADIR}/quake1/id1" + einfo "2 Symlink pak*.pak files in ${GAMES_DATADIR}/quake1/id1" + echo + einfo "Example:" + einfo "my pak*.pak files are in /mnt/secondary/Games/Quake/Id1/" + einfo "ln -s /mnt/secondary/Games/Quake/Id1/pak0.pak ${GAMES_DATADIR}/quake1/id1/pak0.pak" + echo + einfo "You only need pak0.pak to play the demo version," + einfo "the others are needed for registered version" +} -- 2.26.2