diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:58:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:58:29 +0100 |
commit | 0cf2f20608308acdf3cb922c3736446bbd8f3388 (patch) | |
tree | 07815070629c7c11000a7f51ceb8ccbccb49a809 /games-fps/quake2-icculus/files | |
parent | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'games-fps/quake2-icculus/files')
14 files changed, 0 insertions, 800 deletions
diff --git a/games-fps/quake2-icculus/files/0.16-rogue-armor.patch b/games-fps/quake2-icculus/files/0.16-rogue-armor.patch deleted file mode 100644 index 194f965a0501..000000000000 --- a/games-fps/quake2-icculus/files/0.16-rogue-armor.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/rogue/g_local.h.orig -+++ src/rogue/g_local.h -@@ -545,9 +545,6 @@ - extern int sm_meat_index; - extern int snd_fry; - --extern int jacket_armor_index; --extern int combat_armor_index; --extern int body_armor_index; - - - // means of death diff --git a/games-fps/quake2-icculus/files/0.16-rogue-nan.patch b/games-fps/quake2-icculus/files/0.16-rogue-nan.patch deleted file mode 100644 index 0961fa68a985..000000000000 --- a/games-fps/quake2-icculus/files/0.16-rogue-nan.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- src/rogue/g_local.h.orig -+++ src/rogue/g_local.h -@@ -24,3 +24,3 @@ - #ifndef _WIN32 --#include <nan.h> -+#include <bits/nan.h> - #define min(a,b) ((a) < (b) ? (a) : (b)) diff --git a/games-fps/quake2-icculus/files/README-postinstall b/games-fps/quake2-icculus/files/README-postinstall deleted file mode 100644 index 3e2245f3bb0a..000000000000 --- a/games-fps/quake2-icculus/files/README-postinstall +++ /dev/null @@ -1,79 +0,0 @@ -This was taken from the README file in the source distribution -and cleaned up a bit. Read all of this, or at least skim it. Please? - -Note: -1. If you install a new compile of quake2, you'll lose your savegames. I'm -sorry. Don't upgrade in the middle of a single-player game. - -=============================================================================== - -To emerge the Quake2 data: --------------------------- -1. emerge quake2-data - -That was easy huh ? :) Note: this requires the Quake2 CD and/or the data files -from an installed copy of the game (like for windows). - -=============================================================================== - -To install the Quake2 demo data: --------------------------------- -1. download ftp://ftp.idsoftware.com/idstuff/quake2/q2-314-demo-x86.exe -2. unzip -L q2-314-demo-x86.exe into a temp directory -3. cp baseq2/pak0.pak to /usr/share/games/quake2-data/baseq2/pak0.pak - -=============================================================================== - -To install the Quake2 gamedata from game CD: --------------------------------------------- -(assuming the cdrom is mounted at /cdrom) - -1. cp /cdrom/Install/Data/baseq2/pak0.pak /usr/share/games/quake2-data/baseq2/ - -2. cp /cdrom/Install/Data/baseq2/video/ /usr/share/games/quake2-data/baseq2/ - (optional) - -3. Download ftp://ftp.idsoftware.com/idstuff/quake2/q2-3.20-x86-full.exe - and extract the contents to a temporary directory (use unzip -L, as this - is a standard zip file). - -4. cp <temp directory>/baseq2/pak1.pak /usr/share/games/quake2-data/baseq2/ -5. cp <temp directory>/baseq2/pak2.pak /usr/share/games/quake2-data/baseq2/ -6. cp <temp directory>/baseq2/players/ /usr/share/games/quake2-data/baseq2/ - -7. if you really want to use the crakhor model, you can find the - skins/sounds on websites like http://www.mike-d.com/games/modskins.html - (optional) - -=============================================================================== - -Capture The Flag: ------------ -To run Capture The Flag, you need to do the following: - -1. Download ftp://ftp.idsoftware.com/idstuff/quake2/q2-3.20-x86-full-ctf.exe -2. unzip that file (using unzip -L) into a temp directory -3. cp <temp directory>/ctf /usr/share/games/quake2-data/ - -Execute quake2 with: - -quake2 +set game ctf +set dedicated 1 - -- or -- -q2ded +set game ctf -=============================================================================== - -Joystick Support: ------------------ -Joystick should function on all compatible SDL platforms using the sdlquake2 -binary as well as on linux using the linux kernel joystick API. - -Joystick obeys the same free-look/strafe rules as mouse. You can set these in -the options menu. - -There are four command line settings for joystick: -1. j_invert_y [1],0 if set to zero pulling back on the joystick points down -2. j_lr_axis [0] set the axis which controls left right movement -3. j_ud_axis [1] set the axis which controls up down (in free-look) or - forward back (freelock off) -4. j_throttle [3] set the axis which controls the players forward backward - throttle (if free-look is true) diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch deleted file mode 100644 index 185359373c4b..000000000000 --- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch +++ /dev/null @@ -1,172 +0,0 @@ ---- src/linux/snd_alsa.c.old -+++ src/linux/snd_alsa.c -@@ -22,13 +22,22 @@ - $Id: quake2-icculus-0.16.1-alsa.patch,v 1.2 2015/03/27 06:40:34 mr_bones_ Exp $ - */ - --#define BUFFER_SIZE 4096 -+// quake2-r0.16.1/src/linux/snd_alsa.c 2010-08-29 09:58:50 -+// Alsa Redux Patch -+#define BUFFER_SIZE 16384 - - #include <alsa/asoundlib.h> - - #include "../client/client.h" - #include "../client/snd_loc.h" - -+#define AFSize 4 -+static int snd_inited=0; -+static snd_pcm_t *playback_handle; -+static int AlsaFrames; -+static int AlsaPos; -+ -+/* - #define snd_buf BUFFER_SIZE - - static int snd_inited; -@@ -43,17 +52,58 @@ - cvar_t *snddevice; - - static int tryrates[] = { 44100, 22051, 11025, 8000 }; -- -+*/ - qboolean SNDDMA_Init (void) - { -- int i; -- int err; -- int buffersize; -- int framesize; -- int format; -+ int confirm; -+ int latency; -+ Com_Printf("Setting up ALSA driver .....\n"); - - if (snd_inited) { return 1; } -- -+ int s_khz=(Cvar_Get("s_khz", "22", CVAR_ARCHIVE))->value; -+ if (s_khz <22 ){ -+ Com_Printf("Low Performance 11KHz.\n"); -+ Cvar_Set("s_mixahead","0.2"); -+ dma.speed=11025; -+ AlsaFrames=2048; -+ latency=200000; -+ }else{ -+ Com_Printf("High Quality 48KHz.\n"); -+ Cvar_Set("s_mixahead","0.1"); -+ dma.speed=48000; -+ AlsaFrames=4800; -+ latency=110000;} -+ -+ dma.channels = 2; -+ dma.samplebits = 16; -+ AlsaPos = 0; -+ playback_handle = NULL; -+ confirm = -+snd_pcm_open(&playback_handle,"default",SND_PCM_STREAM_PLAYBACK,SND_PCM_NONBLOCK); -+ if (confirm < 0) { -+ Com_Printf("ALSA sound error: cannot open device \n"); -+ return 0;} -+ confirm = snd_pcm_set_params(playback_handle, -+ SND_PCM_FORMAT_S16_LE, -+ SND_PCM_ACCESS_RW_INTERLEAVED, -+ dma.channels, -+ dma.speed, -+ 1,//soft resample -+ latency); -+ if (confirm < 0){ -+ Com_Printf("Alsa error: %s\n", snd_strerror(confirm)); -+ return 0;} -+ confirm = snd_pcm_prepare(playback_handle); -+ if (confirm < 0) { -+ Com_Printf("...failed.\n"); -+ return 0;} -+ -+ int rambuffer = (BUFFER_SIZE+AlsaFrames)*AFSize; -+ dma.buffer=malloc(rambuffer); -+ dma.samplepos = 0; -+ dma.samples = BUFFER_SIZE*dma.channels; -+ dma.submission_chunk = 16; -+ /* - sndbits = Cvar_Get("sndbits", "16", CVAR_ARCHIVE); - sndspeed = Cvar_Get("sndspeed", "0", CVAR_ARCHIVE); - sndchannels = Cvar_Get("sndchannels", "2", CVAR_ARCHIVE); -@@ -159,7 +209,6 @@ - return 0; - } - -- /* - buffer_size = snd_pcm_hw_params_get_buffer_size(hw_params); - frame_size = (snd_pcm_format_physical_width(format)*dma.channels)/8; - -@@ -172,7 +221,6 @@ - } - - snd_buf = buffer_size*frame_size; -- */ - - //snd_buf = BUFFER_SIZE; - -@@ -183,7 +231,7 @@ - dma.samples = snd_buf / (dma.samplebits/8); - dma.submission_chunk = 1; - dma.buffer = (char *)buffer; -- -+ */ - snd_inited = 1; - return 1; - } -@@ -191,11 +239,25 @@ - int - SNDDMA_GetDMAPos (void) - { -- if(snd_inited) -- return dma.samplepos; -- else -- Com_Printf ("Sound not inizialized\n"); -- return 0; -+ int timerpos; -+ int send; -+ int taken; -+ timerpos = snd_pcm_avail(playback_handle); -+ if (timerpos<0){// likely buffer underrun. -+ timerpos = snd_pcm_prepare(playback_handle); -+ timerpos=0;} -+ -+ send=AlsaFrames-timerpos; -+ if ( (send+AlsaPos)>BUFFER_SIZE ) -+ { memcpy (dma.buffer+BUFFER_SIZE*AFSize, -+ dma.buffer,AlsaFrames*AFSize);} -+ taken = snd_pcm_writei(playback_handle, dma.buffer+AlsaPos*AFSize, send); -+ if (taken<0) {taken=0;} -+ -+ AlsaPos+=taken; -+ if (BUFFER_SIZE<=AlsaPos){AlsaPos -= BUFFER_SIZE;} -+ return AlsaPos*dma.channels; -+ - } - - void -@@ -205,8 +267,8 @@ - snd_pcm_drop(playback_handle); - snd_pcm_close(playback_handle); - snd_inited = 0; -+ free(dma.buffer); - } -- free(dma.buffer); - dma.buffer = NULL; - } - -@@ -217,13 +279,6 @@ - void - SNDDMA_Submit (void) - { -- int written; -- -- if ((written = snd_pcm_writei(playback_handle, dma.buffer, snd_buf)) < 0) { -- snd_pcm_prepare(playback_handle); -- Com_Printf("alsa: buffer underrun\n"); -- } -- dma.samplepos += written/(dma.samplebits/8); - } - - diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-amd64.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-amd64.patch deleted file mode 100644 index b3291827996c..000000000000 --- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-amd64.patch +++ /dev/null @@ -1,18 +0,0 @@ -The default video renderers (softx / soft) currently do not work -on amd64. So for now we add a little hack which will select the -glx renderer by default. - -http://bugs.gentoo.org/show_bug.cgi?id=86552 - ---- src/linux/vid_so.c -+++ src/linux/vid_so.c -@@ -435,6 +440,9 @@ VID_Init - */ - void VID_Init (void) - { -+#if defined __x86_64__ -+ vid_ref = Cvar_Get ("vid_ref", "glx", CVAR_ARCHIVE); -+#endif - /* Create the video variables so we know how to start the graphics drivers */ - // if DISPLAY is defined, try X - if (getenv("DISPLAY")) diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch deleted file mode 100644 index 626cf5a1b64d..000000000000 --- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/xatrix/g_local.h.old -+++ src/xatrix/g_local.h -@@ -446,11 +446,6 @@ - extern int sm_meat_index; - extern int snd_fry; - --extern int jacket_armor_index; --extern int combat_armor_index; --extern int body_armor_index; -- -- - // means of death - #define MOD_UNKNOWN 0 - #define MOD_BLASTER 1 diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch deleted file mode 100644 index 61f0bb2286e5..000000000000 --- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch +++ /dev/null @@ -1,213 +0,0 @@ ---- Makefile -+++ Makefile -@@ -74,35 +74,46 @@ endif - - CC=gcc - -+ifndef OPT_CFLAGS - ifeq ($(ARCH),axp) --RELEASE_CFLAGS=$(BASE_CFLAGS) -ffast-math -funroll-loops \ -+OPT_CFLAGS=-ffast-math -funroll-loops \ - -fomit-frame-pointer -fexpensive-optimizations - endif - - ifeq ($(ARCH),ppc) --RELEASE_CFLAGS=$(BASE_CFLAGS) -O2 -ffast-math -funroll-loops \ -+OPT_CFLAGS=-O2 -ffast-math -funroll-loops \ - -fomit-frame-pointer -fexpensive-optimizations - endif - - ifeq ($(ARCH),sparc) --RELEASE_CFLAGS=$(BASE_CFLAGS) -ffast-math -funroll-loops \ -+OPT_CFLAGS=-ffast-math -funroll-loops \ - -fomit-frame-pointer -fexpensive-optimizations - endif - - ifeq ($(ARCH),i386) --RELEASE_CFLAGS=$(BASE_CFLAGS) -O2 -ffast-math -funroll-loops -falign-loops=2 \ -+OPT_CFLAGS=-O2 -ffast-math -funroll-loops -falign-loops=2 \ - -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing - # compiler bugs with gcc 2.96 and 3.0.1 can cause bad builds with heavy opts. --#RELEASE_CFLAGS=$(BASE_CFLAGS) -O6 -m486 -ffast-math -funroll-loops \ -+#OPT_CFLAGS=-O6 -m486 -ffast-math -funroll-loops \ - # -fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \ - # -malign-jumps=2 -malign-functions=2 - endif - - ifeq ($(ARCH),x86_64) - _LIB := 64 --RELEASE_CFLAGS=$(BASE_CFLAGS) -O2 -ffast-math -funroll-loops \ -+OPT_CFLAGS=-O2 -ffast-math -funroll-loops \ - -fomit-frame-pointer -fexpensive-optimizations -fno-strict-aliasing - endif -+endif -+RELEASE_CFLAGS=$(BASE_CFLAGS) $(OPT_CFLAGS) -+ -+ifeq ($(ADDCFLAGS),debug) -+CFLAGS=$(DEBUG_CFLAGS) -DLINUX_VERSION=\"$(VERSION) Debug\" -+endif -+ -+ifeq ($(ADDCFLAGS),release) -+CFLAGS=$(RELEASE_CFLAGS) -DLINUX_VERSION=\"$(VERSION)\" -+endif - - VERSION=3.21+r0.16 - -@@ -133,6 +136,13 @@ else - NET_UDP=net_udp - endif - -+ifdef DEFAULT_BASEDIR -+BASE_CFLAGS += -DDEFAULT_BASEDIR=\"$(DEFAULT_BASEDIR)\" -+endif -+ifdef DEFAULT_LIBDIR -+BASE_CFLAGS += -DDEFAULT_LIBDIR=\"$(DEFAULT_LIBDIR)\" -+endif -+ - ifeq ($(strip $(BUILD_QMAX)),YES) - BASE_CFLAGS+=-DQMAX - endif -@@ -406,7 +424,7 @@ - $(BUILD_DEBUG_DIR)/ctf \ - $(BUILD_DEBUG_DIR)/xatrix \ - $(BUILD_DEBUG_DIR)/rogue -- $(MAKE) targets BUILDDIR=$(BUILD_DEBUG_DIR) CFLAGS="$(DEBUG_CFLAGS) -DLINUX_VERSION='\"$(VERSION) Debug\"'" -+ $(MAKE) targets BUILDDIR=$(BUILD_DEBUG_DIR) ADDCFLAGS=debug - - build_release: - @-mkdir -p $(BUILD_RELEASE_DIR) \ -@@ -418,7 +436,7 @@ - $(BUILD_RELEASE_DIR)/ctf \ - $(BUILD_RELEASE_DIR)/xatrix \ - $(BUILD_RELEASE_DIR)/rogue -- $(MAKE) targets BUILDDIR=$(BUILD_RELEASE_DIR) CFLAGS="$(RELEASE_CFLAGS) -DLINUX_VERSION='\"$(VERSION)\"'" -+ $(MAKE) targets BUILDDIR=$(BUILD_RELEASE_DIR) ADDCFLAGS=release - - targets: $(TARGETS) - ---- src/linux/qgl_linux.c -+++ src/linux/qgl_linux.c -@@ -3006,13 +3006,17 @@ qboolean QGL_Init( const char *dllname ) - // dllname, dlerror()); - - // try basedir next -- path = ri.Cvar_Get ("basedir", ".", CVAR_NOSET)->string; -+ path = ri.Cvar_Get ("basedir", DEFAULT_BASEDIR, CVAR_NOSET)->string; - - snprintf (fn, MAX_OSPATH, "%s/%s", path, dllname ); - - if ( ( glw_state.OpenGLLib = dlopen( fn, RTLD_LAZY ) ) == 0 ) { -- ri.Con_Printf( PRINT_ALL, "%s\n", dlerror() ); -- return false; -+ path = ri.Cvar_Get ("libdir", DEFAULT_LIBDIR, CVAR_NOSET)->string; -+ snprintf (fn, MAX_OSPATH, "%s/%s", path, dllname ); -+ if ( ( glw_state.OpenGLLib = dlopen( fn, RTLD_LAZY ) ) == 0 ) { -+ ri.Con_Printf( PRINT_ALL, "%s\n", dlerror() ); -+ return false; -+ } - } - Com_Printf ("Using %s for OpenGL...", fn); - } else { ---- src/linux/vid_so.c -+++ src/linux/vid_so.c -@@ -237,13 +237,17 @@ qboolean VID_LoadRefresh( char *name ) - //regain root - seteuid(saved_euid); - -- path = Cvar_Get ("basedir", ".", CVAR_NOSET)->string; -+ path = Cvar_Get ("basedir", DEFAULT_BASEDIR, CVAR_NOSET)->string; - - snprintf (fn, MAX_OSPATH, "%s/%s", path, name ); - - if (stat(fn, &st) == -1) { -- Com_Printf( "LoadLibrary(\"%s\") failed: %s\n", name, strerror(errno)); -- return false; -+ path = Cvar_Get ("libdir", DEFAULT_LIBDIR, CVAR_NOSET)->string; -+ snprintf (fn, MAX_OSPATH, "%s/%s", path, name ); -+ if (stat(fn, &st) == -1) { -+ Com_Printf( "LoadLibrary(\"%s\") failed: %s\n", name, strerror(errno)); -+ return false; -+ } - } - - // permission checking -@@ -493,13 +497,19 @@ qboolean VID_CheckRefExists (const char - char *path; - struct stat st; - -- path = Cvar_Get ("basedir", ".", CVAR_NOSET)->string; -+ path = Cvar_Get ("libdir", DEFAULT_LIBDIR, CVAR_NOSET)->string; - snprintf (fn, MAX_OSPATH, "%s/ref_%s.so", path, ref ); - - if (stat(fn, &st) == 0) - return true; -- else -- return false; -+ else { -+ path = Cvar_Get ("basedir", DEFAULT_BASEDIR, CVAR_NOSET)->string; -+ snprintf (fn, MAX_OSPATH, "%s/ref_%s.so", path, ref ); -+ if (stat(fn, &st) == 0) -+ return true; -+ else -+ return false; -+ } - } - - /*****************************************************************************/ ---- src/qcommon/files.c -+++ src/qcommon/files.c -@@ -60,6 +60,7 @@ typedef struct pack_s - - char fs_gamedir[MAX_OSPATH]; - cvar_t *fs_basedir; -+cvar_t *fs_libdir; - cvar_t *fs_cddir; - cvar_t *fs_gamedirvar; - -@@ -681,6 +682,7 @@ void FS_SetGamedir (char *dir) - if (fs_cddir->string[0]) - FS_AddGameDirectory (va("%s/%s", fs_cddir->string, dir) ); - FS_AddGameDirectory (va("%s/%s", fs_basedir->string, dir) ); -+ FS_AddGameDirectory (va("%s/%s", fs_libdir->string, dir) ); - FS_AddHomeAsGameDirectory(dir); - } - } -@@ -898,7 +900,13 @@ void FS_InitFilesystem (void) - // basedir <path> - // allows the game to run from outside the data tree - // -- fs_basedir = Cvar_Get ("basedir", ".", CVAR_NOSET); -+ fs_basedir = Cvar_Get ("basedir", DEFAULT_BASEDIR, CVAR_NOSET); -+ -+ // -+ // libdir <path> -+ // allows the game to store binary files (not data) in a sep tree -+ // -+ fs_libdir = Cvar_Get ("libdir", DEFAULT_LIBDIR, CVAR_NOSET); - - // - // cddir <path> -@@ -913,6 +921,7 @@ void FS_InitFilesystem (void) - // add baseq2 to search path - // - FS_AddGameDirectory (va("%s/"BASEDIRNAME, fs_basedir->string) ); -+ FS_AddGameDirectory (va("%s/"BASEDIRNAME, fs_libdir->string) ); - - // - // then add a '.quake2/baseq2' directory in home directory by default ---- src/qcommon/qcommon.h -+++ src/qcommon/qcommon.h -@@ -74,6 +74,13 @@ Foundation, Inc., 59 Temple Place - Suit - - #endif - -+#ifndef DEFAULT_BASEDIR -+# define DEFAULT_BASEDIR "." -+#endif -+#ifndef DEFAULT_LIBDIR -+# define DEFAULT_LIBDIR DEFAULT_BASEDIR -+#endif -+ - //============================================================================ - - typedef struct sizebuf_s diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch deleted file mode 100644 index ad1f37309c30..000000000000 --- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- quake2-r0.16.1/src/linux/q_shlinux.c -+++ quake2-r0.16.1-modified/src/linux/q_shlinux.c -@@ -17,6 +17,9 @@ - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - */ -+#if !defined(_GNU_SOURCE) -+ #define _GNU_SOURCE -+#endif - #include <sys/types.h> - #include <sys/stat.h> - #include <errno.h> diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ia64.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ia64.patch deleted file mode 100644 index ae1aa2e4068c..000000000000 --- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ia64.patch +++ /dev/null @@ -1,97 +0,0 @@ ---- quake2-r0.16.1.orig/Makefile -+++ quake2-r0.16.1/Makefile -@@ -54,24 +54,26 @@ endif - - - # this nice line comes from the linux kernel makefile - ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/) - - ifneq ($(ARCH),x86_64) - ifneq ($(ARCH),i386) - ifneq ($(ARCH),axp) -+ifneq ($(ARCH),ia64) - ifneq ($(ARCH),ppc) - ifneq ($(ARCH),sparc) - $(error arch $(ARCH) is currently not supported) - endif - endif - endif - endif - endif -+endif - - CC=gcc - - ifndef OPT_CFLAGS - ifeq ($(ARCH),axp) - OPT_CFLAGS=-ffast-math -funroll-loops \ - -fomit-frame-pointer -fexpensive-optimizations - endif -@@ -283,16 +285,46 @@ ifeq ($(ARCH),axp) - $(warning Warning: SDL support not supported for $(ARCH)) - endif - - ifeq ($(strip $(BUILD_SDLGL)),YES) - $(warning Warning: SDLGL support not supported for $(ARCH)) - endif - endif # ARCH axp - -+ifeq ($(ARCH),ia64) -+ ifeq ($(strip $(BUILD_SDLQUAKE2)),YES) -+ TARGETS += $(BUILDDIR)/sdlquake2 -+ endif -+ -+ ifeq ($(strip $(BUILD_SVGA)),YES) -+ TARGETS += $(BUILDDIR)/ref_soft.$(SHLIBEXT) -+ endif -+ -+ ifeq ($(strip $(BUILD_X11)),YES) -+ TARGETS += $(BUILDDIR)/ref_softx.$(SHLIBEXT) -+ endif -+ -+ ifeq ($(strip $(BUILD_GLX)),YES) -+ TARGETS += $(BUILDDIR)/ref_glx.$(SHLIBEXT) -+ endif -+ -+ ifeq ($(strip $(BUILD_FXGL)),YES) -+ TARGETS += $(BUILDDIR)/ref_gl.$(SHLIBEXT) -+ endif -+ -+ ifeq ($(strip $(BUILD_SDL)),YES) -+ TARGETS += $(BUILDDIR)/ref_softsdl.$(SHLIBEXT) -+ endif -+ -+ ifeq ($(strip $(BUILD_SDLGL)),YES) -+ TARGETS += $(BUILDDIR)/ref_sdlgl.$(SHLIBEXT) -+ endif -+endif # ARCH ia64 -+ - ifeq ($(ARCH),ppc) - ifeq ($(strip $(BUILD_SDLQUAKE2)),YES) - TARGETS += $(BUILDDIR)/sdlquake2 - endif - - ifeq ($(strip $(BUILD_SVGA)),YES) - $(warning Warning: SVGAlib support not supported for $(ARCH)) - endif ---- quake2-r0.16.1.orig/src/linux/sys_linux.c -+++ quake2-r0.16.1/src/linux/sys_linux.c -@@ -216,16 +216,18 @@ void *Sys_GetGameAPI (void *parms) - char *path; - char *str_p; - #if defined __i386__ - const char *gamename = "gamei386.so"; - #elif defined __x86_64__ - const char *gamename = "gamex86_64.so"; - #elif defined __alpha__ - const char *gamename = "gameaxp.so"; -+#elif defined __ia64__ -+ const char *gamename = "gameia64.so"; - #elif defined __powerpc__ - const char *gamename = "gameppc.so"; - #elif defined __sparc__ - const char *gamename = "gamesparc.so"; - #else - #error Unknown arch - #endif - diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch deleted file mode 100644 index 978c9c9820ea..000000000000 --- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- Makefile.old -+++ Makefile -@@ -169,18 +169,18 @@ - DEBUG_CFLAGS=$(BASE_CFLAGS) -g - - ifeq ($(OSTYPE),FreeBSD) --LDFLAGS=-lm -+LDLIBS=-lm - endif - ifeq ($(OSTYPE),Linux) --LDFLAGS=-lm -ldl -+LDLIBS=-lm -ldl - endif - - ifeq ($(strip $(BUILD_ARTS)),YES) --LDFLAGS+=$(shell artsc-config --libs) -+LDLIBS+=$(shell artsc-config --libs) - endif - - ifeq ($(strip $(BUILD_ALSA)),YES) --LDFLAGS+=-lasound -+LDLIBS+=-lasound - endif - - -@@ -226,7 +226,7 @@ - SHLIBEXT=so - - SHLIBCFLAGS=-fPIC --SHLIBLDFLAGS=-shared -+SHLIBLDFLAGS=$(LDFLAGS) -shared - - DO_CC=$(CC) $(CFLAGS) -o $@ -c $< - DO_DED_CC=$(CC) $(CFLAGS) -DDEDICATED_ONLY -o $@ -c $< -@@ -518,10 +518,10 @@ - endif - - $(BUILDDIR)/quake2 : $(QUAKE2_OBJS) $(QUAKE2_LNX_OBJS) $(QUAKE2_AS_OBJS) -- $(CC) $(CFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_LNX_OBJS) $(QUAKE2_AS_OBJS) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_LNX_OBJS) $(QUAKE2_AS_OBJS) $(LDLIBS) - - $(BUILDDIR)/sdlquake2 : $(QUAKE2_OBJS) $(QUAKE2_SDL_OBJS) $(QUAKE2_AS_OBJS) -- $(CC) $(CFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_SDL_OBJS) $(QUAKE2_AS_OBJS) $(LDFLAGS) $(SDLLDFLAGS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_SDL_OBJS) $(QUAKE2_AS_OBJS) $(LDLIBS) $(SDLLDFLAGS) - - $(BUILDDIR)/client/cl_cin.o : $(CLIENT_DIR)/cl_cin.c - $(DO_CC) -@@ -710,7 +710,7 @@ - $(BUILDDIR)/ded/cd_null.o - - $(BUILDDIR)/q2ded : $(Q2DED_OBJS) -- $(CC) $(CFLAGS) -o $@ $(Q2DED_OBJS) $(LDFLAGS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(Q2DED_OBJS) $(LDLIBS) - - $(BUILDDIR)/ded/cmd.o : $(COMMON_DIR)/cmd.c - $(DO_DED_CC) diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-no-asm-io.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-no-asm-io.patch deleted file mode 100644 index d94925b83e4b..000000000000 --- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-no-asm-io.patch +++ /dev/null @@ -1,25 +0,0 @@ -http://bugs.gentoo.org/193107 - -asm/io.h does not exist with sanitized kernel headers, nor do these source -files actually need the header, so punt it - ---- src/linux/rw_in_aa.c -+++ src/linux/rw_in_aa.c -@@ -46,7 +46,6 @@ - #include <sys/mman.h>
-
- #if defined (__linux__)
--#include <asm/io.h>
- #include <sys/vt.h>
- #endif
-
---- src/linux/rw_aa.c -+++ src/linux/rw_aa.c -@@ -63,7 +63,6 @@ - #include <dlfcn.h>
- #if defined (__linux__)
- #include <sys/vt.h>
--#include <asm/io.h>
- #endif
- #include <aalib.h>
-
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch deleted file mode 100644 index 6dc6f0f1ddfb..000000000000 --- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/linux/rw_x11.c.old -+++ src/linux/rw_x11.c -@@ -989,8 +989,8 @@ - } - else - { -- mx -= ((int)event.xmotion.x + mwx)*2; -- my -= ((int)event.xmotion.y + mwy)*2; -+ mx += ((int)event.xmotion.x - mwx)*2; -+ my += ((int)event.xmotion.y - mwy)*2; - mwx = event.xmotion.x; - mwy = event.xmotion.y; - diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_soft.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_soft.patch deleted file mode 100644 index e23caf9db09f..000000000000 --- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_soft.patch +++ /dev/null @@ -1,45 +0,0 @@ - -the x11 software renderer just needs some tweaks to get working - ---- Makefile.old -+++ Makefile -@@ -358,7 +358,7 @@ - endif - - ifeq ($(strip $(BUILD_X11)),YES) -- $(warning Warning: Software X Renderer not supported for $(ARCH)) -+ TARGETS += $(BUILDDIR)/ref_softx.$(SHLIBEXT) - endif - - ifeq ($(strip $(BUILD_GLX)),YES) ---- src/linux/rw_x11.c.old -+++ src/linux/rw_x11.c -@@ -53,7 +53,7 @@ - #include <X11/Xatom.h> - #include <X11/keysym.h> - #include <X11/extensions/XShm.h> --#include <X11/extensions/xf86dga.h> -+#include <X11/extensions/Xxf86dga.h> - #ifdef OPENGL - #include <X11/extensions/xf86vmode.h> - #endif -@@ -151,7 +151,7 @@ - int config_notify_height; - - typedef unsigned short PIXEL16; --typedef unsigned long PIXEL24; -+typedef unsigned int PIXEL24; - #ifdef REDBLUE - static PIXEL16 st2d_8to16table_s[2][256]; - static PIXEL24 st2d_8to24table_s[2][256]; ---- src/ref_soft/r_poly.c.old -+++ src/ref_soft/r_poly.c -@@ -994,7 +994,7 @@ - scale = yscale * pout->zi; - pout->v = (ycenter - scale * transformed[1]); - -- pv += sizeof (vec5_t) / sizeof (pv); -+ pv += sizeof (vec5_t) / sizeof (float); - } - - // draw it diff --git a/games-fps/quake2-icculus/files/quake2.xpm b/games-fps/quake2-icculus/files/quake2.xpm deleted file mode 100644 index bbbcbb8f064f..000000000000 --- a/games-fps/quake2-icculus/files/quake2.xpm +++ /dev/null @@ -1,37 +0,0 @@ -/* XPM */ -static char * quake2_xpm[] = { -"32 32 2 1", -" c None", -". c #000000", -" ", -" .. .. ", -" .. .. ", -" .. .. ", -" .. .. ", -" .. .. ", -" .. .. ", -" .. .. ", -" .. .. ", -" .. .. ", -" .. .. ", -" .. .. ", -" .. .. ", -" .. .. ", -" ... ... ", -" ... ........ ... ", -" ... ...... ... ", -" .... .. .. .... ", -" .... .. .. .... ", -" ........ ........ ", -" ................ ", -" .............. ", -" .......... ", -" ...... ", -" .. .. ", -" .. .. ", -" .. .. ", -" .. .. ", -" .. .. ", -" .. .. ", -" .. .. ", -" .. .. "}; |