Merge 5395f21ae5 into 795e78685f

Flatpak: Use ScmRevGen to generate metainfo XML

CMake/ScmRevGen.cmake

@@ -30,6 +30,8 @@ if(GIT_FOUND)
     ERROR_QUIET)
 endif()
 
+string(TIMESTAMP DOLPHIN_WC_BUILD_DATE "%Y-%m-%d" UTC)
+
 # version number
 set(DOLPHIN_VERSION_MAJOR "2412")
 set(DOLPHIN_VERSION_MINOR "0")
@@ -67,3 +69,7 @@ configure_source_file("Source/Core/Common/scmrev.h")
 if(APPLE)
   configure_source_file("Source/Core/VersionInfo.plist")
 endif()
+
+if(LINUX)
+  configure_source_file("Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml")
+endif()

CMakeLists.txt

@@ -789,6 +789,13 @@ if(APPLE)
   endif()
 endif()
 
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Flatpak)
+  if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml)
+    file(TOUCH ${CMAKE_CURRENT_BINARY_DIR}/Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml)
+  endif()
+endif()
+
 find_package(Git)
 if(NOT GIT_FOUND)
 	set(GIT_EXECUTABLE "")
@@ -796,7 +803,7 @@ endif()
 add_custom_target(
 	dolphin_scmrev
 	${CMAKE_COMMAND} -DPROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR} -DPROJECT_BINARY_DIR=${PROJECT_BINARY_DIR} -DDISTRIBUTOR=${DISTRIBUTOR} -DDOLPHIN_DEFAULT_UPDATE_TRACK=${DOLPHIN_DEFAULT_UPDATE_TRACK} -DGIT_FOUND=${GIT_FOUND} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DDOLPHIN_WC_REVISION=${DOLPHIN_WC_REVISION} -DDOLPHIN_WC_DESCRIBE=${DOLPHIN_WC_DESCRIBE} -DDOLPHIN_WC_BRANCH=${DOLPHIN_WC_BRANCH} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} -P ${CMAKE_CURRENT_SOURCE_DIR}/CMake/ScmRevGen.cmake
-	BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/Common/scmrev.h" "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/DolphinQt/Info.plist" "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/MacUpdater/Info.plist"
+	BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/Common/scmrev.h" "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/DolphinQt/Info.plist" "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/MacUpdater/Info.plist" "${CMAKE_CURRENT_BINARY_DIR}/Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml"
 	VERBATIM
 )
 

Data/Sys/GameSettings/GS2E78.ini

@@ -1,7 +1,48 @@
 # GS2E78 - Summoner 2
 
 [OnFrame]
-# Add memory patches to be applied every frame here.
+# This game will reinitialize the sound system buffers during transitions while
+# sounds are still being played. There are still pointers in the sound list to
+# sounds in those buffers when the buffers get cleared, so the game crashes with
+# a null pointer dereference.
+# 
+# This patch will clean up the pending sound list during sound system
+# reinitialization before continuing to the sound system initialization call
+# previously at 0x8017E338.
+$Fix Sound System Crash
+0x8017E338:dword:0x480954C9
+0x80213800:dword:0x9421FFE0
+0x80213804:dword:0x7C0802A6
+0x80213808:dword:0x90010024
+0x8021380C:dword:0x93E1001C
+0x80213810:dword:0x93C10018
+0x80213814:dword:0x93A10014
+0x80213818:dword:0x7C7D1B78
+0x8021381C:dword:0x4BF7A7D1
+0x80213820:dword:0x83CDA0C0
+0x80213824:dword:0x7C7F1B78
+0x80213828:dword:0x48000010
+0x8021382C:dword:0x807E0008
+0x80213830:dword:0x4BF8C721
+0x80213834:dword:0x83DE0000
+0x80213838:dword:0x281E0000
+0x8021383C:dword:0x4082FFF0
+0x80213840:dword:0x38000000
+0x80213844:dword:0x7FE3FB78
+0x80213848:dword:0x900DA0C0
+0x8021384C:dword:0x4BF7A7C9
+0x80213850:dword:0x7FA3EB78
+0x80213854:dword:0x4BF6A49D
+0x80213858:dword:0x80010024
+0x8021385C:dword:0x83E1001C
+0x80213860:dword:0x83C10018
+0x80213864:dword:0x83A10014
+0x80213868:dword:0x7C0803A6
+0x8021386C:dword:0x38210020
+0x80213870:dword:0x4E800020
+
+[OnFrame_Enabled]
+$Fix Sound System Crash
 
 [ActionReplay]
 # Add action replay cheats here.

Flatpak/fill_release_node.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-DATE=$(git log -1 --pretty=%cd --date=iso8601 --date=format:'%Y-%m-%d')
-sed -i -e "s/@DATE_PLACEHOLDER/${DATE}/" org.DolphinEmu.dolphin-emu.metainfo.xml
-VERSION=$(git describe --tags | sed -E 's/^([0-9]+-[0-9]+).*/\1/')
-sed -i -e "s/@VERSION_PLACEHOLDER/${VERSION}/" org.DolphinEmu.dolphin-emu.metainfo.xml
-
-

Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml.in

