From 10f84683fd4a17ec17984f4d0d8ec72f3c73166e Mon Sep 17 00:00:00 2001 From: Mystro256 Date: Mar 12 2020 12:46:39 +0000 Subject: Fix exclusive arches, see RHBZ#1811646 Also some LOVE 11 fixes --- diff --git a/mrrescue-1.02e-Fixed-remaining-setColor-statements.patch b/mrrescue-1.02e-Fixed-remaining-setColor-statements.patch new file mode 100644 index 0000000..c6ce51d --- /dev/null +++ b/mrrescue-1.02e-Fixed-remaining-setColor-statements.patch @@ -0,0 +1,162 @@ +From 5a58668d9a1e661f6591bd44a76cf242b3aabf3e Mon Sep 17 00:00:00 2001 +From: Simon Larsen +Date: Sat, 18 Aug 2018 16:51:03 +0200 +Subject: [PATCH 1/2] Fixed remaining setColor statements + +--- + ingame.lua | 22 +++++++++++----------- + keyboard.lua | 8 ++++---- + splash.lua | 30 +++++++++++++++--------------- + 3 files changed, 30 insertions(+), 30 deletions(-) + +diff --git a/ingame.lua b/ingame.lua +index f5c6f7c..4fcfcfe 100644 +--- a/ingame.lua ++++ b/ingame.lua +@@ -196,7 +196,7 @@ function ingame.draw() + + -- Draw red screen if hit + if player.heat > 0 then +- lg.setColor(1,1,1,cap(player.heat*255, 16, 255)/255) ++ lg.setColor(1,1,1,cap(player.heat, 0.063, 1)) + lg.draw(img.red_screen, quad.red_screen, 0,0) + lg.setColor(1,1,1,1) + end +@@ -249,13 +249,13 @@ end + + function drawWonMessage() + local alpha = cap((-translate_y)/100, 0, 1) +- lg.setColor(0,0,0,alpha*255) ++ lg.setColor(0,0,0,alpha) + lg.rectangle("fill", 0, 40, WIDTH, #WON_MESSAGES[level]*10+12) +- lg.setColor(255,255,255,alpha*255) ++ lg.setColor(1,1,1,alpha) + for i,v in ipairs(WON_MESSAGES[level]) do + lg.printf(v, 0, 48+(i-1)*10, WIDTH, "center") + end +- lg.setColor(255,255,255,255) ++ lg.setColor(1,1,1,1) + end + + function drawHUD() +@@ -296,13 +296,13 @@ function drawHUD() + if player:isDying() then + local color = 0 + if warning_frame <= 1 then +- color = 30 + warning_frame * 225 ++ color = 0.118 + warning_frame + else +- color = 255 - (warning_frame % 1)*225 ++ color = 1 - (warning_frame % 1) + end +- lg.setColor(255,color,color) ++ lg.setColor(1,color,color) + lg.draw(img.temperature_bar_blink, 74, HEIGHT-26) +- lg.setColor(255,255,255) ++ lg.setColor(1,1,1) + end + + -- Draw item slots +@@ -320,11 +320,11 @@ function drawHUD() + + -- Draw score + lg.setFont(font.bold) +- lg.setColor(16,12,9) ++ lg.setColor(16/255,12/255,9/255) + lg.print("SCORE: "..score,150,187) +- lg.setColor(246,247,221) ++ lg.setColor(246/255,247/255,221/255) + lg.print("SCORE: "..score,150,186) +- lg.setColor(255,255,255) ++ lg.setColor(1,1,1) + + -- Draw boss health bar + if map.type == MT_BOSS and ingame_state ~= INGAME_WON then +diff --git a/keyboard.lua b/keyboard.lua +index 5cada98..a4d0db8 100644 +--- a/keyboard.lua ++++ b/keyboard.lua +@@ -22,19 +22,19 @@ function keyboard.draw() + lg.printf("SET KEYBOARD", 0, 26, WIDTH, "center") + for i,v in ipairs(keynames) do + if keyboard.waiting == true and i == keyboard.selection then +- lg.setColor(195,52,41) ++ lg.setColor(195/255,52/255,41/255) + end + lg.print(string.upper(v), 65, 40+i*13) + if config.keys[v] == " " then + lg.print("SPACE", 154, 40+i*13) + elseif config.keys[v] == "none" then +- lg.setColor(118,31,25) ++ lg.setColor(118/255,31/255,25/255) + lg.print("NONE", 154, 40+i*13) +- lg.setColor(255,255,255) ++ lg.setColor(1,1,1) + else + lg.print(string.upper(config.keys[v]:sub(1,7)), 154, 40+i*13) + end +- lg.setColor(255,255,255) ++ lg.setColor(1,1,1) + end + lg.print("DEFAULT", 65, 144) + lg.print("BACK", 65, 157) +diff --git a/splash.lua b/splash.lua +index 6c779cd..0ef225b 100644 +--- a/splash.lua ++++ b/splash.lua +@@ -19,37 +19,37 @@ function splash.draw() + + if transition_time < 4 then + if transition_time < 1 then +- local alpha = cap(255*transition_time, 0,255) +- lg.setColor(255,255,255,alpha) ++ local alpha = cap(transition_time, 0, 1) ++ lg.setColor(1,1,1,alpha) + lg.draw(img.tangram, quad.screen, 0,0) +- lg.setColor(255,255,255,255) ++ lg.setColor(1,1,1,1) + elseif transition_time > 3 then +- local alpha = cap(255*(1-(transition_time-3)), 0,255) +- lg.setColor(255,255,255,alpha) ++ local alpha = cap(1-(transition_time-3), 0, 1) ++ lg.setColor(1,1,1,alpha) + lg.draw(img.tangram, quad.screen, 0,0) +- lg.setColor(255,255,255,255) ++ lg.setColor(1,1,1,1) + else + lg.draw(img.tangram, quad.screen, 0,0) + end + elseif transition_time < 8 then + if transition_time < 5 then +- local alpha = cap(255*(transition_time-4), 0,255) +- lg.setColor(255,255,255,alpha) ++ local alpha = cap(transition_time-4, 0, 1) ++ lg.setColor(1,1,1,alpha) + lg.draw(img.lovesplashpixel, quad.screen, 0,0) +- lg.setColor(255,255,255,255) ++ lg.setColor(1,1,1,1) + elseif transition_time > 7 then +- local alpha = cap(255*(1-(transition_time-7)), 0,255) +- lg.setColor(255,255,255,alpha) ++ local alpha = cap(1-(transition_time-7), 0, 1) ++ lg.setColor(1,1,1,alpha) + lg.draw(img.lovesplashpixel, quad.screen, 0,0) +- lg.setColor(255,255,255,255) ++ lg.setColor(1,1,1,1) + else + lg.draw(img.lovesplashpixel, quad.screen, 0,0) + end + elseif transition_time < 10 then +- local alpha = cap(128*(transition_time-8), 0, 255) +- lg.setColor(255,255,255,alpha) ++ local alpha = cap(0.5*(transition_time-8), 0, 1) ++ lg.setColor(1,1,1,alpha) + lg.draw(img.splash, quad.screen, 0,0) +- lg.setColor(255,255,255,255) ++ lg.setColor(1,1,1,1) + else + lg.draw(img.splash, quad.screen, 0,0) + lg.setFont(font.bold) +-- +2.14.4 + diff --git a/mrrescue-1.02e-Updated-conf.lua-to-11.0-template.patch b/mrrescue-1.02e-Updated-conf.lua-to-11.0-template.patch new file mode 100644 index 0000000..6d1cf63 --- /dev/null +++ b/mrrescue-1.02e-Updated-conf.lua-to-11.0-template.patch @@ -0,0 +1,52 @@ +From a5be73c60acb8d1be506f7b5e48e784492ba96ce Mon Sep 17 00:00:00 2001 +From: Simon Larsen +Date: Sat, 18 Aug 2018 16:56:32 +0200 +Subject: [PATCH] Updated conf.lua to 11.0 template + +--- + conf.lua | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/conf.lua b/conf.lua +index f00b216..41d3cbf 100644 +--- a/conf.lua ++++ b/conf.lua +@@ -1,10 +1,14 @@ + function love.conf(t) + t.identity = "mrrescue" ++ t.appendidentity = false + t.version = "11.0" + t.console = false + t.accelerometerjoystick = true ++ t.externalstorage = false + t.gammacorrect = false +- ++ ++ t.audio.mixwithsystem = true ++ + t.window.title = "Mr. Rescue" + t.window.icon = nil + t.window.width = 256*3 +@@ -15,15 +19,17 @@ function love.conf(t) + t.window.minheight = 1 + t.window.fullscreen = false + t.window.fullscreentype = "desktop" +- t.window.vsync = true ++ t.window.vsync = 1 + t.window.msaa = 0 + t.window.display = 1 + t.window.highdpi = false + t.window.x = nil + t.window.y = nil +- ++ + t.modules.audio = true ++ t.modules.data = true + t.modules.event = true ++ t.modules.font = true + t.modules.graphics = true + t.modules.image = true + t.modules.joystick = true +-- +2.21.1 + diff --git a/mrrescue.spec b/mrrescue.spec index 87c716a..bf8be8c 100644 --- a/mrrescue.spec +++ b/mrrescue.spec @@ -1,6 +1,6 @@ Name: mrrescue Version: 1.02e -Release: 14%{?dist} +Release: 15%{?dist} Summary: Arcade-style fire fighting game #See LICENSE file in source for details @@ -11,14 +11,15 @@ URL: http://tangramgames.dk/games/mrrescue Source0: https://github.com/SimonLarsen/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz #Patch for appdata, manpage, execution script, and desktop file Patch0: %{name}-appdata.patch -#Upstream patch: +#Upstream patches: #https://github.com/SimonLarsen/mrrescue/commit/ec139833eba2781507cf32d9df30772138a76829 Patch1: %{name}-%{version}-double-define.patch -%if 0%{?fedora} > 28 -#Love 11 patch: -#https://github.com/SimonLarsen/mrrescue/pull/17 +#https://github.com/SimonLarsen/mrrescue/commit/ab23031e0c2faecb77fde1be8a41d6f8ea4e6eda Patch2: %{name}-%{version}-love11.patch -%endif +#https://github.com/SimonLarsen/mrrescue/commit/5a58668d9a1e661f6591bd44a76cf242b3aabf3e +Patch3: %{name}-%{version}-Fixed-remaining-setColor-statements.patch +#https://github.com/SimonLarsen/mrrescue/commit/a5be73c60acb8d1be506f7b5e48e784492ba96ce +Patch4: %{name}-%{version}-Updated-conf.lua-to-11.0-template.patch BuildRequires: desktop-file-utils BuildRequires: libappstream-glib @@ -26,10 +27,8 @@ BuildRequires: ImageMagick BuildArch: noarch Requires: love -# List the arches that love builds on prior to f28 -%if 0%{?fedora} < 28 -ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64 -%endif +# List the arches that love builds on +ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le #From the website (see URL above) %description @@ -81,6 +80,10 @@ install -p -D -m 0644 %{name}.png \ %{_datadir}/appdata/*.appdata.xml %changelog +* Thu Mar 12 2020 Jeremy Newton - 1.02e-15 +- Rebuilt for correct exclusive arch +- LOVE 11 fixes + * Wed Jan 29 2020 Fedora Release Engineering - 1.02e-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild