From 010015e856418e3f2fa6d337ad19a833f600ef1c Mon Sep 17 00:00:00 2001 From: Mystro256 Date: Mar 12 2020 01:33:36 +0000 Subject: Fix for RHBZ#1776006 --- diff --git a/0001-Check-for-null-pointer-in-soundReset.patch b/0001-Check-for-null-pointer-in-soundReset.patch new file mode 100644 index 0000000..de22620 --- /dev/null +++ b/0001-Check-for-null-pointer-in-soundReset.patch @@ -0,0 +1,26 @@ +From 410ede543c98c8c6dd89c25484da3bffb46f4187 Mon Sep 17 00:00:00 2001 +From: Mystro256 +Date: Fri, 6 Mar 2020 12:38:33 -0500 +Subject: [PATCH] Check for null pointer in soundReset(). + +Check that soundDriver is defined. +--- + src/gba/Sound.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/gba/Sound.cpp b/src/gba/Sound.cpp +index d6376ff2..90144390 100644 +--- a/src/gba/Sound.cpp ++++ b/src/gba/Sound.cpp +@@ -517,6 +517,8 @@ int soundGetEnable() + + void soundReset() + { ++ if (!soundDriver) ++ return; + soundDriver->reset(); + + remake_stereo_buffer(); +-- +2.21.1 + diff --git a/visualboyadvance-m.spec b/visualboyadvance-m.spec index 3d10e79..4ca432e 100644 --- a/visualboyadvance-m.spec +++ b/visualboyadvance-m.spec @@ -10,7 +10,7 @@ Name: visualboyadvance-m Version: %{upstreamtag} -Release: 2%{?rctagfedora:.%{rctagfedora}}%{?dist} +Release: 3%{?rctagfedora:.%{rctagfedora}}%{?dist} Summary: High compatibility Gameboy Advance Emulator combining VBA builds License: GPLv2 @@ -19,6 +19,8 @@ Source0: https://github.com/%{name}/%{name}/archive/v%{upstreamtag}.tar.g #Upstream patch: #https://github.com/visualboyadvance-m/visualboyadvance-m/commit/af0de1c4b308ef8d9a081ecf407805b75a99d877 Patch0: 0001-xbrz-fix-inline-asm-check.patch +#https://github.com/visualboyadvance-m/visualboyadvance-m/commit/410ede543c98c8c6dd89c25484da3bffb46f4187 +Patch1: 0001-Check-for-null-pointer-in-soundReset.patch BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cairo-devel @@ -106,6 +108,9 @@ appstream-util validate-relax --nonet \ %{_bindir}/%{shortname} %changelog +* Wed Mar 11 2020 Jeremy Newton - 2.1.4-3 +- Fix RHBZ#1776006 + * Fri Mar 6 2020 Jeremy Newton - 2.1.4-2 - Fix non x86 arches (backported a patch from upstream)