Accepting request 510106 from games
OBS-URL: https://build.opensuse.org/request/show/510106 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/chocolate-doom?expand=0&rev=12
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
f652931c22
@ -1,20 +0,0 @@
|
||||
---
|
||||
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
|
||||
@ -12,11 +12,11 @@ IWADs, and so should chocolate-doom.
|
||||
src/d_iwad.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
Index: chocolate-doom-2.2.1/src/d_iwad.c
|
||||
Index: chocolate-doom-2.3.0/src/d_iwad.c
|
||||
===================================================================
|
||||
--- chocolate-doom-2.2.1.orig/src/d_iwad.c
|
||||
+++ chocolate-doom-2.2.1/src/d_iwad.c
|
||||
@@ -633,6 +633,10 @@ static void AddXdgDirs(void)
|
||||
--- chocolate-doom-2.3.0.orig/src/d_iwad.c
|
||||
+++ chocolate-doom-2.3.0/src/d_iwad.c
|
||||
@@ -650,6 +650,10 @@ static void AddXdgDirs(void)
|
||||
// source ports is /usr/share/games/doom - we support this through the
|
||||
// XDG_DATA_DIRS mechanism, through which it can be overridden.
|
||||
AddIWADPath(env, "/games/doom");
|
||||
@ -25,5 +25,5 @@ Index: chocolate-doom-2.2.1/src/d_iwad.c
|
||||
+ AddIWADPath(env, "/games/doom");
|
||||
+ AddIWADPath(env, "/doom");
|
||||
}
|
||||
#endif
|
||||
|
||||
//
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
From ffb5656588db391889890c65c206b5e170c084e7 Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Greffrath <fabian@greffrath.com>
|
||||
Date: Mon, 24 Oct 2016 15:30:18 +0200
|
||||
Subject: [PATCH] i_sdlsound.c: fix compilation with libsamplerate 0.1.9
|
||||
|
||||
This new version has const-corrected the data_in field, fixes #788
|
||||
---
|
||||
src/i_sdlsound.c | 8 +++++---
|
||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/i_sdlsound.c b/src/i_sdlsound.c
|
||||
index 79a15db..2d7a620 100644
|
||||
--- a/src/i_sdlsound.c
|
||||
+++ b/src/i_sdlsound.c
|
||||
@@ -339,6 +339,7 @@ static boolean ExpandSoundData_SRC(sfxinfo_t *sfxinfo,
|
||||
int length)
|
||||
{
|
||||
SRC_DATA src_data;
|
||||
+ float *data_in;
|
||||
uint32_t i, abuf_index=0, clipped=0;
|
||||
// uint32_t alen;
|
||||
int retn;
|
||||
@@ -346,7 +347,8 @@ static boolean ExpandSoundData_SRC(sfxinfo_t *sfxinfo,
|
||||
Mix_Chunk *chunk;
|
||||
|
||||
src_data.input_frames = length;
|
||||
- src_data.data_in = malloc(length * sizeof(float));
|
||||
+ data_in = malloc(length * sizeof(float));
|
||||
+ src_data.data_in = data_in;
|
||||
src_data.src_ratio = (double)mixer_freq / samplerate;
|
||||
|
||||
// We include some extra space here in case of rounding-up.
|
||||
@@ -362,7 +364,7 @@ static boolean ExpandSoundData_SRC(sfxinfo_t *sfxinfo,
|
||||
// Unclear whether 128 should be interpreted as "zero" or whether a
|
||||
// symmetrical range should be assumed. The following assumes a
|
||||
// symmetrical range.
|
||||
- src_data.data_in[i] = data[i] / 127.5 - 1;
|
||||
+ data_in[i] = data[i] / 127.5 - 1;
|
||||
}
|
||||
|
||||
// Do the sound conversion
|
||||
@@ -430,7 +432,7 @@ static boolean ExpandSoundData_SRC(sfxinfo_t *sfxinfo,
|
||||
expanded[abuf_index++] = cvtval_i;
|
||||
}
|
||||
|
||||
- free(src_data.data_in);
|
||||
+ free(data_in);
|
||||
free(src_data.data_out);
|
||||
|
||||
if (clipped > 0)
|
||||
--
|
||||
2.10.2
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ad11e2871667c6fa0658abf2dcba0cd9b26fbd651ee8df55adfdc18ad8fd674a
|
||||
size 2127538
|
||||
@ -1,17 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Comment: GPGTools - http://gpgtools.org
|
||||
|
||||
iQIcBAABCAAGBQJV8jh/AAoJEPbC7pwjNUNEfX8P/18kvHoYwXlguTUbDmhGnVf4
|
||||
MLKBAR1Wr6LbDYVzSaq/fSU0JqZC0BYeFq/TUJUzVVmjaRytfJVc5Ik28SCXSTZn
|
||||
8x3jxrlWbSL17infZapPalICPbWY/Fky9TDW7nYRy8KZyjnWGkctvgjywd/FmPMF
|
||||
9bZHmJeR6l74nrXdrWHNX/kDNA8sH9nfriDEyxxnl8Dnlde+w+acbD68boIcZ4Qy
|
||||
7nfRr0Mhz3SDZ3qgLr6RUbo+S43Y6kChaeyBUuvWd6P4enZjV08kUkSoPlLURkHv
|
||||
7w6LRUW1V9b2MuUqU9zG1gPoHK16OVBQ5aLTjJMW/HeyEwZTMVOFGrVbJYgE7Q3m
|
||||
FA2E37hpH9evPAB1T+r65xeds4CObWLJUpMvwRxxx+nkUg9VSyVwbNyo/nfLbPQM
|
||||
RiNC3wOi3jOavNfjU19+0Cod7K4bp7iXJmUGXkRIxTYPKfczBMj0ze3ymYWF7v3q
|
||||
7LFdIA59qh+GCFN1VFPrOXeF5UYt/8Endn28pOheuCn/OnvP4JRH/Dqf3jb/JYm0
|
||||
1vF2g4RlYxnYIvXpHMGC1Zk6780D2kHNmRAhpuNmF1HidyjgwgNKT0U8CbQVFbrS
|
||||
R4r6dvoUvDNi/iuVxuD/jDOmyVaKI0LXT2bNRt5xrHEjxq7G75F4B7RflflkEN3F
|
||||
jQWwy+BjG3G6wbXDa5Ng
|
||||
=klKm
|
||||
-----END PGP SIGNATURE-----
|
||||
3
chocolate-doom-2.3.0.tar.gz
Normal file
3
chocolate-doom-2.3.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3e6d1a82ac5c8b025a9695ce1e47d0dc6ed142ebb1129b1e4a70e2740f79150c
|
||||
size 2190744
|
||||
17
chocolate-doom-2.3.0.tar.gz.asc
Normal file
17
chocolate-doom-2.3.0.tar.gz.asc
Normal file
@ -0,0 +1,17 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Comment: GPGTools - http://gpgtools.org
|
||||
|
||||
iQIcBAABCAAGBQJYZUOFAAoJEPbC7pwjNUNEQoAP/2HORtVU9REgswO5OkTil+3G
|
||||
9xLlrExCEzgAiFbE8RvSlypQbGxzdNNEpHeKKhwtNrHGMwF58Io3HNEcoPWy/dcD
|
||||
wfkgsBSJayeVEg0soJED0vqOMX+MTSeBYp2OCFPvwqPNMTc08N7sXt83liFiKORr
|
||||
xNs5uj5e7+rLoLbzrgzJZURrS6WTV8vXUR8ghzO52vAGwGbI0TsQSkfN7SuQGb0y
|
||||
hw4a/nudeYpqgACWKhTlc2pxw3NyrkMdJTKK5NVKQPlXZDOJ9YOrO/WP9x9L3Jxo
|
||||
P5sYome3/eTncJSydbSP/AixKUXNyufbcYb6Zc32qYY8r2GEek+29c37xhVyD14y
|
||||
mlN/ujcbx7aYCH5Ts2dgFcdMc/1+pcDXSOXJep8c+ejHuiLSGZbLsG5IbiFb7YcX
|
||||
rM9Q3Db3TuiOXf/053nPbM7d2pjaKCrHN8lZWn/TRUyf9IOU8upR4as5c+3s9whq
|
||||
r+8LXBDFlZULDX5k28z6WLVz/CbVUGffEsVYKlHAeW7G+IAmE3Nw8a+iNf8oGAQ4
|
||||
Swc3iQ1+whfCLAMsJCHAXdYgAlJuxzS5plIzYFr96p09x3o81R1PrzOohnYr6T/3
|
||||
kapiXQUHRjKqyybBpViKSck8EfK9BKPot/+otgorWwseBUQ1EK8BCwSqJRItkM6j
|
||||
AkC7aGFdK9MH/3DXQvvm
|
||||
=V74t
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +1,24 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 4 15:33:15 UTC 2017 - jengelh@inai.de
|
||||
|
||||
- Update to new upstream release 2.3.0 (2016-12-29)
|
||||
* Pitch-shifting from early versions of Doom, Heretic, and Hexen
|
||||
is now supported.
|
||||
* Aspect ratio-corrected 1600×1200 PNGs are now written.
|
||||
* OPL emulation is more accurate.
|
||||
* DMX bugs with GUS cards are now better emulated.
|
||||
* Checksum calculations are fixed on big endian systems, allowing
|
||||
multiplayer games to be played in mixed little/big-endian
|
||||
environments.
|
||||
* The vanilla limit of 4046 lumps per WAD is now enforced.
|
||||
* Solidsegs overflow is emulated like in vanilla.
|
||||
* It is now possible to start multiplayer Chex Quest games.
|
||||
* Versions 1.666, 1.7, and 1.8 are emulated.
|
||||
* An issue was fixed where the game crashed while killing the
|
||||
Wraithverge in 64-bit builds.
|
||||
- Drop chdoom-date.diff (no longer needed), drop
|
||||
chdoom-sdlsound.diff (merged upstream).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 16 00:18:05 UTC 2016 - jengelh@inai.de
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package chocolate-doom
|
||||
#
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2017 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.2.1
|
||||
Version: 2.3.0
|
||||
Release: 0
|
||||
%define rversion 2.2.1
|
||||
%define rversion 2.3.0
|
||||
Summary: Conservative DOOM/Heretic/Hexen/Strife source port
|
||||
License: GPL-2.0+
|
||||
Group: Amusements/Games/3D/Shoot
|
||||
@ -31,8 +31,6 @@ Source: http://www.chocolate-doom.org/downloads/%rversion/%name-%rversio
|
||||
Source2: http://www.chocolate-doom.org/downloads/%rversion/%name-%rversion.tar.gz.asc
|
||||
Source3: %name.keyring
|
||||
Patch1: chdoom-iwaddir.diff
|
||||
Patch4: chdoom-date.diff
|
||||
Patch5: chdoom-sdlsound.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
@ -62,9 +60,18 @@ Chocolate Doom's aims are:
|
||||
* To provide an accurate retro "feel" (display and input should
|
||||
behave the same).
|
||||
|
||||
%package bash-completion
|
||||
Summary: Chocolate Doom command line completion support for bash
|
||||
Group: System/Shells
|
||||
BuildArch: noarch
|
||||
Supplements: packageand(chocolate-doom:bash-completion)
|
||||
|
||||
%description bash-completion
|
||||
Additions for bash-completion to support chocolate-doom.
|
||||
|
||||
%prep
|
||||
%setup -Tqb0 -n %name-%rversion
|
||||
%patch -P 1 -P 4 -P 5 -p1
|
||||
%patch -P 1 -p1
|
||||
|
||||
%build
|
||||
autoreconf -fi
|
||||
@ -76,9 +83,8 @@ b="%buildroot"
|
||||
%make_install iconsdir="%_datadir/icons/hicolor/64x64/apps" \
|
||||
docdir="%_docdir/%name"
|
||||
mkdir -p "$b/%_bindir"
|
||||
mv "$b/%_prefix/games"/* "$b/%_bindir/"
|
||||
rm -f "$b/%_docdir/%name/INSTALL"
|
||||
%suse_update_desktop_file -r chocolate-setup chocolate-setup Game ActionGame
|
||||
rm -f "$b/%_datadir/applications/chocolate-setup.desktop" # has wrong paths
|
||||
%fdupes %buildroot/%_prefix
|
||||
|
||||
%post
|
||||
@ -93,4 +99,8 @@ echo "INFO: %name: The global IWAD directory is %_datadir/doom."
|
||||
%_datadir/icons/*
|
||||
%_docdir/chocolate-*/
|
||||
|
||||
%files bash-completion
|
||||
%defattr(-,root,root)
|
||||
%_datadir/bash-completion/
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user