Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package prboom-plus for openSUSE:Factory checked in at 2021-04-12 12:37:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/prboom-plus (Old) and /work/SRC/openSUSE:Factory/.prboom-plus.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "prboom-plus" Mon Apr 12 12:37:08 2021 rev:13 rq:884442 version:2.6um+g69 Changes: -------- --- /work/SRC/openSUSE:Factory/prboom-plus/prboom-plus.changes 2020-06-10 00:54:42.663928171 +0200 +++ /work/SRC/openSUSE:Factory/.prboom-plus.new.2401/prboom-plus.changes 2021-04-12 12:39:59.381552373 +0200 @@ -1,0 +2,25 @@ +Fri Apr 9 23:53:06 UTC 2021 - Jan Engelhardt <[email protected]> + +- Switch to Oelcker's prboom-plus-um code base +- Update to release 2.6um and snapshot 2.6um+git69 (07925d634) + * Support for UMAPINFO lump, customizable intermissions, + customizable episode menu. + * It is now possible to set individual key bindings to + unassigned (completely disable a hotkey function) + * Support for Compressed ZDoom BSP nodes. + * 100 extra sprites (SP00..SP99) for use in DEH/BEX, + 200 extra sounds for use in DEH/BEX. + * Add -statdump parameter from Chocolate Doom. + * Add -stroller parameter. + * Added new BEX property "Dropped item" for mobjs. + * New demo format with "PR+UM" signature. + * Add a "-pistolstart" command line parameter. + * Add ALSA sequencer API backend for ALSA MIDI support. + * Now defaults to ffmpeg for video encoding + (switched from previous oggenc2 & x264). +- Drop 0001-fix-heap-buffer-overflows-in-UDP-code-CVE-2019-20797.patch + (merged), prboom-types1.diff (obsolete), + prboom-types2.diff (obsolete), prboom-hbar-color.diff (folded + into prboom-hbar-gradient.diff) + +------------------------------------------------------------------- Old: ---- 0001-fix-heap-buffer-overflows-in-UDP-code-CVE-2019-20797.patch prboom-hbar-color.diff prboom-types1.diff prboom-types2.diff prboom2-2.5.1.5+svn4532.tar.xz New: ---- prboom-plus-2.6um+g69.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ prboom-plus.spec ++++++ --- /var/tmp/diff_new_pack.cDanzG/_old 2021-04-12 12:40:00.181553303 +0200 +++ /var/tmp/diff_new_pack.cDanzG/_new 2021-04-12 12:40:00.185553308 +0200 @@ -1,7 +1,7 @@ # # spec file for package prboom-plus # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,44 +17,36 @@ Name: prboom-plus -Version: 2.5.1.5+svn4532 +Version: 2.6um+g69 Release: 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 -#Sibling-Prj: https://github.com/coelckers/prboom-plus (umapinfo fork) -#DL-URL: http://downloads.sf.net/prboom-plus/prboom-plus-2.5.1.4.tar.gz -Source: prboom2-%version.tar.xz +#Git-Clone: https://github.com/coelckers/prboom-plus +Source: %name-%version.tar.xz Patch1: prboom-nodatetime.diff -Patch2: prboom-types1.diff -Patch3: prboom-types2.diff -Patch5: prboom-enable-tessellation.diff -Patch6: prboom-hbar-color.diff -Patch7: prboom-hbar-all.diff -Patch8: prboom-hbar-gradient.diff -Patch9: 0001-fix-heap-buffer-overflows-in-UDP-code-CVE-2019-20797.patch +Patch2: prboom-enable-tessellation.diff +Patch3: prboom-hbar-all.diff +Patch4: prboom-hbar-gradient.diff BuildRequires: Mesa-devel -BuildRequires: automake +BuildRequires: c++_compiler +BuildRequires: cmake BuildRequires: fluidsynth-devel BuildRequires: hicolor-icon-theme BuildRequires: libpng-devel BuildRequires: libvorbis-devel BuildRequires: pcre-devel +BuildRequires: portmidi-devel +BuildRequires: update-desktop-files BuildRequires: pkgconfig(SDL2_image) BuildRequires: pkgconfig(SDL2_mixer) BuildRequires: pkgconfig(SDL2_net) BuildRequires: pkgconfig(sdl2) -%if 0%{?suse_version} >= 1320 -BuildRequires: portmidi-devel -%endif -BuildRequires: update-desktop-files Suggests: freedoom -Provides: prboom = 2.5.0plus -Obsoletes: prboom <= 2.5.0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Provides: prboom = 2.6um +Obsoletes: prboom <= 2.6 %description PrBoom+ is a conservative Doom source port. It features: @@ -72,26 +64,24 @@ mode. %prep -%autosetup -p1 -n prboom2-%version +%autosetup -p0 %build -cp -alv data/sounds/free/*.wav data/sounds/ -cp -alv data/sprites/free/* data/sprites/ -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 CFLAGS="%optflags -fcommon" -make %{?_smp_mflags} +pushd prboom2/ +%cmake -DDOOMWADDIR="%_datadir/doom" +%cmake_build +popd %install -b="%buildroot" -%make_install gamesdir="%_bindir" - +pushd prboom2/ +%cmake_install # convenience symlink -ln -s prboom-plus "%buildroot/%_bindir/prboom" +b="%buildroot" +ln -s prboom-plus "$b/%_bindir/prboom" 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" +popd %if 0%{?suse_version} && 0%{?suse_version} < 1550 %post ++++++ _service ++++++ --- /var/tmp/diff_new_pack.cDanzG/_old 2021-04-12 12:40:00.213553340 +0200 +++ /var/tmp/diff_new_pack.cDanzG/_new 2021-04-12 12:40:00.213553340 +0200 @@ -1,10 +1,11 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="scm">svn</param> - <param name="url">https://svn.prboom.org/repos/branches/prboom-plus-24/prboom2</param> + <param name="scm">git</param> + <param name="url">https://github.com/coelckers/prboom-plus</param> <param name="exclude">data/sounds/dsdg*</param> <param name="exclude">data/sprites/dogs*</param> - <param name="versionformat">2.5.1.5+svn%r</param> + <param name="revision">07925d634cc4d5a8847f76ca4c4f2ce236ba6de8</param> + <param name="versionformat">2.6um+g@TAG_OFFSET@</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ prboom-enable-tessellation.diff ++++++ --- /var/tmp/diff_new_pack.cDanzG/_old 2021-04-12 12:40:00.221553350 +0200 +++ /var/tmp/diff_new_pack.cDanzG/_new 2021-04-12 12:40:00.225553355 +0200 @@ -1,20 +1,20 @@ -Date: 2011-08-03 18:36:44+0200 +From 6f50776b2c6365671fe53bdfc4bc9ffa622f1e06 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt <[email protected]> -Upstream: sent +Date: Wed, 3 Aug 2011 18:36:44 +0200 +Subject: [PATCH 1/4] Unconditionally enable GL tesselation Always do tesselation, because otherwise, map hacks like self-referencing sectors (cf. http://doom.wikia.com/wiki/Making_a_self-referencing_sector) will not be rendered. - --- - src/gl_main.c | 3 +++ + prboom2/src/gl_main.c | 3 +++ 1 file changed, 3 insertions(+) -Index: prboom-plus-2.5.1.4/src/gl_main.c -=================================================================== ---- prboom-plus-2.5.1.4.orig/src/gl_main.c -+++ prboom-plus-2.5.1.4/src/gl_main.c +diff --git prboom2/src/gl_main.c prboom2/src/gl_main.c +index 20712b7e..8fbceb4f 100644 +--- prboom2/src/gl_main.c ++++ prboom2/src/gl_main.c @@ -36,6 +36,9 @@ #ifdef HAVE_CONFIG_H #include "config.h" @@ -25,3 +25,6 @@ #include "gl_opengl.h" +-- +2.30.2 + ++++++ prboom-hbar-all.diff ++++++ --- /var/tmp/diff_new_pack.cDanzG/_old 2021-04-12 12:40:00.233553364 +0200 +++ /var/tmp/diff_new_pack.cDanzG/_new 2021-04-12 12:40:00.233553364 +0200 @@ -1,20 +1,20 @@ +From a0bae535928cbce4eb9da8dd5d33b473776c9693 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt <[email protected]> -Date: 2013-05-01 09:53:49.000000000 +0200 -Category: improvement -Status: sent Wed, 1 May 2013 14:28:44 +0200 - -Show the health bar for all destructible items (including -barrels and Lost Souls). +Date: Wed, 1 May 2013 09:53:49 +0200 +Subject: [PATCH 1/2] Show health bar for all destructible mobjs +References: https://github.com/coelckers/prboom-plus/pull/274 +Show the health bar for all destructible items, especially so +including barrels and Lost Souls. --- - src/gl_main.c | 3 ++- + prboom2/src/gl_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: prboom2/src/gl_main.c -=================================================================== ---- prboom2.orig/src/gl_main.c +diff --git prboom2/src/gl_main.c prboom2/src/gl_main.c +index 20712b7e..e2402e16 100644 +--- prboom2/src/gl_main.c +++ prboom2/src/gl_main.c -@@ -2399,7 +2399,8 @@ static void gld_DrawSprite(GLSprite *spr +@@ -2328,7 +2328,8 @@ static void gld_DrawSprite(GLSprite *sprite) static void gld_AddHealthBar(mobj_t* thing, GLSprite *sprite) { @@ -24,3 +24,6 @@ { GLHealthBar hbar; int health_percent = thing->health * 100 / thing->info->spawnhealth; +-- +2.31.1 + ++++++ prboom-hbar-gradient.diff ++++++ --- /var/tmp/diff_new_pack.cDanzG/_old 2021-04-12 12:40:00.241553374 +0200 +++ /var/tmp/diff_new_pack.cDanzG/_new 2021-04-12 12:40:00.241553374 +0200 @@ -1,38 +1,19 @@ +From 6566b0489164957581d091119bdf480d66e9ca20 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt <[email protected]> -Date: 2013-05-01 14:27:39.000000000 +0200 -Category: improvement -Status: sent Wed, 1 May 2013 14:28:44 +0200 - -This makes the health bar above shootables use gradiented color. +Date: Wed, 1 May 2013 09:53:49 +0200 +Subject: [PATCH 2/2] Implement color gradient for health bar +References: https://github.com/coelckers/prboom-plus/pull/274 --- - src/gl_drawinfo.c | 4 ++-- - src/gl_intern.h | 2 +- - src/gl_main.c | 44 +++++++++++++++++--------------------------- - 3 files changed, 20 insertions(+), 30 deletions(-) + prboom2/src/gl_intern.h | 2 +- + prboom2/src/gl_main.c | 31 +++++++++++++++++-------------- + 2 files changed, 18 insertions(+), 15 deletions(-) -Index: prboom-plus-2.5.1.4/src/gl_drawinfo.c -=================================================================== ---- prboom-plus-2.5.1.4.orig/src/gl_drawinfo.c -+++ prboom-plus-2.5.1.4/src/gl_drawinfo.c -@@ -112,10 +112,10 @@ static void gld_AddDrawRange(int size) - #define SIZEOF8(type) ((sizeof(type)+7)&~7) - void gld_AddDrawItem(GLDrawItemType itemtype, void *itemdata) - { -- int itemsize = 0; -+ unsigned int itemsize = 0; - byte *item_p = NULL; - -- static int itemsizes[GLDIT_TYPES] = { -+ static const unsigned int itemsizes[GLDIT_TYPES] = { - 0, - SIZEOF8(GLWall), SIZEOF8(GLWall), SIZEOF8(GLWall), SIZEOF8(GLWall), SIZEOF8(GLWall), - SIZEOF8(GLWall), SIZEOF8(GLWall), -Index: prboom-plus-2.5.1.4/src/gl_intern.h -=================================================================== ---- prboom-plus-2.5.1.4.orig/src/gl_intern.h -+++ prboom-plus-2.5.1.4/src/gl_intern.h -@@ -218,7 +218,7 @@ typedef struct +diff --git prboom2/src/gl_intern.h prboom2/src/gl_intern.h +index b4be8d56..8c44d9a7 100644 +--- prboom2/src/gl_intern.h ++++ prboom2/src/gl_intern.h +@@ -219,7 +219,7 @@ typedef struct typedef struct { @@ -41,11 +22,11 @@ float x1, x2, x3; float z1, z2, z3; -Index: prboom-plus-2.5.1.4/src/gl_main.c -=================================================================== ---- prboom-plus-2.5.1.4.orig/src/gl_main.c -+++ prboom-plus-2.5.1.4/src/gl_main.c -@@ -2339,15 +2339,20 @@ static void gld_AddHealthBar(mobj_t* thi +diff --git prboom2/src/gl_main.c prboom2/src/gl_main.c +index e2402e16..0a257ecf 100644 +--- prboom2/src/gl_main.c ++++ prboom2/src/gl_main.c +@@ -2334,15 +2334,23 @@ static void gld_AddHealthBar(mobj_t* thing, GLSprite *sprite) GLHealthBar hbar; int health_percent = thing->health * 100 / thing->info->spawnhealth; @@ -56,25 +37,28 @@ - hbar.cm = CR_YELLOW; - else if (health_percent <= health_bar_green) - hbar.cm = CR_GREEN; -+ if (health_percent <= health_bar_red) { -+ hbar.r = 1; -+ hbar.g = 0; ++ hbar.r = hbar.g = -1.0f; ++ if (health_percent <= 0) { ++ hbar.r = 1.0f; ++ hbar.g = 0.0f; ++ } else if (health_percent <= health_bar_red) { ++ hbar.r = 1.0f; ++ hbar.g = (double)health_percent / (health_bar_yellow - health_bar_red); + } else if (health_percent <= health_bar_yellow) { -+ hbar.r = 1; -+ hbar.g = (double)(health_percent - health_bar_red) / ++ hbar.r = (double)(health_bar_yellow - health_percent) / + (health_bar_yellow - health_bar_red); ++ hbar.g = 1.0f; + } else if (health_percent <= health_bar_green) { -+ /* FullSimplify[1-((percent-yellow)/(green-yellow))] */ -+ hbar.r = (double)(health_bar_green - health_percent) / -+ (health_bar_green - health_bar_yellow); -+ hbar.g = 1; ++ hbar.r = 0.0f; ++ hbar.g = 1.0f; + } - if (hbar.cm >= 0) ++ if (hbar.r >= 0) { float sx2 = (float)thing->radius / 2.0f / MAP_SCALE; float sx1 = sx2 - (float)health_percent * (float)thing->radius / 100.0f / MAP_SCALE; -@@ -2371,7 +2376,6 @@ static void gld_AddHealthBar(mobj_t* thi +@@ -2366,7 +2374,6 @@ static void gld_AddHealthBar(mobj_t* thing, GLSprite *sprite) static void gld_DrawHealthBars(void) { int i, count; @@ -82,7 +66,7 @@ count = gld_drawinfo.num_items[GLDIT_HBAR]; if (count > 0) -@@ -2382,31 +2386,17 @@ static void gld_DrawHealthBars(void) +@@ -2377,11 +2384,7 @@ static void gld_DrawHealthBars(void) for (i = count - 1; i >= 0; i--) { GLHealthBar *hbar = gld_drawinfo.items[GLDIT_HBAR][i].item.hbar; @@ -91,30 +75,10 @@ - cm = hbar->cm; - glColor4f(cm2RGB[cm][0], cm2RGB[cm][1], cm2RGB[cm][2], 1.0f); - } -+ glColor4f(hbar->r, hbar->g, 0, 1); ++ glColor4f(hbar->r, hbar->g, 0.0f, 1.0f); glVertex3f(hbar->x1, hbar->y, hbar->z1); glVertex3f(hbar->x2, hbar->y, hbar->z2); -- } -- glEnd(); -- -- if (health_bar_full_length) -- { -- glColor4f(0.5f, 0.5f, 0.5f, 1.0f); -- glBegin(GL_LINES); -- for (i = count - 1; i >= 0; i--) -- { -- GLHealthBar *hbar = gld_drawinfo.items[GLDIT_HBAR][i].item.hbar; -- -+ if (health_bar_full_length) { -+ glColor4f(0.5f, 0.5f, 0.5f, 1.0f); - glVertex3f(hbar->x1, hbar->y, hbar->z1); - glVertex3f(hbar->x3, hbar->y, hbar->z3); - } -- glEnd(); - } -- -+ glEnd(); - gld_EnableTexture2D(GL_TEXTURE0_ARB, true); - } - } +-- +2.31.1 + ++++++ prboom-nodatetime.diff ++++++ --- /var/tmp/diff_new_pack.cDanzG/_old 2021-04-12 12:40:00.253553387 +0200 +++ /var/tmp/diff_new_pack.cDanzG/_new 2021-04-12 12:40:00.253553387 +0200 @@ -1,14 +1,16 @@ +From 2bf8068e0cd916b39fd2c57f3c9bf582b0fc45d8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt <[email protected]> -Date: 2012-02-19 07:16:45.000000000 +0100 +Date: Sun, 19 Feb 2012 07:16:45 +0100 +Subject: [PATCH] Drop __DATE__/__TIME__ / enable reproducible builds --- - src/version.c | 4 ++-- + prboom2/src/version.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: prboom2-2.5.1.5+svn4532/src/version.c -=================================================================== ---- prboom2-2.5.1.5+svn4532.orig/src/version.c -+++ prboom2-2.5.1.5+svn4532/src/version.c +diff --git prboom2/src/version.c prboom2/src/version.c +index 1f5401f2..2cc173f6 100644 +--- prboom2/src/version.c ++++ prboom2/src/version.c @@ -37,11 +37,11 @@ #include "version.h" @@ -23,3 +25,6 @@ #endif const char version_date[] = BUILD_DATE " " BUILD_TIME; +-- +2.30.2 +
