[openjk] 13/15: Update patches
Simon McVittie
smcv at debian.org
Wed Oct 7 07:36:19 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 0a1cc62d36f6174a059b4e14421776931828d260
Author: Simon McVittie <smcv at debian.org>
Date: Sun Aug 16 10:59:38 2015 +0100
Update patches
---
debian/changelog | 2 ++
...E__-to-be-avoided-for-reproducible-builds.patch | 6 ++---
...leViewAngles-fix-use-of-uninitialized-var.patch | 26 ----------------------
...ep-or-Sys_Sleep-in-SP-to-avoid-busy-waiti.patch | 9 ++++----
debian/patches/series | 1 -
5 files changed, 10 insertions(+), 34 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d6b534f..78a95b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
openjk (0~20150815+dfsg1-1) UNRELEASED; urgency=medium
* New upstream snapshot
+ - drop patch for PR #665, applied upstream
+ - update patch for upstream bug #507 (PR #695)
* Drop patch to avoid direct libX11 dependency, no longer needed
with CMake 3.2
* debian/rules: add convenience "maintainer-get-orig-source" target
diff --git a/debian/patches/Allow-__DATE__-to-be-avoided-for-reproducible-builds.patch b/debian/patches/Allow-__DATE__-to-be-avoided-for-reproducible-builds.patch
index ed6c981..8f9fb81 100644
--- a/debian/patches/Allow-__DATE__-to-be-avoided-for-reproducible-builds.patch
+++ b/debian/patches/Allow-__DATE__-to-be-avoided-for-reproducible-builds.patch
@@ -37,7 +37,7 @@ index aeeea5b..7ba6eac 100644
srand( randomSeed );
diff --git a/code/qcommon/common.cpp b/code/qcommon/common.cpp
-index 9817462..4f7b018 100644
+index a0f1460..8ed89c6 100644
--- a/code/qcommon/common.cpp
+++ b/code/qcommon/common.cpp
@@ -1050,7 +1050,7 @@ extern void Com_InitZoneMemory();
@@ -59,7 +59,7 @@ index 9817462..4f7b018 100644
#ifdef JK2_MODE
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
-index 96e58eb..0a525ad 100644
+index ed9b62e..5d365a8 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -76,6 +76,10 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
@@ -122,7 +122,7 @@ index ea1761c..cc4a8a1 100644
XCVAR_DEF( pmove_fixed, "0", NULL, CVAR_SYSTEMINFO|CVAR_ARCHIVE, qtrue )
XCVAR_DEF( pmove_float, "0", NULL, CVAR_SYSTEMINFO|CVAR_ARCHIVE, qtrue )
diff --git a/codemp/qcommon/common.cpp b/codemp/qcommon/common.cpp
-index 899ddcc..f584eab 100644
+index 8c53eb6..b1be55c 100644
--- a/codemp/qcommon/common.cpp
+++ b/codemp/qcommon/common.cpp
@@ -1125,7 +1125,7 @@ void Com_Init( char *commandLine ) {
diff --git a/debian/patches/MP-PM_VehicleViewAngles-fix-use-of-uninitialized-var.patch b/debian/patches/MP-PM_VehicleViewAngles-fix-use-of-uninitialized-var.patch
deleted file mode 100644
index 50bfc62..0000000
--- a/debian/patches/MP-PM_VehicleViewAngles-fix-use-of-uninitialized-var.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Sun, 4 Jan 2015 00:05:34 +0000
-Subject: MP: PM_VehicleViewAngles: fix use of uninitialized variables
-
-We shouldn't use clampMin or clampMax until they have been set,
-at which point setAngles is set to true. Initializing it to true
-defeats that.
-
-Forwarded: https://github.com/JACoders/OpenJK/pull/665
----
- codemp/game/bg_pmove.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/codemp/game/bg_pmove.c b/codemp/game/bg_pmove.c
-index 62efce9..c4180d8 100644
---- a/codemp/game/bg_pmove.c
-+++ b/codemp/game/bg_pmove.c
-@@ -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;
-- qboolean setAngles = qtrue;
-+ qboolean setAngles = qfalse;
- vec3_t clampMin;
- vec3_t clampMax;
- int i;
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 dde51dd..53f89cc 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
@@ -10,6 +10,7 @@ mostly by Thilo Schulz, with contributions from Zack Middleton and
Özkan Sezer.
Bug: https://github.com/JACoders/OpenJK/issues/507
+Forwarded: https://github.com/JACoders/OpenJK/pull/695
---
code/qcommon/common.cpp | 90 +++++++++++++++++++++---------------
code/qcommon/qcommon.h | 2 +-
@@ -25,7 +26,7 @@ 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 68aa2f3..9817462 100644
+index e4ec12b..a0f1460 100644
--- a/code/qcommon/common.cpp
+++ b/code/qcommon/common.cpp
@@ -48,7 +48,6 @@ cvar_t *com_speeds;
@@ -90,7 +91,7 @@ index 68aa2f3..9817462 100644
@@ -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 );
+ com_affinity = Cvar_Get( "com_affinity", "0", CVAR_ARCHIVE );
+ com_busyWait = Cvar_Get( "com_busyWait", "0", CVAR_ARCHIVE );
com_bootlogo = Cvar_Get( "com_bootlogo", "1", CVAR_ARCHIVE );
@@ -258,7 +259,7 @@ index c8abf18..37a012a 100644
- return false;
-}
diff --git a/codemp/qcommon/common.cpp b/codemp/qcommon/common.cpp
-index e3df37a..899ddcc 100644
+index f866324..8c53eb6 100644
--- a/codemp/qcommon/common.cpp
+++ b/codemp/qcommon/common.cpp
@@ -43,9 +43,7 @@ cvar_t *com_developer;
@@ -343,7 +344,7 @@ index e3df37a..899ddcc 100644
@@ -1271,6 +1236,7 @@ void Com_Init( char *commandLine ) {
#endif
- com_affinity = Cvar_Get( "com_affinity", "1", CVAR_ARCHIVE );
+ com_affinity = Cvar_Get( "com_affinity", "0", CVAR_ARCHIVE );
+ com_busyWait = Cvar_Get( "com_busyWait", "0", CVAR_ARCHIVE );
com_bootlogo = Cvar_Get( "com_bootlogo", "1", CVAR_ARCHIVE);
diff --git a/debian/patches/series b/debian/patches/series
index 5a63394..a9e91c7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-MP-PM_VehicleViewAngles-fix-use-of-uninitialized-var.patch
g_utils-disarm-debug-code-that-writes-to-c-nofreeent.patch
Use-NET_Sleep-or-Sys_Sleep-in-SP-to-avoid-busy-waiti.patch
Allow-__DATE__-to-be-avoided-for-reproducible-builds.patch
--
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