[yquake2] 05/11: refresh patches
Simon McVittie
smcv at debian.org
Thu Jun 30 09:23:56 UTC 2016
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository yquake2.
commit 5bc79d18f40d799ae0f9ccd90a406f18c3088605
Author: Simon McVittie <smcv at debian.org>
Date: Thu Jun 30 08:07:41 2016 +0100
refresh patches
---
debian/changelog | 1 +
...TE-macro-which-overrides-__DATE__-for-rep.patch | 29 +++++--
...-LD-FLAGS-instead-of-overriding-them-to-o.patch | 5 +-
.../Fix-spelling-errors-detected-by-lintian.patch | 92 +++++++++++++++-------
...Optionally-link-libopenal-at-compile-time.patch | 18 +++--
.../Remove-unwanted-rpaths-from-LDFLAGS.patch | 4 +-
6 files changed, 103 insertions(+), 46 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ba73718..65f4092 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ yquake2 (5.34~dfsg1-1) UNRELEASED; urgency=medium
* New upstream release
- no longer specific to amd64 and i386 (Closes: #826689)
- install 3D crosshair for stereoscopic rendering
+ - refresh patches
-- Simon McVittie <smcv at debian.org> Fri, 22 Jan 2016 11:11:19 +0000
diff --git a/debian/patches/Add-BUILDDATE-macro-which-overrides-__DATE__-for-rep.patch b/debian/patches/Add-BUILDDATE-macro-which-overrides-__DATE__-for-rep.patch
index 20824e4..b485439 100644
--- a/debian/patches/Add-BUILDDATE-macro-which-overrides-__DATE__-for-rep.patch
+++ b/debian/patches/Add-BUILDDATE-macro-which-overrides-__DATE__-for-rep.patch
@@ -5,13 +5,15 @@ Subject: Add BUILDDATE macro which overrides __DATE__, for reproducible builds
---
src/common/header/common.h | 4 ++++
src/common/misc.c | 2 +-
- src/game/savegame/savegame.c | 2 +-
- 3 files changed, 6 insertions(+), 2 deletions(-)
+ src/game/savegame/savegame.c | 4 ++--
+ 3 files changed, 7 insertions(+), 3 deletions(-)
+diff --git a/src/common/header/common.h b/src/common/header/common.h
+index 9199fe0..39a66e8 100644
--- a/src/common/header/common.h
+++ b/src/common/header/common.h
-@@ -63,6 +63,10 @@
- #define CPUSTRING "Unknown"
+@@ -44,6 +44,10 @@
+ #error ARCH should be defined by the build system
#endif
+#ifndef BUILDDATE
@@ -21,20 +23,33 @@ Subject: Add BUILDDATE macro which overrides __DATE__, for reproducible builds
#ifdef _WIN32
#define CFGDIR "YamagiQ2"
#else
+diff --git a/src/common/misc.c b/src/common/misc.c
+index 98a90e5..c9088ca 100644
--- a/src/common/misc.c
+++ b/src/common/misc.c
@@ -241,7 +241,7 @@ Qcommon_Init(int argc, char **argv)
dedicated = Cvar_Get("dedicated", "0", CVAR_NOSET);
#endif
-- s = va("%s %s %s %s", YQ2VERSION, CPUSTRING, __DATE__, BUILDSTRING);
-+ s = va("%s %s %s %s", YQ2VERSION, CPUSTRING, BUILDDATE, BUILDSTRING);
+- s = va("%s %s %s %s", YQ2VERSION, ARCH, __DATE__, OSTYPE);
++ s = va("%s %s %s %s", YQ2VERSION, ARCH, BUILDDATE, OSTYPE);
Cvar_Get("version", s, CVAR_SERVERINFO | CVAR_NOSET);
if (dedicated->value)
+diff --git a/src/game/savegame/savegame.c b/src/game/savegame/savegame.c
+index 1d1e133..188bc05 100644
--- a/src/game/savegame/savegame.c
+++ b/src/game/savegame/savegame.c
-@@ -217,7 +217,7 @@ InitGame(void)
+@@ -207,7 +207,7 @@ void
+ InitGame(void)
+ {
+ gi.dprintf("Game is starting up.\n");
+- gi.dprintf("Game is %s built on %s.\n", GAMEVERSION, __DATE__);
++ gi.dprintf("Game is %s built on %s.\n", GAMEVERSION, BUILDDATE);
+
+ gun_x = gi.cvar("gun_x", "0", 0);
+ gun_y = gi.cvar("gun_y", "0", 0);
+@@ -223,7 +223,7 @@ InitGame(void)
/* latched vars */
sv_cheats = gi.cvar("cheats", "0", CVAR_SERVERINFO | CVAR_LATCH);
gi.cvar("gamename", GAMEVERSION, CVAR_SERVERINFO | CVAR_LATCH);
diff --git a/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch b/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
index 58e8e3d..5f65bba 100644
--- a/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
+++ b/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
@@ -12,10 +12,10 @@ but yquake2 doesn't.
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
-index 580da76..cfd936a 100755
+index 05c06ad..5b9c60a 100755
--- a/Makefile
+++ b/Makefile
-@@ -153,13 +153,14 @@ endif
+@@ -149,12 +149,13 @@ endif
#
# -MMD to generate header dependencies. (They cannot be
# generated if building universal binaries on OSX)
@@ -24,7 +24,6 @@ index 580da76..cfd936a 100755
-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
+CFLAGS += -O2 -fno-strict-aliasing -fomit-frame-pointer \
-Wall -pipe -g -fwrapv
- #-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.5.sdk
CFLAGS += $(OSX_ARCH)
else
-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
diff --git a/debian/patches/Fix-spelling-errors-detected-by-lintian.patch b/debian/patches/Fix-spelling-errors-detected-by-lintian.patch
index d64cd3f..a57d4f7 100644
--- a/debian/patches/Fix-spelling-errors-detected-by-lintian.patch
+++ b/debian/patches/Fix-spelling-errors-detected-by-lintian.patch
@@ -3,28 +3,30 @@ Date: Mon, 13 Jan 2014 09:14:44 +0000
Subject: Fix spelling-errors detected by lintian
---
- src/backends/unix/signalhandler.c | 6 +++---
- src/game/savegame/savegame.c | 6 +++---
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ src/backends/unix/signalhandler.c | 6 +++---
+ src/game/savegame/savegame.c | 14 +++++++-------
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+diff --git a/src/backends/unix/signalhandler.c b/src/backends/unix/signalhandler.c
+index 2f802df..2a984cf 100644
--- a/src/backends/unix/signalhandler.c
+++ b/src/backends/unix/signalhandler.c
@@ -49,7 +49,7 @@ printBacktrace(int sig)
printf("Product: Yamagi Quake II\n");
printf("Version: %s\n", YQ2VERSION);
-- printf("Plattform: %s\n", BUILDSTRING);
-+ printf("Platform: %s\n", BUILDSTRING);
- printf("Architecture: %s\n", CPUSTRING);
+- printf("Plattform: %s\n", OSTYPE);
++ printf("Platform: %s\n", OSTYPE);
+ printf("Architecture: %s\n", ARCH);
printf("Compiler: %s\n", __VERSION__);
printf("Signal: %i\n", sig);
@@ -70,7 +70,7 @@ printBacktrace(int sig)
{
printf("Product: Yamagi Quake II\n");
printf("Version: %s\n", YQ2VERSION);
-- printf("Plattform: %s\n", BUILDSTRING);
-+ printf("Platform: %s\n", BUILDSTRING);
- printf("Architecture: %s\n", CPUSTRING);
+- printf("Plattform: %s\n", OSTYPE);
++ printf("Platform: %s\n", OSTYPE);
+ printf("Architecture: %s\n", ARCH);
printf("Compiler: %s\n", __VERSION__);
printf("Signal: %i\n", sig);
@@ -97,7 +97,7 @@ signalhandler(int sig)
@@ -36,27 +38,61 @@ Subject: Fix spelling-errors detected by lintian
printf("\nThank you very much for your help, making Yamagi Quake\n");
printf("II an even better source port. It's much appreciated.\n");
printf("\n=======================================================\n\n");
+diff --git a/src/game/savegame/savegame.c b/src/game/savegame/savegame.c
+index 9dc0878..1d1e133 100644
--- a/src/game/savegame/savegame.c
+++ b/src/game/savegame/savegame.c
-@@ -835,18 +835,18 @@ ReadGame(const char *filename)
- else if (strcmp(str_game, GAMEVERSION))
- {
- fclose(f);
-- gi.error("Savegame from an other game.so.\n");
-+ gi.error("Savegame from another game.so.\n");
- }
- else if (strcmp(str_os, OS))
- {
- fclose(f);
-- gi.error("Savegame from an other os.\n");
-+ gi.error("Savegame from another os.\n");
+@@ -838,17 +838,17 @@ ReadGame(const char *filename)
+ if (strcmp(str_game, GAMEVERSION))
+ {
+ fclose(f);
+- gi.error("Savegame from an other game.so.\n");
++ gi.error("Savegame from another game.so.\n");
+ }
+ else if (strcmp(str_os, OSTYPE))
+ {
+ fclose(f);
+- gi.error("Savegame from an other os.\n");
++ gi.error("Savegame from another os.\n");
+ }
+ else if (strcmp(str_arch, ARCH))
+ {
+ fclose(f);
+- gi.error("Savegame from an other architecure.\n");
++ gi.error("Savegame from another architecture.\n");
+ }
}
+ else if (!strcmp(str_ver, "YQ2-1"))
+@@ -856,12 +856,12 @@ ReadGame(const char *filename)
+ if (strcmp(str_game, GAMEVERSION))
+ {
+ fclose(f);
+- gi.error("Savegame from an other game.so.\n");
++ gi.error("Savegame from another game.so.\n");
+ }
+ else if (strcmp(str_os, OSTYPE_1))
+ {
+ fclose(f);
+- gi.error("Savegame from an other os.\n");
++ gi.error("Savegame from another os.\n");
+ }
- else if (strcmp(str_arch, ARCH))
- {
- fclose(f);
-- gi.error("Savegame from an other architecure.\n");
-+ gi.error("Savegame from another architecure.\n");
+ if (!strcmp(str_os, "Windows"))
+@@ -870,7 +870,7 @@ ReadGame(const char *filename)
+ if (strcmp(str_arch, "i386"))
+ {
+ fclose(f);
+- gi.error("Savegame from an other architecure.\n");
++ gi.error("Savegame from another architecture.\n");
+ }
+ }
+ else
+@@ -878,7 +878,7 @@ ReadGame(const char *filename)
+ if (strcmp(str_arch, ARCH_1))
+ {
+ fclose(f);
+- gi.error("Savegame from an other architecure.\n");
++ gi.error("Savegame from another architecture.\n");
+ }
+ }
}
-
- g_edicts = gi.TagMalloc(game.maxentities * sizeof(g_edicts[0]), TAG_GAME);
diff --git a/debian/patches/Optionally-link-libopenal-at-compile-time.patch b/debian/patches/Optionally-link-libopenal-at-compile-time.patch
index 05fdd7e..30f991d 100644
--- a/debian/patches/Optionally-link-libopenal-at-compile-time.patch
+++ b/debian/patches/Optionally-link-libopenal-at-compile-time.patch
@@ -11,11 +11,13 @@ defeats that.
The Debian packaging previously did the same for libGL, but an
equivalent change was made upstream in version 5.20.
---
- Makefile | 19 ++++-
+ Makefile | 17 +++-
src/backends/generic/qal.c | 206 ++++++++++++++++++++++++---------------------
src/backends/unix/system.c | 16 +++-
- 3 files changed, 139 insertions(+), 102 deletions(-)
+ 3 files changed, 138 insertions(+), 101 deletions(-)
+diff --git a/Makefile b/Makefile
+index f194347..01405dc 100755
--- a/Makefile
+++ b/Makefile
@@ -44,6 +44,12 @@ WITH_OGG:=yes
@@ -31,7 +33,7 @@ equivalent change was made upstream in version 5.20.
# Use SDL2 instead of SDL1.2. Disables CD audio support,
# because SDL2 has none. Use OGG/Vorbis music instead :-)
# On Windows sdl-config isn't used, so make sure that
-@@ -399,14 +405,19 @@ release/quake2 : LDFLAGS += -lvorbis -lv
+@@ -399,15 +405,20 @@ release/quake2 : LDFLAGS += -lvorbis -lvorbisfile -logg
endif
ifeq ($(WITH_OPENAL),yes)
@@ -40,8 +42,8 @@ equivalent change was made upstream in version 5.20.
-release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.so"'
+release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.so"' -DDLOPEN_OPENAL
else ifeq ($(OSTYPE), Darwin)
--release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.dylib"'
-+release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.dylib"' -DDLOPEN_OPENAL
+ release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.dylib"' -I/usr/local/opt/openal-soft/include
+ release/quake2 : LDFLAGS += -L/usr/local/opt/openal-soft/lib
else
-release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.so.1"'
-endif
@@ -55,6 +57,8 @@ equivalent change was made upstream in version 5.20.
ifeq ($(WITH_ZIP),yes)
release/quake2 : CFLAGS += -DZIP -DNOUNCRYPT
+diff --git a/src/backends/generic/qal.c b/src/backends/generic/qal.c
+index ae04ac2..b5cdef4 100644
--- a/src/backends/generic/qal.c
+++ b/src/backends/generic/qal.c
@@ -43,7 +43,9 @@
@@ -299,9 +303,11 @@ equivalent change was made upstream in version 5.20.
/* Open the OpenAL device */
Com_Printf("...opening OpenAL device:");
+diff --git a/src/backends/unix/system.c b/src/backends/unix/system.c
+index 13e6a32..93044e1 100644
--- a/src/backends/unix/system.c
+++ b/src/backends/unix/system.c
-@@ -500,7 +500,21 @@ Sys_GetHomeDir(void)
+@@ -480,7 +480,21 @@ Sys_GetHomeDir(void)
void *
Sys_GetProcAddress(void *handle, const char *sym)
{
diff --git a/debian/patches/Remove-unwanted-rpaths-from-LDFLAGS.patch b/debian/patches/Remove-unwanted-rpaths-from-LDFLAGS.patch
index 8d6789b..e747786 100644
--- a/debian/patches/Remove-unwanted-rpaths-from-LDFLAGS.patch
+++ b/debian/patches/Remove-unwanted-rpaths-from-LDFLAGS.patch
@@ -7,10 +7,10 @@ Subject: Remove unwanted rpaths from LDFLAGS
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
-index cfd936a..b0855d1 100755
+index 5b9c60a..f194347 100755
--- a/Makefile
+++ b/Makefile
-@@ -426,23 +426,23 @@ release/quake2 : LDFLAGS += -lGL
+@@ -427,23 +427,23 @@ release/quake2 : LDFLAGS += -lGL
endif
ifeq ($(OSTYPE), FreeBSD)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/yquake2.git
More information about the Pkg-games-commits
mailing list