Hi again,
i've pulled and rebuilt from upstream version bc2efc4, and there is no
performance problem with it.
Please find attached the refreshed quilt patches, and a small fix
to debian/*docs, so you can update easily to that upstream version.
I hope this helps,
Jérémy.
>From 179f09e52587e2ec1417c656c0716aca180529e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapo...@melix.org>
Date: Wed, 1 Jan 2014 18:45:02 +0100
Subject: [PATCH 2/2] Install README.md
---
debian/ioquake3-server.docs | 2 +-
debian/ioquake3.docs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/ioquake3-server.docs b/debian/ioquake3-server.docs
index ad1c255..d4485f1 100644
--- a/debian/ioquake3-server.docs
+++ b/debian/ioquake3-server.docs
@@ -1,2 +1,2 @@
-README
+README.md
id-readme.txt
diff --git a/debian/ioquake3.docs b/debian/ioquake3.docs
index 2cae632..69000d8 100644
--- a/debian/ioquake3.docs
+++ b/debian/ioquake3.docs
@@ -1,3 +1,3 @@
-README
+README.md
voip-readme.txt
id-readme.txt
--
1.8.5.2
>From 5d7159c6dd680e235f514e51e678d979b4a97dca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapo...@melix.org>
Date: Wed, 1 Jan 2014 18:41:24 +0100
Subject: [PATCH 1/2] Refresh patches
---
...al-vmMagic-that-causes-equivalent-native-.patch | 34 +++++++++-------------
...start-which-can-be-set-by-game-code-to-re.patch | 18 ++++--------
.../patches/0007-Let-servers-set-sv_fps-too.patch | 4 +--
...-a-window-by-default-on-new-installations.patch | 12 +++-----
4 files changed, 23 insertions(+), 45 deletions(-)
diff --git a/debian/patches/0001-Add-a-special-vmMagic-that-causes-equivalent-native-.patch b/debian/patches/0001-Add-a-special-vmMagic-that-causes-equivalent-native-.patch
index a442a7f..db9f75d 100644
--- a/debian/patches/0001-Add-a-special-vmMagic-that-causes-equivalent-native-.patch
+++ b/debian/patches/0001-Add-a-special-vmMagic-that-causes-equivalent-native-.patch
@@ -25,20 +25,18 @@ Forwarded: no
code/qcommon/vm.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++-
4 files changed, 64 insertions(+), 5 deletions(-)
-diff --git a/code/qcommon/files.c b/code/qcommon/files.c
-index 5955fb1..eb53221 100644
--- a/code/qcommon/files.c
+++ b/code/qcommon/files.c
-@@ -1398,7 +1398,7 @@ Return the searchpath in "startSearch".
+@@ -1399,7 +1399,7 @@
=================
*/
--vmInterpret_t FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, int enableDll)
-+vmInterpret_t FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, int enableDll, int forceDll)
+-int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, int enableDll)
++int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, int enableDll, int forceDll)
{
searchpath_t *search, *lastSearch;
directory_t *dir;
-@@ -1422,7 +1422,7 @@ vmInterpret_t FS_FindVM(void **startSearch, char *found, int foundlen, const cha
+@@ -1423,7 +1423,7 @@
while(search)
{
@@ -47,7 +45,7 @@ index 5955fb1..eb53221 100644
{
dir = search->dir;
-@@ -1445,7 +1445,7 @@ vmInterpret_t FS_FindVM(void **startSearch, char *found, int foundlen, const cha
+@@ -1446,7 +1446,7 @@
return VMI_COMPILED;
}
}
@@ -56,24 +54,20 @@ index 5955fb1..eb53221 100644
{
pack = search->pack;
-diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
-index 349953d..047691e 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
-@@ -624,7 +624,7 @@ qboolean FS_FileExists( const char *file );
+@@ -624,7 +624,7 @@
qboolean FS_CreatePath (char *OSPath);
--vmInterpret_t FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, int enableDll);
-+vmInterpret_t FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, int enableDll, int forceDll);
+-int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, int enableDll);
++int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, int enableDll, int forceDll);
char *FS_BuildOSPath( const char *base, const char *game, const char *qpath );
qboolean FS_CompareZipChecksum(const char *zipfile);
-diff --git a/code/qcommon/qfiles.h b/code/qcommon/qfiles.h
-index 78b06da..cdfb6ae 100644
--- a/code/qcommon/qfiles.h
+++ b/code/qcommon/qfiles.h
-@@ -52,6 +52,10 @@ QVM files
+@@ -52,6 +52,10 @@
#define VM_MAGIC 0x12721444
#define VM_MAGIC_VER2 0x12721445
@@ -84,11 +78,9 @@ index 78b06da..cdfb6ae 100644
typedef struct {
int vmMagic;
-diff --git a/code/qcommon/vm.c b/code/qcommon/vm.c
-index e8818a6..f1fc425 100644
--- a/code/qcommon/vm.c
+++ b/code/qcommon/vm.c
-@@ -371,6 +371,7 @@ vmHeader_t *VM_LoadQVM( vm_t *vm, qboolean alloc, qboolean unpure)
+@@ -371,6 +371,7 @@
union {
vmHeader_t *h;
void *v;
@@ -96,7 +88,7 @@ index e8818a6..f1fc425 100644
} header;
// load the image
-@@ -391,6 +392,54 @@ vmHeader_t *VM_LoadQVM( vm_t *vm, qboolean alloc, qboolean unpure)
+@@ -391,6 +392,54 @@
// show where the qvm was loaded from
FS_Which(filename, vm->searchPath);
@@ -151,7 +143,7 @@ index e8818a6..f1fc425 100644
if( LittleLong( header.h->vmMagic ) == VM_MAGIC_VER2 ) {
Com_Printf( "...which has vmMagic VM_MAGIC_VER2\n" );
-@@ -610,7 +659,7 @@ vm_t *VM_Create( const char *module, intptr_t (*systemCalls)(intptr_t *),
+@@ -610,7 +659,7 @@
do
{
@@ -160,7 +152,7 @@ index e8818a6..f1fc425 100644
if(retval == VMI_NATIVE)
{
-@@ -642,6 +691,12 @@ vm_t *VM_Create( const char *module, intptr_t (*systemCalls)(intptr_t *),
+@@ -642,6 +691,12 @@
vm->systemCall = systemCalls;
diff --git a/debian/patches/0005-Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch b/debian/patches/0005-Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
index 863ee4f..c3b1596 100644
--- a/debian/patches/0005-Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
+++ b/debian/patches/0005-Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
@@ -11,11 +11,9 @@ Forwarded: no
code/server/sv_main.c | 1 +
4 files changed, 8 insertions(+), 1 deletion(-)
-diff --git a/code/server/server.h b/code/server/server.h
-index be7e5ba..59dec3a 100644
--- a/code/server/server.h
+++ b/code/server/server.h
-@@ -287,6 +287,7 @@ extern cvar_t *sv_dlRate;
+@@ -286,6 +286,7 @@
extern cvar_t *sv_minPing;
extern cvar_t *sv_maxPing;
extern cvar_t *sv_gametype;
@@ -23,11 +21,9 @@ index be7e5ba..59dec3a 100644
extern cvar_t *sv_pure;
extern cvar_t *sv_floodProtect;
extern cvar_t *sv_lanForceRate;
-diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
-index 62dd58c..8821a2f 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
-@@ -173,6 +173,9 @@ static void SV_Map_f( void ) {
+@@ -173,6 +173,9 @@
// force latched values to get set
Cvar_Get ("g_gametype", "0", CVAR_SERVERINFO | CVAR_USERINFO | CVAR_LATCH );
@@ -37,7 +33,7 @@ index 62dd58c..8821a2f 100644
cmd = Cmd_Argv(0);
if( Q_stricmpn( cmd, "sp", 2 ) == 0 ) {
Cvar_SetValue( "g_gametype", GT_SINGLE_PLAYER );
-@@ -262,9 +265,10 @@ static void SV_MapRestart_f( void ) {
+@@ -262,9 +265,10 @@
// check for changes in variables that can't just be restarted
// check for maxclients change
@@ -49,11 +45,9 @@ index 62dd58c..8821a2f 100644
Com_Printf( "variable change -- restarting.\n" );
// restart the map the slow way
Q_strncpyz( mapname, Cvar_VariableString( "mapname" ), sizeof( mapname ) );
-diff --git a/code/server/sv_init.c b/code/server/sv_init.c
-index 71c789f..396c32d 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
-@@ -635,6 +635,7 @@ void SV_Init (void)
+@@ -635,6 +635,7 @@
Cvar_Get ("fraglimit", "20", CVAR_SERVERINFO);
Cvar_Get ("timelimit", "0", CVAR_SERVERINFO);
sv_gametype = Cvar_Get ("g_gametype", "0", CVAR_SERVERINFO | CVAR_LATCH );
@@ -61,11 +55,9 @@ index 71c789f..396c32d 100644
Cvar_Get ("sv_keywords", "", CVAR_SERVERINFO);
sv_mapname = Cvar_Get ("mapname", "nomap", CVAR_SERVERINFO | CVAR_ROM);
sv_privateClients = Cvar_Get ("sv_privateClients", "0", CVAR_SERVERINFO);
-diff --git a/code/server/sv_main.c b/code/server/sv_main.c
-index 8d5f1a2..221aed2 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
-@@ -54,6 +54,7 @@ cvar_t *sv_dlRate;
+@@ -54,6 +54,7 @@
cvar_t *sv_minPing;
cvar_t *sv_maxPing;
cvar_t *sv_gametype;
diff --git a/debian/patches/0007-Let-servers-set-sv_fps-too.patch b/debian/patches/0007-Let-servers-set-sv_fps-too.patch
index 3525c5d..024f058 100644
--- a/debian/patches/0007-Let-servers-set-sv_fps-too.patch
+++ b/debian/patches/0007-Let-servers-set-sv_fps-too.patch
@@ -6,11 +6,9 @@ Subject: Let servers set sv_fps, too
code/client/cl_parse.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/code/client/cl_parse.c b/code/client/cl_parse.c
-index 3db34bc..045412a 100644
--- a/code/client/cl_parse.c
+++ b/code/client/cl_parse.c
-@@ -417,9 +417,9 @@ void CL_SystemInfoChanged( void ) {
+@@ -414,9 +414,9 @@
// If this cvar may not be modified by a server discard the value.
if(!(cvar_flags & (CVAR_SYSTEMINFO | CVAR_SERVER_CREATED | CVAR_USER_CREATED)))
{
diff --git a/debian/patches/0009-Run-in-a-window-by-default-on-new-installations.patch b/debian/patches/0009-Run-in-a-window-by-default-on-new-installations.patch
index b0ef90b..9fdf8ee 100644
--- a/debian/patches/0009-Run-in-a-window-by-default-on-new-installations.patch
+++ b/debian/patches/0009-Run-in-a-window-by-default-on-new-installations.patch
@@ -16,29 +16,25 @@ Forwarded: no, Debian-specific
code/renderergl2/tr_init.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/code/renderergl1/tr_init.c b/code/renderergl1/tr_init.c
-index 8ab50cd..73acc3d 100644
--- a/code/renderergl1/tr_init.c
+++ b/code/renderergl1/tr_init.c
-@@ -1038,7 +1038,7 @@ void R_Register( void )
+@@ -1028,7 +1028,7 @@
r_overBrightBits = ri.Cvar_Get ("r_overBrightBits", "1", CVAR_ARCHIVE | CVAR_LATCH );
r_ignorehwgamma = ri.Cvar_Get( "r_ignorehwgamma", "0", CVAR_ARCHIVE | CVAR_LATCH);
r_mode = ri.Cvar_Get( "r_mode", "3", CVAR_ARCHIVE | CVAR_LATCH );
- r_fullscreen = ri.Cvar_Get( "r_fullscreen", "1", CVAR_ARCHIVE );
+ r_fullscreen = ri.Cvar_Get( "r_fullscreen", "0", CVAR_ARCHIVE );
- r_noborder = ri.Cvar_Get("r_noborder", "0", CVAR_ARCHIVE);
+ r_noborder = ri.Cvar_Get("r_noborder", "0", CVAR_ARCHIVE | CVAR_LATCH);
r_customwidth = ri.Cvar_Get( "r_customwidth", "1600", CVAR_ARCHIVE | CVAR_LATCH );
r_customheight = ri.Cvar_Get( "r_customheight", "1024", CVAR_ARCHIVE | CVAR_LATCH );
-diff --git a/code/renderergl2/tr_init.c b/code/renderergl2/tr_init.c
-index d533024..f45b2ff 100644
--- a/code/renderergl2/tr_init.c
+++ b/code/renderergl2/tr_init.c
-@@ -1145,7 +1145,7 @@ void R_Register( void )
+@@ -1148,7 +1148,7 @@
r_overBrightBits = ri.Cvar_Get ("r_overBrightBits", "1", CVAR_ARCHIVE | CVAR_LATCH );
r_ignorehwgamma = ri.Cvar_Get( "r_ignorehwgamma", "0", CVAR_ARCHIVE | CVAR_LATCH);
r_mode = ri.Cvar_Get( "r_mode", "-2", CVAR_ARCHIVE | CVAR_LATCH );
- r_fullscreen = ri.Cvar_Get( "r_fullscreen", "1", CVAR_ARCHIVE );
+ r_fullscreen = ri.Cvar_Get( "r_fullscreen", "0", CVAR_ARCHIVE );
- r_noborder = ri.Cvar_Get("r_noborder", "0", CVAR_ARCHIVE);
+ r_noborder = ri.Cvar_Get("r_noborder", "0", CVAR_ARCHIVE | CVAR_LATCH);
r_customwidth = ri.Cvar_Get( "r_customwidth", "1600", CVAR_ARCHIVE | CVAR_LATCH );
r_customheight = ri.Cvar_Get( "r_customheight", "1024", CVAR_ARCHIVE | CVAR_LATCH );
--
1.8.5.2
