Merge 8139a8e570 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/Graphics/HacksWidget.cpp

@@ -150,13 +150,13 @@ void HacksWidget::OnBackendChanged(const QString& backend_name)
 
 void HacksWidget::ConnectWidgets()
 {
-  connect(m_store_efb_copies, &QCheckBox::stateChanged,
+  connect(m_store_efb_copies, &QCheckBox::checkStateChanged,
           [this](int) { UpdateDeferEFBCopiesEnabled(); });
-  connect(m_store_xfb_copies, &QCheckBox::stateChanged,
+  connect(m_store_xfb_copies, &QCheckBox::checkStateChanged,
           [this](int) { UpdateDeferEFBCopiesEnabled(); });
-  connect(m_immediate_xfb, &QCheckBox::stateChanged,
+  connect(m_immediate_xfb, &QCheckBox::checkStateChanged,
           [this](int) { UpdateSkipPresentingDuplicateFramesEnabled(); });
-  connect(m_vi_skip, &QCheckBox::stateChanged,
+  connect(m_vi_skip, &QCheckBox::checkStateChanged,
           [this](int) { UpdateSkipPresentingDuplicateFramesEnabled(); });
 }
 

Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp

@@ -76,7 +76,7 @@ MappingBool::MappingBool(MappingWidget* parent, ControllerEmu::NumericSetting<bo
   if (const auto ui_description = m_setting.GetUIDescription())
     setToolTip(tr(ui_description));
 
-  connect(this, &QCheckBox::stateChanged, this, [this, parent](int value) {
+  connect(this, &QCheckBox::checkStateChanged, this, [this, parent](Qt::CheckState value) {
     m_setting.SetValue(value != 0);
     ConfigChanged();
     parent->SaveSettings();

Source/Core/DolphinQt/Config/VerifyWidget.cpp

@@ -121,8 +121,8 @@ void VerifyWidget::ConnectWidgets()
 {
   connect(m_verify_button, &QPushButton::clicked, this, &VerifyWidget::Verify);
 
-  connect(m_md5_checkbox, &QCheckBox::stateChanged, this, &VerifyWidget::UpdateRedumpEnabled);
-  connect(m_sha1_checkbox, &QCheckBox::stateChanged, this, &VerifyWidget::UpdateRedumpEnabled);
+  connect(m_md5_checkbox, &QCheckBox::checkStateChanged, this, &VerifyWidget::UpdateRedumpEnabled);
+  connect(m_sha1_checkbox, &QCheckBox::checkStateChanged, this, &VerifyWidget::UpdateRedumpEnabled);
 }
 
 static void SetHash(QLineEdit* line_edit, const std::vector<u8>& hash)

Source/Core/DolphinQt/Debugger/NetworkWidget.cpp

@@ -209,22 +209,22 @@ void NetworkWidget::ConnectWidgets()
 {
   connect(m_dump_format_combo, &QComboBox::currentIndexChanged, this,
           &NetworkWidget::OnDumpFormatComboChanged);
-  connect(m_dump_ssl_read_checkbox, &QCheckBox::stateChanged, [](int state) {
+  connect(m_dump_ssl_read_checkbox, &QCheckBox::checkStateChanged, [](Qt::CheckState state) {
     Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_DUMP_READ, state == Qt::Checked);
   });
-  connect(m_dump_ssl_write_checkbox, &QCheckBox::stateChanged, [](int state) {
+  connect(m_dump_ssl_write_checkbox, &QCheckBox::checkStateChanged, [](Qt::CheckState state) {
     Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_DUMP_WRITE, state == Qt::Checked);
   });
-  connect(m_dump_root_ca_checkbox, &QCheckBox::stateChanged, [](int state) {
+  connect(m_dump_root_ca_checkbox, &QCheckBox::checkStateChanged, [](Qt::CheckState state) {
     Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_DUMP_ROOT_CA, state == Qt::Checked);
   });
-  connect(m_dump_peer_cert_checkbox, &QCheckBox::stateChanged, [](int state) {
+  connect(m_dump_peer_cert_checkbox, &QCheckBox::checkStateChanged, [](Qt::CheckState state) {
     Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_DUMP_PEER_CERT, state == Qt::Checked);
   });
-  connect(m_verify_certificates_checkbox, &QCheckBox::stateChanged, [](int state) {
+  connect(m_verify_certificates_checkbox, &QCheckBox::checkStateChanged, [](Qt::CheckState state) {
     Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_VERIFY_CERTIFICATES, state == Qt::Checked);
   });
-  connect(m_dump_bba_checkbox, &QCheckBox::stateChanged, [](int state) {
+  connect(m_dump_bba_checkbox, &QCheckBox::checkStateChanged, [](Qt::CheckState state) {
     Config::SetBaseOrCurrent(Config::MAIN_NETWORK_DUMP_BBA, state == Qt::Checked);
   });
   connect(m_open_dump_folder, &QPushButton::clicked, [] {

Source/Core/DolphinQt/NKitWarningDialog.cpp

@@ -80,7 +80,7 @@ NKitWarningDialog::NKitWarningDialog(QWidget* parent) : QDialog(parent)
   connect(cancel, &QPushButton::clicked, this, &QDialog::reject);
 
   ok->setEnabled(false);
-  connect(checkbox_accept, &QCheckBox::stateChanged,
+  connect(checkbox_accept, &QCheckBox::checkStateChanged,
           [ok](int state) { ok->setEnabled(state == Qt::Checked); });
 
   connect(this, &QDialog::accepted, [checkbox_skip] {

Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp

@@ -243,7 +243,7 @@ void NetPlaySetupDialog::ConnectWidgets()
           &NetPlaySetupDialog::SaveSettings);
 
 #ifdef USE_UPNP
-  connect(m_host_upnp, &QCheckBox::stateChanged, this, &NetPlaySetupDialog::SaveSettings);
+  connect(m_host_upnp, &QCheckBox::checkStateChanged, this, &NetPlaySetupDialog::SaveSettings);
 #endif
 
   connect(m_connect_button, &QPushButton::clicked, this, &QDialog::accept);

Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp

@@ -61,7 +61,7 @@ void PadMappingDialog::ConnectWidgets()
   }
   for (const auto& checkbox : m_gba_boxes)
   {
-    connect(checkbox, &QCheckBox::stateChanged, this, &PadMappingDialog::OnMappingChanged);
+    connect(checkbox, &QCheckBox::checkStateChanged, this, &PadMappingDialog::OnMappingChanged);
   }
 }
 

Source/Core/DolphinQt/Settings/AdvancedPane.cpp

@@ -13,6 +13,7 @@
 #include <QRadioButton>
 #include <QSignalBlocker>
 #include <QSlider>
+#include <QTimeZone>
 #include <QVBoxLayout>
 #include <cmath>
 
@@ -170,9 +171,9 @@ void AdvancedPane::CreateLayout()
       QStringLiteral("mm"), QStringLiteral("mm:ss")));
 
   QtUtils::ShowFourDigitYear(m_custom_rtc_datetime);
-  m_custom_rtc_datetime->setDateTimeRange(QDateTime({2000, 1, 1}, {0, 0, 0}, Qt::UTC),
-                                          QDateTime({2099, 12, 31}, {23, 59, 59}, Qt::UTC));
-  m_custom_rtc_datetime->setTimeSpec(Qt::UTC);
+  m_custom_rtc_datetime->setDateTimeRange(QDateTime({2000, 1, 1}, {0, 0, 0}, QTimeZone::UTC),
+                                          QDateTime({2099, 12, 31}, {23, 59, 59}, QTimeZone::UTC));
+  m_custom_rtc_datetime->setTimeZone(QTimeZone::UTC);
   rtc_options->layout()->addWidget(m_custom_rtc_datetime);
 
   auto* custom_rtc_description =

Source/Core/DolphinQt/Settings/GameCubePane.cpp

@@ -247,7 +247,7 @@ void GameCubePane::CreateWidgets()
 void GameCubePane::ConnectWidgets()
 {
   // IPL Settings
-  connect(m_skip_main_menu, &QCheckBox::stateChanged, this, &GameCubePane::SaveSettings);
+  connect(m_skip_main_menu, &QCheckBox::checkStateChanged, this, &GameCubePane::SaveSettings);
   connect(m_language_combo, &QComboBox::currentIndexChanged, this, &GameCubePane::SaveSettings);
 
   // Device Settings
@@ -278,10 +278,10 @@ void GameCubePane::ConnectWidgets()
 
 #ifdef HAS_LIBMGBA
   // GBA Settings
-  connect(m_gba_threads, &QCheckBox::stateChanged, this, &GameCubePane::SaveSettings);
+  connect(m_gba_threads, &QCheckBox::checkStateChanged, this, &GameCubePane::SaveSettings);
   connect(m_gba_bios_edit, &QLineEdit::editingFinished, this, &GameCubePane::SaveSettings);
   connect(m_gba_browse_bios, &QPushButton::clicked, this, &GameCubePane::BrowseGBABios);
-  connect(m_gba_save_rom_path, &QCheckBox::stateChanged, this, &GameCubePane::SaveRomPathChanged);
+  connect(m_gba_save_rom_path, &QCheckBox::checkStateChanged, this, &GameCubePane::SaveRomPathChanged);
   connect(m_gba_saves_edit, &QLineEdit::editingFinished, this, &GameCubePane::SaveSettings);
   connect(m_gba_browse_saves, &QPushButton::clicked, this, &GameCubePane::BrowseGBASaves);
   for (size_t i = 0; i < m_gba_browse_roms.size(); ++i)

Source/Core/DolphinQt/TAS/TASCheckBox.cpp

@@ -15,7 +15,7 @@ TASCheckBox::TASCheckBox(const QString& text, TASInputWindow* parent)
 {
   setTristate(true);
 
-  connect(this, &TASCheckBox::stateChanged, this, &TASCheckBox::OnUIValueChanged);
+  connect(this, &TASCheckBox::checkStateChanged, this, &TASCheckBox::OnUIValueChanged);
 }
 
 bool TASCheckBox::GetValue() const
@@ -58,7 +58,7 @@ void TASCheckBox::mousePressEvent(QMouseEvent* event)
   setCheckState(Qt::PartiallyChecked);
 }
 
-void TASCheckBox::OnUIValueChanged(int new_value)
+void TASCheckBox::OnUIValueChanged(Qt::CheckState new_value)
 {
   m_state.OnUIValueChanged(new_value);
 }

Source/Core/DolphinQt/TAS/TASCheckBox.h

@@ -25,7 +25,7 @@ protected:
   void mousePressEvent(QMouseEvent* event) override;
 
 private slots:
-  void OnUIValueChanged(int new_value);
+  void OnUIValueChanged(Qt::CheckState new_value);
   void ApplyControllerValueChange();
 
 private: