This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch debian/master in repository openjk.
commit b2b64ff58555dba3cd0716c3f001e1b1a1e8dce7 Author: Simon McVittie <[email protected]> Date: Sun Mar 12 16:10:24 2017 +0000 New upstream snapshot - Drop patches that were applied upstream --- debian/changelog | 7 + ...m-SOURCE_DATE_EPOCH-for-reproducible-buil.patch | 178 --------------------- ...arm-debug-code-that-writes-to-c-nofreeent.patch | 2 +- debian/patches/series | 2 - ...d-failure-on-big-endian-CPUs-with-C-11-co.patch | 63 -------- 5 files changed, 8 insertions(+), 244 deletions(-) diff --git a/debian/changelog b/debian/changelog index fcffe88..4f14d9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +openjk (0~20170312+dfsg1-1) UNRELEASED; urgency=medium + + * New upstream snapshot + - Drop patches that were applied upstream + + -- Simon McVittie <[email protected]> Sun, 12 Mar 2017 16:10:01 +0000 + openjk (0~20170122+dfsg1-1) experimental; urgency=medium * New upstream snapshot 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 6228233..0000000 --- a/debian/patches/Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch +++ /dev/null @@ -1,178 +0,0 @@ -From: Simon McVittie <[email protected]> -Date: Fri, 28 Oct 2016 11:09:16 +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. - -Similar to <https://github.com/ioquake/ioq3/pull/225>. - -Forwarded: https://github.com/JACoders/OpenJK/pull/874 ---- - CMakeLists.txt | 9 +++++++++ - code/game/g_main.cpp | 4 ++-- - code/qcommon/common.cpp | 4 ++-- - codeJK2/game/g_main.cpp | 4 ++-- - codemp/game/g_main.c | 2 +- - codemp/game/g_xcvar.h | 2 +- - codemp/qcommon/common.cpp | 4 ++-- - shared/qcommon/q_platform.h | 5 +++++ - 8 files changed, 24 insertions(+), 10 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7a17d4d7..e393e4b5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -302,6 +302,15 @@ if(BuildPortableVersion) - set(SharedDefines ${SharedDefines} "_PORTABLE_VERSION") - endif() - -+# https://reproducible-builds.org/specs/source-date-epoch/ -+if (NOT ("$ENV{SOURCE_DATE_EPOCH}" STREQUAL "")) -+ execute_process(COMMAND "date" -+ "--date=@$ENV{SOURCE_DATE_EPOCH}" "+%b %_d %Y" -+ OUTPUT_VARIABLE source_date -+ ERROR_QUIET -+ OUTPUT_STRIP_TRAILING_WHITESPACE) -+ set(SharedDefines ${SharedDefines} "SOURCE_DATE=\"${source_date}\"") -+endif() - - - -diff --git a/code/game/g_main.cpp b/code/game/g_main.cpp -index 8ae2c6d4..6b385af3 100644 ---- a/code/game/g_main.cpp -+++ b/code/game/g_main.cpp -@@ -617,7 +617,7 @@ void G_InitCvars( void ) { - - // noset vars - gi.cvar( "gamename", GAMEVERSION , CVAR_SERVERINFO | CVAR_ROM ); -- gi.cvar( "gamedate", __DATE__ , CVAR_ROM ); -+ gi.cvar( "gamedate", SOURCE_DATE , CVAR_ROM ); - g_skippingcin = gi.cvar ("skippingCinematic", "0", CVAR_ROM); - - // latched vars -@@ -734,7 +734,7 @@ void InitGame( const char *mapname, const char *spawntarget, int checkSum, cons - - gi.Printf ("------- Game Initialization -------\n"); - gi.Printf ("gamename: %s\n", GAMEVERSION); -- gi.Printf ("gamedate: %s\n", __DATE__); -+ gi.Printf ("gamedate: %s\n", SOURCE_DATE); - - srand( randomSeed ); - -diff --git a/code/qcommon/common.cpp b/code/qcommon/common.cpp -index a1e73e49..031e2b3b 100644 ---- a/code/qcommon/common.cpp -+++ b/code/qcommon/common.cpp -@@ -1050,7 +1050,7 @@ Com_Init - void Com_Init( char *commandLine ) { - char *s; - -- Com_Printf( "%s %s %s\n", Q3_VERSION, PLATFORM_STRING, __DATE__ ); -+ Com_Printf( "%s %s %s\n", Q3_VERSION, PLATFORM_STRING, SOURCE_DATE ); - - try { - Com_InitZoneMemory(); -@@ -1126,7 +1126,7 @@ void Com_Init( char *commandLine ) { - Cmd_AddCommand ("freeze", Com_Freeze_f); - } - -- s = va("%s %s %s", Q3_VERSION, PLATFORM_STRING, __DATE__ ); -+ s = va("%s %s %s", Q3_VERSION, PLATFORM_STRING, SOURCE_DATE ); - com_version = Cvar_Get ("version", s, CVAR_ROM | CVAR_SERVERINFO ); - - #ifdef JK2_MODE -diff --git a/codeJK2/game/g_main.cpp b/codeJK2/game/g_main.cpp -index ef781737..3dba32dd 100644 ---- a/codeJK2/game/g_main.cpp -+++ b/codeJK2/game/g_main.cpp -@@ -558,7 +558,7 @@ void G_InitCvars( void ) { - - // noset vars - gi.cvar( "gamename", GAMEVERSION , CVAR_SERVERINFO | CVAR_ROM ); -- gi.cvar( "gamedate", __DATE__ , CVAR_ROM ); -+ gi.cvar( "gamedate", SOURCE_DATE , CVAR_ROM ); - g_skippingcin = gi.cvar ("skippingCinematic", "0", CVAR_ROM); - - // latched vars -@@ -620,7 +620,7 @@ void InitGame( const char *mapname, const char *spawntarget, int checkSum, cons - - gi.Printf ("------- Game Initialization -------\n"); - gi.Printf ("gamename: %s\n", GAMEVERSION); -- gi.Printf ("gamedate: %s\n", __DATE__); -+ gi.Printf ("gamedate: %s\n", SOURCE_DATE); - - srand( randomSeed ); - -diff --git a/codemp/game/g_main.c b/codemp/game/g_main.c -index e2a3e6bf..f70f6e17 100644 ---- a/codemp/game/g_main.c -+++ b/codemp/game/g_main.c -@@ -193,7 +193,7 @@ void G_InitGame( int levelTime, int randomSeed, int restart ) { - - trap->Print ("------- Game Initialization -------\n"); - trap->Print ("gamename: %s\n", GAMEVERSION); -- trap->Print ("gamedate: %s\n", __DATE__); -+ trap->Print ("gamedate: %s\n", SOURCE_DATE); - - srand( randomSeed ); - -diff --git a/codemp/game/g_xcvar.h b/codemp/game/g_xcvar.h -index ea1761c7..ff0588bc 100644 ---- a/codemp/game/g_xcvar.h -+++ b/codemp/game/g_xcvar.h -@@ -165,7 +165,7 @@ XCVAR_DEF( g_voteDelay, "3000", NULL, CVAR_NONE, qfalse ) - XCVAR_DEF( g_warmup, "20", NULL, CVAR_ARCHIVE, qtrue ) - XCVAR_DEF( g_weaponDisable, "0", NULL, CVAR_SERVERINFO|CVAR_ARCHIVE|CVAR_LATCH, qtrue ) - XCVAR_DEF( g_weaponRespawn, "5", NULL, CVAR_NONE, qtrue ) --XCVAR_DEF( gamedate, __DATE__, NULL, CVAR_ROM, qfalse ) -+XCVAR_DEF( gamedate, SOURCE_DATE, NULL, CVAR_ROM, qfalse ) - XCVAR_DEF( gamename, GAMEVERSION, NULL, CVAR_SERVERINFO|CVAR_ROM, qfalse ) - 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 525e3d44..3011c8de 100644 ---- a/codemp/qcommon/common.cpp -+++ b/codemp/qcommon/common.cpp -@@ -1126,7 +1126,7 @@ void Com_Init( char *commandLine ) { - char *s; - int qport; - -- Com_Printf( "%s %s %s\n", JK_VERSION, PLATFORM_STRING, __DATE__ ); -+ Com_Printf( "%s %s %s\n", JK_VERSION, PLATFORM_STRING, SOURCE_DATE ); - - try - { -@@ -1241,7 +1241,7 @@ void Com_Init( char *commandLine ) { - - com_bootlogo = Cvar_Get( "com_bootlogo", "1", CVAR_ARCHIVE, "Show intro movies" ); - -- s = va("%s %s %s", JK_VERSION_OLD, PLATFORM_STRING, __DATE__ ); -+ s = va("%s %s %s", JK_VERSION_OLD, PLATFORM_STRING, SOURCE_DATE ); - com_version = Cvar_Get ("version", s, CVAR_ROM | CVAR_SERVERINFO ); - - SE_Init(); -diff --git a/shared/qcommon/q_platform.h b/shared/qcommon/q_platform.h -index aa8ff139..8af17226 100644 ---- a/shared/qcommon/q_platform.h -+++ b/shared/qcommon/q_platform.h -@@ -358,3 +358,8 @@ typedef union byteAlias_u { - #else - #define PLATFORM_STRING OS_STRING "-" ARCH_STRING "-debug" - #endif -+ -+// to support https://reproducible-builds.org/specs/source-date-epoch/ -+#ifndef SOURCE_DATE -+#define SOURCE_DATE __DATE__ -+#endif diff --git a/debian/patches/g_utils-disarm-debug-code-that-writes-to-c-nofreeent.patch b/debian/patches/g_utils-disarm-debug-code-that-writes-to-c-nofreeent.patch index 0d4fd49..48069d9 100644 --- a/debian/patches/g_utils-disarm-debug-code-that-writes-to-c-nofreeent.patch +++ b/debian/patches/g_utils-disarm-debug-code-that-writes-to-c-nofreeent.patch @@ -12,7 +12,7 @@ Forwarded: no 1 file changed, 2 insertions(+) diff --git a/code/game/g_utils.cpp b/code/game/g_utils.cpp -index 9273fad5..4d04c157 100644 +index 9273fad..4d04c15 100644 --- a/code/game/g_utils.cpp +++ b/code/game/g_utils.cpp @@ -818,6 +818,7 @@ gentity_t *G_Spawn( void ) diff --git a/debian/patches/series b/debian/patches/series index 603a0f6..e0f7a6b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ -Pick-up-date-from-SOURCE_DATE_EPOCH-for-reproducible-buil.patch g_utils-disarm-debug-code-that-writes-to-c-nofreeent.patch -snd_mem-fix-build-failure-on-big-endian-CPUs-with-C-11-co.patch diff --git a/debian/patches/snd_mem-fix-build-failure-on-big-endian-CPUs-with-C-11-co.patch b/debian/patches/snd_mem-fix-build-failure-on-big-endian-CPUs-with-C-11-co.patch deleted file mode 100644 index 9bf58de..0000000 --- a/debian/patches/snd_mem-fix-build-failure-on-big-endian-CPUs-with-C-11-co.patch +++ /dev/null @@ -1,63 +0,0 @@ -From: Simon McVittie <[email protected]> -Date: Sat, 29 Oct 2016 13:07:04 +0100 -Subject: snd_mem: fix build failure on big-endian CPUs with C++11 compilers - -The Debian powerpc, mips and s390x builds failed with: - -.../code/client/snd_mem.cpp: In function 'qboolean S_LoadSound_Actual(sfx_t*)': -.../code/client/snd_mem.cpp:843:54: error: invalid operands of types '__gnu_cxx::__enable_if<true, double>::__type {aka double}' and 'int' to binary 'operator>>' - if (sfx->fVolRange < (abs(sfx->pSoundData[i]) >> 8)) - ~~~~~~~~~~~~~~~~~~~~~~~~^~~~ -.../code/client/snd_mem.cpp:845:50: error: invalid operands of types '__gnu_cxx::__enable_if<true, double>::__type {aka double}' and 'int' to binary 'operator>>' - sfx->fVolRange = abs(sfx->pSoundData[i]) >> 8; - ~~~~~~~~~~~~~~~~~~~~~~~~^~~~ - -This appears to be because sfx->pSoundData[i] is of type short. C++98 -only provided int abs(int), long abs(long), float abs(float), -double abs(double) and long double abs(long double) overloads, but -C++11 also provides double abs(T) for all integral types T, including -short. double is not a valid left-hand side for operator>> so -compilation fails. - -Forwarded: https://github.com/JACoders/OpenJK/pull/886 ---- - code/client/snd_mem.cpp | 6 ++++-- - codemp/client/snd_mem.cpp | 6 ++++-- - 2 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/code/client/snd_mem.cpp b/code/client/snd_mem.cpp -index 821c8424..f2a003ed 100644 ---- a/code/client/snd_mem.cpp -+++ b/code/client/snd_mem.cpp -@@ -840,9 +840,11 @@ static qboolean S_LoadSound_Actual( sfx_t *sfx ) - for (int i = 0; i < sfx->iSoundLengthInSamples; i++) - { - sfx->pSoundData[i] = LittleShort(sfx->pSoundData[i]); -- if (sfx->fVolRange < (abs(sfx->pSoundData[i]) >> 8)) -+ // C++11 defines double abs(short) which is not what we want here, -+ // because double >> int is not defined. Force interpretation as int -+ if (sfx->fVolRange < (abs(static_cast<int>(sfx->pSoundData[i])) >> 8)) - { -- sfx->fVolRange = abs(sfx->pSoundData[i]) >> 8; -+ sfx->fVolRange = abs(static_cast<int>(sfx->pSoundData[i])) >> 8; - } - } - #endif -diff --git a/codemp/client/snd_mem.cpp b/codemp/client/snd_mem.cpp -index 62adbdd1..ba07a335 100644 ---- a/codemp/client/snd_mem.cpp -+++ b/codemp/client/snd_mem.cpp -@@ -839,9 +839,11 @@ static qboolean S_LoadSound_Actual( sfx_t *sfx ) - for (int i = 0; i < sfx->iSoundLengthInSamples; i++) - { - sfx->pSoundData[i] = LittleShort(sfx->pSoundData[i]); -- if (sfx->fVolRange < (abs(sfx->pSoundData[i]) >> 8)) -+ // C++11 defines double abs(short) which is not what we want here, -+ // because double >> int is not defined. Force interpretation as int -+ if (sfx->fVolRange < (abs(static_cast<int>(sfx->pSoundData[i])) >> 8)) - { -- sfx->fVolRange = abs(sfx->pSoundData[i]) >> 8; -+ sfx->fVolRange = abs(static_cast<int>(sfx->pSoundData[i])) >> 8; - } - } - #endif -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
