diff --git a/.gitignore b/.gitignore index e4a2373..4ee4a79 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /dolphin-emu-5.0.11817.tar.gz /dolphin-emu-5.0.11819.tar.gz /dolphin-emu-5.0.11824.tar.gz +/dolphin-emu-5.0.11991.tar.gz diff --git a/0001-Revert-Externals-Update-minizip-search-path.patch b/0001-Revert-Externals-Update-minizip-search-path.patch new file mode 100644 index 0000000..0c7f943 --- /dev/null +++ b/0001-Revert-Externals-Update-minizip-search-path.patch @@ -0,0 +1,55 @@ +From 2d956647a7727e2c92c9ee3156a57948738485c7 Mon Sep 17 00:00:00 2001 +From: Mystro256 +Date: Tue, 5 May 2020 16:50:14 -0400 +Subject: [PATCH] Revert "Externals: Update minizip search path." + +This reverts commit f8f592c34536d58febb8dc485927ac48c3f165a3. +--- + Source/Core/Common/MinizipUtil.h | 2 +- + Source/Core/DiscIO/VolumeVerifier.cpp | 2 +- + Source/Core/UICommon/ResourcePack/ResourcePack.cpp | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Source/Core/Common/MinizipUtil.h b/Source/Core/Common/MinizipUtil.h +index 13589dd1b3..8d8bc7d692 100644 +--- a/Source/Core/Common/MinizipUtil.h ++++ b/Source/Core/Common/MinizipUtil.h +@@ -6,7 +6,7 @@ + + #include + +-#include ++#include + + #include "Common/CommonTypes.h" + #include "Common/ScopeGuard.h" +diff --git a/Source/Core/DiscIO/VolumeVerifier.cpp b/Source/Core/DiscIO/VolumeVerifier.cpp +index 6a620131fb..18e86481b2 100644 +--- a/Source/Core/DiscIO/VolumeVerifier.cpp ++++ b/Source/Core/DiscIO/VolumeVerifier.cpp +@@ -18,8 +18,8 @@ + + #include + #include ++#include + #include +-#include + #include + + #include "Common/Align.h" +diff --git a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp +index 75f178a840..f03a7d58a0 100644 +--- a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp ++++ b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp +@@ -6,7 +6,7 @@ + + #include + +-#include ++#include + + #include "Common/CommonPaths.h" + #include "Common/FileSearch.h" +-- +2.25.1 + diff --git a/dolphin-emu.spec b/dolphin-emu.spec index 3aabaf7..e3b12f7 100644 --- a/dolphin-emu.spec +++ b/dolphin-emu.spec @@ -6,8 +6,8 @@ #Dolphin now uses gitsnapshots for it's versions. #See upstream release notes for this snapshot: #https://dolphin-emu.org/download/dev/$commit -%global commit 1b97f081b8eff9012132a4124537968bdb0e03e0 -%global snapnumber 11824 +%global commit 8d4e8314a3dcd8680ae81d91fb7e076b4496b43b +%global snapnumber 11991 Name: dolphin-emu Version: 5.0.%{snapnumber} @@ -37,6 +37,8 @@ Patch1: 0001-Use-system-headers-for-Vulkan.patch Patch2: 0001-soundtounch-update-to-2.1.2.patch Patch3: 0002-soundtouch-Use-shorts-instead-of-floats-for-samples.patch Patch4: 0003-soundtounch-disable-exceptions.patch +#This needs to be fixed, I've reverted the patch that breaks minizip +Patch5: 0001-Revert-Externals-Update-minizip-search-path.patch ##Bundled code ahoy #The following isn't in Fedora yet: @@ -86,6 +88,7 @@ BuildRequires: qt5-qtbase-devel BuildRequires: vulkan-headers BuildRequires: xxhash-devel BuildRequires: zlib-devel +BuildRequires: xz-devel BuildRequires: gettext BuildRequires: desktop-file-utils @@ -228,6 +231,9 @@ appstream-util validate-relax --nonet \ %{_udevrulesdir}/51-dolphin-usb-device.rules %changelog +* Tue May 05 2020 Jeremy Newton - 5.0.11991-1 +- Update to latest beta version + * Wed Apr 29 2020 Jeremy Newton - 5.0.11824-1 - Unbundle cubeb - Update to latest beta version diff --git a/sources b/sources index 958f443..6005d75 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dolphin-emu-5.0.11824.tar.gz) = 9ab5bf3dda7cff09bc1a7124f4f04d43129824d3a9f726ef253f3c3e948aebdbef7b6a4fbf3b2a61041164c38844ccf819becadc292d9855a150a6febc89225b +SHA512 (dolphin-emu-5.0.11991.tar.gz) = 5a4b73be03bb1552d29b7161fe3de12313ce3c0f99cf879a443217dcae8ad570f08b19dad0c7817ae3ad00d8719331ad2f82da1607dfb7d8551fdc8c13f3f265