[yquake2] 05/09: refresh patches
Simon McVittie
smcv at debian.org
Tue May 5 10:40:25 UTC 2015
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository yquake2.
commit 9ad655c5308b9e1da46907bb7e5837281c7c81a1
Author: Simon McVittie <smcv at debian.org>
Date: Tue May 5 10:39:57 2015 +0100
refresh patches
- drop patch adding LIBDIR: the engine now looks for files relative
to the executable, which happens to be exactly the directory we were
using as our LIBDIR
---
debian/changelog | 4 ++
...-LD-FLAGS-instead-of-overriding-them-to-o.patch | 11 ++--
...2-Fix-spelling-errors-detected-by-lintian.patch | 10 ++--
...chitecture-dependent-files-in-a-separate-.patch | 44 ---------------
...Optionally-link-libopenal-at-compile-time.patch | 63 +++++++---------------
debian/patches/series | 1 -
6 files changed, 33 insertions(+), 100 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b7376a3..7e47ec6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ yquake2 (5.30~dfsg1-1) UNRELEASED; urgency=medium
* New upstream release
- update debian/copyright
+ - refresh patches
+ - drop patch adding LIBDIR: the engine now looks for files relative
+ to the executable, which happens to be exactly the directory we were
+ using as our LIBDIR
* Use https and cgit for Vcs-Browser
-- Simon McVittie <smcv at debian.org> Tue, 05 May 2015 10:26:54 +0100
diff --git a/debian/patches/0001-Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch b/debian/patches/0001-Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
index c19de77..6d44235 100644
--- a/debian/patches/0001-Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
+++ b/debian/patches/0001-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 9689645..3e1aada 100644
+index 2609513..9ce3d76 100755
--- a/Makefile
+++ b/Makefile
-@@ -140,12 +140,13 @@ endif
+@@ -153,13 +153,14 @@ endif
#
# -MMD to generate header dependencies. (They cannot be
# generated if building universal binaries on OSX)
@@ -23,15 +23,16 @@ index 9689645..3e1aada 100644
ifeq ($(OSTYPE), Darwin)
-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
+CFLAGS += -O2 -fno-strict-aliasing -fomit-frame-pointer \
- -Wall -pipe -g
+ -Wall -pipe -g
+ #-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 \
+CFLAGS += -O2 -fno-strict-aliasing -fomit-frame-pointer \
- -Wall -pipe -g -MMD
+ -Wall -pipe -g -ggdb -MMD
endif
-@@ -204,9 +205,9 @@ endif
+@@ -227,9 +228,9 @@ endif
# Base LDFLAGS.
ifeq ($(OSTYPE),Linux)
diff --git a/debian/patches/0002-Fix-spelling-errors-detected-by-lintian.patch b/debian/patches/0002-Fix-spelling-errors-detected-by-lintian.patch
index c50b48e..f9bd245 100644
--- a/debian/patches/0002-Fix-spelling-errors-detected-by-lintian.patch
+++ b/debian/patches/0002-Fix-spelling-errors-detected-by-lintian.patch
@@ -8,13 +8,13 @@ Subject: Fix spelling-errors detected by lintian
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/backends/unix/signalhandler.c b/src/backends/unix/signalhandler.c
-index 1ae2435..2cada6d 100644
+index ec36e8d..afeef93 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", VERSION);
+ printf("Version: %s\n", YQ2VERSION);
- printf("Plattform: %s\n", BUILDSTRING);
+ printf("Platform: %s\n", BUILDSTRING);
printf("Architecture: %s\n", CPUSTRING);
@@ -23,13 +23,13 @@ index 1ae2435..2cada6d 100644
@@ -70,7 +70,7 @@ printBacktrace(int sig)
{
printf("Product: Yamagi Quake II\n");
- printf("Version: %s\n", VERSION);
+ printf("Version: %s\n", YQ2VERSION);
- printf("Plattform: %s\n", BUILDSTRING);
+ printf("Platform: %s\n", BUILDSTRING);
printf("Architecture: %s\n", CPUSTRING);
printf("Compiler: %s\n", __VERSION__);
printf("Signal: %i\n", sig);
-@@ -98,7 +98,7 @@ signalhandler(int sig)
+@@ -97,7 +97,7 @@ signalhandler(int sig)
printf(" - game.so (the game.so of the mod you were playing\n");
printf(" when the game crashed. baseq2/game.so for the\n");
printf(" main game)\n\n");
@@ -39,7 +39,7 @@ index 1ae2435..2cada6d 100644
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 a72981e..4351808 100644
+index 09ac8a8..ce235e2 100644
--- a/src/game/savegame/savegame.c
+++ b/src/game/savegame/savegame.c
@@ -835,18 +835,18 @@ ReadGame(const char *filename)
diff --git a/debian/patches/0003-Look-for-architecture-dependent-files-in-a-separate-.patch b/debian/patches/0003-Look-for-architecture-dependent-files-in-a-separate-.patch
deleted file mode 100644
index 5a3be81..0000000
--- a/debian/patches/0003-Look-for-architecture-dependent-files-in-a-separate-.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Fabian Greffrath <fabian+debian at greffrath.com>
-Date: Mon, 13 Jan 2014 10:02:11 +0000
-Subject: Look for architecture-dependent files in a separate LIBDIR directory
-
-[Updated for yquake2/5.21, added commit message -Simon McVittie]
----
- src/common/filesystem.c | 2 ++
- src/common/header/common.h | 3 +++
- 2 files changed, 5 insertions(+)
-
-diff --git a/src/common/filesystem.c b/src/common/filesystem.c
-index 35064b2..72cc055 100644
---- a/src/common/filesystem.c
-+++ b/src/common/filesystem.c
-@@ -1675,6 +1675,7 @@ FS_SetGamedir(char *dir)
- #endif
-
- FS_AddGameDirectory(va("%s/%s", fs_basedir->string, dir));
-+ FS_AddGameDirectory(va("%s/%s", LIBDIR, dir));
- FS_AddHomeAsGameDirectory(dir);
- }
- }
-@@ -2088,6 +2089,7 @@ FS_InitFilesystem(void)
-
- /* Add baseq2 to search path. */
- FS_AddGameDirectory(va("%s/" BASEDIRNAME, fs_basedir->string));
-+ FS_AddGameDirectory(va("%s/" BASEDIRNAME, LIBDIR));
- FS_AddHomeAsGameDirectory(BASEDIRNAME);
-
- /* Any set gamedirs will be freed up to here. */
-diff --git a/src/common/header/common.h b/src/common/header/common.h
-index 2f1d570..fbdc233 100644
---- a/src/common/header/common.h
-+++ b/src/common/header/common.h
-@@ -79,6 +79,9 @@
- #define LIBGL "libGL.so.1"
- #endif
-
-+#ifndef LIBDIR
-+ #define LIBDIR "."
-+#endif
-
- /* ================================================================== */
-
diff --git a/debian/patches/0004-Optionally-link-libopenal-at-compile-time.patch b/debian/patches/0004-Optionally-link-libopenal-at-compile-time.patch
index 9279e08..403ecd0 100644
--- a/debian/patches/0004-Optionally-link-libopenal-at-compile-time.patch
+++ b/debian/patches/0004-Optionally-link-libopenal-at-compile-time.patch
@@ -11,16 +11,16 @@ defeats that.
The Debian packaging previously did the same for libGL, but an
equivalent change was made upstream in version 5.20.
---
- Makefile | 19 +++-
- src/backends/generic/qal.c | 217 ++++++++++++++++++++++++---------------------
+ Makefile | 19 ++++-
+ src/backends/generic/qal.c | 206 ++++++++++++++++++++++++---------------------
src/backends/unix/system.c | 16 +++-
- 3 files changed, 146 insertions(+), 106 deletions(-)
+ 3 files changed, 139 insertions(+), 102 deletions(-)
diff --git a/Makefile b/Makefile
-index 3e1aada..2adec6c 100644
+index 9ce3d76..9863fa2 100755
--- a/Makefile
+++ b/Makefile
-@@ -38,6 +38,12 @@ WITH_OGG:=yes
+@@ -44,6 +44,12 @@ WITH_OGG:=yes
# installed
WITH_OPENAL:=yes
@@ -30,10 +30,10 @@ index 3e1aada..2adec6c 100644
+# time in the normal way.
+DLOPEN_OPENAL:=yes
+
- # Enables retexturing support. Adds
- # a dependency to libjpeg
- WITH_RETEXTURING:=yes
-@@ -395,15 +401,20 @@ endif
+ # 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 -lvorbisfile -logg
endif
ifeq ($(WITH_OPENAL),yes)
@@ -42,9 +42,8 @@ index 3e1aada..2adec6c 100644
-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='"/System/Library/Frameworks/OpenAL.framework/OpenAL"'
-+release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"/System/Library/Frameworks/OpenAL.framework/OpenAL"' -DDLOPEN_OPENAL
- release/quake2 : LDFLAGS += -framework OpenAL
+-release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.dylib"'
++release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.dylib"' -DDLOPEN_OPENAL
else
-release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.so.1"'
-endif
@@ -59,27 +58,10 @@ index 3e1aada..2adec6c 100644
ifeq ($(WITH_ZIP),yes)
release/quake2 : CFLAGS += -DZIP -DNOUNCRYPT
diff --git a/src/backends/generic/qal.c b/src/backends/generic/qal.c
-index b3eef6d..fba2e4c 100644
+index ae04ac2..b5cdef4 100644
--- a/src/backends/generic/qal.c
+++ b/src/backends/generic/qal.c
-@@ -32,6 +32,8 @@
-
- #ifdef USE_OPENAL
-
-+#define AL_ALEXT_PROTOTYPES
-+
- #if defined (__APPLE__)
- #include <OpenAL/al.h>
- #include <OpenAL/alc.h>
-@@ -39,6 +41,7 @@
- #include <AL/al.h>
- #include <AL/alc.h>
- #include <AL/alext.h>
-+#include <AL/efx.h>
- #endif
-
- #include "../../common/header/common.h"
-@@ -48,7 +51,9 @@
+@@ -43,7 +43,9 @@
static ALCcontext *context;
static ALCdevice *device;
static cvar_t *al_device;
@@ -89,9 +71,9 @@ index b3eef6d..fba2e4c 100644
static void *handle;
/* Function pointers for OpenAL management */
-@@ -331,9 +336,12 @@ QAL_Shutdown()
+@@ -322,9 +324,12 @@ QAL_Shutdown()
+ qalFilterf = NULL;
qalDeleteFilters = NULL;
- #endif
- /* Unload the shared lib */
- Sys_FreeLibrary(handle);
@@ -105,7 +87,7 @@ index b3eef6d..fba2e4c 100644
}
/*
-@@ -343,9 +351,11 @@ QAL_Shutdown()
+@@ -334,9 +339,11 @@ QAL_Shutdown()
qboolean
QAL_Init()
{
@@ -118,7 +100,7 @@ index b3eef6d..fba2e4c 100644
Com_Printf("LoadLibrary(%s)\n", al_driver->string);
-@@ -357,109 +367,114 @@ QAL_Init()
+@@ -348,104 +355,109 @@ QAL_Init()
Com_Printf("Loading %s failed! Disabling OpenAL.\n", al_driver->string);
return false;
}
@@ -318,18 +300,9 @@ index b3eef6d..fba2e4c 100644
+ qalDopplerVelocity = ALSYMBOL(handle, alDopplerVelocity);
+ qalSpeedOfSound = ALSYMBOL(handle, alSpeedOfSound);
+ qalDistanceModel = ALSYMBOL(handle, alDistanceModel);
- #if !defined (__APPLE__)
-- qalGenFilters = Sys_GetProcAddress(handle, "alGenFilters");
-- qalFilteri = Sys_GetProcAddress(handle, "alFilteri");
-- qalFilterf = Sys_GetProcAddress(handle, "alFilterf");
-- qalDeleteFilters = Sys_GetProcAddress(handle, "alDeleteFilters");
-+ qalGenFilters = ALSYMBOL(handle, alGenFilters);
-+ qalFilteri = ALSYMBOL(handle, alFilteri);
-+ qalFilterf = ALSYMBOL(handle, alFilterf);
-+ qalDeleteFilters = ALSYMBOL(handle, alDeleteFilters);
- #endif
/* Open the OpenAL device */
+ Com_Printf("...opening OpenAL device:");
diff --git a/src/backends/unix/system.c b/src/backends/unix/system.c
index 79cb942..9617b28 100644
--- a/src/backends/unix/system.c
diff --git a/debian/patches/series b/debian/patches/series
index 8be08cc..2941827 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
0001-Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
0002-Fix-spelling-errors-detected-by-lintian.patch
-0003-Look-for-architecture-dependent-files-in-a-separate-.patch
0004-Optionally-link-libopenal-at-compile-time.patch
--
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