chocolate-doom-2.1.0

OBS-URL: https://build.opensuse.org/package/show/games/chocolate-doom?expand=0&rev=17

chdoom-date.diff

@@ -0,0 +1,20 @@
+---
+ 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

@@ -0,0 +1,43 @@
+From 51ab62f6fb06b42c80c98ea71ab29d208d10e422 Mon Sep 17 00:00:00 2001
+From: Fabian Greffrath <fabian@greffrath.com>
+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

@@ -0,0 +1,123 @@
+From dcc41ce5c432a8641cdd278cc3ffb4eeb5fd5d8a Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+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 <openssl/rand.h>
+ 
++#ifdef AESPRNG
+ #define MAXKC			(256/32)
+ #define MAXROUNDS		14
+ 
+@@ -929,10 +931,11 @@ static char *AES_SelfTest(void)
+ 
+     return NULL;
+ }
++#endif /* AESPRNG */
+ 
+ #ifndef TEST
+-
+ static boolean prng_enabled = false;
++#ifdef AESPRNG
+ static RIJNDAEL_context prng_context;
+ static uint32_t prng_input_counter;
+ static uint32_t prng_values[4];
+@@ -992,6 +995,7 @@ static void PRNG_Generate(void)
+ 
+     prng_value_index = 0;
+ }
++#endif /* AESPRNG */
+ 
+ // Read a random 32-bit integer from the PRNG.
+ 
+@@ -1004,14 +1008,7 @@ unsigned int PRNG_Random(void)
+         return 0;
+     }
+ 
+-    if (prng_value_index >= 4)
+-    {
+-        PRNG_Generate();
+-    }
+-
+-    result = prng_values[prng_value_index];
+-    ++prng_value_index;
+-
++    RAND_pseudo_bytes((unsigned char *)&result, sizeof(result));
+     return result;
+ }
+ 
+@@ -1020,6 +1017,7 @@ unsigned int PRNG_Random(void)
+ 
+ int main(int argc, char *argv[])
+ {
++#ifdef AESPRNG
+     char *errormsg;
+ 
+     errormsg = AES_SelfTest();
+@@ -1034,6 +1032,8 @@ int main(int argc, char *argv[])
+         fprintf(stderr, "AES self test failed: %s\n", errormsg);
+         return 1;
+     }
++#endif
++    return 0;
+ }
+ 
+ #endif

chocolate-doom-2.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0079936e75aa76f93e1941ecbf7c55e236f9fdd4942b1a336830231e76fddce8
-size 1257996

chocolate-doom-2.1.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:629305e7f328659f3e93e89b93adc9da4e99b5a351e51ceb749dcf3e3da8bcd3
+size 2129632

chocolate-doom-2.1.0.tar.gz.asc

@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+iQIcBAABCAAGBQJURzKyAAoJEPbC7pwjNUNE1E4P/2LzWIquIlC/CNlpdHpswo24
+SO5JAZdWeENgIjJqaNBYCUnW1OsCTjgWXMp58F2rS7oo2tJnJ3Ezujdb847n+VkE
+92CXSU6dsfJKHRdt1JzRq+YYgDWBbQQkAW+/RPsWMiZUfqVtRtVWf2xxBpt0uQAh
+psRvGzmUCPo8bAO0ZxxEO1lvjSC7DDCL8Co7O+luXSRt0Wz0qx+QCkwRnrvJuufL
+0nhHYUHawqdq3pexmqo/wfsairD8EKN9+xpfze3pbVLqlQoezzxSFYkI9y8CmMOZ
+PD45Trti73OTVre9LLOdjnIFfmDK322t5uvMfwFbbY0KyTwvMtbQYLceJJZ8V4La
+/T1Bl4p/noLGtSeIaGTMwVB1bRX7uSSK+oQXfEXtkP285aIWPXnoVz0zF+h3yz2N
+c2CmuX62a+zaq/2CSw5aFhV8Stj0CHO0yVxNcmfr15ogV2AQqCz8DZFZkev0GeSw
+wseSO2EWQdxERYlALqSzYyusGaz3IPmbv3d+5ZLvgSQDoPuuBk1oB64vktnEds/u
+vEClUxE99eXqIKy++ajyosAPwTYdkU0zOqgRb6kZ06RgZI02mtodTswdzNj9jcwh
+QuSYZnWufdQKHWbxLmbNeH40n0zSJFZgmYP4naKnm1M1kaICxEcKiTa1/2w/a+Nj
+BB9T7CBU3kf3ZRcPrLDP
+=hVjh
+-----END PGP SIGNATURE-----

chocolate-doom.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+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.
+
 -------------------------------------------------------------------
 Sun May 11 17:01:43 UTC 2014 - jengelh@inai.de
 

chocolate-doom.keyring

@@ -0,0 +1,93 @@
+pub   4096R/23354344 2012-06-17
+uid       [ unknown] Simon Howard <fraggle@soulsphere.org>
+uid       [ unknown] Simon Howard <fraggle@gmail.com>
+sub   4096R/7403AB9B 2012-06-17
+sub   4096R/67FA65F2 2013-04-14
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+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
+082P35I=
+=qig6
+-----END PGP PUBLIC KEY BLOCK-----

chocolate-doom.spec

@@ -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 @@ Url:            http://chocolate-doom.org/
 
 #Git-Clone:	git://github.com/fragglet/chocolate-doom
 #Git-Web:	https://github.com/fragglet/chocolate-doom
-#Freecode-URL:	https://freecode.com/projects/chocolate-doom
+Source:         http://www.chocolate-doom.org/downloads/%rversion/%name-%rversion.tar.gz
-#DL-URL:	http://chocolate-doom.org/downloads/2.0.0/chocolate-doom-2.0.0.tar.gz
+Source2:        http://www.chocolate-doom.org/downloads/%rversion/%name-%rversion.tar.gz.asc
-Source:         chocolate-doom-%rversion.tar.xz
+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 @@ Chocolate Doom's aims are:
    behave the same).
 
 %prep
-%setup -qn %name
+%setup -Tqb0 -n %name-%rversion
-%patch -P 1 -p1
+%patch -P 1 -P 2 -P 3 -P 4 -p1
 
 %build
 autoreconf -fi