From ec916d1f5f30234fcef05a4d3794ba704a373c1f Mon Sep 17 00:00:00 2001 From: Megamouse Date: Fri, 18 Aug 2023 17:29:21 +0200 Subject: [PATCH] Update dependencies Update Qt to 6.6.0 Update yaml-cpp to 0.8.0 (support for more data types, cmake changes) Update FAudio to 23.10 (now defaults to WASAPI on Win10+) Update pugixml 1.14 (better error handling) Update SDL to 2.28.4 (third-party DualSense fix) --- .cirrus.yml | 6 +++--- 3rdparty/FAudio | 2 +- 3rdparty/libsdl-org/SDL | 2 +- 3rdparty/pugixml | 2 +- 3rdparty/yaml-cpp/CMakeLists.txt | 2 ++ 3rdparty/yaml-cpp/yaml-cpp | 2 +- BUILDING.md | 8 ++++---- azure-pipelines.yml | 10 +++++----- buildfiles/msvc/rpcs3_default.props | 2 +- 9 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index cc669fcab3..6e3d2862bd 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -7,7 +7,7 @@ env: BUILD_SOURCEBRANCHNAME: $CIRRUS_BRANCH RPCS3_TOKEN: ENCRYPTED[!a4c3850e29ab150692286a74bec29819d25971a7ec431b86de2a35f7ed90c5b2ab3c93469f9298e30924d843599110e9!] QT_VER_MAIN: '6' - QT_VER: '6.5.3' + QT_VER: '6.6.0' # windows_task: # matrix: @@ -21,7 +21,7 @@ env: # COMPILER: msvc # BUILD_ARTIFACTSTAGINGDIRECTORY: ${CIRRUS_WORKING_DIR}\artifacts\ # QT_VER_MSVC: 'msvc2019' -# QT_DATE: '202309260341' +# QT_DATE: '202310040911' # QTDIR: C:\Qt\${QT_VER}\${QT_VER_MSVC}_64 # VULKAN_VER: '1.3.224.1' # VULKAN_SDK_SHA: '2029e652e39ee6a6036cff3765da31e1e6c595fd2413d3cd111dfab7855621ea' @@ -56,7 +56,7 @@ env: # linux_task: # container: -# image: rpcs3/rpcs3-ci-focal:1.1 +# image: rpcs3/rpcs3-ci-focal:1.3 # cpu: 4 # memory: 16G # env: diff --git a/3rdparty/FAudio b/3rdparty/FAudio index 60480416bd..a26a9a8eba 160000 --- a/3rdparty/FAudio +++ b/3rdparty/FAudio @@ -1 +1 @@ -Subproject commit 60480416bda930bf7544e6abe31b937f0daa0256 +Subproject commit a26a9a8ebab96a2fa99ee6aa01af1c76f71725fb diff --git a/3rdparty/libsdl-org/SDL b/3rdparty/libsdl-org/SDL index 8a5ba43d00..cc016b0046 160000 --- a/3rdparty/libsdl-org/SDL +++ b/3rdparty/libsdl-org/SDL @@ -1 +1 @@ -Subproject commit 8a5ba43d00252c6c8b33c9aa4f1048222955ab4d +Subproject commit cc016b0046d563287f0aa9f09b958b5e70d43696 diff --git a/3rdparty/pugixml b/3rdparty/pugixml index a0e0643363..db78afc2b7 160000 --- a/3rdparty/pugixml +++ b/3rdparty/pugixml @@ -1 +1 @@ -Subproject commit a0e064336317c9347a91224112af9933598714e9 +Subproject commit db78afc2b7d8f043b4bc6b185635d949ea2ed2a8 diff --git a/3rdparty/yaml-cpp/CMakeLists.txt b/3rdparty/yaml-cpp/CMakeLists.txt index 78792066b6..0c123a37b8 100644 --- a/3rdparty/yaml-cpp/CMakeLists.txt +++ b/3rdparty/yaml-cpp/CMakeLists.txt @@ -3,6 +3,8 @@ # to disable it... # So we just install it to a different directory set(YAML_CPP_INSTALL OFF CACHE BOOL "Don't install YAML") +set(YAML_CPP_DISABLE_UNINSTALL ON CACHE BOOL "Disable yaml-cpp uninstall") + set(CMAKE_INSTALL_PREFIX_OLD ${CMAKE_INSTALL_PREFIX}) set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/yaml-cpp_install) diff --git a/3rdparty/yaml-cpp/yaml-cpp b/3rdparty/yaml-cpp/yaml-cpp index 0b67821f30..456c68f452 160000 --- a/3rdparty/yaml-cpp/yaml-cpp +++ b/3rdparty/yaml-cpp/yaml-cpp @@ -1 +1 @@ -Subproject commit 0b67821f307e8c6bf0eba9b6d3250e3cf1441450 +Subproject commit 456c68f452da09d8ca84b375faa2b1397713eaba diff --git a/BUILDING.md b/BUILDING.md index 502b28bf8d..04c27e22c0 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -9,11 +9,11 @@ Other instructions may be found [here](https://wiki.rpcs3.net/index.php?title=Bu * [CMake 3.16.9+](https://www.cmake.org/download/) (add to PATH) * [Python 3.6+](https://www.python.org/downloads/) (add to PATH) -* [Qt 6.5.3](https://www.qt.io/download-qt-installer) +* [Qt 6.6.0](https://www.qt.io/download-qt-installer) * [Visual Studio 2019](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community) * [Vulkan SDK 1.3.224](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/windows/getting_started.html)) for now future SDKs don't work. You need precisely 1.3.224. -**Either add the** `QTDIR` **environment variable, e.g.** `\6.5.3\msvc2019_64\` **, or use the [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2019)** +**Either add the** `QTDIR` **environment variable, e.g.** `\6.6.0\msvc2019_64\` **, or use the [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2019)** ### Linux @@ -21,7 +21,7 @@ These are the essentials tools to build RPCS3 on Linux. Some of them can be inst * Clang 12+ or GCC 11+ * [CMake 3.16.9+](https://www.cmake.org/download/) -* [Qt 6.5.3](https://www.qt.io/download-qt-installer) +* [Qt 6.6.0](https://www.qt.io/download-qt-installer) * [Vulkan SDK 1.3.224](https://vulkan.lunarg.com/sdk/home) (See "Install the SDK" [here](https://vulkan.lunarg.com/doc/sdk/latest/linux/getting_started.html)) for now future SDKs don't work. You need precisely 1.3.224. * [SDL2](https://github.com/libsdl-org/SDL/releases) (for the FAudio backend) @@ -96,7 +96,7 @@ git submodule update --init #### Configuring the Qt plugin (if used) 1) Go to `Extensions->Qt VS Tools->Qt Versions`. -2) Add the path to your Qt installation with compiler e.g. `\6.5.3\msvc2019_64`, version will fill in automatically. +2) Add the path to your Qt installation with compiler e.g. `\6.6.0\msvc2019_64`, version will fill in automatically. 3) Go to `Extensions->Qt VS Tools->Options->Legacy Project Format`. 4) Set `Build: Run pre-build setup` to `true`. diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 13b8a3856e..b997f820a6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -38,13 +38,13 @@ jobs: displayName: ccache - bash: | - docker pull --quiet rpcs3/rpcs3-ci-focal:1.2 + docker pull --quiet rpcs3/rpcs3-ci-focal:1.3 docker run \ -v $(pwd):/rpcs3 \ --env-file .ci/docker.env \ -v $CCACHE_DIR:/root/.ccache \ -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \ - rpcs3/rpcs3-ci-focal:1.2 \ + rpcs3/rpcs3-ci-focal:1.3 \ /rpcs3/.ci/build-linux.sh displayName: Docker setup and build @@ -69,9 +69,9 @@ jobs: variables: COMPILER: msvc QT_VER_MAIN: '6' - QT_VER: '6.5.3' + QT_VER: '6.6.0' QT_VER_MSVC: 'msvc2019' - QT_DATE: '202309260341' + QT_DATE: '202310040911' QTDIR: C:\Qt\$(QT_VER)\$(QT_VER_MSVC)_64 VULKAN_VER: '1.3.224.1' VULKAN_SDK_SHA: '2029e652e39ee6a6036cff3765da31e1e6c595fd2413d3cd111dfab7855621ea' @@ -132,7 +132,7 @@ jobs: UPLOAD_REPO_FULL_NAME: "RPCS3/rpcs3-binaries-mac" RELEASE_MESSAGE: "../GitHubReleaseMessage.txt" ARTDIR: $(Build.ArtifactStagingDirectory) - QT_VER: '6.5.3' + QT_VER: '6.6.0' QT_VER_MAIN: '6' pool: diff --git a/buildfiles/msvc/rpcs3_default.props b/buildfiles/msvc/rpcs3_default.props index 6f5030c91d..97b7fd22e1 100644 --- a/buildfiles/msvc/rpcs3_default.props +++ b/buildfiles/msvc/rpcs3_default.props @@ -13,7 +13,7 @@ true - NOMINMAX;PUGIXML_HEADER_ONLY;_ENABLE_EXTENDED_ALIGNED_STORAGE;_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) + NOMINMAX;PUGIXML_HEADER_ONLY;YAML_CPP_STATIC_DEFINE;_ENABLE_EXTENDED_ALIGNED_STORAGE;_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) true Level3 false