commit chocolate-doom for openSUSE:Factory
Hello community, here is the log from the commit of package chocolate-doom for openSUSE:Factory checked in at 2015-04-30 11:50:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chocolate-doom (Old) and /work/SRC/openSUSE:Factory/.chocolate-doom.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "chocolate-doom" Changes: -------- --- /work/SRC/openSUSE:Factory/chocolate-doom/chocolate-doom.changes 2014-05-13 20:43:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.chocolate-doom.new/chocolate-doom.changes 2015-04-30 11:50:46.000000000 +0200 @@ -1,0 +2,17 @@ +Sat Mar 28 22:16:09 UTC 2015 - jengelh@inai.de + +- Update to new upstream release 2.1 +* Chocolate Doom now supports high-quality substitute music packs + that are used in place of the original MIDI music tracks. +* Support for joysticks and gamepads has been significantly + improved in this version. +* OPL MIDI playback has been significantly improved. Multi-track + MIDI files now play back properly. +* The "no fog on spawn west" Vanilla bug is now correctly + emulated. +* Behavior of older versions of Doom back to v1.666 can now be + emulated. +- Add chdoom-nonvoid.diff, chdoom-prng.diff to quench compiler + warnings. Add chdoom-date.diff to kill __DATE__ instances. + +------------------------------------------------------------------- Old: ---- chocolate-doom-2.0.tar.xz New: ---- chdoom-date.diff chdoom-nonvoid.diff chdoom-prng.diff chocolate-doom-2.1.0.tar.gz chocolate-doom-2.1.0.tar.gz.asc chocolate-doom.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chocolate-doom.spec ++++++ --- /var/tmp/diff_new_pack.531ckv/_old 2015-04-30 11:50:47.000000000 +0200 +++ /var/tmp/diff_new_pack.531ckv/_new 2015-04-30 11:50:47.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package chocolate-doom # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,9 +17,9 @@ Name: chocolate-doom -Version: 2.0 +Version: 2.1 Release: 0 -%define rversion 2.0 +%define rversion 2.1.0 Summary: Conservative DOOM/Heretic/Hexen/Strife source port License: GPL-2.0+ Group: Amusements/Games/3D/Shoot @@ -27,19 +27,22 @@ #Git-Clone: git://github.com/fragglet/chocolate-doom #Git-Web: https://github.com/fragglet/chocolate-doom -#Freecode-URL: https://freecode.com/projects/chocolate-doom -#DL-URL: http://chocolate-doom.org/downloads/2.0.0/chocolate-doom-2.0.0.tar.gz -Source: chocolate-doom-%rversion.tar.xz +Source: http://www.chocolate-doom.org/downloads/%rversion/%name-%rversion.tar.gz +Source2: http://www.chocolate-doom.org/downloads/%rversion/%name-%rversion.tar.gz.asc +Source3: %name.keyring Patch1: chdoom-iwaddir.diff +Patch2: chdoom-nonvoid.diff +Patch3: chdoom-prng.diff +Patch4: chdoom-date.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake BuildRequires: fdupes BuildRequires: python BuildRequires: update-desktop-files -BuildRequires: xz BuildRequires: pkgconfig(SDL_mixer) BuildRequires: pkgconfig(SDL_net) +BuildRequires: pkgconfig(libcrypto) >= 0.9.7 BuildRequires: pkgconfig(samplerate) BuildRequires: pkgconfig(sdl) >= 1.1.3 Provides: chocolate-heretic = %version @@ -62,8 +65,8 @@ behave the same). %prep -%setup -qn %name -%patch -P 1 -p1 +%setup -Tqb0 -n %name-%rversion +%patch -P 1 -P 2 -P 3 -P 4 -p1 %build autoreconf -fi ++++++ chdoom-date.diff ++++++ --- src/hexen/h2def.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: chocolate-doom-2.1.0/src/hexen/h2def.h =================================================================== --- chocolate-doom-2.1.0.orig/src/hexen/h2def.h +++ chocolate-doom-2.1.0/src/hexen/h2def.h @@ -67,9 +67,9 @@ //#define HEXEN_VERSIONTEXT "DVL BETA 10 07 95" // Just an update for Romero //#define HEXEN_VERSIONTEXT "FINAL 1.0 (10 13 95)" // Just an update for Romero #ifdef RANGECHECK -#define HEXEN_VERSIONTEXT "Version 1.1 +R "__DATE__" ("VER_ID")" +#define HEXEN_VERSIONTEXT "Version 1.1 +R "" ("VER_ID")" #else -#define HEXEN_VERSIONTEXT "Version 1.1 "__DATE__" ("VER_ID")" +#define HEXEN_VERSIONTEXT "Version 1.1 "" ("VER_ID")" #endif // all exterior data is defined here ++++++ chdoom-nonvoid.diff ++++++
From 51ab62f6fb06b42c80c98ea71ab29d208d10e422 Mon Sep 17 00:00:00 2001 From: Fabian Greffrath
Date: Tue, 17 Feb 2015 12:00:04 +0100 Subject: [PATCH] setup: fix "control reaches end of non-void function" compiler warning
Actually, it is impossible to reach the end of these two functions without return()ing earlier from one of the switch() statements' branches. But since the compiler cannot know this and warns about it, and since this warning can be escalated into an error in later compiler versions, silence it by return()ing a dummy value at the end of each function. Fixes #508 --- src/setup/txt_joyaxis.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/setup/txt_joyaxis.c b/src/setup/txt_joyaxis.c index 4747a4f..5e59b9f 100644 --- a/src/setup/txt_joyaxis.c +++ b/src/setup/txt_joyaxis.c @@ -63,6 +63,8 @@ static char *CalibrationLabel(txt_joystick_axis_t *joystick_axis) "right, and press the button."; } } + + return NULL; } static void SetCalibrationLabel(txt_joystick_axis_t *joystick_axis) @@ -265,6 +267,8 @@ static int NextCalibrateStage(txt_joystick_axis_t *joystick_axis) case CONFIG_STAGE2: return CONFIG_CENTER; } + + return -1; } static int EventCallback(SDL_Event *event, TXT_UNCAST_ARG(joystick_axis)) -- 2.1.4 ++++++ chdoom-prng.diff ++++++
From dcc41ce5c432a8641cdd278cc3ffb4eeb5fd5d8a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt
Date: Tue, 21 Apr 2015 09:28:15 +0200 Subject: [PATCH] build: avoid code breaking the aliasing regularly Upstream: no
Just use libcrypto already.
aes_prng.c: In function 'AES_SetKey':
aes_prng.c:693:9: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
*((uint32_t*)tk[j]) = *((uint32_t*)k[j]);
---
configure.ac | 1 +
src/Makefile.am | 6 +++---
src/aes_prng.c | 18 +++++++++---------
3 files changed, 13 insertions(+), 12 deletions(-)
Index: chocolate-doom-2.1.0/configure.ac
===================================================================
--- chocolate-doom-2.1.0.orig/configure.ac
+++ chocolate-doom-2.1.0/configure.ac
@@ -55,6 +55,7 @@ LDFLAGS="$LDFLAGS $SDL_LIBS"
AC_SDL_MAIN_WORKAROUND([
+ PKG_CHECK_MODULES([crypto], [libcrypto >= 0.9.7])
# Check for SDL_mixer.
AC_CHECK_LIB(SDL_mixer,Mix_LoadMUS,[
Index: chocolate-doom-2.1.0/src/Makefile.am
===================================================================
--- chocolate-doom-2.1.0.orig/src/Makefile.am
+++ chocolate-doom-2.1.0/src/Makefile.am
@@ -18,10 +18,10 @@ SETUP_BINARIES = @PROGRAM_PREFIX@doom-se
execgames_SCRIPTS = $(SETUP_BINARIES)
-AM_CFLAGS = -I$(top_builddir)/textscreen \
+AM_CPPFLAGS = -I$(top_builddir)/textscreen \
-I$(top_builddir)/opl \
-I$(top_builddir)/pcsound \
- @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
+ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@ ${crypto_CFLAGS}
# Common source files used by absolutely everything:
@@ -150,7 +150,7 @@ EXTRA_LIBS =
@LDFLAGS@ \
@SDL_LIBS@ \
@SDLMIXER_LIBS@ \
- @SDLNET_LIBS@
+ @SDLNET_LIBS@ ${crypto_LIBS}
if HAVE_WINDRES
@PROGRAM_PREFIX@doom_SOURCES=$(SOURCE_FILES_WITH_DEH) resource.rc
Index: chocolate-doom-2.1.0/src/aes_prng.c
===================================================================
--- chocolate-doom-2.1.0.orig/src/aes_prng.c
+++ chocolate-doom-2.1.0/src/aes_prng.c
@@ -64,7 +64,9 @@
#include "aes_prng.h"
#include "doomtype.h"
#include "i_system.h"
+#include
participants (1)
-
root@hilbert.suse.de