[openjk] 02/04: New upstream snapshot
Simon McVittie
smcv at debian.org
Fri Mar 20 21:37:49 UTC 2015
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository openjk.
commit 95597cc83b2663a46b1c4586a9351ced71af220c
Author: Simon McVittie <smcv at debian.org>
Date: Thu Mar 19 09:14:44 2015 +0000
New upstream snapshot
---
debian/changelog | 4 +-
debian/control | 1 +
debian/copyright | 54 +++----------
...renderer-and-clients-to-a-bunch-of-unnece.patch | 6 +-
...d-QINLINE-to-inline-on-Linux-and-kFreeBSD.patch | 40 ----------
...ompiler-warnings-about-NORETURN-functions.patch | 71 -----------------
.../Fix-use-of-uninitialized-variable.patch | 4 +-
...ep-or-Sys_Sleep-in-SP-to-avoid-busy-waiti.patch | 90 +++++++++++-----------
...b-out-debug-code-to-write-to-a-misc-Windo.patch | 6 +-
debian/patches/series | 2 -
debian/rules | 8 +-
11 files changed, 70 insertions(+), 216 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fca17da..b39c143 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-openjk (0~20150208+ds1-1) UNRELEASED; urgency=low
+openjk (0~20150318+ds1-1) UNRELEASED; urgency=low
* Initial release. (Closes: #739486)
- -- Simon McVittie <smcv at debian.org> Thu, 05 Feb 2015 23:51:15 +0000
+ -- Simon McVittie <smcv at debian.org> Thu, 19 Mar 2015 08:34:41 +0000
diff --git a/debian/control b/debian/control
index b23b624..fd2f1eb 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends:
libjpeg-dev,
libpng-dev,
libsdl2-dev (>= 2.0.0),
+ zip,
Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/pkg-games/openjk.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/openjk.git
diff --git a/debian/copyright b/debian/copyright
index ab6088e..a7d2e6b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,6 @@ Files-Excluded:
CMakeModules/FindPNG.cmake
code*/client/OpenAL
code*/client/eax
- codemp/rd-dedicated/glext.h
code*/*.dll
lib/*.lib
lib/jpeg-8c
@@ -33,14 +32,9 @@ Comment:
OpenJK is licensed under GPLv2 as free software. You are free to use,
modify and redistribute OpenJK following the terms in LICENSE.txt.
.
- Many files do not indicate a specific copyright holder or license at a
- per-file level, but appear to have been written by either Activision or
- Raven Software and were included in the GPL-2 release of these game engines
- described at
- <http://www.kotaku.com.au/2013/04/in-tribute-to-lucasarts-raven-releases-the-source-code-for-jedi-knight-ii/>.
- .
The original license grant from James Monroe at Raven Software can be seen at
- <http://sourceforge.net/u/richwhitehouse/jediacademy/ci/c141658a69a44c9f986d225a8917b5c84bf7c3d0/tree/>:
+ <http://sourceforge.net/u/richwhitehouse/jediacademy/ci/c141658a69a44c9f986d225a8917b5c84bf7c3d0/tree/>
+ or in rv-readme.txt:
.
Activision and Raven are releasing this code for people to learn from
and play with. This code is copyright Activision 2003. This source is
@@ -81,9 +75,6 @@ Comment:
EAX is only relevant on Windows, and the license of the bundled DLL
is unknown.
.
- rd-dedicated/glext.h is only used on Windows, and the copy bundled in OpenJK is
- under an annoyingly verbose license.
- .
The tools directory is not needed for the main OpenJK build, apart from
Ibize which contributes one header file.
@@ -91,16 +82,17 @@ Files: *
Copyright:
© 1999-2005 Id Software, Inc.
© 2000-2013 Raven Software, Inc.
- © 2002-2013 Activision
- © 2013-2014 OpenJK
+ © 2001-2013 Activision, Inc.
+ © 2005-2015 ioquake3 contributors
+ © 2013-2015 OpenJK contributors
License: GPL-2
Files:
codemp/client/cl_avi.cpp
- codemp/qcommon/md4.cpp
- shared/sdl/con_passive.cpp
- shared/sdl/con_tty.cpp
- shared/sdl/sdl_snd.cpp
+ code*/qcommon/md4.cpp
+ shared/sdl/sdl_sound.cpp
+ shared/sys/con_passive.cpp
+ shared/sys/con_tty.cpp
shared/sys/con_win32.cpp
Copyright:
© 1997-1998 Andrew Tridgell
@@ -133,19 +125,6 @@ Copyright:
License: boost-permissive
Files:
- code/qcommon/md4.cpp
-Copyright:
- © 1990-1992 RSA Data Security, Inc.
- © 2001-2013 Raven Software
-License: GPL-2 and RSA-MD4
-
-Files:
- tools/Ibize/md4.c
-Copyright:
- © 1990-1992 RSA Data Security, Inc.
-License: RSA-MD4
-
-Files:
codemp/qcommon/md5.cpp
Copyright: none
License: MD5-PD
@@ -206,21 +185,6 @@ Comment:
or similar text instead of "Quake III Arena", or with different details for
contacting the FSF.
-License: RSA-MD4
- License to copy and use this software is granted provided that it is
- identified as the RSA Data Security, Inc. MD4 Message-Digest Algorithm in
- all material mentioning or referencing this software or this function.
- License is also granted to make and use derivative works provided that
- such works are identified as derived from the RSA Data Security, Inc. MD4
- Message-Digest Algorithm in all material mentioning or referencing
- the derived work. RSA Data Security, Inc. makes no representations
- concerning either the merchantability of this software or the suitability
- of this software for any particular purpose. It is provided as is without
- express or implied warranty of any kind.
- .
- These notices must be retained in any copies of any part of this
- documentation and/or software.
-
License: zlib
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
diff --git a/debian/patches/Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch b/debian/patches/Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch
index 4ee8075..d62d724 100644
--- a/debian/patches/Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch
+++ b/debian/patches/Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch
@@ -11,7 +11,7 @@ They only directly use libGL.
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/code/rd-vanilla/CMakeLists.txt b/code/rd-vanilla/CMakeLists.txt
-index 0c4ed8f..81bc1de 100644
+index b7a2d79..8808618 100644
--- a/code/rd-vanilla/CMakeLists.txt
+++ b/code/rd-vanilla/CMakeLists.txt
@@ -177,7 +177,7 @@ if(BuildSPRdVanilla OR BuildJK2SPRdVanilla)
@@ -24,7 +24,7 @@ index 0c4ed8f..81bc1de 100644
set(SPRDVanillaRendererIncludeDirectories ${SPRDVanillaRendererIncludeDirectories} ${OpenJKLibDir})
diff --git a/codemp/CMakeLists.txt b/codemp/CMakeLists.txt
-index cd09c1c..98620cb 100644
+index 4082f93..b0a1ae9 100644
--- a/codemp/CMakeLists.txt
+++ b/codemp/CMakeLists.txt
@@ -349,7 +349,7 @@ if(BuildMPEngine)
@@ -37,7 +37,7 @@ index cd09c1c..98620cb 100644
# OpenAL (is optionally included for Windows)
diff --git a/codemp/rd-vanilla/CMakeLists.txt b/codemp/rd-vanilla/CMakeLists.txt
-index bcfe4c9..ba3327c 100644
+index 72c8e67..464b465 100644
--- a/codemp/rd-vanilla/CMakeLists.txt
+++ b/codemp/rd-vanilla/CMakeLists.txt
@@ -162,7 +162,7 @@ endif()
diff --git a/debian/patches/Expand-QINLINE-to-inline-on-Linux-and-kFreeBSD.patch b/debian/patches/Expand-QINLINE-to-inline-on-Linux-and-kFreeBSD.patch
deleted file mode 100644
index 0e33a1c..0000000
--- a/debian/patches/Expand-QINLINE-to-inline-on-Linux-and-kFreeBSD.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Sun, 8 Feb 2015 16:26:17 +0000
-Subject: Expand QINLINE to inline on Linux (and kFreeBSD)
-
-This suppresses a lot of compiler warnings about GLimp_LogComment
-being unused: gcc warns if a static function is unused, but does not
-warn about static inline functions.
-
-Applied-upstream: 2015-02-08, commit:a175acc
----
- code/qcommon/q_platform.h | 2 +-
- codemp/qcommon/q_platform.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
-index 6578739..daf818d 100644
---- a/code/qcommon/q_platform.h
-+++ b/code/qcommon/q_platform.h
-@@ -100,7 +100,7 @@
- #ifdef __clang__
- #define QINLINE static inline
- #else
-- #define QINLINE /*inline*/
-+ #define QINLINE inline
- #endif
-
- #define PATH_SEP '/'
-diff --git a/codemp/qcommon/q_platform.h b/codemp/qcommon/q_platform.h
-index 1b3221b..14c9eba 100644
---- a/codemp/qcommon/q_platform.h
-+++ b/codemp/qcommon/q_platform.h
-@@ -100,7 +100,7 @@
- #ifdef __clang__
- #define QINLINE static inline
- #else
-- #define QINLINE /*inline*/
-+ #define QINLINE inline
- #endif
-
- #define PATH_SEP '/'
diff --git a/debian/patches/Fix-some-compiler-warnings-about-NORETURN-functions.patch b/debian/patches/Fix-some-compiler-warnings-about-NORETURN-functions.patch
deleted file mode 100644
index 62913cf..0000000
--- a/debian/patches/Fix-some-compiler-warnings-about-NORETURN-functions.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Sun, 8 Feb 2015 16:11:50 +0000
-Subject: Fix some compiler warnings about NORETURN functions
-
-gcc warns that Com_Crash_f returns (even though in practice it does not),
-because a NULL dereference is undefined behaviour. However, abort()
-is a standard (ISO C) way to crash the program.
-
-Similarly, gcc warns that G_Error returns (even though it doesn't
-really), because it doesn't know that gi.Error is in fact also NORETURN.
-
-Applied-upstream: 2015-02-08, commit:a175acc
----
- code/game/g_local.h | 2 +-
- code/game/g_public.h | 2 +-
- code/qcommon/common.cpp | 2 ++
- codemp/qcommon/common.cpp | 2 ++
- 4 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/code/game/g_local.h b/code/game/g_local.h
-index dd50908..b78c0aa 100644
---- a/code/game/g_local.h
-+++ b/code/game/g_local.h
-@@ -452,7 +452,7 @@ void G_SayTo( gentity_t *ent, gentity_t *other, int mode, int color, const char
- // g_main.c
- //
- void G_RunThink (gentity_t *ent);
--void QDECL G_Error( const char *fmt, ... );
-+void QDECL NORETURN G_Error( const char *fmt, ... );
- void SetInUse(gentity_t *ent);
- void ClearInUse(gentity_t *ent);
- qboolean PInUse(unsigned int entNum);
-diff --git a/code/game/g_public.h b/code/game/g_public.h
-index 451e965..7c687c8 100644
---- a/code/game/g_public.h
-+++ b/code/game/g_public.h
-@@ -146,7 +146,7 @@ typedef struct {
- void (*FlushCamFile)();
-
- // abort the game
-- void (*Error)( int, const char *fmt, ... );
-+ NORETURN void (*Error)( int, const char *fmt, ... );
-
- // get current time for profiling reasons
- // this should NOT be used for any game related tasks,
-diff --git a/code/qcommon/common.cpp b/code/qcommon/common.cpp
-index 26dc848..e110696 100644
---- a/code/qcommon/common.cpp
-+++ b/code/qcommon/common.cpp
-@@ -960,6 +960,8 @@ A way to force a bus error for development reasons
- */
- static void NORETURN Com_Crash_f( void ) {
- * ( volatile int * ) 0 = 0x12345678;
-+ /* that should crash already, but to reassure the compiler: */
-+ abort();
- }
-
- /*
-diff --git a/codemp/qcommon/common.cpp b/codemp/qcommon/common.cpp
-index c6f763b..7350689 100644
---- a/codemp/qcommon/common.cpp
-+++ b/codemp/qcommon/common.cpp
-@@ -979,6 +979,8 @@ A way to force a bus error for development reasons
- */
- static void NORETURN Com_Crash_f( void ) {
- * ( volatile int * ) 0 = 0x12345678;
-+ /* that should crash already, but to reassure the compiler: */
-+ abort();
- }
-
- /*
diff --git a/debian/patches/Fix-use-of-uninitialized-variable.patch b/debian/patches/Fix-use-of-uninitialized-variable.patch
index 16511e5..053e6e2 100644
--- a/debian/patches/Fix-use-of-uninitialized-variable.patch
+++ b/debian/patches/Fix-use-of-uninitialized-variable.patch
@@ -9,10 +9,10 @@ at which point setAngles becomes true.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/codemp/game/bg_pmove.c b/codemp/game/bg_pmove.c
-index 11d0b67..776f19b 100644
+index 62efce9..c4180d8 100644
--- a/codemp/game/bg_pmove.c
+++ b/codemp/game/bg_pmove.c
-@@ -9625,7 +9625,7 @@ static QINLINE void PM_CmdForSaberMoves(usercmd_t *ucmd)
+@@ -9646,7 +9646,7 @@ static QINLINE void PM_CmdForSaberMoves(usercmd_t *ucmd)
void PM_VehicleViewAngles(playerState_t *ps, bgEntity_t *veh, usercmd_t *ucmd)
{
Vehicle_t *pVeh = veh->m_pVehicle;
diff --git a/debian/patches/Use-NET_Sleep-or-Sys_Sleep-in-SP-to-avoid-busy-waiti.patch b/debian/patches/Use-NET_Sleep-or-Sys_Sleep-in-SP-to-avoid-busy-waiti.patch
index 97aef4e..77e688d 100644
--- a/debian/patches/Use-NET_Sleep-or-Sys_Sleep-in-SP-to-avoid-busy-waiti.patch
+++ b/debian/patches/Use-NET_Sleep-or-Sys_Sleep-in-SP-to-avoid-busy-waiti.patch
@@ -25,10 +25,10 @@ Bug: https://github.com/JACoders/OpenJK/issues/507
11 files changed, 235 insertions(+), 157 deletions(-)
diff --git a/code/qcommon/common.cpp b/code/qcommon/common.cpp
-index 1f950c0..26dc848 100644
+index 9ef9953..8b21fca 100644
--- a/code/qcommon/common.cpp
+++ b/code/qcommon/common.cpp
-@@ -41,7 +41,6 @@ cvar_t *com_speeds;
+@@ -48,7 +48,6 @@ cvar_t *com_speeds;
cvar_t *com_developer;
cvar_t *com_timescale;
cvar_t *com_fixedtime;
@@ -36,7 +36,7 @@ index 1f950c0..26dc848 100644
cvar_t *com_sv_running;
cvar_t *com_cl_running;
cvar_t *com_logfile; // 1 = buffer log, 2 = flush after each print
-@@ -57,6 +56,7 @@ cvar_t *com_homepath;
+@@ -64,6 +63,7 @@ cvar_t *com_homepath;
#ifndef _WIN32
cvar_t *com_ansiColor = NULL;
#endif
@@ -44,7 +44,7 @@ index 1f950c0..26dc848 100644
#ifdef G2_PERFORMANCE_ANALYSIS
cvar_t *com_G2Report;
-@@ -74,7 +74,6 @@ int timeInPVSCheck;
+@@ -81,7 +81,6 @@ int timeInPVSCheck;
int numTraces;
int com_frameTime;
@@ -52,7 +52,7 @@ index 1f950c0..26dc848 100644
int com_frameNumber = 0;
qboolean com_errorEntered = qfalse;
-@@ -874,25 +873,6 @@ int Com_EventLoop( void ) {
+@@ -881,25 +880,6 @@ int Com_EventLoop( void ) {
Cbuf_AddText( (char *)ev.evPtr );
Cbuf_AddText( "\n" );
break;
@@ -78,7 +78,7 @@ index 1f950c0..26dc848 100644
}
// free any block data
-@@ -1106,8 +1086,6 @@ void Com_Init( char *commandLine ) {
+@@ -1115,8 +1095,6 @@ void Com_Init( char *commandLine ) {
Cmd_AddCommand ("quit", Com_Quit_f);
Cmd_AddCommand ("writeconfig", Com_WriteConfig_f );
@@ -87,7 +87,7 @@ index 1f950c0..26dc848 100644
com_developer = Cvar_Get ("developer", "0", CVAR_TEMP );
com_logfile = Cvar_Get ("logfile", "0", CVAR_TEMP );
com_speedslog = Cvar_Get ("speedslog", "0", CVAR_TEMP );
-@@ -1129,6 +1107,7 @@ void Com_Init( char *commandLine ) {
+@@ -1138,6 +1116,7 @@ void Com_Init( char *commandLine ) {
com_buildScript = Cvar_Get( "com_buildScript", "0", 0 );
com_affinity = Cvar_Get( "com_affinity", "1", CVAR_ARCHIVE );
@@ -95,7 +95,7 @@ index 1f950c0..26dc848 100644
com_bootlogo = Cvar_Get( "com_bootlogo", "1", CVAR_ARCHIVE );
-@@ -1317,6 +1296,26 @@ int Com_ModifyMsec( int msec, float &fraction )
+@@ -1326,6 +1305,26 @@ int Com_ModifyMsec( int msec, float &fraction )
/*
=================
@@ -122,7 +122,7 @@ index 1f950c0..26dc848 100644
Com_Frame
=================
*/
-@@ -1342,7 +1341,8 @@ void Com_Frame( void ) {
+@@ -1351,7 +1350,8 @@ void Com_Frame( void ) {
{
int timeBeforeFirstEvents = 0, timeBeforeServer = 0, timeBeforeEvents = 0, timeBeforeClient = 0, timeAfter = 0;
int msec, minMsec;
@@ -132,7 +132,7 @@ index 1f950c0..26dc848 100644
// write config file if anything changed
Com_WriteConfiguration();
-@@ -1354,25 +1354,43 @@ void Com_Frame( void ) {
+@@ -1363,25 +1363,43 @@ void Com_Frame( void ) {
timeBeforeFirstEvents = Sys_Milliseconds ();
}
@@ -189,10 +189,10 @@ index 1f950c0..26dc848 100644
msec = Com_ModifyMsec( msec, fractionMsec);
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
-index 366e236..b8be98a 100644
+index 8cb982b..490f9a3 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
-@@ -598,6 +598,7 @@ unsigned Com_BlockChecksum( const void *buffer, int length );
+@@ -605,6 +605,7 @@ unsigned Com_BlockChecksum( const void *buffer, int length );
int Com_Filter(const char *filter, const char *name, int casesensitive);
int Com_FilterPath(const char *filter, const char *name, int casesensitive);
qboolean Com_SafeMode( void );
@@ -200,7 +200,7 @@ index 366e236..b8be98a 100644
void Com_StartupVariable( const char *match );
// checks for and removes command line "+set var arg" constructs
-@@ -632,7 +633,6 @@ extern int timeInPVSCheck;
+@@ -639,7 +640,6 @@ extern int timeInPVSCheck;
extern int numTraces;
extern int com_frameTime;
@@ -258,10 +258,10 @@ index c8abf18..37a012a 100644
- return false;
-}
diff --git a/codemp/qcommon/common.cpp b/codemp/qcommon/common.cpp
-index 7995c5e..c6f763b 100644
+index 7f48587..615340d 100644
--- a/codemp/qcommon/common.cpp
+++ b/codemp/qcommon/common.cpp
-@@ -19,9 +19,7 @@ cvar_t *com_developer;
+@@ -43,9 +43,7 @@ cvar_t *com_developer;
cvar_t *com_dedicated;
cvar_t *com_timescale;
cvar_t *com_fixedtime;
@@ -271,7 +271,7 @@ index 7995c5e..c6f763b 100644
cvar_t *com_timedemo;
cvar_t *com_sv_running;
cvar_t *com_cl_running;
-@@ -44,6 +42,7 @@ cvar_t *com_homepath;
+@@ -68,6 +66,7 @@ cvar_t *com_homepath;
#ifndef _WIN32
cvar_t *com_ansiColor = NULL;
#endif
@@ -279,7 +279,7 @@ index 7995c5e..c6f763b 100644
cvar_t *com_affinity;
-@@ -53,7 +52,6 @@ int time_frontend; // renderer frontend time
+@@ -77,7 +76,6 @@ int time_frontend; // renderer frontend time
int time_backend; // renderer backend time
int com_frameTime;
@@ -287,7 +287,7 @@ index 7995c5e..c6f763b 100644
int com_frameNumber;
qboolean com_errorEntered = qfalse;
-@@ -892,36 +890,6 @@ int Com_EventLoop( void ) {
+@@ -916,36 +914,6 @@ int Com_EventLoop( void ) {
}
Cbuf_AddText( "\n" );
break;
@@ -324,7 +324,7 @@ index 7995c5e..c6f763b 100644
}
// free any block data
-@@ -1209,15 +1177,12 @@ void Com_Init( char *commandLine ) {
+@@ -1235,15 +1203,12 @@ void Com_Init( char *commandLine ) {
//
// init commands and vars
//
@@ -340,7 +340,7 @@ index 7995c5e..c6f763b 100644
com_speeds = Cvar_Get ("com_speeds", "0", 0);
com_timedemo = Cvar_Get ("timedemo", "0", 0);
com_cameraMode = Cvar_Get ("com_cameraMode", "0", CVAR_CHEAT);
-@@ -1238,6 +1203,7 @@ void Com_Init( char *commandLine ) {
+@@ -1264,6 +1229,7 @@ void Com_Init( char *commandLine ) {
#endif
com_affinity = Cvar_Get( "com_affinity", "1", CVAR_ARCHIVE );
@@ -348,7 +348,7 @@ index 7995c5e..c6f763b 100644
com_bootlogo = Cvar_Get( "com_bootlogo", "1", CVAR_ARCHIVE);
-@@ -1429,6 +1395,26 @@ extern int G2Time_PreciseFrame;
+@@ -1455,6 +1421,26 @@ extern int G2Time_PreciseFrame;
/*
=================
@@ -375,7 +375,7 @@ index 7995c5e..c6f763b 100644
Com_Frame
=================
*/
-@@ -1440,7 +1426,8 @@ void Com_Frame( void ) {
+@@ -1466,7 +1452,8 @@ void Com_Frame( void ) {
G2PerformanceTimer_PreciseFrame.Start();
#endif
int msec, minMsec;
@@ -385,7 +385,7 @@ index 7995c5e..c6f763b 100644
int timeBeforeFirstEvents = 0;
int timeBeforeServer = 0;
-@@ -1458,25 +1445,53 @@ void Com_Frame( void ) {
+@@ -1484,25 +1471,53 @@ void Com_Frame( void ) {
timeBeforeFirstEvents = Sys_Milliseconds ();
}
@@ -453,10 +453,10 @@ index 7995c5e..c6f763b 100644
//
diff --git a/codemp/qcommon/net_ip.cpp b/codemp/qcommon/net_ip.cpp
-index 06550cf..498b8ed 100644
+index 3105df1..ccfddf9 100644
--- a/codemp/qcommon/net_ip.cpp
+++ b/codemp/qcommon/net_ip.cpp
-@@ -71,6 +71,8 @@ static cvar_t *net_socksPassword;
+@@ -95,6 +95,8 @@ static cvar_t *net_socksPassword;
static cvar_t *net_ip;
static cvar_t *net_port;
@@ -465,7 +465,7 @@ index 06550cf..498b8ed 100644
static struct sockaddr socksRelayAddr;
static SOCKET ip_socket = INVALID_SOCKET;
-@@ -213,21 +215,21 @@ qboolean Sys_StringToAdr( const char *s, netadr_t *a ) {
+@@ -237,21 +239,21 @@ qboolean Sys_StringToAdr( const char *s, netadr_t *a ) {
/*
==================
@@ -491,7 +491,7 @@ index 06550cf..498b8ed 100644
return qfalse;
}
-@@ -865,6 +867,8 @@ static qboolean NET_GetCvars( void ) {
+@@ -889,6 +891,8 @@ static qboolean NET_GetCvars( void ) {
modified += net_socksPassword->modified;
net_socksPassword->modified = qfalse;
@@ -500,7 +500,7 @@ index 06550cf..498b8ed 100644
return modified ? qtrue : qfalse;
}
-@@ -969,31 +973,91 @@ void NET_Shutdown( void ) {
+@@ -993,31 +997,91 @@ void NET_Shutdown( void ) {
/*
====================
@@ -603,10 +603,10 @@ index 06550cf..498b8ed 100644
/*
diff --git a/codemp/qcommon/qcommon.h b/codemp/qcommon/qcommon.h
-index 7907097..685264e 100644
+index 52a3368..899102e 100644
--- a/codemp/qcommon/qcommon.h
+++ b/codemp/qcommon/qcommon.h
-@@ -734,6 +734,7 @@ int Com_Filter(char *filter, char *name, int casesensitive);
+@@ -758,6 +758,7 @@ int Com_Filter(char *filter, char *name, int casesensitive);
int Com_FilterPath(char *filter, char *name, int casesensitive);
int Com_RealTime(qtime_t *qtime);
qboolean Com_SafeMode( void );
@@ -614,7 +614,7 @@ index 7907097..685264e 100644
void Com_StartupVariable( const char *match );
// checks for and removes command line "+set var arg" constructs
-@@ -774,7 +775,6 @@ extern int time_frontend;
+@@ -798,7 +799,6 @@ extern int time_frontend;
extern int time_backend; // renderer backend time
extern int com_frameTime;
@@ -622,7 +622,7 @@ index 7907097..685264e 100644
extern qboolean com_errorEntered;
-@@ -954,6 +954,7 @@ void SV_Init( void );
+@@ -978,6 +978,7 @@ void SV_Init( void );
void SV_Shutdown( char *finalmsg );
void SV_Frame( int msec );
void SV_PacketEvent( netadr_t from, msg_t *msg );
@@ -631,10 +631,10 @@ index 7907097..685264e 100644
diff --git a/codemp/server/sv_main.cpp b/codemp/server/sv_main.cpp
-index 2f7352f..f2d7d57 100644
+index 6542b39..cf9246b 100644
--- a/codemp/server/sv_main.cpp
+++ b/codemp/server/sv_main.cpp
-@@ -8,7 +8,7 @@ server_t sv; // local server
+@@ -32,7 +32,7 @@ server_t sv; // local server
cvar_t *sv_snapsMin; // minimum snapshots/sec a client can request, also limited by sv_snapsMax
cvar_t *sv_snapsMax; // maximum snapshots/sec a client can request, also limited by sv_fps
@@ -643,7 +643,7 @@ index 2f7352f..f2d7d57 100644
cvar_t *sv_timeout; // seconds without any message
cvar_t *sv_zombietime; // seconds to sink messages after disconnect
cvar_t *sv_rconPassword; // password for remote server commands
-@@ -995,6 +995,29 @@ void SV_CheckCvars( void ) {
+@@ -1021,6 +1021,29 @@ void SV_CheckCvars( void ) {
/*
==================
@@ -673,7 +673,7 @@ index 2f7352f..f2d7d57 100644
SV_Frame
Player movement occurs as a result of packet events, which
-@@ -1037,13 +1060,6 @@ void SV_Frame( int msec ) {
+@@ -1063,13 +1086,6 @@ void SV_Frame( int msec ) {
if (!com_dedicated->integer) SV_BotFrame( sv.time + sv.timeResidual );
@@ -688,10 +688,10 @@ index 2f7352f..f2d7d57 100644
// and clear sv.time, rather
// than checking for negative time wraparound everywhere.
diff --git a/shared/sys/sys_event.cpp b/shared/sys/sys_event.cpp
-index 33ff7ca..6756c37 100644
+index 2f03bd2..cc4aa86 100644
--- a/shared/sys/sys_event.cpp
+++ b/shared/sys/sys_event.cpp
-@@ -15,17 +15,10 @@ EVENT LOOP
+@@ -39,17 +39,10 @@ EVENT LOOP
static sysEvent_t eventQue[MAX_QUED_EVENTS] = {};
static int eventHead = 0, eventTail = 0;
@@ -709,7 +709,7 @@ index 33ff7ca..6756c37 100644
// return if we have data
if ( eventHead > eventTail ) {
-@@ -45,22 +38,6 @@ sysEvent_t Sys_GetEvent( void ) {
+@@ -69,22 +62,6 @@ sysEvent_t Sys_GetEvent( void ) {
Sys_QueEvent( 0, SE_CONSOLE, 0, 0, len, b );
}
@@ -733,10 +733,10 @@ index 33ff7ca..6756c37 100644
if ( eventHead > eventTail ) {
eventTail++;
diff --git a/shared/sys/sys_main.cpp b/shared/sys/sys_main.cpp
-index 3525f8c..25c7f08 100644
+index 61869b5..8fa2b2e 100644
--- a/shared/sys/sys_main.cpp
+++ b/shared/sys/sys_main.cpp
-@@ -14,10 +14,11 @@
+@@ -35,10 +35,11 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
static char binaryPath[ MAX_OSPATH ] = { 0 };
static char installPath[ MAX_OSPATH ] = { 0 };
@@ -750,7 +750,7 @@ index 3525f8c..25c7f08 100644
/*
=================
-@@ -132,10 +133,12 @@ void Sys_Init( void ) {
+@@ -153,10 +154,12 @@ void Sys_Init( void ) {
Cmd_AddCommand ("in_restart", IN_Restart);
Cvar_Get( "arch", OS_STRING " " ARCH_STRING, CVAR_ROM );
Cvar_Get( "username", Sys_GetCurrentUser(), CVAR_ROM );
@@ -766,10 +766,10 @@ index 3525f8c..25c7f08 100644
static void NORETURN Sys_Exit( int ex ) {
diff --git a/shared/sys/sys_public.h b/shared/sys/sys_public.h
-index c3b7d5d..623f373 100644
+index baf2c4c..8271a7f 100644
--- a/shared/sys/sys_public.h
+++ b/shared/sys/sys_public.h
-@@ -46,8 +46,7 @@ typedef enum {
+@@ -67,8 +67,7 @@ typedef enum {
SE_CHAR, // evValue is an ascii char
SE_MOUSE, // evValue and evValue2 are reletive signed x / y moves
SE_JOYSTICK_AXIS, // evValue is an axis number and evValue2 is the current state (-127 to 127)
@@ -779,7 +779,7 @@ index c3b7d5d..623f373 100644
} sysEventType_t;
typedef struct sysEvent_s {
-@@ -58,10 +57,11 @@ typedef struct sysEvent_s {
+@@ -79,10 +78,11 @@ typedef struct sysEvent_s {
void *evPtr; // this must be manually freed if not NULL
} sysEvent_t;
diff --git a/debian/patches/g_utils-stub-out-debug-code-to-write-to-a-misc-Windo.patch b/debian/patches/g_utils-stub-out-debug-code-to-write-to-a-misc-Windo.patch
index 73ad62b..c4797f4 100644
--- a/debian/patches/g_utils-stub-out-debug-code-to-write-to-a-misc-Windo.patch
+++ b/debian/patches/g_utils-stub-out-debug-code-to-write-to-a-misc-Windo.patch
@@ -8,10 +8,10 @@ This is just not going to work.
1 file changed, 2 insertions(+)
diff --git a/code/game/g_utils.cpp b/code/game/g_utils.cpp
-index 181487a..0c2760a 100644
+index ee622b0..345c5a9 100644
--- a/code/game/g_utils.cpp
+++ b/code/game/g_utils.cpp
-@@ -812,6 +812,7 @@ gentity_t *G_Spawn( void )
+@@ -818,6 +818,7 @@ gentity_t *G_Spawn( void )
e = &g_entities[0];
//--------------Use this to dump directly to a file
@@ -19,7 +19,7 @@ index 181487a..0c2760a 100644
char buff[256];
FILE *fp;
-@@ -826,6 +827,7 @@ gentity_t *G_Spawn( void )
+@@ -832,6 +833,7 @@ gentity_t *G_Spawn( void )
fputs( buff, fp );
}
fclose( fp );
diff --git a/debian/patches/series b/debian/patches/series
index 4539e44..dc3734f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
g_utils-stub-out-debug-code-to-write-to-a-misc-Windo.patch
Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch
Use-NET_Sleep-or-Sys_Sleep-in-SP-to-avoid-busy-waiti.patch
-Fix-some-compiler-warnings-about-NORETURN-functions.patch
-Expand-QINLINE-to-inline-on-Linux-and-kFreeBSD.patch
Fix-use-of-uninitialized-variable.patch
diff --git a/debian/rules b/debian/rules
index ef25230..ad4ff07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -119,10 +119,10 @@ override_dh_clean:
ORIG_REPO ?= https://github.com/JACoders/OpenJK
ORIG_REL =
# Empty if it's a release
-ORIG_REV = 471dd02dcfb04a821e0d8a91d89e8f048ec68024
+ORIG_REV = eb70ecaf184caf54f3c28973b726ce847d77fb22
# Use the date of the ORIG_REV, or 20130426.1 if you snapshot twice in a day,
# or empty if ORIG_REV is
-ORIG_DATE = 20150208
+ORIG_DATE = 20150318
ORIG_SUFFIX = +ds1
ifeq (${ORIG_REV},)
@@ -150,7 +150,6 @@ get-orig-source:
rm -fr openjk-${ORIG_VER}.orig/CMakeModules/FindPNG.cmake
rm -fr openjk-${ORIG_VER}.orig/code*/client/OpenAL
rm -fr openjk-${ORIG_VER}.orig/code*/client/eax
- rm -fr openjk-${ORIG_VER}.orig/codemp/rd-dedicated/glext.h
rm -fr openjk-${ORIG_VER}.orig/code*/*.dll
rm -fr openjk-${ORIG_VER}.orig/lib/*.lib
rm -fr openjk-${ORIG_VER}.orig/lib/SDL2
@@ -159,6 +158,9 @@ get-orig-source:
rm -fr openjk-${ORIG_VER}.orig/lib/zlib
rm -fr openjk-${ORIG_VER}.orig/tools/Assimilate
rm -fr openjk-${ORIG_VER}.orig/tools/ModView
+ rm -fr openjk-${ORIG_VER}.orig/tools/Ibize/[^i]*
+ rm -fr openjk-${ORIG_VER}.orig/tools/Ibize/ibize.cpp
+ rm -fr openjk-${ORIG_VER}.orig/tools/Ibize/interpreter.h
rm -fr openjk-${ORIG_VER}.orig/tools/create_soundbank
rm -fr openjk-${ORIG_VER}.orig/tools/lipsyncthing
rm -fr openjk-${ORIG_VER}.orig/tools/lipthing2
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git
More information about the Pkg-games-commits
mailing list