The following commit has been merged in the debian-experimental branch:
commit e1c3aa91e73c85cf9b25a057fd133a327bdd7327
Author: Simon McVittie <[email protected]>
Date: Thu Mar 10 23:43:00 2011 +0000
refresh patches, etc.
diff --git a/debian/changelog b/debian/changelog
index 4c2b1f0..18d62b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
ioquake3 (1.36+svn1921-1) experimental; urgency=low
* New upstream svn snapshot
+ - discard patches that were applied or replaced upstream
+ - refresh remaining patches
+ - remove patch 0015 again, breaking obsolete experimental openarena
+ versions (if you're running 0.8.5-5+expX for any X, please upgrade)
+ - add patch to compile against OpenAL Soft extension headers
-- Simon McVittie <[email protected]> Thu, 10 Mar 2011 23:05:29 +0000
diff --git a/debian/patches/0001-Fix-build-and-resulting-binary-on-alpha.patch
b/debian/patches/0001-Fix-build-and-resulting-binary-on-alpha.patch
deleted file mode 100644
index 3e33323..0000000
--- a/debian/patches/0001-Fix-build-and-resulting-binary-on-alpha.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Steve Langasek <[email protected]>
-Date: Thu, 12 Aug 2010 22:57:37 +0100
-Subject: [PATCH] Fix build and resulting binary on alpha
-
-[Patch adjusted for current ioquake3 -smcv]
-
-Origin: vendor, Debian
-Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4703
-Bug-Debian: http://bugs.debian.org/410555
-Applied-upstream: 1.37, commit:1859
----
- Makefile | 9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 9bd03a7..bbc5d24 100644
---- a/Makefile
-+++ b/Makefile
-@@ -241,8 +241,8 @@ MKDIR=mkdir
-
- ifneq (,findstring($(PLATFORM),linux gnu_kfreebsd kfreebsd-gnu))
-
-- ifeq ($(ARCH),alpha)
-- ARCH=axp
-+ ifeq ($(ARCH),axp)
-+ ARCH=alpha
- else
- ifeq ($(ARCH),x86_64)
- LIB=lib64
-@@ -310,6 +310,11 @@ ifneq (,findstring($(PLATFORM),linux gnu_kfreebsd
kfreebsd-gnu))
- OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus
- HAVE_VM_COMPILED=true
- endif
-+ ifeq ($(ARCH),alpha)
-+ # According to http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=410555
-+ # -ffast-math will cause the client to die with SIGFPE on Alpha
-+ OPTIMIZE = $(OPTIMIZEVM)
-+ endif
- endif
- endif
-
---
diff --git a/debian/patches/0002-Import-syslib-JPEG-patch-from-fedora.patch
b/debian/patches/0001-Import-syslib-JPEG-patch-from-fedora.patch
similarity index 96%
rename from debian/patches/0002-Import-syslib-JPEG-patch-from-fedora.patch
rename to debian/patches/0001-Import-syslib-JPEG-patch-from-fedora.patch
index d0fb656..3ff619e 100644
--- a/debian/patches/0002-Import-syslib-JPEG-patch-from-fedora.patch
+++ b/debian/patches/0001-Import-syslib-JPEG-patch-from-fedora.patch
@@ -1,6 +1,6 @@
From: Bruno Kleinert <[email protected]>
Date: Thu, 11 Mar 2010 19:09:03 +0100
-Subject: [PATCH] Import syslib JPEG patch from fedora
+Subject: Import syslib JPEG patch from fedora
Origin: vendor, Fedora
Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4564
@@ -16,10 +16,10 @@ Forwarded: yes
create mode 100644 code/renderer/jpeg_memsrc.h
diff --git a/Makefile b/Makefile
-index bbc5d24..1657476 100644
+index bfba8fd..04ead1e 100644
--- a/Makefile
+++ b/Makefile
-@@ -107,6 +107,10 @@ ifndef GENERATE_DEPENDENCIES
+@@ -111,6 +111,10 @@ ifndef GENERATE_DEPENDENCIES
GENERATE_DEPENDENCIES=1
endif
@@ -30,7 +30,7 @@ index bbc5d24..1657476 100644
ifndef USE_OPENAL
USE_OPENAL=1
endif
-@@ -262,6 +266,10 @@ ifneq (,findstring($(PLATFORM),linux gnu_kfreebsd
kfreebsd-gnu))
+@@ -265,6 +269,10 @@ ifneq (,$(findstring "$(PLATFORM)", "linux"
"gnu_kfreebsd" "kfreebsd-gnu"))
CLIENT_CFLAGS = $(SDL_CFLAGS)
SERVER_CFLAGS =
@@ -41,7 +41,7 @@ index bbc5d24..1657476 100644
ifeq ($(USE_OPENAL),1)
CLIENT_CFLAGS += -DUSE_OPENAL
ifeq ($(USE_OPENAL_DLOPEN),1)
-@@ -331,6 +339,10 @@ ifneq (,findstring($(PLATFORM),linux gnu_kfreebsd
kfreebsd-gnu))
+@@ -334,6 +342,10 @@ ifneq (,$(findstring "$(PLATFORM)", "linux"
"gnu_kfreebsd" "kfreebsd-gnu"))
CLIENT_LIBS=$(SDL_LIBS) -lGL
@@ -52,7 +52,7 @@ index bbc5d24..1657476 100644
ifeq ($(USE_OPENAL),1)
ifneq ($(USE_OPENAL_DLOPEN),1)
CLIENT_LIBS += -lopenal
-@@ -1396,41 +1408,7 @@ Q3OBJ = \
+@@ -1399,41 +1411,7 @@ Q3OBJ = \
$(B)/client/l_script.o \
$(B)/client/l_struct.o \
\
@@ -94,7 +94,7 @@ index bbc5d24..1657476 100644
\
$(B)/client/tr_animation.o \
$(B)/client/tr_backend.o \
-@@ -1469,6 +1447,46 @@ Q3OBJ = \
+@@ -1472,6 +1450,46 @@ Q3OBJ = \
$(B)/client/con_log.o \
$(B)/client/sys_main.o
diff --git
a/debian/patches/0008-Add-a-special-vmMagic-that-causes-equivalent-native-.patch
b/debian/patches/0002-Add-a-special-vmMagic-that-causes-equivalent-native-.patch
similarity index 80%
rename from
debian/patches/0008-Add-a-special-vmMagic-that-causes-equivalent-native-.patch
rename to
debian/patches/0002-Add-a-special-vmMagic-that-causes-equivalent-native-.patch
index 1b4af4f..9884e8c 100644
---
a/debian/patches/0008-Add-a-special-vmMagic-that-causes-equivalent-native-.patch
+++
b/debian/patches/0002-Add-a-special-vmMagic-that-causes-equivalent-native-.patch
@@ -1,6 +1,6 @@
From: Simon McVittie <[email protected]>
-Date: Wed, 21 Jul 2010 19:50:32 +0100
-Subject: [PATCH] Add a special vmMagic that causes equivalent native code to
be loaded instead
+Date: Thu, 10 Mar 2011 23:32:30 +0000
+Subject: Add a special vmMagic that causes equivalent native code to be loaded
instead
This means that mods can build everything from source without relying on
the non-GPL q3lcc compiler. By padding the fake QVM with bytes chosen
@@ -30,17 +30,17 @@ index 7f1ef96..e3515b4 100644
int vmMagic;
diff --git a/code/qcommon/vm.c b/code/qcommon/vm.c
-index 2ccc24f..83832d1 100644
+index d3fb85b..0b7bbfe 100644
--- a/code/qcommon/vm.c
+++ b/code/qcommon/vm.c
-@@ -384,6 +384,18 @@ vmHeader_t *VM_LoadQVM( vm_t *vm, qboolean alloc ) {
- return NULL;
- }
+@@ -387,6 +387,18 @@ vmHeader_t *VM_LoadQVM( vm_t *vm, qboolean alloc ) {
+ // show where the qvm was loaded from
+ Cmd_ExecuteString( va( "which %s\n", filename ) );
+ if (LittleLong( header.h->vmMagic ) == VM_MAGIC_USE_NATIVE) {
+ Com_Printf( "...which has vmMagic VM_MAGIC_USE_NATIVE.\n" );
+ Com_Printf( "Loading DLL file %s instead.\n", vm->name );
-+ vm->dllHandle = Sys_LoadDll( vm->name, vm->fqpath ,
&vm->entryPoint, VM_DllSyscall );
++ vm->dllHandle = Sys_LoadDll( vm->name, &vm->entryPoint,
VM_DllSyscall );
+ if ( !vm->dllHandle ) {
+ Com_Printf( "Failed to load DLL.\n" );
+ VM_Free( vm );
@@ -52,7 +52,7 @@ index 2ccc24f..83832d1 100644
if( LittleLong( header.h->vmMagic ) == VM_MAGIC_VER2 ) {
Com_Printf( "...which has vmMagic VM_MAGIC_VER2\n" );
-@@ -570,6 +582,12 @@ vm_t *VM_Create( const char *module, intptr_t
(*systemCalls)(intptr_t *),
+@@ -573,6 +585,12 @@ vm_t *VM_Create( const char *module, intptr_t
(*systemCalls)(intptr_t *),
return NULL;
}
diff --git a/debian/patches/0011-Double-the-maximum-number-of-cvars.patch
b/debian/patches/0003-Double-the-maximum-number-of-cvars.patch
similarity index 89%
rename from debian/patches/0011-Double-the-maximum-number-of-cvars.patch
rename to debian/patches/0003-Double-the-maximum-number-of-cvars.patch
index 8eafc51..cb0faa0 100644
--- a/debian/patches/0011-Double-the-maximum-number-of-cvars.patch
+++ b/debian/patches/0003-Double-the-maximum-number-of-cvars.patch
@@ -1,6 +1,6 @@
From: Simon McVittie <[email protected]>
Date: Wed, 11 Aug 2010 21:37:03 +0100
-Subject: [PATCH] Double the maximum number of cvars
+Subject: Double the maximum number of cvars
OpenArena has had problems with hitting the cvar limit, and it only costs
52K of memory (on i386/armel) to double the arbitrary limit. That should
@@ -13,7 +13,7 @@ Forwarded: no
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/code/qcommon/cvar.c b/code/qcommon/cvar.c
-index bae4154..d06eb8f 100644
+index fa4c00c..34f42d0 100644
--- a/code/qcommon/cvar.c
+++ b/code/qcommon/cvar.c
@@ -28,7 +28,7 @@ cvar_t *cvar_vars = NULL;
diff --git
a/debian/patches/0012-Increase-the-command-buffer-from-16K-to-128K-followi.patch
b/debian/patches/0004-Increase-the-command-buffer-from-16K-to-128K-followi.patch
similarity index 83%
rename from
debian/patches/0012-Increase-the-command-buffer-from-16K-to-128K-followi.patch
rename to
debian/patches/0004-Increase-the-command-buffer-from-16K-to-128K-followi.patch
index 49f706c..3167f38 100644
---
a/debian/patches/0012-Increase-the-command-buffer-from-16K-to-128K-followi.patch
+++
b/debian/patches/0004-Increase-the-command-buffer-from-16K-to-128K-followi.patch
@@ -1,6 +1,6 @@
From: Simon McVittie <[email protected]>
Date: Wed, 11 Aug 2010 21:40:03 +0100
-Subject: [PATCH] Increase the command buffer from 16K to 128K, following
OpenArena
+Subject: Increase the command buffer from 16K to 128K, following OpenArena
Origin: OpenArena
Forwarded: no
@@ -9,7 +9,7 @@ Forwarded: no
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/code/qcommon/cmd.c b/code/qcommon/cmd.c
-index f40b5bd..553536e 100644
+index 15c2d89..f9de5a1 100644
--- a/code/qcommon/cmd.c
+++ b/code/qcommon/cmd.c
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
diff --git a/debian/patches/0013-Double-the-default-com_hunkMegs-to-128M.patch
b/debian/patches/0005-Double-the-default-com_hunkMegs-to-128M.patch
similarity index 89%
rename from debian/patches/0013-Double-the-default-com_hunkMegs-to-128M.patch
rename to debian/patches/0005-Double-the-default-com_hunkMegs-to-128M.patch
index 7e08b24..9c7d5e9 100644
--- a/debian/patches/0013-Double-the-default-com_hunkMegs-to-128M.patch
+++ b/debian/patches/0005-Double-the-default-com_hunkMegs-to-128M.patch
@@ -1,6 +1,6 @@
From: Simon McVittie <[email protected]>
Date: Wed, 11 Aug 2010 21:40:59 +0100
-Subject: [PATCH] Double the default com_hunkMegs, to 128M
+Subject: Double the default com_hunkMegs, to 128M
OpenArena apparently aims for double the detail level, texture size etc.
of vanilla Quake 3, so it needs more memory.
@@ -12,7 +12,7 @@ Forwarded: no
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
-index f7a4edf..1bebf1a 100644
+index 498614f..2c4f727 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -38,7 +38,7 @@ int demo_protocols[] =
diff --git
a/debian/patches/0005-FS_FOpenFileRead-allow-loading-any-demo-not-just-the.patch
b/debian/patches/0005-FS_FOpenFileRead-allow-loading-any-demo-not-just-the.patch
deleted file mode 100644
index 25d9cc7..0000000
---
a/debian/patches/0005-FS_FOpenFileRead-allow-loading-any-demo-not-just-the.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Simon McVittie <[email protected]>
-Date: Fri, 6 Aug 2010 20:26:40 +0100
-Subject: [PATCH] FS_FOpenFileRead: allow loading any demo, not just the
current protocol
-
-Origin: vendor, Debian
-Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4698
-Forwarded: yes
----
- code/qcommon/files.c | 12 +++++++++---
- 1 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/code/qcommon/files.c b/code/qcommon/files.c
-index 8c719d0..1a39917 100644
---- a/code/qcommon/files.c
-+++ b/code/qcommon/files.c
-@@ -1000,6 +1000,14 @@ qboolean FS_FilenameCompare( const char *s1, const char
*s2 ) {
- return qfalse; // strings are equal
- }
-
-+static ID_INLINE qboolean extension_is_demo( const char *filename, int len ) {
-+ return (Q_stricmpn (filename + len - 6, ".dm_", 4) == 0 &&
-+ filename[len - 2] >= '0' &&
-+ filename[len - 2] <= '9' &&
-+ filename[len - 1] >= '0' &&
-+ filename[len - 1] <= '9' );
-+}
-+
- /*
- ===========
- FS_FOpenFileRead
-@@ -1021,7 +1029,6 @@ int FS_FOpenFileRead( const char *filename, fileHandle_t
*file, qboolean uniqueF
- long hash;
- FILE *temp;
- int l;
-- char demoExt[16];
-
- hash = 0;
-
-@@ -1068,7 +1075,6 @@ int FS_FOpenFileRead( const char *filename, fileHandle_t
*file, qboolean uniqueF
- Com_Error( ERR_FATAL, "FS_FOpenFileRead: NULL 'filename'
parameter passed\n" );
- }
-
-- Com_sprintf (demoExt, sizeof(demoExt), ".dm_%d",PROTOCOL_VERSION );
- // qpaths are not supposed to have a leading slash
- if ( filename[0] == '/' || filename[0] == '\\' ) {
- filename++;
-@@ -1185,7 +1191,7 @@ int FS_FOpenFileRead( const char *filename, fileHandle_t
*file, qboolean uniqueF
- if ( Q_stricmp( filename + l - 4, ".cfg" )
// for config files
- && Q_stricmp( filename + l - 5, ".menu"
) // menu files
- && Q_stricmp( filename + l - 5, ".game"
) // menu files
-- && Q_stricmp( filename + l -
strlen(demoExt), demoExt ) // menu files
-+ && !extension_is_demo( filename, l )
// demos
- && Q_stricmp( filename + l - 4, ".dat"
) ) { // for journal files
- continue;
- }
---
diff --git
a/debian/patches/0006-Allow-protocol-cvar-to-be-changed-on-the-command-lin.patch
b/debian/patches/0006-Allow-protocol-cvar-to-be-changed-on-the-command-lin.patch
deleted file mode 100644
index ba87cbc..0000000
---
a/debian/patches/0006-Allow-protocol-cvar-to-be-changed-on-the-command-lin.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From: Simon McVittie <[email protected]>
-Date: Fri, 6 Aug 2010 20:34:51 +0100
-Subject: [PATCH] Allow protocol cvar to be changed on the command line
-
-This allows an unmodified ioquake3 binary to run standalone games that
-have the same underlying protocol, but change PROTOCOL_VERSION to reflect
-incompatible changes to game content, such as OpenArena. For instance,
-OpenArena >= 0.8.1 can use:
-
- ioquake3 +set protocol 71 [...]
-
-Origin: vendor, Debian
-Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4698
-Forwarded: yes
----
- code/client/cl_main.c | 4 ++--
- code/qcommon/common.c | 2 ++
- code/qcommon/qcommon.h | 2 ++
- code/server/sv_client.c | 4 ++--
- code/server/sv_init.c | 1 -
- code/server/sv_main.c | 2 +-
- 6 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/code/client/cl_main.c b/code/client/cl_main.c
-index 5cbd649..016c7b8 100644
---- a/code/client/cl_main.c
-+++ b/code/client/cl_main.c
-@@ -2123,7 +2123,7 @@ void CL_CheckForResend( void ) {
- port = Cvar_VariableValue ("net_qport");
-
- Q_strncpyz( info, Cvar_InfoString( CVAR_USERINFO ), sizeof(
info ) );
-- Info_SetValueForKey( info, "protocol", va("%i",
PROTOCOL_VERSION ) );
-+ Info_SetValueForKey( info, "protocol", va("%i",
sv_protocol->integer ) );
- Info_SetValueForKey( info, "qport", va("%i", port ) );
- Info_SetValueForKey( info, "challenge", va("%i", clc.challenge
) );
-
-@@ -3391,7 +3391,7 @@ void CL_ServerInfoPacket( netadr_t from, msg_t *msg ) {
-
- // if this isn't the correct protocol version, ignore it
- prot = atoi( Info_ValueForKey( infoString, "protocol" ) );
-- if ( prot != PROTOCOL_VERSION ) {
-+ if ( prot != sv_protocol->integer ) {
- Com_DPrintf( "Different protocol info packet: %s\n", infoString
);
- return;
- }
-diff --git a/code/qcommon/common.c b/code/qcommon/common.c
-index 73e82fb..f7a4edf 100644
---- a/code/qcommon/common.c
-+++ b/code/qcommon/common.c
-@@ -86,6 +86,7 @@ cvar_t *com_standalone;
- cvar_t *com_basegame;
- cvar_t *com_homepath;
- cvar_t *com_busyWait;
-+cvar_t *sv_protocol;
-
- // com_speeds times
- int time_game;
-@@ -2705,6 +2706,7 @@ void Com_Init( char *commandLine ) {
-
- s = va("%s %s %s", Q3_VERSION, PLATFORM_STRING, __DATE__ );
- com_version = Cvar_Get ("version", s, CVAR_ROM | CVAR_SERVERINFO );
-+ sv_protocol = Cvar_Get ("protocol", va("%i", PROTOCOL_VERSION),
CVAR_SERVERINFO | CVAR_INIT);
-
- Sys_Init();
-
-diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
-index 04d41e1..ffcbf94 100644
---- a/code/qcommon/qcommon.h
-+++ b/code/qcommon/qcommon.h
-@@ -848,6 +848,8 @@ extern cvar_t *sv_paused;
- extern cvar_t *cl_packetdelay;
- extern cvar_t *sv_packetdelay;
-
-+extern cvar_t *sv_protocol;
-+
- // com_speeds times
- extern int time_game;
- extern int time_frontend;
-diff --git a/code/server/sv_client.c b/code/server/sv_client.c
-index e14454a..3de54e7 100644
---- a/code/server/sv_client.c
-+++ b/code/server/sv_client.c
-@@ -302,8 +302,8 @@ void SV_DirectConnect( netadr_t from ) {
- Q_strncpyz( userinfo, Cmd_Argv(1), sizeof(userinfo) );
-
- version = atoi( Info_ValueForKey( userinfo, "protocol" ) );
-- if ( version != PROTOCOL_VERSION ) {
-- NET_OutOfBandPrint( NS_SERVER, from, "print\nServer uses
protocol version %i.\n", PROTOCOL_VERSION );
-+ if ( version != sv_protocol->integer ) {
-+ NET_OutOfBandPrint( NS_SERVER, from, "print\nServer uses
protocol version %i (yours is %i).\n", sv_protocol->integer, version );
- Com_DPrintf (" rejected connect from version %i\n", version);
- return;
- }
-diff --git a/code/server/sv_init.c b/code/server/sv_init.c
-index 875961e..39b06a0 100644
---- a/code/server/sv_init.c
-+++ b/code/server/sv_init.c
-@@ -636,7 +636,6 @@ void SV_Init (void)
- Cvar_Get ("timelimit", "0", CVAR_SERVERINFO);
- sv_gametype = Cvar_Get ("g_gametype", "0", CVAR_SERVERINFO | CVAR_LATCH
);
- Cvar_Get ("sv_keywords", "", CVAR_SERVERINFO);
-- Cvar_Get ("protocol", va("%i", PROTOCOL_VERSION), CVAR_SERVERINFO |
CVAR_ROM);
- sv_mapname = Cvar_Get ("mapname", "nomap", CVAR_SERVERINFO | CVAR_ROM);
- sv_privateClients = Cvar_Get ("sv_privateClients", "0",
CVAR_SERVERINFO);
- sv_hostname = Cvar_Get ("sv_hostname", "noname", CVAR_SERVERINFO |
CVAR_ARCHIVE );
-diff --git a/code/server/sv_main.c b/code/server/sv_main.c
-index 3cb9f4f..17afd3b 100644
---- a/code/server/sv_main.c
-+++ b/code/server/sv_main.c
-@@ -637,7 +637,7 @@ void SVC_Info( netadr_t from ) {
- // to prevent timed spoofed reply packets that add ghost servers
- Info_SetValueForKey( infostring, "challenge", Cmd_Argv(1) );
-
-- Info_SetValueForKey( infostring, "protocol", va("%i", PROTOCOL_VERSION)
);
-+ Info_SetValueForKey( infostring, "protocol", va("%i",
sv_protocol->integer) );
- Info_SetValueForKey( infostring, "hostname", sv_hostname->string );
- Info_SetValueForKey( infostring, "mapname", sv_mapname->string );
- Info_SetValueForKey( infostring, "clients", va("%i", count) );
---
diff --git
a/debian/patches/0006-If-using-system-OpenAL-include-alext.h-for-ALC_ALL_D.patch
b/debian/patches/0006-If-using-system-OpenAL-include-alext.h-for-ALC_ALL_D.patch
new file mode 100644
index 0000000..5ed5b93
--- /dev/null
+++
b/debian/patches/0006-If-using-system-OpenAL-include-alext.h-for-ALC_ALL_D.patch
@@ -0,0 +1,23 @@
+From: Simon McVittie <[email protected]>
+Date: Thu, 10 Mar 2011 23:41:26 +0000
+Subject: If using system OpenAL, include alext.h for ALC_ALL_DEVICES_SPECIFIER
+
+This assumes OpenAL Soft, which more or less supersedes Creative's OpenAL,
+as far as I understand it.
+---
+ code/client/qal.h | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/code/client/qal.h b/code/client/qal.h
+index 1a2284a..964fff1 100644
+--- a/code/client/qal.h
++++ b/code/client/qal.h
+@@ -44,6 +44,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
+ #else
+ #include <AL/al.h>
+ #include <AL/alc.h>
++ #include <AL/alext.h>
+ #endif
+ #endif
+
+--
diff --git
a/debian/patches/0007-Load-demos-using-the-protocol-version-from-the-comma.patch
b/debian/patches/0007-Load-demos-using-the-protocol-version-from-the-comma.patch
deleted file mode 100644
index 7e7cad9..0000000
---
a/debian/patches/0007-Load-demos-using-the-protocol-version-from-the-comma.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From: Simon McVittie <[email protected]>
-Date: Fri, 6 Aug 2010 20:37:48 +0100
-Subject: [PATCH] Load demos using the protocol version from the command line,
if overridden
-
-Origin: vendor, Debian
-Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4698
-Forwarded: yes
----
- code/client/cl_main.c | 21 +++++++++++++++++----
- 1 files changed, 17 insertions(+), 4 deletions(-)
-
-diff --git a/code/client/cl_main.c b/code/client/cl_main.c
-index 016c7b8..726ecfb 100644
---- a/code/client/cl_main.c
-+++ b/code/client/cl_main.c
-@@ -626,14 +626,14 @@ void CL_Record_f( void ) {
- if ( Cmd_Argc() == 2 ) {
- s = Cmd_Argv(1);
- Q_strncpyz( demoName, s, sizeof( demoName ) );
-- Com_sprintf (name, sizeof(name), "demos/%s.dm_%d", demoName,
PROTOCOL_VERSION );
-+ Com_sprintf (name, sizeof(name), "demos/%s.dm_%d", demoName,
sv_protocol->integer );
- } else {
- int number;
-
- // scan for a free demo name
- for ( number = 0 ; number <= 9999 ; number++ ) {
- CL_DemoFilename( number, demoName );
-- Com_sprintf (name, sizeof(name), "demos/%s.dm_%d",
demoName, PROTOCOL_VERSION );
-+ Com_sprintf (name, sizeof(name), "demos/%s.dm_%d",
demoName, sv_protocol->integer );
-
- if (!FS_FileExists(name))
- break; // file doesn't exist
-@@ -883,6 +883,19 @@ static void CL_WalkDemoExt(char *arg, char *name, int
*demofile)
- {
- int i = 0;
- *demofile = 0;
-+
-+ Com_sprintf (name, MAX_OSPATH, "demos/%s.dm_%d", arg,
sv_protocol->integer);
-+
-+ FS_FOpenFileRead( name, demofile, qtrue );
-+
-+ if (*demofile)
-+ {
-+ Com_Printf("Demo file: %s\n", name);
-+ return;
-+ }
-+
-+ Com_Printf("Not found: %s\n", name);
-+
- while(demo_protocols[i])
- {
- Com_sprintf (name, MAX_OSPATH, "demos/%s.dm_%d", arg,
demo_protocols[i]);
-@@ -909,7 +922,7 @@ static void CL_CompleteDemoName( char *args, int argNum )
- {
- char demoExt[ 16 ];
-
-- Com_sprintf( demoExt, sizeof( demoExt ), ".dm_%d",
PROTOCOL_VERSION );
-+ Com_sprintf( demoExt, sizeof( demoExt ), ".dm_%d",
sv_protocol->integer );
- Field_CompleteFilename( "demos", demoExt, qtrue );
- }
- }
-@@ -957,7 +970,7 @@ void CL_PlayDemo_f( void ) {
- break;
- i++;
- }
-- if (demo_protocols[i])
-+ if (demo_protocols[i] || (protocol == sv_protocol->integer))
- {
- Com_sprintf (name, sizeof(name), "demos/%s", arg);
- FS_FOpenFileRead( name, &clc.demofile, qtrue );
---
diff --git
a/debian/patches/0014-Put-g_humanplayers-and-g_needpass-in-server-info.patch
b/debian/patches/0014-Put-g_humanplayers-and-g_needpass-in-server-info.patch
deleted file mode 100644
index 38e8643..0000000
--- a/debian/patches/0014-Put-g_humanplayers-and-g_needpass-in-server-info.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From: Zack Middleton <ZTurtleMan>
-Date: Sat, 5 Feb 2011 13:21:30 +0000
-Subject: [PATCH] Add g_humansplayers (found by server) and g_needpass (cvar)
to serverinfo
-
-Based on patches from OpenArena.
-
-Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4702
----
- code/client/cl_main.c | 4 ++++
- code/client/cl_ui.c | 2 ++
- code/client/client.h | 2 ++
- code/server/sv_main.c | 9 +++++++--
- 4 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/code/client/cl_main.c b/code/client/cl_main.c
-index 726ecfb..c966910 100644
---- a/code/client/cl_main.c
-+++ b/code/client/cl_main.c
-@@ -3361,6 +3361,8 @@ static void CL_SetServerInfo(serverInfo_t *server, const
char *info, int ping) {
- server->minPing = atoi(Info_ValueForKey(info,
"minping"));
- server->maxPing = atoi(Info_ValueForKey(info,
"maxping"));
- server->punkbuster = atoi(Info_ValueForKey(info,
"punkbuster"));
-+ server->g_humanplayers = atoi(Info_ValueForKey(info,
"g_humanplayers"));
-+ server->g_needpass = atoi(Info_ValueForKey(info,
"g_needpass"));
- }
- server->ping = ping;
- }
-@@ -3479,6 +3481,8 @@ void CL_ServerInfoPacket( netadr_t from, msg_t *msg ) {
- cls.localServers[i].gameType = 0;
- cls.localServers[i].netType = from.type;
- cls.localServers[i].punkbuster = 0;
-+ cls.localServers[i].g_humanplayers = 0;
-+ cls.localServers[i].g_needpass = 0;
-
- Q_strncpyz( info, MSG_ReadString( msg ), MAX_INFO_STRING );
- if (strlen(info)) {
-diff --git a/code/client/cl_ui.c b/code/client/cl_ui.c
-index adda0db..00857ed 100644
---- a/code/client/cl_ui.c
-+++ b/code/client/cl_ui.c
-@@ -298,6 +298,8 @@ static void LAN_GetServerInfo( int source, int n, char
*buf, int buflen ) {
- Info_SetValueForKey( info, "nettype", va("%i",server->netType));
- Info_SetValueForKey( info, "addr",
NET_AdrToStringwPort(server->adr));
- Info_SetValueForKey( info, "punkbuster", va("%i",
server->punkbuster));
-+ Info_SetValueForKey( info, "g_needpass", va("%i",
server->g_needpass));
-+ Info_SetValueForKey( info, "g_humanplayers", va("%i",
server->g_humanplayers));
- Q_strncpyz(buf, info, buflen);
- } else {
- if (buf) {
-diff --git a/code/client/client.h b/code/client/client.h
-index 7891a83..c105fb8 100644
---- a/code/client/client.h
-+++ b/code/client/client.h
-@@ -296,6 +296,8 @@ typedef struct {
- int ping;
- qboolean visible;
- int punkbuster;
-+ int g_humanplayers;
-+ int g_needpass;
- } serverInfo_t;
-
- typedef struct {
-diff --git a/code/server/sv_main.c b/code/server/sv_main.c
-index 17afd3b..2e33aff 100644
---- a/code/server/sv_main.c
-+++ b/code/server/sv_main.c
-@@ -605,7 +605,7 @@ if a user is interested in a server to do a full status
- ================
- */
- void SVC_Info( netadr_t from ) {
-- int i, count;
-+ int i, count, humans;
- char *gamedir;
- char infostring[MAX_INFO_STRING];
-
-@@ -624,10 +624,13 @@ void SVC_Info( netadr_t from ) {
- return;
-
- // don't count privateclients
-- count = 0;
-+ count = humans = 0;
- for ( i = sv_privateClients->integer ; i < sv_maxclients->integer ; i++
) {
- if ( svs.clients[i].state >= CS_CONNECTED ) {
- count++;
-+ if (svs.clients[i].netchan.remoteAddress.type !=
NA_BOT) {
-+ humans++;
-+ }
- }
- }
-
-@@ -641,10 +644,12 @@ void SVC_Info( netadr_t from ) {
- Info_SetValueForKey( infostring, "hostname", sv_hostname->string );
- Info_SetValueForKey( infostring, "mapname", sv_mapname->string );
- Info_SetValueForKey( infostring, "clients", va("%i", count) );
-+ Info_SetValueForKey( infostring, "g_humanplayers", va("%i", humans ) );
- Info_SetValueForKey( infostring, "sv_maxclients",
- va("%i", sv_maxclients->integer - sv_privateClients->integer )
);
- Info_SetValueForKey( infostring, "gametype", va("%i",
sv_gametype->integer ) );
- Info_SetValueForKey( infostring, "pure", va("%i", sv_pure->integer ) );
-+ Info_SetValueForKey( infostring, "g_needpass",
Cvar_VariableIntegerValue( "g_needpass" ));
-
- #ifdef USE_VOIP
- if (sv_voip->integer) {
diff --git
a/debian/patches/0015-Set-com_basegame-from-fs_basegame-if-com_standalone-.patch
b/debian/patches/0015-Set-com_basegame-from-fs_basegame-if-com_standalone-.patch
deleted file mode 100644
index d3add14..0000000
---
a/debian/patches/0015-Set-com_basegame-from-fs_basegame-if-com_standalone-.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 9e24ed84d2807ee9d8135a689e44bafd9aced7da Mon Sep 17 00:00:00 2001
-From: Simon McVittie <[email protected]>
-Date: Fri, 4 Feb 2011 23:32:30 +0000
-Subject: [PATCH] Set com_basegame from fs_basegame if com_standalone is set on
command line
-
-This is how the previous Debian patch for
-http://bugzilla.icculus.org/show_bug.cgi?id=4699 worked; we can remove
-it when we no longer care about openarena 0.8.5-5+exp[1-3] from
-experimental.
-
-Forwarded: not-needed
----
- code/qcommon/common.c | 20 ++++++++++++++++++--
- 1 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/code/qcommon/common.c b/code/qcommon/common.c
-index 73e82fb..c9814b1 100644
---- a/code/qcommon/common.c
-+++ b/code/qcommon/common.c
-@@ -2623,8 +2623,24 @@ void Com_Init( char *commandLine ) {
- // done early so bind command exists
- CL_InitKeyCommands();
-
-- com_standalone = Cvar_Get("com_standalone", "0", CVAR_ROM);
-- com_basegame = Cvar_Get("com_basegame", BASEGAME, CVAR_INIT);
-+ // Debian-specific: return com_standalone to CVAR_INIT for
-+ // compatibility with OA 0.8.5-5+exp[1-3]
-+ com_standalone = Cvar_Get("com_standalone", "0", CVAR_INIT);
-+ if (com_standalone->integer)
-+ {
-+ cvar_t *tmp = Cvar_Get("fs_basegame", "", CVAR_INIT);
-+
-+ if (tmp->string[0])
-+ {
-+ Com_Printf( "Switching default com_basegame to
fs_basegame %s (this won't work forever)\n", tmp->string );
-+ com_basegame = Cvar_Get("com_basegame", tmp->string,
CVAR_INIT);
-+ }
-+ }
-+ else
-+ {
-+ com_basegame = Cvar_Get("com_basegame", BASEGAME, CVAR_INIT);
-+ }
-+
- com_homepath = Cvar_Get("com_homepath", "", CVAR_INIT);
-
- if(!com_basegame->string[0])
---
-1.7.2.3
-
diff --git
a/debian/patches/0016-Fix-bug-where-Com_StartupVariable-would-set-CVAR_USE.patch
b/debian/patches/0016-Fix-bug-where-Com_StartupVariable-would-set-CVAR_USE.patch
deleted file mode 100644
index a1b7a40..0000000
---
a/debian/patches/0016-Fix-bug-where-Com_StartupVariable-would-set-CVAR_USE.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 48521a1f6090e7f4628522b88e2aa78d2339221a Mon Sep 17 00:00:00 2001
-From: thilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea>
-Date: Wed, 9 Mar 2011 22:50:06 +0000
-Subject: [PATCH] Fix bug where Com_StartupVariable would set CVAR_USER_CREATED
on already existing cvars
-
-Origin: upstream
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=613692
-git-svn-id: svn://svn.icculus.org/quake3/trunk@1919
edf5b092-35ff-0310-97b2-ce42778d08ea
----
- code/qcommon/common.c | 13 +++++++------
- 1 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/code/qcommon/common.c b/code/qcommon/common.c
-index dd85a99..a7a5a6f 100644
---- a/code/qcommon/common.c
-+++ b/code/qcommon/common.c
-@@ -451,7 +451,6 @@ be after execing the config and default.
- void Com_StartupVariable( const char *match ) {
- int i;
- char *s;
-- cvar_t *cv;
-
- for (i=0 ; i < com_numConsoleLines ; i++) {
- Cmd_TokenizeString( com_consoleLines[i] );
-@@ -460,11 +459,13 @@ void Com_StartupVariable( const char *match ) {
- }
-
- s = Cmd_Argv(1);
-- if ( !match || !strcmp( s, match ) ) {
-- Cvar_Set( s, Cmd_Argv(2) );
-- cv = Cvar_Get( s, "", 0 );
-- cv->flags |= CVAR_USER_CREATED;
--// com_consoleLines[i] = 0;
-+
-+ if(!match || !strcmp(s, match))
-+ {
-+ if(Cvar_Flags(s) == CVAR_NONEXISTENT)
-+ Cvar_Get(s, Cmd_Argv(2), CVAR_USER_CREATED);
-+ else
-+ Cvar_Set(s, Cmd_Argv(2));
- }
- }
- }
---
-1.7.4.1
-
diff --git a/debian/patches/series b/debian/patches/series
index 98eb03c..aba12c9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,6 @@
-0001-Fix-build-and-resulting-binary-on-alpha.patch
-0002-Import-syslib-JPEG-patch-from-fedora.patch
-0005-FS_FOpenFileRead-allow-loading-any-demo-not-just-the.patch
-0006-Allow-protocol-cvar-to-be-changed-on-the-command-lin.patch
-0007-Load-demos-using-the-protocol-version-from-the-comma.patch
-0008-Add-a-special-vmMagic-that-causes-equivalent-native-.patch
-0011-Double-the-maximum-number-of-cvars.patch
-0012-Increase-the-command-buffer-from-16K-to-128K-followi.patch
-0013-Double-the-default-com_hunkMegs-to-128M.patch
-0014-Put-g_humanplayers-and-g_needpass-in-server-info.patch
-0015-Set-com_basegame-from-fs_basegame-if-com_standalone-.patch
-0016-Fix-bug-where-Com_StartupVariable-would-set-CVAR_USE.patch
+0001-Import-syslib-JPEG-patch-from-fedora.patch
+0002-Add-a-special-vmMagic-that-causes-equivalent-native-.patch
+0003-Double-the-maximum-number-of-cvars.patch
+0004-Increase-the-command-buffer-from-16K-to-128K-followi.patch
+0005-Double-the-default-com_hunkMegs-to-128M.patch
+0006-If-using-system-OpenAL-include-alext.h-for-ALC_ALL_D.patch
--
Quake 3 engine
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
