This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch debian/master in repository yquake2.
commit c6504136c294a38a8578965b0725c368b576196f Author: Simon McVittie <[email protected]> Date: Tue Dec 13 13:33:03 2016 +0000 New upstream release - remove several patches, applied upstream --- debian/changelog | 7 + ...-LD-FLAGS-instead-of-overriding-them-to-o.patch | 6 +- .../Fix-spelling-errors-detected-by-lintian.patch | 114 ------- ...Optionally-link-libopenal-at-compile-time.patch | 338 --------------------- ...de-__DATE__-from-SOURCE_DATE_EPOCH-if-set.patch | 95 ------ .../Remove-unwanted-rpaths-from-LDFLAGS.patch | 4 +- debian/patches/series | 3 - 7 files changed, 12 insertions(+), 555 deletions(-) diff --git a/debian/changelog b/debian/changelog index 51315d9..672428f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +yquake2 (6.00~dfsg1-1) UNRELEASED; urgency=medium + + * New upstream release + - remove several patches, applied upstream + + -- Simon McVittie <[email protected]> Tue, 13 Dec 2016 13:31:54 +0000 + yquake2 (5.34~dfsg1-1) unstable; urgency=medium * Switch Vcs-Git to https (see #810378) 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 5f65bba..102cb82 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 05c06ad..5b9c60a 100755 +index d085c83..54ade51 100755 --- a/Makefile +++ b/Makefile -@@ -149,12 +149,13 @@ endif +@@ -156,12 +156,13 @@ endif # # -MMD to generate header dependencies. (They cannot be # generated if building universal binaries on OSX) @@ -31,7 +31,7 @@ index 05c06ad..5b9c60a 100755 -Wall -pipe -g -ggdb -MMD -fwrapv endif -@@ -227,9 +228,9 @@ endif +@@ -241,9 +242,9 @@ endif # Base LDFLAGS. ifeq ($(OSTYPE),Linux) diff --git a/debian/patches/Fix-spelling-errors-detected-by-lintian.patch b/debian/patches/Fix-spelling-errors-detected-by-lintian.patch deleted file mode 100644 index 49ac79d..0000000 --- a/debian/patches/Fix-spelling-errors-detected-by-lintian.patch +++ /dev/null @@ -1,114 +0,0 @@ -From: Simon McVittie <[email protected]> -Date: Thu, 30 Jun 2016 08:13:24 +0100 -Subject: Fix spelling errors detected by lintian - -Based on a patch by Fabian Greffrath against an earlier version of -yquake2. ---- - src/backends/unix/signalhandler.c | 6 +++--- - src/client/menu/menu.c | 2 +- - src/game/savegame/savegame.c | 14 +++++++------- - 3 files changed, 11 insertions(+), 11 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", 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", 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) - 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"); -- printf(" - Any other data which you think might be usefull\n"); -+ printf(" - Any other data which you think might be useful\n"); - 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/client/menu/menu.c b/src/client/menu/menu.c -index 57ded35..1c5a9d2 100644 ---- a/src/client/menu/menu.c -+++ b/src/client/menu/menu.c -@@ -1696,7 +1696,7 @@ static const char *xatcredits[] = - "Chris Toft", - "Juan Valdes", - "", -- "+THANKS TO INTERGRAPH COMPUTER SYTEMS", -+ "+THANKS TO INTERGRAPH COMPUTER SYSTEMS", - "+IN PARTICULAR:", - "", - "Michael T. Nicolaou", -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 -@@ -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"); - } - - 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"); - } - } - } diff --git a/debian/patches/Optionally-link-libopenal-at-compile-time.patch b/debian/patches/Optionally-link-libopenal-at-compile-time.patch deleted file mode 100644 index d3c41a3..0000000 --- a/debian/patches/Optionally-link-libopenal-at-compile-time.patch +++ /dev/null @@ -1,338 +0,0 @@ -From: Simon McVittie <[email protected]> -Date: Thu, 30 Jun 2016 09:41:57 +0100 -Subject: Optionally link libopenal at compile time - -In Linux distributions, having the executable depend on the right -libraries and arrange for them to be installed is straightforward, -and there's a lot of infrastructure for tracking which library -version a particular executable needs, including making sure we have -a version that contains all of the symbols that were used. Loading -libopenal at runtime defeats that infrastructure. - -The ability to substitute a different-but-compatible libopenal, -or operate with reduced functionality without libopenal, might -still be desirable for generic/portable binary releases. - -The CMake build system already linked the executable to -${OPENAL_LIBRARY} anyway, so it is already a hard dependency in that -build system. ---- - Makefile | 17 +++- - src/backends/generic/qal.c | 206 ++++++++++++++++++++++++--------------------- - src/backends/unix/system.c | 16 +++- - 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 - # installed - WITH_OPENAL:=yes - -+# Enables optional runtime loading of OpenAL (dlopen -+# or similar). -+# If set to "no", the library is linked in at compile -+# time in the normal way. -+DLOPEN_OPENAL:=yes -+ - # 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,15 +405,20 @@ release/quake2 : LDFLAGS += -lvorbis -lvorbisfile -logg - endif - - ifeq ($(WITH_OPENAL),yes) -+ifeq ($(DLOPEN_OPENAL),yes) - ifeq ($(OSTYPE), OpenBSD) --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"' -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 -+release/quake2 : CFLAGS += -DUSE_OPENAL -DDEFAULT_OPENAL_DRIVER='"libopenal.so.1"' -DDLOPEN_OPENAL - endif -+else # !DLOPEN_OPENAL -+release/quake2 : CFLAGS += -DUSE_OPENAL -+release/quake2 : LDFLAGS += -lopenal -+endif # !DLOPEN_OPENAL -+endif # WITH_OPENAL - - 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 @@ - static ALCcontext *context; - static ALCdevice *device; - static cvar_t *al_device; -+#ifdef DLOPEN_OPENAL - static cvar_t *al_driver; -+#endif - static void *handle; - - /* Function pointers for OpenAL management */ -@@ -322,9 +324,12 @@ QAL_Shutdown() - qalFilterf = NULL; - qalDeleteFilters = NULL; - -- /* Unload the shared lib */ -- Sys_FreeLibrary(handle); -- handle = NULL; -+ if (handle) -+ { -+ /* Unload the shared lib */ -+ Sys_FreeLibrary(handle); -+ handle = NULL; -+ } - } - - /* -@@ -334,9 +339,11 @@ QAL_Shutdown() - qboolean - QAL_Init() - { -+ al_device = Cvar_Get("al_device", "", CVAR_ARCHIVE); -+ -+#ifdef DLOPEN_OPENAL - /* DEFAULT_OPENAL_DRIVER is defined at compile time via the compiler */ - al_driver = Cvar_Get("al_driver", DEFAULT_OPENAL_DRIVER, CVAR_ARCHIVE); -- al_device = Cvar_Get("al_device", "", CVAR_ARCHIVE); - - Com_Printf("LoadLibrary(%s)\n", al_driver->string); - -@@ -348,104 +355,109 @@ QAL_Init() - Com_Printf("Loading %s failed! Disabling OpenAL.\n", al_driver->string); - return false; - } -+# define ALSYMBOL(handle, sym) Sys_GetProcAddress(handle, #sym) -+#else -+ handle = NULL; -+# define ALSYMBOL(handle, sym) sym -+#endif - - /* Connect function pointers to management functions */ -- qalcCreateContext = Sys_GetProcAddress(handle, "alcCreateContext"); -- qalcMakeContextCurrent = Sys_GetProcAddress(handle, "alcMakeContextCurrent"); -- qalcProcessContext = Sys_GetProcAddress(handle, "alcProcessContext"); -- qalcSuspendContext = Sys_GetProcAddress(handle, "alcSuspendContext"); -- qalcDestroyContext = Sys_GetProcAddress(handle, "alcDestroyContext"); -- qalcGetCurrentContext = Sys_GetProcAddress(handle, "alcGetCurrentContext"); -- qalcGetContextsDevice = Sys_GetProcAddress(handle, "alcGetContextsDevice"); -- qalcOpenDevice = Sys_GetProcAddress(handle, "alcOpenDevice"); -- qalcCloseDevice = Sys_GetProcAddress(handle, "alcCloseDevice"); -- qalcGetError = Sys_GetProcAddress(handle, "alcGetError"); -- qalcIsExtensionPresent = Sys_GetProcAddress(handle, "alcIsExtensionPresent"); -- qalcGetProcAddress = Sys_GetProcAddress(handle, "alcGetProcAddress"); -- qalcGetEnumValue = Sys_GetProcAddress(handle, "alcGetEnumValue"); -- qalcGetString = Sys_GetProcAddress(handle, "alcGetString"); -- qalcGetIntegerv = Sys_GetProcAddress(handle, "alcGetIntegerv"); -- qalcCaptureOpenDevice = Sys_GetProcAddress(handle, "alcCaptureOpenDevice"); -- qalcCaptureCloseDevice = Sys_GetProcAddress(handle, "alcCaptureCloseDevice"); -- qalcCaptureStart = Sys_GetProcAddress(handle, "alcCaptureStart"); -- qalcCaptureStop = Sys_GetProcAddress(handle, "alcCaptureStop"); -- qalcCaptureSamples = Sys_GetProcAddress(handle, "alcCaptureSamples"); -+ qalcCreateContext = ALSYMBOL(handle, alcCreateContext); -+ qalcMakeContextCurrent = ALSYMBOL(handle, alcMakeContextCurrent); -+ qalcProcessContext = ALSYMBOL(handle, alcProcessContext); -+ qalcSuspendContext = ALSYMBOL(handle, alcSuspendContext); -+ qalcDestroyContext = ALSYMBOL(handle, alcDestroyContext); -+ qalcGetCurrentContext = ALSYMBOL(handle, alcGetCurrentContext); -+ qalcGetContextsDevice = ALSYMBOL(handle, alcGetContextsDevice); -+ qalcOpenDevice = ALSYMBOL(handle, alcOpenDevice); -+ qalcCloseDevice = ALSYMBOL(handle, alcCloseDevice); -+ qalcGetError = ALSYMBOL(handle, alcGetError); -+ qalcIsExtensionPresent = ALSYMBOL(handle, alcIsExtensionPresent); -+ qalcGetProcAddress = ALSYMBOL(handle, alcGetProcAddress); -+ qalcGetEnumValue = ALSYMBOL(handle, alcGetEnumValue); -+ qalcGetString = ALSYMBOL(handle, alcGetString); -+ qalcGetIntegerv = ALSYMBOL(handle, alcGetIntegerv); -+ qalcCaptureOpenDevice = ALSYMBOL(handle, alcCaptureOpenDevice); -+ qalcCaptureCloseDevice = ALSYMBOL(handle, alcCaptureCloseDevice); -+ qalcCaptureStart = ALSYMBOL(handle, alcCaptureStart); -+ qalcCaptureStop = ALSYMBOL(handle, alcCaptureStop); -+ qalcCaptureSamples = ALSYMBOL(handle, alcCaptureSamples); - - /* Connect function pointers to - to OpenAL API functions */ -- qalEnable = Sys_GetProcAddress(handle, "alEnable"); -- qalDisable = Sys_GetProcAddress(handle, "alDisable"); -- qalIsEnabled = Sys_GetProcAddress(handle, "alIsEnabled"); -- qalGetString = Sys_GetProcAddress(handle, "alGetString"); -- qalGetBooleanv = Sys_GetProcAddress(handle, "alGetBooleanv"); -- qalGetIntegerv = Sys_GetProcAddress(handle, "alGetIntegerv"); -- qalGetFloatv = Sys_GetProcAddress(handle, "alGetFloatv"); -- qalGetDoublev = Sys_GetProcAddress(handle, "alGetDoublev"); -- qalGetBoolean = Sys_GetProcAddress(handle, "alGetBoolean"); -- qalGetInteger = Sys_GetProcAddress(handle, "alGetInteger"); -- qalGetFloat = Sys_GetProcAddress(handle, "alGetFloat"); -- qalGetDouble = Sys_GetProcAddress(handle, "alGetDouble"); -- qalGetError = Sys_GetProcAddress(handle, "alGetError"); -- qalIsExtensionPresent = Sys_GetProcAddress(handle, "alIsExtensionPresent"); -- qalGetProcAddress = Sys_GetProcAddress(handle, "alGetProcAddress"); -- qalGetEnumValue = Sys_GetProcAddress(handle, "alGetEnumValue"); -- qalListenerf = Sys_GetProcAddress(handle, "alListenerf"); -- qalListener3f = Sys_GetProcAddress(handle, "alListener3f"); -- qalListenerfv = Sys_GetProcAddress(handle, "alListenerfv"); -- qalListeneri = Sys_GetProcAddress(handle, "alListeneri"); -- qalListener3i = Sys_GetProcAddress(handle, "alListener3i"); -- qalListeneriv = Sys_GetProcAddress(handle, "alListeneriv"); -- qalGetListenerf = Sys_GetProcAddress(handle, "alGetListenerf"); -- qalGetListener3f = Sys_GetProcAddress(handle, "alGetListener3f"); -- qalGetListenerfv = Sys_GetProcAddress(handle, "alGetListenerfv"); -- qalGetListeneri = Sys_GetProcAddress(handle, "alGetListeneri"); -- qalGetListener3i = Sys_GetProcAddress(handle, "alGetListener3i"); -- qalGetListeneriv = Sys_GetProcAddress(handle, "alGetListeneriv"); -- qalGenSources = Sys_GetProcAddress(handle, "alGenSources"); -- qalDeleteSources = Sys_GetProcAddress(handle, "alDeleteSources"); -- qalIsSource = Sys_GetProcAddress(handle, "alIsSource"); -- qalSourcef = Sys_GetProcAddress(handle, "alSourcef"); -- qalSource3f = Sys_GetProcAddress(handle, "alSource3f"); -- qalSourcefv = Sys_GetProcAddress(handle, "alSourcefv"); -- qalSourcei = Sys_GetProcAddress(handle, "alSourcei"); -- qalSource3i = Sys_GetProcAddress(handle, "alSource3i"); -- qalSourceiv = Sys_GetProcAddress(handle, "alSourceiv"); -- qalGetSourcef = Sys_GetProcAddress(handle, "alGetSourcef"); -- qalGetSource3f = Sys_GetProcAddress(handle, "alGetSource3f"); -- qalGetSourcefv = Sys_GetProcAddress(handle, "alGetSourcefv"); -- qalGetSourcei = Sys_GetProcAddress(handle, "alGetSourcei"); -- qalGetSource3i = Sys_GetProcAddress(handle, "alGetSource3i"); -- qalGetSourceiv = Sys_GetProcAddress(handle, "alGetSourceiv"); -- qalSourcePlayv = Sys_GetProcAddress(handle, "alSourcePlayv"); -- qalSourceStopv = Sys_GetProcAddress(handle, "alSourceStopv"); -- qalSourceRewindv = Sys_GetProcAddress(handle, "alSourceRewindv"); -- qalSourcePausev = Sys_GetProcAddress(handle, "alSourcePausev"); -- qalSourcePlay = Sys_GetProcAddress(handle, "alSourcePlay"); -- qalSourceStop = Sys_GetProcAddress(handle, "alSourceStop"); -- qalSourceRewind = Sys_GetProcAddress(handle, "alSourceRewind"); -- qalSourcePause = Sys_GetProcAddress(handle, "alSourcePause"); -- qalSourceQueueBuffers = Sys_GetProcAddress(handle, "alSourceQueueBuffers"); -- qalSourceUnqueueBuffers = Sys_GetProcAddress(handle, "alSourceUnqueueBuffers"); -- qalGenBuffers = Sys_GetProcAddress(handle, "alGenBuffers"); -- qalDeleteBuffers = Sys_GetProcAddress(handle, "alDeleteBuffers"); -- qalIsBuffer = Sys_GetProcAddress(handle, "alIsBuffer"); -- qalBufferData = Sys_GetProcAddress(handle, "alBufferData"); -- qalBufferf = Sys_GetProcAddress(handle, "alBufferf"); -- qalBuffer3f = Sys_GetProcAddress(handle, "alBuffer3f"); -- qalBufferfv = Sys_GetProcAddress(handle, "alBufferfv"); -- qalBufferi = Sys_GetProcAddress(handle, "alBufferi"); -- qalBuffer3i = Sys_GetProcAddress(handle, "alBuffer3i"); -- qalBufferiv = Sys_GetProcAddress(handle, "alBufferiv"); -- qalGetBufferf = Sys_GetProcAddress(handle, "alGetBufferf"); -- qalGetBuffer3f = Sys_GetProcAddress(handle, "alGetBuffer3f"); -- qalGetBufferfv = Sys_GetProcAddress(handle, "alGetBufferfv"); -- qalGetBufferi = Sys_GetProcAddress(handle, "alGetBufferi"); -- qalGetBuffer3i = Sys_GetProcAddress(handle, "alGetBuffer3i"); -- qalGetBufferiv = Sys_GetProcAddress(handle, "alGetBufferiv"); -- qalDopplerFactor = Sys_GetProcAddress(handle, "alDopplerFactor"); -- qalDopplerVelocity = Sys_GetProcAddress(handle, "alDopplerVelocity"); -- qalSpeedOfSound = Sys_GetProcAddress(handle, "alSpeedOfSound"); -- qalDistanceModel = Sys_GetProcAddress(handle, "alDistanceModel"); -+ qalEnable = ALSYMBOL(handle, alEnable); -+ qalDisable = ALSYMBOL(handle, alDisable); -+ qalIsEnabled = ALSYMBOL(handle, alIsEnabled); -+ qalGetString = ALSYMBOL(handle, alGetString); -+ qalGetBooleanv = ALSYMBOL(handle, alGetBooleanv); -+ qalGetIntegerv = ALSYMBOL(handle, alGetIntegerv); -+ qalGetFloatv = ALSYMBOL(handle, alGetFloatv); -+ qalGetDoublev = ALSYMBOL(handle, alGetDoublev); -+ qalGetBoolean = ALSYMBOL(handle, alGetBoolean); -+ qalGetInteger = ALSYMBOL(handle, alGetInteger); -+ qalGetFloat = ALSYMBOL(handle, alGetFloat); -+ qalGetDouble = ALSYMBOL(handle, alGetDouble); -+ qalGetError = ALSYMBOL(handle, alGetError); -+ qalIsExtensionPresent = ALSYMBOL(handle, alIsExtensionPresent); -+ qalGetProcAddress = ALSYMBOL(handle, alGetProcAddress); -+ qalGetEnumValue = ALSYMBOL(handle, alGetEnumValue); -+ qalListenerf = ALSYMBOL(handle, alListenerf); -+ qalListener3f = ALSYMBOL(handle, alListener3f); -+ qalListenerfv = ALSYMBOL(handle, alListenerfv); -+ qalListeneri = ALSYMBOL(handle, alListeneri); -+ qalListener3i = ALSYMBOL(handle, alListener3i); -+ qalListeneriv = ALSYMBOL(handle, alListeneriv); -+ qalGetListenerf = ALSYMBOL(handle, alGetListenerf); -+ qalGetListener3f = ALSYMBOL(handle, alGetListener3f); -+ qalGetListenerfv = ALSYMBOL(handle, alGetListenerfv); -+ qalGetListeneri = ALSYMBOL(handle, alGetListeneri); -+ qalGetListener3i = ALSYMBOL(handle, alGetListener3i); -+ qalGetListeneriv = ALSYMBOL(handle, alGetListeneriv); -+ qalGenSources = ALSYMBOL(handle, alGenSources); -+ qalDeleteSources = ALSYMBOL(handle, alDeleteSources); -+ qalIsSource = ALSYMBOL(handle, alIsSource); -+ qalSourcef = ALSYMBOL(handle, alSourcef); -+ qalSource3f = ALSYMBOL(handle, alSource3f); -+ qalSourcefv = ALSYMBOL(handle, alSourcefv); -+ qalSourcei = ALSYMBOL(handle, alSourcei); -+ qalSource3i = ALSYMBOL(handle, alSource3i); -+ qalSourceiv = ALSYMBOL(handle, alSourceiv); -+ qalGetSourcef = ALSYMBOL(handle, alGetSourcef); -+ qalGetSource3f = ALSYMBOL(handle, alGetSource3f); -+ qalGetSourcefv = ALSYMBOL(handle, alGetSourcefv); -+ qalGetSourcei = ALSYMBOL(handle, alGetSourcei); -+ qalGetSource3i = ALSYMBOL(handle, alGetSource3i); -+ qalGetSourceiv = ALSYMBOL(handle, alGetSourceiv); -+ qalSourcePlayv = ALSYMBOL(handle, alSourcePlayv); -+ qalSourceStopv = ALSYMBOL(handle, alSourceStopv); -+ qalSourceRewindv = ALSYMBOL(handle, alSourceRewindv); -+ qalSourcePausev = ALSYMBOL(handle, alSourcePausev); -+ qalSourcePlay = ALSYMBOL(handle, alSourcePlay); -+ qalSourceStop = ALSYMBOL(handle, alSourceStop); -+ qalSourceRewind = ALSYMBOL(handle, alSourceRewind); -+ qalSourcePause = ALSYMBOL(handle, alSourcePause); -+ qalSourceQueueBuffers = ALSYMBOL(handle, alSourceQueueBuffers); -+ qalSourceUnqueueBuffers = ALSYMBOL(handle, alSourceUnqueueBuffers); -+ qalGenBuffers = ALSYMBOL(handle, alGenBuffers); -+ qalDeleteBuffers = ALSYMBOL(handle, alDeleteBuffers); -+ qalIsBuffer = ALSYMBOL(handle, alIsBuffer); -+ qalBufferData = ALSYMBOL(handle, alBufferData); -+ qalBufferf = ALSYMBOL(handle, alBufferf); -+ qalBuffer3f = ALSYMBOL(handle, alBuffer3f); -+ qalBufferfv = ALSYMBOL(handle, alBufferfv); -+ qalBufferi = ALSYMBOL(handle, alBufferi); -+ qalBuffer3i = ALSYMBOL(handle, alBuffer3i); -+ qalBufferiv = ALSYMBOL(handle, alBufferiv); -+ qalGetBufferf = ALSYMBOL(handle, alGetBufferf); -+ qalGetBuffer3f = ALSYMBOL(handle, alGetBuffer3f); -+ qalGetBufferfv = ALSYMBOL(handle, alGetBufferfv); -+ qalGetBufferi = ALSYMBOL(handle, alGetBufferi); -+ qalGetBuffer3i = ALSYMBOL(handle, alGetBuffer3i); -+ qalGetBufferiv = ALSYMBOL(handle, alGetBufferiv); -+ qalDopplerFactor = ALSYMBOL(handle, alDopplerFactor); -+ qalDopplerVelocity = ALSYMBOL(handle, alDopplerVelocity); -+ qalSpeedOfSound = ALSYMBOL(handle, alSpeedOfSound); -+ qalDistanceModel = ALSYMBOL(handle, alDistanceModel); - - /* 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 -@@ -480,7 +480,21 @@ Sys_GetHomeDir(void) - void * - Sys_GetProcAddress(void *handle, const char *sym) - { -- return dlsym(handle, sym); -+ if (handle == NULL) -+ { -+#ifdef RTLD_DEFAULT -+ return dlsym(RTLD_DEFAULT, sym); -+#else -+ /* POSIX suggests that this is a portable equivalent */ -+ static void *global_namespace = NULL; -+ -+ if (global_namespace == NULL) -+ global_namespace = dlopen(NULL, RTLD_GLOBAL|RTLD_LAZY); -+ -+ return dlsym(global_namespace, sym); -+#endif -+ } -+ return dlsym(handle, sym); - } - - void * diff --git a/debian/patches/Override-__DATE__-from-SOURCE_DATE_EPOCH-if-set.patch b/debian/patches/Override-__DATE__-from-SOURCE_DATE_EPOCH-if-set.patch deleted file mode 100644 index fe91ad9..0000000 --- a/debian/patches/Override-__DATE__-from-SOURCE_DATE_EPOCH-if-set.patch +++ /dev/null @@ -1,95 +0,0 @@ -From: Simon McVittie <[email protected]> -Date: Thu, 30 Jun 2016 10:05:40 +0100 -Subject: Override __DATE__ from SOURCE_DATE_EPOCH if set - -For deterministic/reproducible builds (where the same source and -toolchain can be verified to produce the same binary, allowing -maliciously substituted binaries to be detected) it is desirable to -take the software's idea of the build date from the build system; -otherwise, the real-time clock at the time of building affects the -result, making it non-reproducible. - -SOURCE_DATE_EPOCH is a distribution-neutral specification for how -to do that. It is meant to be set by meta-build systems such as -dpkg or RPM, using a date/time that is already part of the source code, -for example the date of the latest git commit, the date in -the package's debian/changelog, or the date in the RPM spec file. - -See https://reproducible-builds.org/specs/source-date-epoch/ for the -specification of SOURCE_DATE_EPOCH, or https://reproducible-builds.org/ -for more information on reproducible builds in general. ---- - Makefile | 7 +++++++ - src/common/header/common.h | 4 ++++ - src/common/misc.c | 2 +- - src/game/savegame/savegame.c | 4 ++-- - 4 files changed, 14 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 01405dc..bd264dd 100755 ---- a/Makefile -+++ b/Makefile -@@ -172,6 +172,13 @@ CFLAGS += -DOSTYPE=\"$(OSTYPE)\" -DARCH=\"$(ARCH)\" - - # ---------- - -+# https://reproducible-builds.org/specs/source-date-epoch/ -+ifdef SOURCE_DATE_EPOCH -+CFLAGS += -DBUILD_DATE=\"$(shell date --utc --date="@${SOURCE_DATE_EPOCH}" +"%b %_d %Y" | sed -e 's/ /\\ /g')\" -+endif -+ -+# ---------- -+ - # Systemwide installation - ifeq ($(WITH_SYSTEMWIDE),yes) - CFLAGS += -DSYSTEMWIDE -diff --git a/src/common/header/common.h b/src/common/header/common.h -index 9199fe0..9ae5fb3 100644 ---- a/src/common/header/common.h -+++ b/src/common/header/common.h -@@ -44,6 +44,10 @@ - #error ARCH should be defined by the build system - #endif - -+#ifndef BUILD_DATE -+#define BUILD_DATE __DATE__ -+#endif -+ - #ifdef _WIN32 - #define CFGDIR "YamagiQ2" - #else -diff --git a/src/common/misc.c b/src/common/misc.c -index 98a90e5..7589b15 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, ARCH, __DATE__, OSTYPE); -+ s = va("%s %s %s %s", YQ2VERSION, ARCH, BUILD_DATE, 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..6e011a4 100644 ---- a/src/game/savegame/savegame.c -+++ b/src/game/savegame/savegame.c -@@ -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, BUILD_DATE); - - 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); -- gi.cvar("gamedate", __DATE__, CVAR_SERVERINFO | CVAR_LATCH); -+ gi.cvar("gamedate", BUILD_DATE, CVAR_SERVERINFO | CVAR_LATCH); - maxclients = gi.cvar("maxclients", "4", CVAR_SERVERINFO | CVAR_LATCH); - maxspectators = gi.cvar("maxspectators", "4", CVAR_SERVERINFO); - deathmatch = gi.cvar("deathmatch", "0", CVAR_LATCH); diff --git a/debian/patches/Remove-unwanted-rpaths-from-LDFLAGS.patch b/debian/patches/Remove-unwanted-rpaths-from-LDFLAGS.patch index e0c64a3..1eca900 100644 --- a/debian/patches/Remove-unwanted-rpaths-from-LDFLAGS.patch +++ b/debian/patches/Remove-unwanted-rpaths-from-LDFLAGS.patch @@ -8,10 +8,10 @@ Forwarded: no, Debian-specific 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile -index 5b9c60a..f194347 100755 +index 54ade51..ffbb8f8 100755 --- a/Makefile +++ b/Makefile -@@ -427,23 +427,23 @@ release/quake2 : LDFLAGS += -lGL +@@ -446,23 +446,23 @@ release/quake2 : LDFLAGS += -lGL endif ifeq ($(OSTYPE), FreeBSD) diff --git a/debian/patches/series b/debian/patches/series index 3d8f560..8b9c105 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,2 @@ Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch Remove-unwanted-rpaths-from-LDFLAGS.patch -Fix-spelling-errors-detected-by-lintian.patch -Optionally-link-libopenal-at-compile-time.patch -Override-__DATE__-from-SOURCE_DATE_EPOCH-if-set.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/yquake2.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
