diff --git a/_service b/_service new file mode 100644 index 0000000..a20094e --- /dev/null +++ b/_service @@ -0,0 +1,13 @@ + + + svn + https://svn.prboom.org/repos/branches/prboom-plus-24/prboom2 + data/sounds/dsdg* + 2.5.1.5+svn%r + + + *.tar + xz + + + diff --git a/clean_source.sh b/clean_source.sh index afdda1d..eae745d 100644 --- a/clean_source.sh +++ b/clean_source.sh @@ -1,4 +1,5 @@ #!/bin/sh -ex +# To be used with normal tarballs; it's replicated in _service for service downloads. # Remove Wolfenstein dogs from source; they belong to another game # with incompatible licensing. diff --git a/prboom-nodatetime.diff b/prboom-nodatetime.diff index 2f3a119..f6860fb 100644 --- a/prboom-nodatetime.diff +++ b/prboom-nodatetime.diff @@ -2,16 +2,24 @@ From: Jan Engelhardt Date: 2012-02-19 07:16:45.000000000 +0100 --- - src/version.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/version.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) -Index: prboom-plus-2.5.1.1/src/version.c +Index: prboom2-2.5.1.5+svn4532/src/version.c =================================================================== ---- prboom-plus-2.5.1.1.orig/src/version.c -+++ prboom-plus-2.5.1.1/src/version.c -@@ -35,4 +35,4 @@ - +--- prboom2-2.5.1.5+svn4532.orig/src/version.c ++++ prboom2-2.5.1.5+svn4532/src/version.c +@@ -37,11 +37,11 @@ #include "version.h" --const char version_date[] = __DATE__ " " __TIME__; -+const char version_date[] = ""; + #ifndef BUILD_DATE +-#define BUILD_DATE __DATE__ ++#define BUILD_DATE "" + #endif + + #ifndef BUILD_TIME +-#define BUILD_TIME __TIME__ ++#define BUILD_TIME "" + #endif + + const char version_date[] = BUILD_DATE " " BUILD_TIME; diff --git a/prboom-plus-2.5.1.4+.tar.xz b/prboom-plus-2.5.1.4+.tar.xz deleted file mode 100644 index 0c8e4b4..0000000 --- a/prboom-plus-2.5.1.4+.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5554c6690677886fc976182f03e2f4cc16d9b3ffb8e039c839065d082031bbe -size 1118052 diff --git a/prboom-plus.changes b/prboom-plus.changes index 6b2c4b4..2c24b48 100644 --- a/prboom-plus.changes +++ b/prboom-plus.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Nov 14 08:55:03 UTC 2018 - Jan Engelhardt + +- Update to snapshot 2.5.1.5 SVN4532 + * Move to SDL2 + * Added the "cap_fps" config variable + * The Del key can be used to clear key bindings in the setup menu. + * Added "Weapon Attack Alignment" option to align the weapon while + shooting. Possible values: "off" (doom behavior), "horizontal", + "centered" and "bobbing" for bobbing during fire. + * Removed the "Strafe 50 on Turns" and "Two-key strafe50: + StrafeOn + MoveLR = strafe50" feature. + ------------------------------------------------------------------- Tue Mar 29 23:57:18 UTC 2016 - jengelh@inai.de diff --git a/prboom-plus.spec b/prboom-plus.spec index 13e4d4f..d0f9769 100644 --- a/prboom-plus.spec +++ b/prboom-plus.spec @@ -1,7 +1,7 @@ # # spec file for package prboom-plus # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -12,21 +12,21 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: prboom-plus -Version: 2.5.1.4 +Version: 2.5.1.5+svn4532 Release: 0 -Summary: Open source port of the DOOM game engine -License: GPL-2.0+ +Summary: DOOM source port with demo compatibility +License: GPL-2.0-or-later Group: Amusements/Games/3D/Shoot Url: http://prboom-plus.sf.net/ #SVN-Clone: https://svn.prboom.org/repos/branches/prboom-plus-24/prboom2 #DL-URL: http://downloads.sf.net/prboom-plus/prboom-plus-2.5.1.4.tar.gz -Source: %name-%version+.tar.xz +Source: prboom2-%version.tar.xz Source2: clean_source.sh Patch1: prboom-nodatetime.diff Patch2: prboom-types1.diff @@ -39,12 +39,13 @@ BuildRequires: Mesa-devel BuildRequires: automake BuildRequires: fluidsynth-devel BuildRequires: hicolor-icon-theme -BuildRequires: libSDL_image-devel -BuildRequires: libSDL_mixer-devel -BuildRequires: libSDL_net-devel BuildRequires: libpng-devel BuildRequires: libvorbis-devel BuildRequires: pcre-devel +BuildRequires: pkgconfig(SDL2_image) +BuildRequires: pkgconfig(SDL2_mixer) +BuildRequires: pkgconfig(SDL2_net) +BuildRequires: pkgconfig(sdl2) %if 0%{?suse_version} >= 1320 BuildRequires: portmidi-devel %endif @@ -55,35 +56,41 @@ Obsoletes: prboom <= 2.5.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -PrBoom+ is a Doom source port developed from the original PrBoom -project, an open-source port of Doom, the classic 3D first-person -shooter game which outclassed any 3D world games that preceded -it, with amazing speed, flexibility, and outstanding gameplay. +PrBoom+ is a conservative Doom source port. It features: -prboom(-plus) focuses heavily on retaining compatibility with the -original Doom engines, which plays a big role in demo recording and -playback. +* The removal of engine limits and bugs, like the visplane limit, + savegame size limit, the tutti-frutti and medusa visual effects, + and others. +* BOOM editing extensions, e.g. configurable animated/switch + textures, deep water effect, scrolling walls/floors/ceilings, + conveyor belts, translucent walls and sprites, friction effects, + and generic linedef actions. +* Focus on retaining compatibility with the original Doom engines + for the purpose of demo recording and playback. +* High resolution rendering of map geometry, optionally in OpenGL + mode. %prep -%setup -q +%setup -qn prboom2-%version %patch -P 1 -P 2 -P 3 -P 5 -P 6 -P 7 -P 8 -p1 %build +cp -al data/sounds/free/*.wav data/sounds/ +autoreconf -fi # rpm has its own optimizations, so turn off shipped defaults %configure --enable-gl --disable-cpu-opt --program-prefix="" \ --with-waddir="%_datadir/doom" --disable-dogs make %{?_smp_mflags} %install +b="%buildroot" %make_install gamesdir="%_bindir" # convenience symlink ln -s prboom-plus "%buildroot/%_bindir/prboom" - -install -Dm0644 ICONS/prboom-plus.svg "%buildroot/%_datadir/icons/hicolor/scalable/apps/prboom-plus.svg" -install -Dm0644 ICONS/prboom-plus.desktop "%buildroot/%_datadir/applications/prboom-plus.desktop" - -install -Dm0644 ICONS/prboom-plus.bash "%buildroot/%_datadir/bash-completion/completions/prboom-plus.bash" +install -Dm0644 ICONS/prboom-plus.svg "$b/%_datadir/icons/hicolor/scalable/apps/prboom-plus.svg" +install -Dm0644 ICONS/prboom-plus.desktop "$b/%_datadir/applications/prboom-plus.desktop" +install -Dm0644 ICONS/prboom-plus.bash "$b/%_datadir/bash-completion/completions/prboom-plus.bash" %post %desktop_database_post @@ -97,7 +104,7 @@ install -Dm0644 ICONS/prboom-plus.bash "%buildroot/%_datadir/bash-completion/com %defattr(-,root,root) %_bindir/* %_datadir/doom/ -%_datadir/doc/%name-%version/ +%_datadir/doc/* %_mandir/*/* %_datadir/applications/prboom-plus.desktop %_datadir/icons/hicolor/scalable/apps/prboom-plus.svg diff --git a/prboom2-2.5.1.5+svn4532.tar.xz b/prboom2-2.5.1.5+svn4532.tar.xz new file mode 100644 index 0000000..0bb205d --- /dev/null +++ b/prboom2-2.5.1.5+svn4532.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:beab681f955e75a89dcc9366ff394b1fa29c2f79e2aaf785cb180963e68e5e95 +size 1698948