summaryrefslogtreecommitdiff
path: root/games/ioquake3/files
diff options
context:
space:
mode:
Diffstat (limited to 'games/ioquake3/files')
-rw-r--r--games/ioquake3/files/patch-Makefile16
-rw-r--r--games/ioquake3/files/patch-README6
-rw-r--r--games/ioquake3/files/patch-code-client-snd_openal.c6
-rw-r--r--games/ioquake3/files/patch-code-qcommon-files.c8
-rw-r--r--games/ioquake3/files/patch-code-qcommon-q_platform.h6
-rw-r--r--games/ioquake3/files/patch-code-qcommon-qcommon.h6
-rw-r--r--games/ioquake3/files/patch-code-qcommon-vm_interpreted.c6
-rw-r--r--games/ioquake3/files/patch-code-qcommon-vm_x86.c8
-rw-r--r--games/ioquake3/files/patch-code-qcommon-vm_x86_64.c6
-rw-r--r--games/ioquake3/files/patch-code-sys-sys_main.c20
-rw-r--r--games/ioquake3/files/patch-code-sys-sys_unix.c6
11 files changed, 47 insertions, 47 deletions
diff --git a/games/ioquake3/files/patch-Makefile b/games/ioquake3/files/patch-Makefile
index 7b1d83f32a4e..3c77c16c2fb9 100644
--- a/games/ioquake3/files/patch-Makefile
+++ b/games/ioquake3/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig 2009-04-22 22:54:48.000000000 +0400
-+++ Makefile 2015-09-28 20:24:27.956819000 +0300
-@@ -187,6 +187,8 @@
+--- Makefile.orig 2009-04-22 18:54:48 UTC
++++ Makefile
+@@ -187,6 +187,8 @@ ifeq ($(shell which pkg-config > /dev/nu
# FIXME: introduce CLIENT_CFLAGS
SDL_CFLAGS=$(shell pkg-config --cflags sdl|sed 's/-Dmain=SDL_main//')
SDL_LIBS=$(shell pkg-config --libs sdl)
@@ -9,7 +9,7 @@
endif
# version info
-@@ -521,44 +523,25 @@
+@@ -521,44 +523,25 @@ else # ifeq mingw32
ifeq ($(PLATFORM),freebsd)
@@ -72,7 +72,7 @@
SHLIBEXT=so
SHLIBCFLAGS=-fPIC
-@@ -568,20 +551,52 @@
+@@ -568,20 +551,52 @@ ifeq ($(PLATFORM),freebsd)
# don't need -ldl (FreeBSD)
LIBS=-lm
@@ -131,7 +131,7 @@
else # ifeq freebsd
#############################################################################
-@@ -831,7 +846,7 @@
+@@ -831,7 +846,7 @@ endif
ifeq ($(USE_VOIP),1)
BASE_CFLAGS += -DUSE_VOIP
ifeq ($(USE_INTERNAL_SPEEX),1)
@@ -140,7 +140,7 @@
else
CLIENT_LIBS += -lspeex
endif
-@@ -1442,6 +1457,9 @@
+@@ -1442,6 +1457,9 @@ ifeq ($(HAVE_VM_COMPILED),true)
ifeq ($(ARCH),x86_64)
Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o
endif
@@ -150,7 +150,7 @@
ifeq ($(ARCH),ppc)
Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o
endif
-@@ -1591,6 +1609,9 @@
+@@ -1591,6 +1609,9 @@ ifeq ($(HAVE_VM_COMPILED),true)
ifeq ($(ARCH),x86_64)
Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o
endif
diff --git a/games/ioquake3/files/patch-README b/games/ioquake3/files/patch-README
index cc92efbf4a5d..70f34f917c26 100644
--- a/games/ioquake3/files/patch-README
+++ b/games/ioquake3/files/patch-README
@@ -1,6 +1,6 @@
---- README.orig 2009-04-08 05:36:16.000000000 +0200
-+++ README 2011-10-27 13:13:59.000000000 +0200
-@@ -79,6 +79,8 @@
+--- README.orig 2009-04-08 03:36:16 UTC
++++ README
+@@ -79,6 +79,8 @@ Makefile.local:
CFLAGS - use this for custom CFLAGS
V - set to show cc command line when building
DEFAULT_BASEDIR - extra path to search for baseq3 and such
diff --git a/games/ioquake3/files/patch-code-client-snd_openal.c b/games/ioquake3/files/patch-code-client-snd_openal.c
index 411fb3564ea8..d594ddef55e5 100644
--- a/games/ioquake3/files/patch-code-client-snd_openal.c
+++ b/games/ioquake3/files/patch-code-client-snd_openal.c
@@ -1,6 +1,6 @@
---- code/client/snd_openal.c.orig 2009-12-26 18:10:44.000000000 +0100
-+++ code/client/snd_openal.c 2009-12-26 18:11:00.000000000 +0100
-@@ -1719,7 +1719,7 @@
+--- code/client/snd_openal.c.orig 2009-03-15 12:39:53 UTC
++++ code/client/snd_openal.c
+@@ -1719,7 +1719,7 @@ static cvar_t *s_alCapture;
#elif defined(MACOS_X)
#define ALDRIVER_DEFAULT "/System/Library/Frameworks/OpenAL.framework/OpenAL"
#else
diff --git a/games/ioquake3/files/patch-code-qcommon-files.c b/games/ioquake3/files/patch-code-qcommon-files.c
index be48d4f46238..3477203f9680 100644
--- a/games/ioquake3/files/patch-code-qcommon-files.c
+++ b/games/ioquake3/files/patch-code-qcommon-files.c
@@ -1,6 +1,6 @@
---- code/qcommon/files.c.orig 2009-12-08 11:07:08.000000000 +0100
-+++ code/qcommon/files.c 2009-12-08 11:08:41.000000000 +0100
-@@ -241,6 +241,7 @@
+--- code/qcommon/files.c.orig 2009-02-26 13:02:59 UTC
++++ code/qcommon/files.c
+@@ -241,6 +241,7 @@ static cvar_t *fs_apppath;
#endif
static cvar_t *fs_basepath;
@@ -8,7 +8,7 @@
static cvar_t *fs_basegame;
static cvar_t *fs_gamedirvar;
static searchpath_t *fs_searchpaths;
-@@ -2761,6 +2762,7 @@
+@@ -2761,6 +2762,7 @@ static void FS_Startup( const char *game
fs_debug = Cvar_Get( "fs_debug", "0", 0 );
fs_basepath = Cvar_Get ("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT );
fs_basegame = Cvar_Get ("fs_basegame", "", CVAR_INIT );
diff --git a/games/ioquake3/files/patch-code-qcommon-q_platform.h b/games/ioquake3/files/patch-code-qcommon-q_platform.h
index a46ef085ea57..55b1d5d2ec17 100644
--- a/games/ioquake3/files/patch-code-qcommon-q_platform.h
+++ b/games/ioquake3/files/patch-code-qcommon-q_platform.h
@@ -1,6 +1,6 @@
---- code/qcommon/q_platform.h.orig 2009-08-30 19:30:01.000000000 +0200
-+++ code/qcommon/q_platform.h 2009-08-30 19:28:38.000000000 +0200
-@@ -199,6 +199,8 @@
+--- code/qcommon/q_platform.h.orig 2009-03-02 17:29:30 UTC
++++ code/qcommon/q_platform.h
+@@ -199,6 +199,8 @@ Foundation, Inc., 51 Franklin St, Fifth
#ifdef __i386__
#define ARCH_STRING "i386"
diff --git a/games/ioquake3/files/patch-code-qcommon-qcommon.h b/games/ioquake3/files/patch-code-qcommon-qcommon.h
index e19e7f23b235..be0794f9c4c1 100644
--- a/games/ioquake3/files/patch-code-qcommon-qcommon.h
+++ b/games/ioquake3/files/patch-code-qcommon-qcommon.h
@@ -1,6 +1,6 @@
---- code/qcommon/qcommon.h.orig 2009-12-08 11:09:48.000000000 +0100
-+++ code/qcommon/qcommon.h 2009-12-08 11:10:43.000000000 +0100
-@@ -1069,6 +1069,9 @@
+--- code/qcommon/qcommon.h.orig 2009-01-17 23:09:58 UTC
++++ code/qcommon/qcommon.h
+@@ -1069,6 +1069,9 @@ char *Sys_DefaultInstallPath(void);
char *Sys_DefaultAppPath(void);
#endif
diff --git a/games/ioquake3/files/patch-code-qcommon-vm_interpreted.c b/games/ioquake3/files/patch-code-qcommon-vm_interpreted.c
index 1e9b6ee4d54b..77e7b9829d23 100644
--- a/games/ioquake3/files/patch-code-qcommon-vm_interpreted.c
+++ b/games/ioquake3/files/patch-code-qcommon-vm_interpreted.c
@@ -1,6 +1,6 @@
---- code/qcommon/vm_interpreted.c 2009/11/01 19:58:07 1717
-+++ code/qcommon/vm_interpreted.c 2010/01/16 10:55:51 1772
-@@ -516,18 +516,20 @@
+--- code/qcommon/vm_interpreted.c.orig 2008-08-23 22:45:30 UTC
++++ code/qcommon/vm_interpreted.c
+@@ -526,18 +526,20 @@ nextInstruction2:
//VM_LogSyscalls( (int *)&image[ programStack + 4 ] );
{
diff --git a/games/ioquake3/files/patch-code-qcommon-vm_x86.c b/games/ioquake3/files/patch-code-qcommon-vm_x86.c
index c5d8d1b8c766..a189b82107ea 100644
--- a/games/ioquake3/files/patch-code-qcommon-vm_x86.c
+++ b/games/ioquake3/files/patch-code-qcommon-vm_x86.c
@@ -1,6 +1,6 @@
---- code/qcommon/vm_x86.c.orig 2008-08-18 01:22:06.000000000 +0200
-+++ code/qcommon/vm_x86.c 2013-11-14 11:44:27.000000000 +0100
-@@ -36,7 +36,25 @@
+--- code/qcommon/vm_x86.c.orig 2008-08-17 23:22:06 UTC
++++ code/qcommon/vm_x86.c
+@@ -36,7 +36,25 @@ Foundation, Inc., 51 Franklin St, Fifth
/* need this on NX enabled systems (i386 with PAE kernel or
* noexec32=on x86_64) */
@@ -27,7 +27,7 @@
#define VM_X86_MMAP
#endif
-@@ -90,7 +108,11 @@
+@@ -90,7 +108,11 @@ void AsmCall(void);
static void (*const asmCallPtr)(void) = AsmCall;
diff --git a/games/ioquake3/files/patch-code-qcommon-vm_x86_64.c b/games/ioquake3/files/patch-code-qcommon-vm_x86_64.c
index 89cbf7ff670c..084bc76729b2 100644
--- a/games/ioquake3/files/patch-code-qcommon-vm_x86_64.c
+++ b/games/ioquake3/files/patch-code-qcommon-vm_x86_64.c
@@ -1,6 +1,6 @@
---- code/qcommon/vm_x86_64.c.orig 2009-08-30 20:50:41.000000000 +0200
-+++ code/qcommon/vm_x86_64.c 2009-08-30 20:51:43.000000000 +0200
-@@ -246,7 +246,7 @@
+--- code/qcommon/vm_x86_64.c.orig 2008-08-06 16:09:29 UTC
++++ code/qcommon/vm_x86_64.c
+@@ -246,7 +246,7 @@ void emit(const char* fmt, ...)
#else
#define JMPIARG \
emit("movq $%lu, %%rax", vm->codeBase+vm->instructionPointers[iarg]); \
diff --git a/games/ioquake3/files/patch-code-sys-sys_main.c b/games/ioquake3/files/patch-code-sys-sys_main.c
index 0a936fdf9f2c..31c9bfff93d6 100644
--- a/games/ioquake3/files/patch-code-sys-sys_main.c
+++ b/games/ioquake3/files/patch-code-sys-sys_main.c
@@ -1,6 +1,6 @@
---- code/sys/sys_main.c.orig 2009-03-02 23:26:36.000000000 +0100
-+++ code/sys/sys_main.c 2009-12-08 11:31:12.000000000 +0100
-@@ -49,6 +49,7 @@
+--- code/sys/sys_main.c.orig 2009-03-02 22:26:36 UTC
++++ code/sys/sys_main.c
+@@ -49,6 +49,7 @@ Foundation, Inc., 51 Franklin St, Fifth
static char binaryPath[ MAX_OSPATH ] = { 0 };
static char installPath[ MAX_OSPATH ] = { 0 };
@@ -8,7 +8,7 @@
/*
=================
-@@ -95,6 +96,30 @@
+@@ -95,6 +96,30 @@ char *Sys_DefaultInstallPath(void)
/*
=================
@@ -39,7 +39,7 @@
Sys_DefaultAppPath
=================
*/
-@@ -384,6 +409,7 @@
+@@ -384,6 +409,7 @@ Used to load a development dll instead o
#1 look down current path
#2 look in fs_homepath
#3 look in fs_basepath
@@ -47,7 +47,7 @@
=================
*/
void *Sys_LoadDll( const char *name, char *fqpath ,
-@@ -394,6 +420,7 @@
+@@ -394,6 +420,7 @@ void *Sys_LoadDll( const char *name, cha
void (*dllEntry)( intptr_t (*syscallptr)(intptr_t, ...) );
char fname[MAX_OSPATH];
char *basepath;
@@ -55,7 +55,7 @@
char *homepath;
char *pwdpath;
char *gamedir;
-@@ -405,6 +432,7 @@
+@@ -405,6 +432,7 @@ void *Sys_LoadDll( const char *name, cha
// TODO: use fs_searchpaths from files.c
pwdpath = Sys_Cwd();
basepath = Cvar_VariableString( "fs_basepath" );
@@ -63,7 +63,7 @@
homepath = Cvar_VariableString( "fs_homepath" );
gamedir = Cvar_VariableString( "fs_game" );
-@@ -413,6 +441,9 @@
+@@ -413,6 +441,9 @@ void *Sys_LoadDll( const char *name, cha
if(!libHandle && homepath)
libHandle = Sys_TryLibraryLoad(homepath, gamedir, fname, fqpath);
@@ -73,7 +73,7 @@
if(!libHandle && basepath)
libHandle = Sys_TryLibraryLoad(basepath, gamedir, fname, fqpath);
-@@ -469,6 +500,10 @@
+@@ -469,6 +500,10 @@ void Sys_ParseArgs( int argc, char **arg
# endif
#endif
@@ -84,7 +84,7 @@
/*
=================
Sys_SigHandler
-@@ -540,6 +575,7 @@
+@@ -540,6 +575,7 @@ int main( int argc, char **argv )
Sys_ParseArgs( argc, argv );
Sys_SetBinaryPath( Sys_Dirname( argv[ 0 ] ) );
Sys_SetDefaultInstallPath( DEFAULT_BASEDIR );
diff --git a/games/ioquake3/files/patch-code-sys-sys_unix.c b/games/ioquake3/files/patch-code-sys-sys_unix.c
index e6b5219879b0..628e559344fd 100644
--- a/games/ioquake3/files/patch-code-sys-sys_unix.c
+++ b/games/ioquake3/files/patch-code-sys-sys_unix.c
@@ -1,6 +1,6 @@
---- code/sys/sys_unix.c.orig 2008-11-11 00:55:22.000000000 +0100
-+++ code/sys/sys_unix.c 2011-10-27 13:11:15.000000000 +0200
-@@ -53,7 +53,9 @@
+--- code/sys/sys_unix.c.orig 2008-11-10 23:55:22 UTC
++++ code/sys/sys_unix.c
+@@ -53,7 +53,9 @@ char *Sys_DefaultHomePath(void)
if( ( p = getenv( "HOME" ) ) != NULL )
{
Q_strncpyz( homePath, p, sizeof( homePath ) );
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-31 11:04:56 +0000