[openjk] 05/11: New upstream snapshot; update patches
Simon McVittie
smcv at debian.org
Sun Jan 4 21:54:44 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 40f8ceda1e28d30cd525c570eb71e882546a24a0
Author: Simon McVittie <smcv at debian.org>
Date: Sat Jan 3 22:34:37 2015 +0000
New upstream snapshot; update patches
---
debian/changelog | 4 +-
debian/copyright | 1 -
...ing-an-external-libjpeg-turbo-or-libjpeg8.patch | 120 -------------------
...renderer-and-clients-to-a-bunch-of-unnece.patch | 4 +-
.../Import-sys_loadlib.h-from-ioquake3.patch | 128 ---------------------
.../patches/Only-require-glext.h-on-Windows.patch | 10 +-
...ep-or-Sys_Sleep-for-SP-to-avoid-busy-wait.patch | 30 ++---
...m-zlib-headers-if-we-re-using-system-zlib.patch | 113 ------------------
...b-out-debug-code-to-write-to-a-misc-Windo.patch | 6 +-
debian/patches/series | 3 -
debian/rules | 5 +-
11 files changed, 29 insertions(+), 395 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7dc9e62..a9f834c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-openjk (0~20141229+ds1-1) UNRELEASED-experimental; urgency=low
+openjk (0~20150103+ds1-1) experimental; urgency=low
* Initial release. (Closes: #739486)
- -- Simon McVittie <smcv at debian.org> Tue, 23 Dec 2014 23:13:20 +0000
+ -- Simon McVittie <smcv at debian.org> Sat, 03 Jan 2015 22:18:06 +0000
diff --git a/debian/copyright b/debian/copyright
index ee5aa31..f3cf58f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,7 +8,6 @@ Files-Excluded:
code*/client/OpenAL
code*/client/eax
code*/rd-*/glext.h
- code*/sys/sys_loadlib.h
code*/*.dll
lib/*.lib
lib/jpeg-8c
diff --git a/debian/patches/Allow-using-an-external-libjpeg-turbo-or-libjpeg8.patch b/debian/patches/Allow-using-an-external-libjpeg-turbo-or-libjpeg8.patch
deleted file mode 100644
index 4ffbd2f..0000000
--- a/debian/patches/Allow-using-an-external-libjpeg-turbo-or-libjpeg8.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Tue, 30 Dec 2014 00:31:39 +0000
-Subject: Allow using an external libjpeg-turbo or libjpeg8
-
----
- CMakeLists.txt | 10 ++++++++++
- code/rd-common/tr_image_jpg.cpp | 4 ++++
- code/rd-vanilla/CMakeLists.txt | 12 +++++++++---
- codemp/rd-common/tr_image_jpg.cpp | 4 ++++
- codemp/rd-vanilla/CMakeLists.txt | 12 +++++++++---
- 5 files changed, 36 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d41b678..7d0380b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -37,6 +37,12 @@ else()
- option(UseInternalPNG "Whether to use the included libpng instead of a locally installed one" OFF)
- endif()
-
-+if(WIN32 OR APPLE)
-+ option(UseInternalJPEG "Whether to use the included libjpeg instead of a locally installed one" ON)
-+else()
-+ option(UseInternalJPEG "Whether to use the included libjpeg instead of a locally installed one" OFF)
-+endif()
-+
- if(APPLE)
- option(MakeApplicationBundles "Whether to build .app application bundles for engines built" ON)
- else()
-@@ -192,6 +198,10 @@ if(BuildPortableVersion)
- set(SharedDefines ${SharedDefines} "_PORTABLE_VERSION")
- endif()
-
-+if(UseInternalJPEG)
-+ set(SharedDefines ${SharedDefines} "USE_INTERNAL_JPEG")
-+endif()
-+
- set(OpenJKLibDir "${CMAKE_SOURCE_DIR}/lib")
-
- if(NOT MSVC)
-diff --git a/code/rd-common/tr_image_jpg.cpp b/code/rd-common/tr_image_jpg.cpp
-index 72aa9f1..6d52e45 100644
---- a/code/rd-common/tr_image_jpg.cpp
-+++ b/code/rd-common/tr_image_jpg.cpp
-@@ -11,8 +11,12 @@
- * (stdio.h is sufficient on ANSI-conforming systems.)
- * You may also wish to include "jerror.h".
- */
-+#ifdef USE_INTERNAL_JPEG
- #define JPEG_INTERNALS
- #include "jpeg-8c/jpeglib.h"
-+#else
-+#include <jpeglib.h>
-+#endif
-
- static void R_JPGErrorExit(j_common_ptr cinfo)
- {
-diff --git a/code/rd-vanilla/CMakeLists.txt b/code/rd-vanilla/CMakeLists.txt
-index 983aaf5..09c498f 100644
---- a/code/rd-vanilla/CMakeLists.txt
-+++ b/code/rd-vanilla/CMakeLists.txt
-@@ -18,9 +18,15 @@ if(BuildSPRdVanilla OR BuildJK2SPRdVanilla)
- # Files
-
- # JPEG
-- file(GLOB_RECURSE J_SRC "${OpenJKLibDir}/jpeg-8c/*.c" "${OpenJKLibDir}/jpeg-8c/*.h")
-- source_group("jpeg-8c" FILES ${J_SRC})
-- set(SPRDVanillaFiles ${SPRDVanillaFiles} ${J_SRC})
-+ if(UseInternalJPEG)
-+ file(GLOB_RECURSE J_SRC "${OpenJKLibDir}/jpeg-8c/*.c" "${OpenJKLibDir}/jpeg-8c/*.h")
-+ source_group("jpeg-8c" FILES ${J_SRC})
-+ set(SPRDVanillaFiles ${SPRDVanillaFiles} ${J_SRC})
-+ else()
-+ find_package(JPEG REQUIRED)
-+ set(SPRDVanillaRendererIncludeDirectories ${SPRDVanillaRendererIncludeDirectories} ${JPEG_INCLUDE_DIR})
-+ set(SPRDVanillaRendererLibraries ${SPRDVanillaRendererLibraries} ${JPEG_LIBRARIES})
-+ endif()
-
- # GHOUL 2
- set(SPRDVanillaG2Files
-diff --git a/codemp/rd-common/tr_image_jpg.cpp b/codemp/rd-common/tr_image_jpg.cpp
-index 9e35130..3c5b985 100644
---- a/codemp/rd-common/tr_image_jpg.cpp
-+++ b/codemp/rd-common/tr_image_jpg.cpp
-@@ -7,8 +7,12 @@
- * (stdio.h is sufficient on ANSI-conforming systems.)
- * You may also wish to include "jerror.h".
- */
-+#ifdef USE_INTERNAL_JPEG
- #define JPEG_INTERNALS
- #include "jpeg-8c/jpeglib.h"
-+#else
-+#include <jpeglib.h>
-+#endif
-
- static void R_JPGErrorExit(j_common_ptr cinfo)
- {
-diff --git a/codemp/rd-vanilla/CMakeLists.txt b/codemp/rd-vanilla/CMakeLists.txt
-index 51ae174..1b05ba0 100644
---- a/codemp/rd-vanilla/CMakeLists.txt
-+++ b/codemp/rd-vanilla/CMakeLists.txt
-@@ -83,9 +83,15 @@ set(MPVanillaRendererCommonFiles
- source_group("common" FILES ${MPVanillaRendererCommonFiles})
- set(MPVanillaRendererFiles ${MPVanillaRendererFiles} ${MPVanillaRendererCommonFiles})
-
--file(GLOB_RECURSE MPVanillaRendererJpegFiles "${OpenJKLibDir}/jpeg-8c/*.c" "${OpenJKLibDir}/jpeg-8c/*.h")
--source_group("jpeg-8c" FILES ${MPVanillaRendererJpegFiles})
--set(MPVanillaRendererFiles ${MPVanillaRendererFiles} ${MPVanillaRendererJpegFiles})
-+if(UseInternalJPEG)
-+ file(GLOB_RECURSE MPVanillaRendererJpegFiles "${OpenJKLibDir}/jpeg-8c/*.c" "${OpenJKLibDir}/jpeg-8c/*.h")
-+ source_group("jpeg-8c" FILES ${MPVanillaRendererJpegFiles})
-+ set(MPVanillaRendererFiles ${MPVanillaRendererFiles} ${MPVanillaRendererJpegFiles})
-+else()
-+ find_package(JPEG REQUIRED)
-+ set(MPVanillaRendererIncludeDirectories ${MPVanillaRendererIncludeDirectories} ${JPEG_INCLUDE_DIR})
-+ set(MPVanillaRendererLibraries ${MPVanillaRendererLibraries} ${JPEG_LIBRARIES})
-+endif()
-
- if(UseInternalPNG)
- set(MPVanillaRendererLibPngFiles
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 7a1adc7..ebe4747 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
@@ -25,10 +25,10 @@ index ac30195..5a24f15 100644
# OpenAL (is optionally included for Windows)
diff --git a/code/rd-vanilla/CMakeLists.txt b/code/rd-vanilla/CMakeLists.txt
-index 09c498f..710da5b 100644
+index 4e00534..9c84912 100644
--- a/code/rd-vanilla/CMakeLists.txt
+++ b/code/rd-vanilla/CMakeLists.txt
-@@ -192,7 +192,7 @@ if(BuildSPRdVanilla OR BuildJK2SPRdVanilla)
+@@ -193,7 +193,7 @@ if(BuildSPRdVanilla OR BuildJK2SPRdVanilla)
if(NOT WIN32)
find_package(OpenGL REQUIRED)
set(SPRDVanillaRendererIncludeDirectories ${SPRDVanillaRendererIncludeDirectories} ${OPENGL_INCLUDE_DIR})
diff --git a/debian/patches/Import-sys_loadlib.h-from-ioquake3.patch b/debian/patches/Import-sys_loadlib.h-from-ioquake3.patch
deleted file mode 100644
index 24f3541..0000000
--- a/debian/patches/Import-sys_loadlib.h-from-ioquake3.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Tue, 30 Dec 2014 00:23:51 +0000
-Subject: Import sys_loadlib.h from ioquake3
-
-The one in OpenJK is functionally identical, but has GPL-3+ headers
-because it came via one of the Return to Castle Wolfenstein family
-of games. Let's simplify the licensing here.
----
- code/sys/sys_loadlib.h | 51 ++++++++++++++++++++++++++++++++++++++++++++++++
- codemp/sys/sys_loadlib.h | 51 ++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 102 insertions(+)
- create mode 100644 code/sys/sys_loadlib.h
- create mode 100644 codemp/sys/sys_loadlib.h
-
-diff --git a/code/sys/sys_loadlib.h b/code/sys/sys_loadlib.h
-new file mode 100644
-index 0000000..0b1eac3
---- /dev/null
-+++ b/code/sys/sys_loadlib.h
-@@ -0,0 +1,51 @@
-+/*
-+===========================================================================
-+Copyright (C) 1999-2005 Id Software, Inc.
-+
-+This file is part of Quake III Arena source code.
-+
-+Quake III Arena source code is free software; you can redistribute it
-+and/or modify it under the terms of the GNU General Public License as
-+published by the Free Software Foundation; either version 2 of the License,
-+or (at your option) any later version.
-+
-+Quake III Arena source code is distributed in the hope that it will be
-+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with Quake III Arena source code; if not, write to the Free Software
-+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+===========================================================================
-+*/
-+
-+#ifdef DEDICATED
-+# ifdef _WIN32
-+# include <windows.h>
-+# define Sys_LoadLibrary(f) (void*)LoadLibrary(f)
-+# define Sys_UnloadLibrary(h) FreeLibrary((HMODULE)h)
-+# define Sys_LoadFunction(h,fn) (void*)GetProcAddress((HMODULE)h,fn)
-+# define Sys_LibraryError() "unknown"
-+# else
-+# include <dlfcn.h>
-+# define Sys_LoadLibrary(f) dlopen(f,RTLD_NOW)
-+# define Sys_UnloadLibrary(h) dlclose(h)
-+# define Sys_LoadFunction(h,fn) dlsym(h,fn)
-+# define Sys_LibraryError() dlerror()
-+# endif
-+#else
-+# ifdef USE_LOCAL_HEADERS
-+# include "SDL.h"
-+# include "SDL_loadso.h"
-+# else
-+# include <SDL.h>
-+# include <SDL_loadso.h>
-+# endif
-+# define Sys_LoadLibrary(f) SDL_LoadObject(f)
-+# define Sys_UnloadLibrary(h) SDL_UnloadObject(h)
-+# define Sys_LoadFunction(h,fn) SDL_LoadFunction(h,fn)
-+# define Sys_LibraryError() SDL_GetError()
-+#endif
-+
-+void * QDECL Sys_LoadDll(const char *name, qboolean useSystemLib);
-diff --git a/codemp/sys/sys_loadlib.h b/codemp/sys/sys_loadlib.h
-new file mode 100644
-index 0000000..0b1eac3
---- /dev/null
-+++ b/codemp/sys/sys_loadlib.h
-@@ -0,0 +1,51 @@
-+/*
-+===========================================================================
-+Copyright (C) 1999-2005 Id Software, Inc.
-+
-+This file is part of Quake III Arena source code.
-+
-+Quake III Arena source code is free software; you can redistribute it
-+and/or modify it under the terms of the GNU General Public License as
-+published by the Free Software Foundation; either version 2 of the License,
-+or (at your option) any later version.
-+
-+Quake III Arena source code is distributed in the hope that it will be
-+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with Quake III Arena source code; if not, write to the Free Software
-+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+===========================================================================
-+*/
-+
-+#ifdef DEDICATED
-+# ifdef _WIN32
-+# include <windows.h>
-+# define Sys_LoadLibrary(f) (void*)LoadLibrary(f)
-+# define Sys_UnloadLibrary(h) FreeLibrary((HMODULE)h)
-+# define Sys_LoadFunction(h,fn) (void*)GetProcAddress((HMODULE)h,fn)
-+# define Sys_LibraryError() "unknown"
-+# else
-+# include <dlfcn.h>
-+# define Sys_LoadLibrary(f) dlopen(f,RTLD_NOW)
-+# define Sys_UnloadLibrary(h) dlclose(h)
-+# define Sys_LoadFunction(h,fn) dlsym(h,fn)
-+# define Sys_LibraryError() dlerror()
-+# endif
-+#else
-+# ifdef USE_LOCAL_HEADERS
-+# include "SDL.h"
-+# include "SDL_loadso.h"
-+# else
-+# include <SDL.h>
-+# include <SDL_loadso.h>
-+# endif
-+# define Sys_LoadLibrary(f) SDL_LoadObject(f)
-+# define Sys_UnloadLibrary(h) SDL_UnloadObject(h)
-+# define Sys_LoadFunction(h,fn) SDL_LoadFunction(h,fn)
-+# define Sys_LibraryError() SDL_GetError()
-+#endif
-+
-+void * QDECL Sys_LoadDll(const char *name, qboolean useSystemLib);
diff --git a/debian/patches/Only-require-glext.h-on-Windows.patch b/debian/patches/Only-require-glext.h-on-Windows.patch
index 2c516df..96ed35b 100644
--- a/debian/patches/Only-require-glext.h-on-Windows.patch
+++ b/debian/patches/Only-require-glext.h-on-Windows.patch
@@ -12,18 +12,18 @@ Forwarded: not needed, Debian-specific
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/code/rd-vanilla/CMakeLists.txt b/code/rd-vanilla/CMakeLists.txt
-index 11e991a..983aaf5 100644
+index 41edc95..4e00534 100644
--- a/code/rd-vanilla/CMakeLists.txt
+++ b/code/rd-vanilla/CMakeLists.txt
-@@ -112,7 +112,6 @@ if(BuildSPRdVanilla OR BuildJK2SPRdVanilla)
+@@ -118,7 +118,6 @@ if(BuildSPRdVanilla OR BuildJK2SPRdVanilla)
# main files
set(SPRDVanillaMainFiles
- "${SPDir}/rd-vanilla/glext.h"
"${SPDir}/rd-vanilla/qgl.h"
+ "${SPDir}/rd-vanilla/tr_arb.cpp"
"${SPDir}/rd-vanilla/tr_backend.cpp"
- "${SPDir}/rd-vanilla/tr_bsp.cpp"
-@@ -147,6 +146,11 @@ if(BuildSPRdVanilla OR BuildJK2SPRdVanilla)
+@@ -154,6 +153,11 @@ if(BuildSPRdVanilla OR BuildJK2SPRdVanilla)
"${SPDir}/rd-vanilla/tr_WorldEffects.h"
)
source_group("renderer" FILES ${SPRDVanillaMainFiles})
@@ -36,7 +36,7 @@ index 11e991a..983aaf5 100644
set(SPRDVanillaRdCommonFiles
diff --git a/codemp/rd-vanilla/CMakeLists.txt b/codemp/rd-vanilla/CMakeLists.txt
-index 4d51711..51ae174 100644
+index bc4c09d..1b05ba0 100644
--- a/codemp/rd-vanilla/CMakeLists.txt
+++ b/codemp/rd-vanilla/CMakeLists.txt
@@ -9,7 +9,6 @@ set(MPVanillaRendererIncludeDirectories ${MPDir})
diff --git a/debian/patches/Use-NET_Sleep-or-Sys_Sleep-for-SP-to-avoid-busy-wait.patch b/debian/patches/Use-NET_Sleep-or-Sys_Sleep-for-SP-to-avoid-busy-wait.patch
index 117bb96..5c35f5f 100644
--- a/debian/patches/Use-NET_Sleep-or-Sys_Sleep-for-SP-to-avoid-busy-wait.patch
+++ b/debian/patches/Use-NET_Sleep-or-Sys_Sleep-for-SP-to-avoid-busy-wait.patch
@@ -23,10 +23,10 @@ mostly by Thilo Schulz, with contributions from Zack Middleton and
11 files changed, 243 insertions(+), 170 deletions(-)
diff --git a/code/qcommon/common.cpp b/code/qcommon/common.cpp
-index fb33c65..bf8a496 100644
+index 23c2a60..a67f2e3 100644
--- a/code/qcommon/common.cpp
+++ b/code/qcommon/common.cpp
-@@ -53,6 +53,7 @@ cvar_t *sv_paused;
+@@ -52,6 +52,7 @@ cvar_t *sv_paused;
cvar_t *com_skippingcin;
cvar_t *com_speedslog; // 1 = buffer log, 2 = flush after each print
cvar_t *com_homepath;
@@ -34,7 +34,7 @@ index fb33c65..bf8a496 100644
#ifdef G2_PERFORMANCE_ANALYSIS
cvar_t *com_G2Report;
-@@ -70,7 +71,6 @@ int timeInPVSCheck;
+@@ -69,7 +70,6 @@ int timeInPVSCheck;
int numTraces;
int com_frameTime;
@@ -42,7 +42,7 @@ index fb33c65..bf8a496 100644
int com_frameNumber = 0;
qboolean com_errorEntered = qfalse;
-@@ -873,25 +873,6 @@ int Com_EventLoop( void ) {
+@@ -872,25 +872,6 @@ int Com_EventLoop( void ) {
Cbuf_AddText( (char *)ev.evPtr );
Cbuf_AddText( "\n" );
break;
@@ -68,7 +68,7 @@ index fb33c65..bf8a496 100644
}
// free any block data
-@@ -1160,6 +1141,7 @@ void Com_Init( char *commandLine ) {
+@@ -1159,6 +1140,7 @@ void Com_Init( char *commandLine ) {
com_buildScript = Cvar_Get( "com_buildScript", "0", 0 );
com_affinity = Cvar_Get( "com_affinity", "1", CVAR_ARCHIVE );
@@ -76,7 +76,7 @@ index fb33c65..bf8a496 100644
com_bootlogo = Cvar_Get( "com_bootlogo", "1", CVAR_ARCHIVE );
-@@ -1350,6 +1332,26 @@ int Com_ModifyMsec( int msec, float &fraction )
+@@ -1349,6 +1331,26 @@ int Com_ModifyMsec( int msec, float &fraction )
/*
=================
@@ -103,7 +103,7 @@ index fb33c65..bf8a496 100644
Com_Frame
=================
*/
-@@ -1375,7 +1377,8 @@ void Com_Frame( void ) {
+@@ -1374,7 +1376,8 @@ void Com_Frame( void ) {
{
int timeBeforeFirstEvents = 0, timeBeforeServer = 0, timeBeforeEvents = 0, timeBeforeClient = 0, timeAfter = 0;
int msec, minMsec;
@@ -113,7 +113,7 @@ index fb33c65..bf8a496 100644
// write config file if anything changed
Com_WriteConfiguration();
-@@ -1393,25 +1396,47 @@ void Com_Frame( void ) {
+@@ -1392,25 +1395,47 @@ void Com_Frame( void ) {
timeBeforeFirstEvents = Sys_Milliseconds ();
}
@@ -174,10 +174,10 @@ index fb33c65..bf8a496 100644
msec = Com_ModifyMsec( msec, fractionMsec);
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
-index 2f87978..f1ed20e 100644
+index 39abea9..34bf0a5 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
-@@ -572,6 +572,7 @@ unsigned Com_BlockChecksum( const void *buffer, int length );
+@@ -571,6 +571,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 );
@@ -185,7 +185,7 @@ index 2f87978..f1ed20e 100644
void Com_StartupVariable( const char *match );
// checks for and removes command line "+set var arg" constructs
-@@ -602,7 +603,6 @@ extern int timeInPVSCheck;
+@@ -601,7 +602,6 @@ extern int timeInPVSCheck;
extern int numTraces;
extern int com_frameTime;
@@ -193,7 +193,7 @@ index 2f87978..f1ed20e 100644
extern qboolean com_errorEntered;
-@@ -778,8 +778,7 @@ typedef enum {
+@@ -777,8 +777,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)
@@ -203,7 +203,7 @@ index 2f87978..f1ed20e 100644
} sysEventType_t;
typedef struct {
-@@ -843,6 +842,7 @@ const char *Sys_Basename( char *path );
+@@ -842,6 +841,7 @@ const char *Sys_Basename( char *path );
char **Sys_ListFiles( const char *directory, const char *extension, char *filter, int *numfiles, qboolean wantsubs );
void Sys_FreeFileList( char **filelist );
@@ -212,10 +212,10 @@ index 2f87978..f1ed20e 100644
qboolean Sys_LowPhysicalMemory();
qboolean Sys_FileOutOfDate( const char *psFinalFileName /* dest */, const char *psDataFileName /* src */ );
diff --git a/code/win32/win_main.cpp b/code/win32/win_main.cpp
-index d29bc54..e063593 100644
+index 860c730..b25eae2 100644
--- a/code/win32/win_main.cpp
+++ b/code/win32/win_main.cpp
-@@ -1037,6 +1037,14 @@ static int ParseCommandLine(char *cmdline, char **argv)
+@@ -1055,6 +1055,14 @@ static int ParseCommandLine(char *cmdline, char **argv)
//=======================================================================
//int totalMsec, countMsec;
diff --git a/debian/patches/Use-system-zlib-headers-if-we-re-using-system-zlib.patch b/debian/patches/Use-system-zlib-headers-if-we-re-using-system-zlib.patch
deleted file mode 100644
index cba348b..0000000
--- a/debian/patches/Use-system-zlib-headers-if-we-re-using-system-zlib.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Tue, 30 Dec 2014 00:32:01 +0000
-Subject: Use system zlib headers if we're using system zlib
-
----
- CMakeLists.txt | 4 ++++
- code/qcommon/files.h | 4 ++++
- codemp/client/cl_parse.cpp | 5 +++++
- codemp/server/sv_client.cpp | 6 ++++++
- lib/minizip/ioapi.c | 5 +++++
- lib/minizip/unzip.h | 5 +++++
- 6 files changed, 29 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7d0380b..2db8c24 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -202,6 +202,10 @@ if(UseInternalJPEG)
- set(SharedDefines ${SharedDefines} "USE_INTERNAL_JPEG")
- endif()
-
-+if(UseInternalZlib)
-+ set(SharedDefines ${SharedDefines} "USE_INTERNAL_ZLIB")
-+endif()
-+
- set(OpenJKLibDir "${CMAKE_SOURCE_DIR}/lib")
-
- if(NOT MSVC)
-diff --git a/code/qcommon/files.h b/code/qcommon/files.h
-index f45fe98..8383eb6 100644
---- a/code/qcommon/files.h
-+++ b/code/qcommon/files.h
-@@ -25,7 +25,11 @@ This file is part of Jedi Academy.
- Structures local to the files_* modules.
- */
-
-+#ifdef USE_INTERNAL_ZLIB
- #include "zlib/zlib.h"
-+#else
-+#include <zlib.h>
-+#endif
- #include "minizip/unzip.h"
-
- #define MAX_ZPATH 256
-diff --git a/codemp/client/cl_parse.cpp b/codemp/client/cl_parse.cpp
-index a48fa0b..71df1d8 100644
---- a/codemp/client/cl_parse.cpp
-+++ b/codemp/client/cl_parse.cpp
-@@ -3,7 +3,12 @@
- #include "client.h"
- #include "cl_cgameapi.h"
- #include "qcommon/stringed_ingame.h"
-+
-+#ifdef USE_INTERNAL_ZLIB
- #include "zlib/zlib.h"
-+#else
-+#include <zlib.h>
-+#endif
-
- static char hiddenCvarVal[128];
-
-diff --git a/codemp/server/sv_client.cpp b/codemp/server/sv_client.cpp
-index e5b3e7e..7c10b1b 100644
---- a/codemp/server/sv_client.cpp
-+++ b/codemp/server/sv_client.cpp
-@@ -2,7 +2,13 @@
-
- #include "server.h"
- #include "qcommon/stringed_ingame.h"
-+
-+#ifdef USE_INTERNAL_ZLIB
- #include "zlib/zlib.h"
-+#else
-+#include <zlib.h>
-+#endif
-+
- #include "server/sv_gameapi.h"
-
- static void SV_CloseDownload( client_t *cl );
-diff --git a/lib/minizip/ioapi.c b/lib/minizip/ioapi.c
-index 217eb25..e0ffbeb 100644
---- a/lib/minizip/ioapi.c
-+++ b/lib/minizip/ioapi.c
-@@ -10,7 +10,12 @@
- #include <stdlib.h>
- #include <string.h>
-
-+#ifdef USE_INTERNAL_ZLIB
- #include "../zlib/zlib.h"
-+#else
-+#include <zlib.h>
-+#endif
-+
- #include "ioapi.h"
-
-
-diff --git a/lib/minizip/unzip.h b/lib/minizip/unzip.h
-index 4b090bd..f8f9f29 100644
---- a/lib/minizip/unzip.h
-+++ b/lib/minizip/unzip.h
-@@ -48,7 +48,12 @@
- extern "C" {
- #endif
-
-+#ifdef USE_INTERNAL_ZLIB
- #include "zlib/zlib.h"
-+#else
-+#include <zlib.h>
-+#endif
-+
- #include "ioapi.h"
-
- #define NOUNCRYPT
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 aa91968..73ad62b 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 c5aaf50..c3a40c5 100644
+index 181487a..0c2760a 100644
--- a/code/game/g_utils.cpp
+++ b/code/game/g_utils.cpp
-@@ -813,6 +813,7 @@ gentity_t *G_Spawn( void )
+@@ -812,6 +812,7 @@ gentity_t *G_Spawn( void )
e = &g_entities[0];
//--------------Use this to dump directly to a file
@@ -19,7 +19,7 @@ index c5aaf50..c3a40c5 100644
char buff[256];
FILE *fp;
-@@ -827,6 +828,7 @@ gentity_t *G_Spawn( void )
+@@ -826,6 +827,7 @@ gentity_t *G_Spawn( void )
fputs( buff, fp );
}
fclose( fp );
diff --git a/debian/patches/series b/debian/patches/series
index 06bc0dc..6775ce1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,4 @@
-Import-sys_loadlib.h-from-ioquake3.patch
Only-require-glext.h-on-Windows.patch
g_utils-stub-out-debug-code-to-write-to-a-misc-Windo.patch
-Allow-using-an-external-libjpeg-turbo-or-libjpeg8.patch
-Use-system-zlib-headers-if-we-re-using-system-zlib.patch
Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch
Use-NET_Sleep-or-Sys_Sleep-for-SP-to-avoid-busy-wait.patch
diff --git a/debian/rules b/debian/rules
index 11640f2..7437dc1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -129,10 +129,10 @@ override_dh_clean:
ORIG_REPO ?= https://github.com/JACoders/OpenJK
ORIG_REL =
# Empty if upstream ever get round to tagging a release
-ORIG_REV = 428c0a0a2217b2e9e83a35fa1ac52f6c2bf477f1
+ORIG_REV = 4c7b78482e7e2a21d1b9e73284025d87edce5b10
# 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 = 20141229
+ORIG_DATE = 20150103
ORIG_SUFFIX = +ds1
ifeq (${ORIG_REV},)
@@ -161,7 +161,6 @@ get-orig-source:
rm -fr openjk-${ORIG_VER}.orig/code*/client/OpenAL
rm -fr openjk-${ORIG_VER}.orig/code*/client/eax
rm -fr openjk-${ORIG_VER}.orig/code*/rd-*/glext.h
- rm -fr openjk-${ORIG_VER}.orig/code*/sys/sys_loadlib.h
rm -fr openjk-${ORIG_VER}.orig/code*/*.dll
rm -fr openjk-${ORIG_VER}.orig/lib/*.lib
rm -fr openjk-${ORIG_VER}.orig/lib/jpeg-*
--
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