From 404b9799bb61e3f1051208f7416b1875d27e80e0 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 6 Oct 2003 06:42:22 +0000 Subject: SDL + cflags + path fixes #26147 --- games-fps/anaglyph-stereo-quake/ChangeLog | 12 ++++- games-fps/anaglyph-stereo-quake/Manifest | 10 +++++ .../anaglyph-stereo-quake-130100-r1.ebuild | 50 +++++++++++++++++++++ .../anaglyph-stereo-quake-130100.ebuild | 51 ---------------------- .../files/digest-anaglyph-stereo-quake-130100 | 1 - .../files/digest-anaglyph-stereo-quake-130100-r1 | 2 + .../anaglyph-stereo-quake/files/gentoo-paths.patch | 30 +++++++++++++ .../files/makefile-cflags.patch | 22 ++++++++++ .../files/makefile-gcc2-cflags.patch | 7 --- .../files/makefile-gcc3-cflags.patch | 7 --- .../files/makefile-onlyglx.patch | 2 +- 11 files changed, 126 insertions(+), 68 deletions(-) create mode 100644 games-fps/anaglyph-stereo-quake/Manifest create mode 100644 games-fps/anaglyph-stereo-quake/anaglyph-stereo-quake-130100-r1.ebuild delete mode 100644 games-fps/anaglyph-stereo-quake/anaglyph-stereo-quake-130100.ebuild delete mode 100644 games-fps/anaglyph-stereo-quake/files/digest-anaglyph-stereo-quake-130100 create mode 100644 games-fps/anaglyph-stereo-quake/files/digest-anaglyph-stereo-quake-130100-r1 create mode 100644 games-fps/anaglyph-stereo-quake/files/gentoo-paths.patch create mode 100644 games-fps/anaglyph-stereo-quake/files/makefile-cflags.patch delete mode 100644 games-fps/anaglyph-stereo-quake/files/makefile-gcc2-cflags.patch delete mode 100644 games-fps/anaglyph-stereo-quake/files/makefile-gcc3-cflags.patch (limited to 'games-fps') diff --git a/games-fps/anaglyph-stereo-quake/ChangeLog b/games-fps/anaglyph-stereo-quake/ChangeLog index 42e10a322830..6a495c8e6c4b 100644 --- a/games-fps/anaglyph-stereo-quake/ChangeLog +++ b/games-fps/anaglyph-stereo-quake/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for games-fps/anaglyph-stereo-quake # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/anaglyph-stereo-quake/ChangeLog,v 1.2 2003/09/10 16:04:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/anaglyph-stereo-quake/ChangeLog,v 1.3 2003/10/06 06:41:57 vapier Exp $ + +*anaglyph-stereo-quake-130100-r1 (06 Oct 2003) + + 06 Oct 2003; Mike Frysinger : + A lot to see a lot to do here ... + First up, ported the SDL fixes found in NPRQuake to this + so that the game can be used with a mouse ;) #26147. + Next fixed cflags so that only user defined flags get in. + Finally, fixed data file finding so the user can be + anywhere and the game will search the quake-data dir. *anaglyph-stereo-quake-130100 (03 Aug 2003) diff --git a/games-fps/anaglyph-stereo-quake/Manifest b/games-fps/anaglyph-stereo-quake/Manifest new file mode 100644 index 000000000000..dbc71bfc6499 --- /dev/null +++ b/games-fps/anaglyph-stereo-quake/Manifest @@ -0,0 +1,10 @@ +MD5 7262313d61aa23feac532c98f818ddf5 files/makefile-onlyglx.patch 464 +MD5 4609964e62cdec31ee47cebf59f8fde4 files/stupid-dosformat.patch 749 +MD5 41c0380996274c19f292758da6dc66cd files/gentoo-paths.patch 1005 +MD5 285ecebade8c014a499f23ffe68da975 files/digest-anaglyph-stereo-quake-130100-r1 155 +MD5 2cdc759b378cdf4dea66f3d85e1e0263 files/fix-sys_printf.patch 271 +MD5 a4c6edf40c5ddec35cc9cc9b5e408482 files/makefile-path-fixes.patch 928 +MD5 c1ebbdc10cf08c7d223e07c0f8cb288b files/makefile-cflags.patch 721 +MD5 4e6a604dbd963ba6aa4600500c15a207 anaglyph-stereo-quake-130100-r1.ebuild 1296 +MD5 50e9e46df5282d6dd513a184344c1686 ChangeLog 805 +MD5 9c02404e0c72f3b32208486230278677 metadata.xml 1249 diff --git a/games-fps/anaglyph-stereo-quake/anaglyph-stereo-quake-130100-r1.ebuild b/games-fps/anaglyph-stereo-quake/anaglyph-stereo-quake-130100-r1.ebuild new file mode 100644 index 000000000000..fb4cbb80daf0 --- /dev/null +++ b/games-fps/anaglyph-stereo-quake/anaglyph-stereo-quake-130100-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/anaglyph-stereo-quake/anaglyph-stereo-quake-130100-r1.ebuild,v 1.1 2003/10/06 06:41:57 vapier Exp $ + +inherit games gcc eutils + +DESCRIPTION="play Quake in 3D with red - blue glasses" +HOMEPAGE="http://home.iprimus.com.au/crbean/" +SRC_URI="http://home.iprimus.com.au/crbean/zip/3dGLQuake_SRC_${PV}.zip + mirror://gentoo/${P}-SDL.patch.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86" + +DEPEND="virtual/x11 + virtual/opengl" + +S=${WORKDIR}/WinQuake + +src_unpack() { + unpack ${A} + + cd ${S} + mv GLQUAKE.H glquake.h + mv GL_DRAW.C gl_draw.c + mv GL_RMAIN.C gl_rmain.c + epatch ${FILESDIR}/stupid-dosformat.patch + mv Makefile{.linuxi386,} + epatch ${FILESDIR}/makefile-path-fixes.patch + epatch ${FILESDIR}/fix-sys_printf.patch + epatch ${FILESDIR}/makefile-cflags.patch + epatch ${FILESDIR}/gentoo-paths.patch + epatch ${WORKDIR}/${P}-SDL.patch +} + +src_compile() { + make \ + OPTFLAGS="${CFLAGS}" \ + GENTOO_DATADIR=${GAMES_DATADIR}/quake-data \ + build_release \ + || die "failed to build WinQuake" +} + +src_install() { + newgamesbin release*/bin/glquake.sdl anaglyph-stereo-quake + dodoc ${WORKDIR}/readme.id.txt + dohtml ${WORKDIR}/3dquake.html + prepgamesdirs +} diff --git a/games-fps/anaglyph-stereo-quake/anaglyph-stereo-quake-130100.ebuild b/games-fps/anaglyph-stereo-quake/anaglyph-stereo-quake-130100.ebuild deleted file mode 100644 index 3580eb83759f..000000000000 --- a/games-fps/anaglyph-stereo-quake/anaglyph-stereo-quake-130100.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/anaglyph-stereo-quake/anaglyph-stereo-quake-130100.ebuild,v 1.1 2003/09/09 18:10:14 vapier Exp $ - -inherit games gcc eutils - -DESCRIPTION="play Quake in 3D with red - blue glasses" -HOMEPAGE="http://home.iprimus.com.au/crbean/" -SRC_URI="http://home.iprimus.com.au/crbean/zip/3dGLQuake_SRC_${PV}.zip" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86" - -DEPEND="virtual/x11 - virtual/opengl" - -S=${WORKDIR}/WinQuake - -src_unpack() { - unpack ${A} - - cd ${S} - mv GLQUAKE.H glquake.h - mv GL_DRAW.C gl_draw.c - mv GL_RMAIN.C gl_rmain.c - epatch ${FILESDIR}/stupid-dosformat.patch - - epatch ${FILESDIR}/fix-sys_printf.patch - - mv Makefile{.linuxi386,} - epatch ${FILESDIR}/makefile-path-fixes.patch - - [ `gcc-major-version` -eq 3 ] \ - && epatch ${FILESDIR}/makefile-gcc3-cflags.patch \ - || epatch ${FILESDIR}/makefile-gcc2-cflags.patch - sed -i "s:GENTOO_CFLAGS:${CFLAGS} -DGL_EXT_SHARED=1:" Makefile - - epatch ${FILESDIR}/makefile-onlyglx.patch -} - -src_compile() { - make build_release || die "failed to build WinQuake" -} - -src_install() { - newgamesbin release*/bin/glquake.glx anaglyph-stereo-quake - dodoc ${WORKDIR}/readme.id.txt - dohtml ${WORKDIR}/3dquake.html - prepgamesdirs -} diff --git a/games-fps/anaglyph-stereo-quake/files/digest-anaglyph-stereo-quake-130100 b/games-fps/anaglyph-stereo-quake/files/digest-anaglyph-stereo-quake-130100 deleted file mode 100644 index 067c889a11de..000000000000 --- a/games-fps/anaglyph-stereo-quake/files/digest-anaglyph-stereo-quake-130100 +++ /dev/null @@ -1 +0,0 @@ -MD5 3aadfe00325fe3a3b30c5bb2a6724433 3dGLQuake_SRC_130100.zip 1828997 diff --git a/games-fps/anaglyph-stereo-quake/files/digest-anaglyph-stereo-quake-130100-r1 b/games-fps/anaglyph-stereo-quake/files/digest-anaglyph-stereo-quake-130100-r1 new file mode 100644 index 000000000000..6c9e18c5ff64 --- /dev/null +++ b/games-fps/anaglyph-stereo-quake/files/digest-anaglyph-stereo-quake-130100-r1 @@ -0,0 +1,2 @@ +MD5 3aadfe00325fe3a3b30c5bb2a6724433 3dGLQuake_SRC_130100.zip 1828997 +MD5 97aff3f797e74c7d52352853d4e58e96 anaglyph-stereo-quake-130100-SDL.patch.bz2 6934 diff --git a/games-fps/anaglyph-stereo-quake/files/gentoo-paths.patch b/games-fps/anaglyph-stereo-quake/files/gentoo-paths.patch new file mode 100644 index 000000000000..4328ea8523e2 --- /dev/null +++ b/games-fps/anaglyph-stereo-quake/files/gentoo-paths.patch @@ -0,0 +1,30 @@ +diff -ur NPRQuake-SDL.orig/NPRQuakeSrc/common.c NPRQuake-SDL/NPRQuakeSrc/common.c +--- NPRQuake-SDL.orig/NPRQuakeSrc/common.c 2003-09-28 20:09:29.140832648 -0400 ++++ NPRQuake-SDL/NPRQuakeSrc/common.c 2003-09-28 20:09:29.525774128 -0400 +@@ -1775,11 +1775,16 @@ + // start up with GAMENAME by default (id1) + // + COM_AddGameDirectory (va("%s/"GAMENAME, basedir) ); ++ COM_AddGameDirectory (GENTOO_DATADIR"/"GAMENAME); + +- if (COM_CheckParm ("-rogue")) ++ if (COM_CheckParm ("-rogue")) { + COM_AddGameDirectory (va("%s/rogue", basedir) ); +- if (COM_CheckParm ("-hipnotic")) ++ COM_AddGameDirectory (GENTOO_DATADIR"/rogue"); ++ } ++ if (COM_CheckParm ("-hipnotic")) { + COM_AddGameDirectory (va("%s/hipnotic", basedir) ); ++ COM_AddGameDirectory (GENTOO_DATADIR"/hipnotic"); ++ } + + // + // -game +@@ -1790,6 +1795,7 @@ + { + com_modified = true; + COM_AddGameDirectory (va("%s/%s", basedir, com_argv[i+1])); ++ COM_AddGameDirectory (va(GENTOO_DATADIR"/%s", com_argv[i+1])); + } + + // diff --git a/games-fps/anaglyph-stereo-quake/files/makefile-cflags.patch b/games-fps/anaglyph-stereo-quake/files/makefile-cflags.patch new file mode 100644 index 000000000000..db8dd769115a --- /dev/null +++ b/games-fps/anaglyph-stereo-quake/files/makefile-cflags.patch @@ -0,0 +1,22 @@ +diff -ur WinQuake.orig/Makefile WinQuake/Makefile +--- WinQuake.orig/Makefile 2003-10-06 02:28:17.195830512 -0400 ++++ WinQuake/Makefile 2003-10-06 02:29:38.307499664 -0400 +@@ -37,8 +37,7 @@ + CC=$(EGCS) + + BASE_CFLAGS=-Dstricmp=strcasecmp +-RELEASE_CFLAGS=$(BASE_CFLAGS) -g -mpentiumpro -O6 -ffast-math -funroll-loops \ +- -fomit-frame-pointer -fexpensive-optimizations ++RELEASE_CFLAGS=$(BASE_CFLAGS) $(OPTFLAGS) -DGENTOO_DATADIR='\"$(GENTOO_DATADIR)\"' + DEBUG_CFLAGS=$(BASE_CFLAGS) -g + LDFLAGS=-lm + SVGALDFLAGS=-lvga +@@ -940,7 +940,7 @@ + $(DO_GL_CC) + + $(BUILDDIR)/glquake/common.o : $(MOUNT_DIR)/common.c +- $(DO_GL_DEBUG_CC) ++ $(DO_GL_CC) + + $(BUILDDIR)/glquake/console.o : $(MOUNT_DIR)/console.c + $(DO_GL_CC) diff --git a/games-fps/anaglyph-stereo-quake/files/makefile-gcc2-cflags.patch b/games-fps/anaglyph-stereo-quake/files/makefile-gcc2-cflags.patch deleted file mode 100644 index 76c9cbf5c876..000000000000 --- a/games-fps/anaglyph-stereo-quake/files/makefile-gcc2-cflags.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- WinQuake/Makefile.orig 2003-07-14 15:13:27.000000000 -0400 -+++ WinQuake/Makefile 2003-07-14 15:17:10.000000000 -0400 -@@ -39,3 +39,3 @@ - BASE_CFLAGS=-Dstricmp=strcasecmp --RELEASE_CFLAGS=$(BASE_CFLAGS) -g -mpentiumpro -O6 -ffast-math -funroll-loops \ -+RELEASE_CFLAGS=$(BASE_CFLAGS) GENTOO_CFLAGS -O6 -ffast-math -funroll-loops \ - -fomit-frame-pointer -fexpensive-optimizations diff --git a/games-fps/anaglyph-stereo-quake/files/makefile-gcc3-cflags.patch b/games-fps/anaglyph-stereo-quake/files/makefile-gcc3-cflags.patch deleted file mode 100644 index 76c9cbf5c876..000000000000 --- a/games-fps/anaglyph-stereo-quake/files/makefile-gcc3-cflags.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- WinQuake/Makefile.orig 2003-07-14 15:13:27.000000000 -0400 -+++ WinQuake/Makefile 2003-07-14 15:17:10.000000000 -0400 -@@ -39,3 +39,3 @@ - BASE_CFLAGS=-Dstricmp=strcasecmp --RELEASE_CFLAGS=$(BASE_CFLAGS) -g -mpentiumpro -O6 -ffast-math -funroll-loops \ -+RELEASE_CFLAGS=$(BASE_CFLAGS) GENTOO_CFLAGS -O6 -ffast-math -funroll-loops \ - -fomit-frame-pointer -fexpensive-optimizations diff --git a/games-fps/anaglyph-stereo-quake/files/makefile-onlyglx.patch b/games-fps/anaglyph-stereo-quake/files/makefile-onlyglx.patch index 06cbda385cd8..bdd29650b21f 100644 --- a/games-fps/anaglyph-stereo-quake/files/makefile-onlyglx.patch +++ b/games-fps/anaglyph-stereo-quake/files/makefile-onlyglx.patch @@ -10,7 +10,7 @@ - $(BUILDDIR)/bin/glquake.3dfxgl \ - $(BUILDDIR)/bin/quake.x11 +TARGETS=\ -+ $(BUILDDIR)/bin/glquake.glx ++ $(BUILDDIR)/bin/glquake.SDL # $(BUILDDIR)/bin/unixded build_debug: -- cgit v1.2.3-65-gdbad