@@ -36,7 +36,7 @@
     <id>dolphin-emu.desktop</id>
   </provides>
   <releases>
-    <release version="@VERSION_PLACEHOLDER" date="@DATE_PLACEHOLDER"/>
+    <release version="${DOLPHIN_WC_DESCRIBE}" date="${DOLPHIN_WC_BUILD_DATE}"/>
   </releases>
   <url type="homepage">https://dolphin-emu.org</url>
   <url type="bugtracker">https://bugs.dolphin-emu.org/projects/emulator/issues</url>
@@ -46,4 +46,7 @@
   <url type="contact">https://dolphin-emu.org/docs/faq/#ive-got-idea-make-dolphin-better-how-should-i-tell</url>
   <url type="vcs-browser">https://github.com/dolphin-emu/dolphin</url>
   <url type="contribute">https://github.com/dolphin-emu/dolphin/blob/master/Contributing.md</url>
+  <custom>
+    <value key="flathub::manifest">https://github.com/dolphin-emu/dolphin/blob/${DOLPHIN_WC_REVISION}/Flatpak/org.DolphinEmu.dolphin-emu.yml</value>
+  </custom>
 </component>

Flatpak/org.DolphinEmu.dolphin-emu.yml

@@ -52,6 +52,7 @@ modules:
 
   - name: dolphin-emu
     buildsystem: cmake-ninja
+    builddir: true
     config-opts:
       - -DCMAKE_BUILD_TYPE=Release
       - -DENABLE_ALSA=OFF
@@ -61,17 +62,13 @@ modules:
     cleanup:
       - /share/man
     post-install:
-      - install -D -t ${FLATPAK_DEST}/bin/ dolphin-emu-wrapper
-      - "${FLATPAK_BUILDER_BUILDDIR}/Flatpak/fill_release_node.sh"
-      - install -Dm644 -t ${FLATPAK_DEST}/share/metainfo/ org.DolphinEmu.dolphin-emu.metainfo.xml
+      - install -D -t ${FLATPAK_DEST}/bin/ ../dolphin-emu-wrapper
+      - install -Dm644 -t ${FLATPAK_DEST}/share/metainfo/ Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml
       - desktop-file-edit --set-key=Exec --set-value='/app/bin/dolphin-emu-wrapper'
         /app/share/applications/dolphin-emu.desktop
     sources:
       - type: dir
         path: ..
-      - type: file
-        path: org.DolphinEmu.dolphin-emu.metainfo.xml.in
-        dest-filename: org.DolphinEmu.dolphin-emu.metainfo.xml
       - type: script
         commands:
           - |

Source/Core/DolphinQt/Config/ConfigControls/ConfigChoice.cpp

@@ -63,7 +63,6 @@ void ConfigStringChoice::Load()
   const int index = m_text_is_data ? findText(setting_value) : findData(setting_value);
 
   // This can be called publicly.
-  const QSignalBlocker block(this);
   setCurrentIndex(index);
 }
 
@@ -145,6 +144,7 @@ void ConfigComplexChoice::UpdateComboIndex()
   auto it = std::find(m_options.begin(), m_options.end(), values);
   int index = static_cast<int>(std::distance(m_options.begin(), it));
 
+  // Will crash if not blocked
   const QSignalBlocker blocker(this);
   setCurrentIndex(index);
 }

Source/Core/DolphinQt/Config/ConfigControls/ConfigControl.h

@@ -5,7 +5,6 @@
 
 #include <QFont>
 #include <QMouseEvent>
-#include <QSignalBlocker>
 
 #include "Common/Config/Enums.h"
 #include "Common/Config/Layer.h"
@@ -49,14 +48,21 @@ protected:
       bf.setBold(IsConfigLocal());
       Derived::setFont(bf);
 
-      const QSignalBlocker blocker(this);
+      // This isn't signal blocked because the UI may need to be updated.
+      m_updating = true;
       OnConfigChanged();
+      m_updating = false;
     });
   }
 
   template <typename T>
   void SaveValue(const Config::Info<T>& setting, const T& value)
   {
+    // Avoid OnConfigChanged -> option changed to current config's value -> unnecessary save ->
+    // ConfigChanged.
+    if (m_updating)
+      return;
+
     if (m_layer != nullptr)
     {
       m_layer->Set(m_location, value);
@@ -100,6 +106,7 @@ private:
     }
   }
 
+  bool m_updating = false;
   const Config::Location m_location;
   Config::Layer* m_layer;
 };

Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp

@@ -232,7 +232,10 @@ void GeneralWidget::OnEmulationStateChanged(bool running)
   std::string current_backend = m_backend_combo->currentData().toString().toStdString();
   if (Config::Get(Config::MAIN_GFX_BACKEND) != current_backend)
   {
+    {
+      const QSignalBlocker blocker(m_backend_combo);
       m_backend_combo->Load();
+    }
     emit BackendChanged(QString::fromStdString(Config::Get(Config::MAIN_GFX_BACKEND)));
   }
 }