[ioquake3] 36/39: New upstream snapshot
Simon McVittie
smcv at debian.org
Sat Nov 5 20:26:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian/master
in repository ioquake3.
commit 36b23a880328143b78aa0b5bfbb1e636809ede88
Author: Simon McVittie <smcv at debian.org>
Date: Sat Nov 5 18:24:08 2016 +0000
New upstream snapshot
- d/p/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch,
- d/p/Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch,
- d/p/Fix-mis-spellings-of-separating-as-seperating.patch:
drop, applied upstream
---
debian/changelog | 12 +--
...mis-spellings-of-separating-as-seperating.patch | 68 ------------
...HLIBLDFLAGS-used-to-link-executables-only.patch | 52 ----------
...m-SOURCE_DATE_EPOCH-for-reproducible-buil.patch | 114 ---------------------
...BuildFindPlayerList-avoid-array-underflow.patch | 41 --------
...erList-make-a-sizeof-more-obviously-corre.patch | 27 -----
debian/patches/series | 6 --
...void-undefined-pointer-below-array-bounds.patch | 67 ------------
debian/rules | 4 +-
9 files changed, 8 insertions(+), 383 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3d87b15..485e3be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-ioquake3 (1.36+u20160914+dfsg1-2) UNRELEASED; urgency=medium
+ioquake3 (1.36+u20161101+dfsg1-1) UNRELEASED; urgency=medium
- * d/p/UI_BuildFindPlayerList-avoid-array-underflow.patch,
- d/p/UI_BuildFindPlayerList-make-a-sizeof-more-obviously-corre.patch,
- d/p/snd_wavelet-avoid-undefined-pointer-below-array-bounds.patch:
- add patches fixing (probably non-security-sensitive) array underflows
- diagnosed by gcc 6
+ * New upstream snapshot
+ - d/p/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch,
+ - d/p/Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch,
+ - d/p/Fix-mis-spellings-of-separating-as-seperating.patch:
+ drop, applied upstream
* debian/.gitignore: update for debhelper 10
* debian/rules: do the build in debian/build
* debian/rules: let dh_auto_clean pick up the correct BUILD_DIR
diff --git a/debian/patches/Fix-mis-spellings-of-separating-as-seperating.patch b/debian/patches/Fix-mis-spellings-of-separating-as-seperating.patch
deleted file mode 100644
index de0e22a..0000000
--- a/debian/patches/Fix-mis-spellings-of-separating-as-seperating.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Wed, 21 Sep 2016 20:15:01 +0100
-Subject: Fix mis-spellings of "separating" as "seperating"
-
-Found by Debian's Lintian tool.
-
-Forwarded: https://github.com/ioquake/ioq3/pull/223
----
- code/botlib/aasfile.h | 4 ++--
- code/botlib/be_aas_cluster.c | 2 +-
- code/qcommon/cm_trace.c | 2 +-
- code/qcommon/common.c | 2 +-
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/code/botlib/aasfile.h b/code/botlib/aasfile.h
-index 8f2fbf6..a0593df 100644
---- a/code/botlib/aasfile.h
-+++ b/code/botlib/aasfile.h
-@@ -65,8 +65,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- #define FACE_LADDER 2 //ladder
- #define FACE_GROUND 4 //standing on ground when in this face
- #define FACE_GAP 8 //gap in the ground
--#define FACE_LIQUID 16 //face seperating two areas with liquid
--#define FACE_LIQUIDSURFACE 32 //face seperating liquid and air
-+#define FACE_LIQUID 16 //face separating two areas with liquid
-+#define FACE_LIQUIDSURFACE 32 //face separating liquid and air
- #define FACE_BRIDGE 64 //can walk over this face if bridge is closed
-
- //area contents
-diff --git a/code/botlib/be_aas_cluster.c b/code/botlib/be_aas_cluster.c
-index 013e806..c2fed97 100644
---- a/code/botlib/be_aas_cluster.c
-+++ b/code/botlib/be_aas_cluster.c
-@@ -152,7 +152,7 @@ int AAS_UpdatePortal(int areanum, int clusternum)
- {
- //remove the cluster portal flag contents
- aasworld.areasettings[areanum].contents &= ~AREACONTENTS_CLUSTERPORTAL;
-- Log_Write("portal area %d is seperating more than two clusters\r\n", areanum);
-+ Log_Write("portal area %d is separating more than two clusters\r\n", areanum);
- return qfalse;
- } //end else
- if (aasworld.portalindexsize >= AAS_MAX_PORTALINDEXSIZE)
-diff --git a/code/qcommon/cm_trace.c b/code/qcommon/cm_trace.c
-index a4ac80a..e6ca055 100644
---- a/code/qcommon/cm_trace.c
-+++ b/code/qcommon/cm_trace.c
-@@ -1053,7 +1053,7 @@ void CM_TraceThroughTree( traceWork_t *tw, int num, float p1f, float p2f, vec3_t
- }
-
- //
-- // find the point distances to the seperating plane
-+ // find the point distances to the separating plane
- // and the offset for the size of the box
- //
- node = cm.nodes + num;
-diff --git a/code/qcommon/common.c b/code/qcommon/common.c
-index 70a6b1b..80dd2c3 100644
---- a/code/qcommon/common.c
-+++ b/code/qcommon/common.c
-@@ -411,7 +411,7 @@ void Com_ParseCommandLine( char *commandLine ) {
- if (*commandLine == '"') {
- inq = !inq;
- }
-- // look for a + seperating character
-+ // look for a + separating character
- // if commandLine came from a file, we might have real line seperators
- if ( (*commandLine == '+' && !inq) || *commandLine == '\n' || *commandLine == '\r' ) {
- if ( com_numConsoleLines == MAX_CONSOLE_LINES ) {
diff --git a/debian/patches/Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch b/debian/patches/Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch
deleted file mode 100644
index de75a5f..0000000
--- a/debian/patches/Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Mon, 21 Mar 2016 08:55:23 +0000
-Subject: Introduce NOTSHLIBLDFLAGS, used to link executables only
-
-This can be used for LDFLAGS that would be inappropriate for shared
-libraries, such as the "-fPIE -pie" used to link position-independent
-executables. PIEs make it more difficult to exploit various classes
-of security vulnerability.
-
-Forwarded: https://github.com/ioquake/ioq3/pull/224
----
- Makefile | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 6594598..6c7272c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2071,7 +2071,7 @@ endif
- ifneq ($(USE_RENDERER_DLOPEN),0)
- $(B)/$(CLIENTBIN)$(FULLBINEXT): $(Q3OBJ) $(LIBSDLMAIN)
- $(echo_cmd) "LD $@"
-- $(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) \
-+ $(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(NOTSHLIBLDFLAGS) \
- -o $@ $(Q3OBJ) \
- $(LIBSDLMAIN) $(CLIENT_LIBS) $(LIBS)
-
-@@ -2087,13 +2087,13 @@ $(B)/renderer_opengl2_$(SHLIBNAME): $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ)
- else
- $(B)/$(CLIENTBIN)$(FULLBINEXT): $(Q3OBJ) $(Q3ROBJ) $(JPGOBJ) $(LIBSDLMAIN)
- $(echo_cmd) "LD $@"
-- $(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) \
-+ $(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(NOTSHLIBLDFLAGS) \
- -o $@ $(Q3OBJ) $(Q3ROBJ) $(JPGOBJ) \
- $(LIBSDLMAIN) $(CLIENT_LIBS) $(RENDERER_LIBS) $(LIBS)
-
- $(B)/$(CLIENTBIN)_opengl2$(FULLBINEXT): $(Q3OBJ) $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ) $(LIBSDLMAIN)
- $(echo_cmd) "LD $@"
-- $(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) \
-+ $(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(NOTSHLIBLDFLAGS) \
- -o $@ $(Q3OBJ) $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ) \
- $(LIBSDLMAIN) $(CLIENT_LIBS) $(RENDERER_LIBS) $(LIBS)
- endif
-@@ -2235,7 +2235,7 @@ endif
-
- $(B)/$(SERVERBIN)$(FULLBINEXT): $(Q3DOBJ)
- $(echo_cmd) "LD $@"
-- $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(Q3DOBJ) $(LIBS)
-+ $(Q)$(CC) $(CFLAGS) $(LDFLAGS) $(NOTSHLIBLDFLAGS) -o $@ $(Q3DOBJ) $(LIBS)
-
-
-
diff --git a/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch b/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
deleted file mode 100644
index 8d28a10..0000000
--- a/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Thu, 2 Apr 2015 11:10:26 +0100
-Subject: Pick up date from SOURCE_DATE_EPOCH, for reproducible builds
-
-The goal of reproducible builds is that a rebuild of the same source
-code with the same compiler, libraries, etc. should result in the same
-binaries. SOURCE_DATE_EPOCH provides a standard way for build systems
-to fill in the date of the latest source change, typically from a git
-commit or from metadata like the debian/changelog in Debian packages.
-
-This does not change anything if SOURCE_DATE_EPOCH is not defined;
-the intention is that a larger build system like a Debian package
-will define it.
-
-Please see https://reproducible-builds.org/ for more information about
-reproducible builds.
-
-Forwarded: https://github.com/ioquake/ioq3/pull/225
----
- Makefile | 5 +++++
- code/game/g_main.c | 4 ++--
- code/qcommon/common.c | 4 ++--
- code/qcommon/q_shared.h | 4 ++++
- code/sys/sys_main.c | 2 +-
- 5 files changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index fb7efd0..6594598 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1098,6 +1098,11 @@ else
- STRIP_FLAG = -s
- endif
-
-+# https://reproducible-builds.org/specs/source-date-epoch/
-+ifdef SOURCE_DATE_EPOCH
-+ BASE_CFLAGS += -DPRODUCT_DATE=\\\"$(shell date --date="@$$SOURCE_DATE_EPOCH" "+%b %_d %Y" | sed -e 's/ /\\\ /'g)\\\"
-+endif
-+
- BASE_CFLAGS += -DPRODUCT_VERSION=\\\"$(VERSION)\\\"
- BASE_CFLAGS += -Wformat=2 -Wno-format-zero-length -Wformat-security -Wno-format-nonliteral
- BASE_CFLAGS += -Wstrict-aliasing=2 -Wmissing-format-attribute
-diff --git a/code/game/g_main.c b/code/game/g_main.c
-index e3903bf..6d9d9fa 100644
---- a/code/game/g_main.c
-+++ b/code/game/g_main.c
-@@ -101,7 +101,7 @@ static cvarTable_t gameCvarTable[] = {
-
- // noset vars
- { NULL, "gamename", GAMEVERSION , CVAR_SERVERINFO | CVAR_ROM, 0, qfalse },
-- { NULL, "gamedate", __DATE__ , CVAR_ROM, 0, qfalse },
-+ { NULL, "gamedate", PRODUCT_DATE , CVAR_ROM, 0, qfalse },
- { &g_restarted, "g_restarted", "0", CVAR_ROM, 0, qfalse },
-
- // latched vars
-@@ -408,7 +408,7 @@ void G_InitGame( int levelTime, int randomSeed, int restart ) {
-
- G_Printf ("------- Game Initialization -------\n");
- G_Printf ("gamename: %s\n", GAMEVERSION);
-- G_Printf ("gamedate: %s\n", __DATE__);
-+ G_Printf ("gamedate: %s\n", PRODUCT_DATE);
-
- srand( randomSeed );
-
-diff --git a/code/qcommon/common.c b/code/qcommon/common.c
-index 84b5f62..70a6b1b 100644
---- a/code/qcommon/common.c
-+++ b/code/qcommon/common.c
-@@ -2639,7 +2639,7 @@ void Com_Init( char *commandLine ) {
- char *s;
- int qport;
-
-- Com_Printf( "%s %s %s\n", Q3_VERSION, PLATFORM_STRING, __DATE__ );
-+ Com_Printf( "%s %s %s\n", Q3_VERSION, PLATFORM_STRING, PRODUCT_DATE );
-
- if ( setjmp (abortframe) ) {
- Sys_Error ("Error during initialization");
-@@ -2760,7 +2760,7 @@ void Com_Init( char *commandLine ) {
- com_introPlayed = Cvar_Get( "com_introplayed", "0", CVAR_ARCHIVE);
- #endif
-
-- s = va("%s %s %s", Q3_VERSION, PLATFORM_STRING, __DATE__ );
-+ s = va("%s %s %s", Q3_VERSION, PLATFORM_STRING, PRODUCT_DATE );
- com_version = Cvar_Get ("version", s, CVAR_ROM | CVAR_SERVERINFO );
- com_gamename = Cvar_Get("com_gamename", GAMENAME_FOR_MASTER, CVAR_SERVERINFO | CVAR_INIT);
- com_protocol = Cvar_Get("com_protocol", va("%i", PROTOCOL_VERSION), CVAR_SERVERINFO | CVAR_INIT);
-diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
-index 1812f5e..791a5ab 100644
---- a/code/qcommon/q_shared.h
-+++ b/code/qcommon/q_shared.h
-@@ -70,6 +70,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- #define PRODUCT_VERSION "1.36"
- #endif
-
-+#ifndef PRODUCT_DATE
-+# define PRODUCT_DATE __DATE__
-+#endif
-+
- #define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION
-
- #define MAX_TEAMNAME 32
-diff --git a/code/sys/sys_main.c b/code/sys/sys_main.c
-index 8bbc3a5..019ea12 100644
---- a/code/sys/sys_main.c
-+++ b/code/sys/sys_main.c
-@@ -553,7 +553,7 @@ void Sys_ParseArgs( int argc, char **argv )
- if( !strcmp( argv[1], "--version" ) ||
- !strcmp( argv[1], "-v" ) )
- {
-- const char* date = __DATE__;
-+ const char* date = PRODUCT_DATE;
- #ifdef DEDICATED
- fprintf( stdout, Q3_VERSION " dedicated server (%s)\n", date );
- #else
diff --git a/debian/patches/UI_BuildFindPlayerList-avoid-array-underflow.patch b/debian/patches/UI_BuildFindPlayerList-avoid-array-underflow.patch
deleted file mode 100644
index a68618c..0000000
--- a/debian/patches/UI_BuildFindPlayerList-avoid-array-underflow.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Sun, 25 Sep 2016 16:57:52 +0100
-Subject: UI_BuildFindPlayerList: avoid array underflow
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-This function is used in the Team Arena menus
-
-I don't think it's actually possible to reach this line with
-foundPlayerServerNames < 1, because by the time we get here we have
-set it to 1 + the actual number of servers; but if we did, it would
-clearly underflow into foundPlayerServerNames[-1], which would be
-undefined behaviour. gcc 6 diagnoses this with a warning:
-
-code/ui/ui_main.c: In function ‘UI_BuildFindPlayerList’:
-code/ui/ui_main.c:4138:16: warning: array subscript is below array bounds [-Warray-bounds]
-
-Also correct the sizeof() invocation to make it more obviously
-correct (in fact the buffers for names and addresses happen to both
-be of size MAX_ADDRESSLENGTH, so it was fine, but it's good to be
-obvious).
-
-Forwarded: https://github.com/ioquake/ioq3/pull/226
----
- code/ui/ui_main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/code/ui/ui_main.c b/code/ui/ui_main.c
-index a1539f3..044c00f 100644
---- a/code/ui/ui_main.c
-+++ b/code/ui/ui_main.c
-@@ -4135,7 +4135,7 @@ static void UI_BuildFindPlayerList(qboolean force) {
- else {
- // add a line that shows the number of servers found
- if (!uiInfo.numFoundPlayerServers) {
-- Com_sprintf(uiInfo.foundPlayerServerNames[uiInfo.numFoundPlayerServers-1], sizeof(uiInfo.foundPlayerServerAddresses[0]), "no servers found");
-+ Com_sprintf(uiInfo.foundPlayerServerNames[0], sizeof(uiInfo.foundPlayerServerNames[0]), "no servers found");
- }
- else {
- Com_sprintf(uiInfo.foundPlayerServerNames[uiInfo.numFoundPlayerServers-1], sizeof(uiInfo.foundPlayerServerAddresses[0]),
diff --git a/debian/patches/UI_BuildFindPlayerList-make-a-sizeof-more-obviously-corre.patch b/debian/patches/UI_BuildFindPlayerList-make-a-sizeof-more-obviously-corre.patch
deleted file mode 100644
index 6117ef7..0000000
--- a/debian/patches/UI_BuildFindPlayerList-make-a-sizeof-more-obviously-corre.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Sun, 25 Sep 2016 16:59:12 +0100
-Subject: UI_BuildFindPlayerList: make a sizeof() more obviously correct
-
-As with the other branch of the if/else, each element of
-foundPlayerServerNames is in fact the same size as each element of
-foundPlayerServerAddresses, so it was fine; but it's better to make
-it obvious that we are using the right array sizes.
-
-Forwarded: https://github.com/ioquake/ioq3/pull/226
----
- code/ui/ui_main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/code/ui/ui_main.c b/code/ui/ui_main.c
-index 044c00f..e9e36ea 100644
---- a/code/ui/ui_main.c
-+++ b/code/ui/ui_main.c
-@@ -4138,7 +4138,7 @@ static void UI_BuildFindPlayerList(qboolean force) {
- Com_sprintf(uiInfo.foundPlayerServerNames[0], sizeof(uiInfo.foundPlayerServerNames[0]), "no servers found");
- }
- else {
-- Com_sprintf(uiInfo.foundPlayerServerNames[uiInfo.numFoundPlayerServers-1], sizeof(uiInfo.foundPlayerServerAddresses[0]),
-+ Com_sprintf(uiInfo.foundPlayerServerNames[uiInfo.numFoundPlayerServers-1], sizeof(uiInfo.foundPlayerServerNames[0]),
- "%d server%s found with player %s", uiInfo.numFoundPlayerServers-1,
- uiInfo.numFoundPlayerServers == 2 ? "":"s", uiInfo.findPlayerName);
- }
diff --git a/debian/patches/series b/debian/patches/series
index ec1739a..de9c674 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,3 @@
-Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch
-Introduce-NOTSHLIBLDFLAGS-used-to-link-executables-only.patch
-Fix-mis-spellings-of-separating-as-seperating.patch
-snd_wavelet-avoid-undefined-pointer-below-array-bounds.patch
-UI_BuildFindPlayerList-avoid-array-underflow.patch
-UI_BuildFindPlayerList-make-a-sizeof-more-obviously-corre.patch
debian/Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
debian/Let-servers-set-sv_fps-too.patch
debian/Add-a-special-vmMagic-that-causes-equivalent-native-.patch
diff --git a/debian/patches/snd_wavelet-avoid-undefined-pointer-below-array-bounds.patch b/debian/patches/snd_wavelet-avoid-undefined-pointer-below-array-bounds.patch
deleted file mode 100644
index a98e2b5..0000000
--- a/debian/patches/snd_wavelet-avoid-undefined-pointer-below-array-bounds.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Sun, 25 Sep 2016 16:43:54 +0100
-Subject: snd_wavelet: avoid undefined pointer below array bounds
-
-Given an array b[] of length n, pointers to &b[0]..&b[n] are defined
-(where only &b[0]..&b[n-1] can be validly dereferenced). &b[-1], or
-equivalently b-1, is not something we can use in valid Standard C.
-
-gcc 6 diagnoses this as:
-
-code/client/snd_wavelet.c:33:9: warning: array subscript is below array bounds [-Warray-bounds]
-
-and might take this undefined behaviour as permission to emit
-"more efficient" object code that is not what the author expected,
-for example nothing at all. Use a macro to fake a 1-based array instead.
-
-Forwarded: https://github.com/ioquake/ioq3/pull/226
----
- code/client/snd_wavelet.c | 21 +++++++++++----------
- 1 file changed, 11 insertions(+), 10 deletions(-)
-
-diff --git a/code/client/snd_wavelet.c b/code/client/snd_wavelet.c
-index 3d8f5c7..e051da2 100644
---- a/code/client/snd_wavelet.c
-+++ b/code/client/snd_wavelet.c
-@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- void daub4(float b[], unsigned long n, int isign)
- {
- float wksp[4097] = { 0.0f };
-- float *a=b-1; // numerical recipies so a[1] = b[0]
-+#define a(x) b[(x)-1] // numerical recipies so a[1] = b[0]
-
- unsigned long nh,nh1,i,j;
-
-@@ -39,22 +39,23 @@ void daub4(float b[], unsigned long n, int isign)
- nh1=(nh=n >> 1)+1;
- if (isign >= 0) {
- for (i=1,j=1;j<=n-3;j+=2,i++) {
-- wksp[i] = C0*a[j]+C1*a[j+1]+C2*a[j+2]+C3*a[j+3];
-- wksp[i+nh] = C3*a[j]-C2*a[j+1]+C1*a[j+2]-C0*a[j+3];
-+ wksp[i] = C0*a(j)+C1*a(j+1)+C2*a(j+2)+C3*a(j+3);
-+ wksp[i+nh] = C3*a(j)-C2*a(j+1)+C1*a(j+2)-C0*a(j+3);
- }
-- wksp[i ] = C0*a[n-1]+C1*a[n]+C2*a[1]+C3*a[2];
-- wksp[i+nh] = C3*a[n-1]-C2*a[n]+C1*a[1]-C0*a[2];
-+ wksp[i ] = C0*a(n-1)+C1*a(n)+C2*a(1)+C3*a(2);
-+ wksp[i+nh] = C3*a(n-1)-C2*a(n)+C1*a(1)-C0*a(2);
- } else {
-- wksp[1] = C2*a[nh]+C1*a[n]+C0*a[1]+C3*a[nh1];
-- wksp[2] = C3*a[nh]-C0*a[n]+C1*a[1]-C2*a[nh1];
-+ wksp[1] = C2*a(nh)+C1*a(n)+C0*a(1)+C3*a(nh1);
-+ wksp[2] = C3*a(nh)-C0*a(n)+C1*a(1)-C2*a(nh1);
- for (i=1,j=3;i<nh;i++) {
-- wksp[j++] = C2*a[i]+C1*a[i+nh]+C0*a[i+1]+C3*a[i+nh1];
-- wksp[j++] = C3*a[i]-C0*a[i+nh]+C1*a[i+1]-C2*a[i+nh1];
-+ wksp[j++] = C2*a(i)+C1*a(i+nh)+C0*a(i+1)+C3*a(i+nh1);
-+ wksp[j++] = C3*a(i)-C0*a(i+nh)+C1*a(i+1)-C2*a(i+nh1);
- }
- }
- for (i=1;i<=n;i++) {
-- a[i]=wksp[i];
-+ a(i)=wksp[i];
- }
-+#undef a
- }
-
- void wt1(float a[], unsigned long n, int isign)
diff --git a/debian/rules b/debian/rules
index 1c667bb..8025e58 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,10 +91,10 @@ ORIG_SOURCE = ioquake3
ORIG_REPO ?= https://github.com/ioquake/ioq3
ORIG_REL = 1.36
# Empty if packaging a tagged release
-ORIG_REV = 8417c184b42bd2d97f57b428b56c3c039531853b
+ORIG_REV = 1c1e1f61f180596c925a4ac0eddba4806d1369cd
# 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 = 20160914
+ORIG_DATE = 20161101
ORIG_SUFFIX = +dfsg1
ifeq (${ORIG_REV},)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git
More information about the Pkg-games-commits
mailing list