[SCM] Quake 3 engine branch, master, updated. debian/1.36+svn2224-5-7-g595bd05
Simon McVittie
smcv at debian.org
Sat Jun 23 00:26:11 UTC 2012
The following commit has been merged in the master branch:
commit 8e1d87f241136a118f7b54cca34e12b70da5343a
Author: Simon McVittie <smcv at debian.org>
Date: Fri Jun 22 23:51:31 2012 +0100
Run in a window by default on new installations (mitigates: #546671)
diff --git a/debian/changelog b/debian/changelog
index 9accce7..6e8c159 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ioquake3 (1.36+svn2287-1) UNRELEASED; urgency=low
nVidia driver (Closes: #677647)
- drop patches for CVE-2012-3345, applied upstream
- drop patches excluding qagame.qvm from checksums, applied upstream
+ * Run in a window by default on new installations (mitigates: #546671)
-- Simon McVittie <smcv at debian.org> Fri, 22 Jun 2012 21:07:05 +0100
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 b2e66a2..842b8dc 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
@@ -19,17 +19,17 @@ the 0.8.1 game-code.
Origin: vendor, Debian
Forwarded: no
---
- code/qcommon/files.c | 6 ++--
+ code/qcommon/files.c | 6 ++---
code/qcommon/qcommon.h | 2 +-
- code/qcommon/qfiles.h | 4 +++
+ code/qcommon/qfiles.h | 4 ++++
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 c577eab..ce525cf 100644
+index cfb0d82..719ce0e 100644
--- a/code/qcommon/files.c
+++ b/code/qcommon/files.c
-@@ -1384,7 +1384,7 @@ Return the searchpath in "startSearch".
+@@ -1383,7 +1383,7 @@ Return the searchpath in "startSearch".
=================
*/
@@ -38,7 +38,7 @@ index c577eab..ce525cf 100644
{
searchpath_t *search, *lastSearch;
directory_t *dir;
-@@ -1408,7 +1408,7 @@ vmInterpret_t FS_FindVM(void **startSearch, char *found, int foundlen, const cha
+@@ -1407,7 +1407,7 @@ vmInterpret_t FS_FindVM(void **startSearch, char *found, int foundlen, const cha
while(search)
{
@@ -47,7 +47,7 @@ index c577eab..ce525cf 100644
{
dir = search->dir;
-@@ -1431,7 +1431,7 @@ vmInterpret_t FS_FindVM(void **startSearch, char *found, int foundlen, const cha
+@@ -1430,7 +1430,7 @@ vmInterpret_t FS_FindVM(void **startSearch, char *found, int foundlen, const cha
return VMI_COMPILED;
}
}
@@ -57,10 +57,10 @@ index c577eab..ce525cf 100644
pack = search->pack;
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
-index da6f3b7..ee5c714 100644
+index 86d53ba..243b2a7 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
-@@ -626,7 +626,7 @@ qboolean FS_FileExists( const char *file );
+@@ -625,7 +625,7 @@ qboolean FS_FileExists( const char *file );
qboolean FS_CreatePath (char *OSPath);
@@ -85,7 +85,7 @@ index 7f1ef96..e3515b4 100644
int vmMagic;
diff --git a/code/qcommon/vm.c b/code/qcommon/vm.c
-index 13e41b0..6bf23bd 100644
+index ac73c6e..b471c27 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)
diff --git a/debian/patches/0002-Double-the-maximum-number-of-cvars.patch b/debian/patches/0002-Double-the-maximum-number-of-cvars.patch
index b47d2a1..391b58c 100644
--- a/debian/patches/0002-Double-the-maximum-number-of-cvars.patch
+++ b/debian/patches/0002-Double-the-maximum-number-of-cvars.patch
@@ -10,7 +10,7 @@ Origin: vendor, Debian
Forwarded: no
---
code/qcommon/cvar.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/qcommon/cvar.c b/code/qcommon/cvar.c
index 9321e9c..bb03643 100644
diff --git a/debian/patches/0003-Increase-the-command-buffer-from-16K-to-128K-followi.patch b/debian/patches/0003-Increase-the-command-buffer-from-16K-to-128K-followi.patch
index 4458177..5f50d99 100644
--- a/debian/patches/0003-Increase-the-command-buffer-from-16K-to-128K-followi.patch
+++ b/debian/patches/0003-Increase-the-command-buffer-from-16K-to-128K-followi.patch
@@ -6,10 +6,10 @@ Origin: OpenArena
Forwarded: no
---
code/qcommon/cmd.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/qcommon/cmd.c b/code/qcommon/cmd.c
-index 8020207..b415381 100644
+index 40f1786..29ce115 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/0004-Double-the-default-com_hunkMegs-to-128M.patch b/debian/patches/0004-Double-the-default-com_hunkMegs-to-128M.patch
index 2b6ed5c..7f6c36f 100644
--- a/debian/patches/0004-Double-the-default-com_hunkMegs-to-128M.patch
+++ b/debian/patches/0004-Double-the-default-com_hunkMegs-to-128M.patch
@@ -9,7 +9,7 @@ Origin: OpenArena
Forwarded: no
---
code/qcommon/common.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 7f79047..158193e 100644
diff --git a/debian/patches/0006-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
similarity index 95%
rename from debian/patches/0006-Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
rename to debian/patches/0005-Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
index 79cd8df..3369c4c 100644
--- a/debian/patches/0006-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
@@ -9,10 +9,10 @@ Forwarded: no
code/server/sv_ccmds.c | 6 +++++-
code/server/sv_init.c | 1 +
code/server/sv_main.c | 1 +
- 4 files changed, 8 insertions(+), 1 deletions(-)
+ 4 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/code/server/server.h b/code/server/server.h
-index be74916..9a5965a 100644
+index 3fefb60..325bc38 100644
--- a/code/server/server.h
+++ b/code/server/server.h
@@ -287,6 +287,7 @@ extern cvar_t *sv_dlRate;
@@ -24,7 +24,7 @@ index be74916..9a5965a 100644
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 8ddb94d..5f31593 100644
+index 29181bb..a73d9c6 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -173,6 +173,9 @@ static void SV_Map_f( void ) {
@@ -62,7 +62,7 @@ index 89f4ceb..3d904bc 100644
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 d7b88ed..11add69 100644
+index cd0706d..ded98e5 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@@ -54,6 +54,7 @@ cvar_t *sv_dlRate;
diff --git a/debian/patches/0007-Increase-maximum-number-of-flares-to-256.patch b/debian/patches/0006-Increase-maximum-number-of-flares-to-256.patch
similarity index 86%
rename from debian/patches/0007-Increase-maximum-number-of-flares-to-256.patch
rename to debian/patches/0006-Increase-maximum-number-of-flares-to-256.patch
index 8b38bcc..6e60e59 100644
--- a/debian/patches/0007-Increase-maximum-number-of-flares-to-256.patch
+++ b/debian/patches/0006-Increase-maximum-number-of-flares-to-256.patch
@@ -5,10 +5,10 @@ Subject: Increase maximum number of flares to 256
Origin: OpenArena
---
code/renderer/tr_flares.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/renderer/tr_flares.c b/code/renderer/tr_flares.c
-index 05b1835..ca1438a 100644
+index e6a757c..ff768ba 100644
--- a/code/renderer/tr_flares.c
+++ b/code/renderer/tr_flares.c
@@ -79,7 +79,7 @@ typedef struct flare_s {
diff --git a/debian/patches/0008-Let-servers-set-sv_fps-too.patch b/debian/patches/0007-Let-servers-set-sv_fps-too.patch
similarity index 94%
rename from debian/patches/0008-Let-servers-set-sv_fps-too.patch
rename to debian/patches/0007-Let-servers-set-sv_fps-too.patch
index d8665e3..fa4fbed 100644
--- a/debian/patches/0008-Let-servers-set-sv_fps-too.patch
+++ b/debian/patches/0007-Let-servers-set-sv_fps-too.patch
@@ -4,7 +4,7 @@ Subject: Let servers set sv_fps, too
---
code/client/cl_parse.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/client/cl_parse.c b/code/client/cl_parse.c
index 78f4a92..b029996 100644
diff --git a/debian/patches/0013-Only-emit-i486-instructions-on-x86-but-optimize-for-.patch b/debian/patches/0008-Only-emit-i486-instructions-on-x86-but-optimize-for-.patch
similarity index 80%
rename from debian/patches/0013-Only-emit-i486-instructions-on-x86-but-optimize-for-.patch
rename to debian/patches/0008-Only-emit-i486-instructions-on-x86-but-optimize-for-.patch
index 41a1db6..c57cfae 100644
--- a/debian/patches/0013-Only-emit-i486-instructions-on-x86-but-optimize-for-.patch
+++ b/debian/patches/0008-Only-emit-i486-instructions-on-x86-but-optimize-for-.patch
@@ -1,8 +1,7 @@
-From 466f75d0022f2b4226009fda1004e2baff973af2 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv at debian.org>
Date: Fri, 15 Jun 2012 11:54:53 +0100
-Subject: [PATCH] Only emit i486 instructions on x86, but optimize for
- something modern
+Subject: Only emit i486 instructions on x86, but optimize for something
+ modern
Debian on i386 theoretically supports 486-class CPUs (e.g. older AMD
Geode models). Using -march=i486 restricts the compiler to emitting
@@ -16,10 +15,10 @@ to work around a compiler segfault on *-i386 in gcc >= 4.7 (#677606).
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
-index 57676a3..c7e7077 100644
+index ce65ab9..b1f4d5c 100644
--- a/Makefile
+++ b/Makefile
-@@ -319,8 +319,8 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu"))
+@@ -324,8 +324,8 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu"))
HAVE_VM_COMPILED = true
else
ifeq ($(ARCH),i386)
@@ -30,6 +29,3 @@ index 57676a3..c7e7077 100644
-falign-functions=2 -fstrength-reduce
OPTIMIZE = $(OPTIMIZEVM) -ffast-math
HAVE_VM_COMPILED=true
---
-1.7.10
-
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
new file mode 100644
index 0000000..6cfd0ef
--- /dev/null
+++ b/debian/patches/0009-Run-in-a-window-by-default-on-new-installations.patch
@@ -0,0 +1,30 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Fri, 22 Jun 2012 23:27:03 +0100
+Subject: Run in a window by default on new installations
+
+Debian Games Team policy seems to be to default to windowed to avoid
+resetting screen geometry, breaking multi-head, etc. r_fullscreen
+is "archived" (saved to the user configuration), so this doesn't
+affect current players.
+
+Most people will want to configure a higher resolution than 640x480
+anyway, at which point it's easy to switch fullscreen on too.
+
+Forwarded: no, Debian-specific
+---
+ code/renderer/tr_init.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
+index 7e89b83..984d4d3 100644
+--- a/code/renderer/tr_init.c
++++ b/code/renderer/tr_init.c
+@@ -1016,7 +1016,7 @@ void R_Register( void )
+ 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_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/debian/patches/series b/debian/patches/series
index 9f83811..57083f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,8 @@
0002-Double-the-maximum-number-of-cvars.patch
0003-Increase-the-command-buffer-from-16K-to-128K-followi.patch
0004-Double-the-default-com_hunkMegs-to-128M.patch
-0006-Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
-0007-Increase-maximum-number-of-flares-to-256.patch
-0008-Let-servers-set-sv_fps-too.patch
-0013-Only-emit-i486-instructions-on-x86-but-optimize-for-.patch
+0005-Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
+0006-Increase-maximum-number-of-flares-to-256.patch
+0007-Let-servers-set-sv_fps-too.patch
+0008-Only-emit-i486-instructions-on-x86-but-optimize-for-.patch
+0009-Run-in-a-window-by-default-on-new-installations.patch
--
Quake 3 engine
More information about the Pkg-games-commits
mailing list