The package rpms/dolphin-emu.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/dolphin-emu.git/commit/?id=93fafb....
Change:
-%ifarch x86_64
Thanks.
Full change:
============
commit 93fafb21d1a0c6db188ae6ca1d014a77f5a6823d
Author: Mystro256 <alexjnewt(a)hotmail.com>
Date: Wed Aug 4 14:55:28 2021 -0400
I update to 5.0.14970
- Bochs needs to be bundled (F35's bochs 2.7 is too new)
- Disable mGBA, since this requires bundling that is not too straight
forward to implement
diff --git a/.gitignore b/.gitignore
index 0785747..06f23b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
/dolphin-emu-5.0.13603.tar.gz
/dolphin-emu-5.0.13963.tar.gz
/dolphin-emu-5.0.14344.tar.gz
+/dolphin-emu-5.0.14790.tar.gz
diff --git a/dolphin-emu.spec b/dolphin-emu.spec
index 9a77a2c..f9f4201 100644
--- a/dolphin-emu.spec
+++ b/dolphin-emu.spec
@@ -7,8 +7,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 acc7d3710d60552769f61f4b44bc8533a940df36
-%global snapnumber 14344
+%global commit 3cc274880f47d340bd508dba91aaf37c48acd367
+%global snapnumber 14790
#JIT is only supported on x86_64 and aarch64:
%ifarch x86_64 aarch64
@@ -58,14 +58,16 @@ Provides: bundled(soundtouch) = 2.1.2
Provides: bundled(gtest) = 1.9.0
#This is hard to unbundle and is unmaintainable with little benefit:
Provides: bundled(glslang)
+#dolphin uses a very old bochs, which is impatible with f35+'s bochs.
+#We could rework dolphin to use latest, but this requires a lot of work.
+#Furthermore, the dolphin gtest test cases that fail with f33/34 bochs
+#My best guess is that this is 2.6.6, as dolphin does not specify
+Provides: bundled(bochs) = 2.6.6
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: alsa-lib-devel
BuildRequires: bluez-libs-devel
-%ifarch x86_64
-BuildRequires: bochs-devel
-%endif
BuildRequires: cmake
BuildRequires: cubeb-devel
BuildRequires: enet-devel
@@ -163,18 +165,6 @@ sed -i "/PageFaultTest/d"
Source/UnitTests/Core/CMakeLists.txt
cd Externals
#Keep what we need...
rm -rf `ls | grep -v 'Bochs' | grep -v 'FreeSurround' | grep -v
'imgui' | grep -v 'cpp-optparse' | grep -v 'soundtouch' | grep -v
'picojson' | grep -v 'gtest' | grep -v 'rangeset' | grep -v
'glslang'`
-#Remove Bundled Bochs source and replace with links (for x86 only):
-%ifarch x86_64
-pushd Bochs_disasm
-rm -rf `ls | grep -v 'stdafx' | grep -v 'CMakeLists.txt'`
-ln -s %{_includedir}/bochs/* ./
-ln -s %{_includedir}/bochs/disasm/* ./
-popd
-#FIXME: This test fails because we unbundle bochs
-sed -i "/x64EmitterTest/d" ../Source/UnitTests/Common/CMakeLists.txt
-%else
-rm -rf Bochs_disasm
-%endif
#Replace bundled picojson with a modified system copy (remove use of throw)
pushd picojson
rm picojson.h
@@ -189,6 +179,7 @@ popd
%cmake . \
-DAPPROVED_VENDORED_DEPENDENCIES=";" \
-DXXHASH_FOUND=ON \
+ -DUSE_MGBA=OFF \
%{?!enablejit:-DENABLE_GENERIC=ON} \
-DUSE_SHARED_ENET=ON \
-DENABLE_ANALYTICS=OFF \
@@ -230,7 +221,7 @@ appstream-util validate-relax --nonet \
%files -f %{name}.lang
%doc Readme.md
-%license license.txt
+%license Data/license.txt
%attr(755, root, root) %{_bindir}/%{name}
%{_bindir}/%{name}-x11
%{_mandir}/man6/%{name}.*
@@ -243,13 +234,13 @@ appstream-util validate-relax --nonet \
%files nogui
%doc Readme.md
-%license license.txt
+%license Data/license.txt
%{_bindir}/%{name}-nogui
%{_mandir}/man6/%{name}-nogui.*
%files data
%doc Readme.md docs/gc-font-tool.cpp
-%license license.txt font-licenses.txt
+%license Data/license.txt font-licenses.txt
#For the gui package:
%exclude %{_datadir}/%{name}/sys/Resources/
%exclude %{_datadir}/%{name}/sys/Themes/
@@ -259,6 +250,9 @@ appstream-util validate-relax --nonet \
%{_udevrulesdir}/51-dolphin-usb-device.rules
%changelog
+* Wed Aug 04 2021 Jeremy Newton <alexjnewt at hotmail dot com> - 5.0.14790-1
+- Update to 5.0-14790
+
* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
5.0.14344-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/sources b/sources
index b2048ec..68cc222 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dolphin-emu-5.0.14344.tar.gz) =
618db9f56142e7ba7358f0afa7323ec50ac5ba2bbcb9d0db774b9d1b3a5e9404919c025bcdee709275e770cd6af714e294d70339cccb2ead040f0396039d2dfa
+SHA512 (dolphin-emu-5.0.14790.tar.gz) =
14f67cc85c89604e547c356f3d8c9f3a1902b2be3ba17c7fe526e1bcdc3141b3616fb8bfb4547addd9be9522d30c87d49a92a6f1004d56fa9ba97c1e4efddcb5
commit 83a238ed9e72aa8538325fc3b82d82135798d923
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 21 21:02:31 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/dolphin-emu.spec b/dolphin-emu.spec
index 6f6214a..9a77a2c 100644
--- a/dolphin-emu.spec
+++ b/dolphin-emu.spec
@@ -17,7 +17,7 @@
Name: dolphin-emu
Version: 5.0.%{snapnumber}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: GameCube / Wii / Triforce Emulator
Url:
https://dolphin-emu.org/
@@ -259,6 +259,9 @@ appstream-util validate-relax --nonet \
%{_udevrulesdir}/51-dolphin-usb-device.rules
%changelog
+* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
5.0.14344-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Mon Jul 05 2021 Richard Shaw <hobbes1069(a)gmail.com> - 5.0.14344-2
- Rebuild for new fmt version.
commit 635a44d746cb62894f21fb1f4f7d5df61ee4d5bc
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Mon Jul 5 07:41:25 2021 -0500
Rebuild for new fmt version.
diff --git a/dolphin-emu.spec b/dolphin-emu.spec
index 89a8427..6f6214a 100644
--- a/dolphin-emu.spec
+++ b/dolphin-emu.spec
@@ -17,7 +17,7 @@
Name: dolphin-emu
Version: 5.0.%{snapnumber}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GameCube / Wii / Triforce Emulator
Url:
https://dolphin-emu.org/
@@ -259,6 +259,9 @@ appstream-util validate-relax --nonet \
%{_udevrulesdir}/51-dolphin-usb-device.rules
%changelog
+* Mon Jul 05 2021 Richard Shaw <hobbes1069(a)gmail.com> - 5.0.14344-2
+- Rebuild for new fmt version.
+
* Mon Jun 07 2021 Jeremy Newton <alexjnewt at hotmail dot com> - 5.0.14344-1
- Update to 5.0-14344