git: 59bc324ecf76 - main - emulators/pcsx2: Update to 2.3.9
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 15 Nov 2024 16:02:34 UTC
The branch main has been updated by martymac:
URL: https://cgit.FreeBSD.org/ports/commit/?id=59bc324ecf7641895b20c7825d78ddf37ceae854
commit 59bc324ecf7641895b20c7825d78ddf37ceae854
Author: Ganael LAPLANCHE <martymac@FreeBSD.org>
AuthorDate: 2024-11-15 15:58:41 +0000
Commit: Ganael LAPLANCHE <martymac@FreeBSD.org>
CommitDate: 2024-11-15 15:58:41 +0000
emulators/pcsx2: Update to 2.3.9
Also:
- Remove tuples-handling code (every dependency is now in-tree)
- Disable Vulkan support as it needs a modified version
- Remove local cpuinfo patch (integrated + updated upstream,
this should fix PR 282655)
PR: 282655
Reported by: celcion@gmail.com
---
emulators/pcsx2/Makefile | 24 +-
emulators/pcsx2/Makefile.tuples | 9 -
emulators/pcsx2/distinfo | 20 +-
emulators/pcsx2/files/gen_gh_tuple.sh | 29 -
emulators/pcsx2/files/patch-3rdparty-cpuinfo.txt | 609 ---------------------
.../patch-pcsx2-GS-Renderers-Vulkan-GSDeviceVK.h | 10 -
.../files/patch-pcsx2-qt-AutoUpdaterDialog.cpp | 11 -
emulators/pcsx2/pkg-plist | 7 +
8 files changed, 17 insertions(+), 702 deletions(-)
diff --git a/emulators/pcsx2/Makefile b/emulators/pcsx2/Makefile
index 800442c1f95e..f9aa9f4fdc64 100644
--- a/emulators/pcsx2/Makefile
+++ b/emulators/pcsx2/Makefile
@@ -1,5 +1,5 @@
PORTNAME= pcsx2
-PORTVERSION= 1.7.5698
+PORTVERSION= 2.3.9
DISTVERSIONPREFIX= v
CATEGORIES= emulators
@@ -33,16 +33,12 @@ LIB_DEPENDS= libpng.so:graphics/png \
libjack.so:audio/jack \
libsndio.so:audio/sndio \
libbacktrace.so:devel/libbacktrace
-# XXX Necessary for Qt6/FindWrapVulkanHeaders.cmake
-# then vulkan-haders and glslang are unconditionnaly included from 3rdparty/
-BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers
USES= cmake compiler:c++20-lang \
desktop-file-utils elfctl gl jpeg pkgconfig qt:6 sdl xorg
USE_GITHUB= yes
GH_PROJECT= pcsx2
-.include "${.CURDIR}/Makefile.tuples"
USE_GL= egl
USE_SDL= sdl2
@@ -61,12 +57,17 @@ EXTRA_PATCHES= ${PATCHDIR}/extra-patch-no-march-minimum-req
.endif
# See: cmake/BuildParameters.cmake
+# XXX Vulkan support needs libshaderc_shared.so:graphics/shaderc but
+# Pcsx2 embeds its own -patched/incompatible- version
+# (see: .github/workflows/scripts/common/shaderc-changes.patch) so we just
+# disable it for now.
CMAKE_ARGS+= \
-DCMAKE_REQUIRED_INCLUDES:STRING=${LOCALBASE}/include/ \
-DPCSX2_RESOURCES_PATH:STRING=${DATADIR}/resources \
-DUSE_VTUNE:BOOL=OFF \
-DWAYLAND_API=OFF \
- -DENABLE_TESTS:BOOL=OFF
+ -DENABLE_TESTS:BOOL=OFF \
+ -DUSE_VULKAN:BOOL=OFF
OPTIONS_DEFINE= DOCS
PORTDOCS= Debugger.pdf GameIndex.pdf
@@ -89,15 +90,4 @@ post-install-DOCS-on:
${INSTALL_DATA} ${PORTDOCS:S|^|${CONFIGURE_WRKSRC}/bin/resources/docs/|} \
${STAGEDIR}${DOCSDIR}
-# For maintainer (do not forget to clean up Makefile.tuples afterwards to
-# remove useless submodules)
-Makefile.tuples::
- @${RM} -f ${.CURDIR}/Makefile.tuples
- @${RM} -rf ${WRKDIR}/.maintainer.checkout
- @${MKDIR} ${WRKDIR}/.maintainer.checkout && \
- cd ${WRKDIR}/.maintainer.checkout && \
- git clone --recursive --branch=v${PORTVERSION} \
- https://github.com/${PORTNAME}/${PORTNAME} . && \
- ${SH} ${FILESDIR}/gen_gh_tuple.sh >> ${.CURDIR}/Makefile.tuples
-
.include <bsd.port.mk>
diff --git a/emulators/pcsx2/Makefile.tuples b/emulators/pcsx2/Makefile.tuples
deleted file mode 100644
index 247a817f4bc5..000000000000
--- a/emulators/pcsx2/Makefile.tuples
+++ /dev/null
@@ -1,9 +0,0 @@
-GH_TUPLE= \
- fmtlib:fmt:5cfd28d476c6859617878f951931b8ce7d36b9df:fmt/3rdparty/fmt/fmt \
- biojppm:rapidyaml:213b201d264139cd1b887790197e08850af628e3:rapidyaml/3rdparty/rapidyaml/rapidyaml \
- KhronosGroup:Vulkan-Headers:19a863ccce773ff393b186329478b1eb1a519fd3:VulkanHeaders/3rdparty/vulkan-headers \
- biojppm:c4core:d35c7c9bf370134595699d791e6ff8db018ddc8d:c4core/3rdparty/rapidyaml/rapidyaml/ext/c4core \
- biojppm:cmake:371982300ff5a076d7c3199057ebed77bbe3472f:cmake/3rdparty/rapidyaml/rapidyaml/ext/c4core/cmake \
- biojppm:debugbreak:5dcbe41d2bd4712c8014aa7e843723ad7b40fd74:debugbreak/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/debugbreak \
- fastfloat:fast_float:32d21dcecb404514f94fb58660b8029a4673c2c1:fast_float/3rdparty/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float \
-
diff --git a/emulators/pcsx2/distinfo b/emulators/pcsx2/distinfo
index 936f13913d5d..44d930ca0c86 100644
--- a/emulators/pcsx2/distinfo
+++ b/emulators/pcsx2/distinfo
@@ -1,17 +1,3 @@
-TIMESTAMP = 1712866618
-SHA256 (pcsx2-pcsx2-v1.7.5698_GH0.tar.gz) = f99cf06c78f96b540bc7a27d13d830fe048b110a6202e78e8ec6a9987b0045f7
-SIZE (pcsx2-pcsx2-v1.7.5698_GH0.tar.gz) = 13889267
-SHA256 (fmtlib-fmt-5cfd28d476c6859617878f951931b8ce7d36b9df_GH0.tar.gz) = e15cac38b42b4c6800a03b9a21fc3c461fb631cc312e60b04b96ee441bd7bf92
-SIZE (fmtlib-fmt-5cfd28d476c6859617878f951931b8ce7d36b9df_GH0.tar.gz) = 849171
-SHA256 (biojppm-rapidyaml-213b201d264139cd1b887790197e08850af628e3_GH0.tar.gz) = c206d4565ccfa721991a8df90821d1a1f747e68385a0f3f5b9ab995e191c06be
-SIZE (biojppm-rapidyaml-213b201d264139cd1b887790197e08850af628e3_GH0.tar.gz) = 446070
-SHA256 (KhronosGroup-Vulkan-Headers-19a863ccce773ff393b186329478b1eb1a519fd3_GH0.tar.gz) = a3ea48206d391a182ebcf5532e889706b5003b0b3a8d2cfed355eb59ae715ead
-SIZE (KhronosGroup-Vulkan-Headers-19a863ccce773ff393b186329478b1eb1a519fd3_GH0.tar.gz) = 2172059
-SHA256 (biojppm-c4core-d35c7c9bf370134595699d791e6ff8db018ddc8d_GH0.tar.gz) = b768c8fb5dd4740317b7e1a3e43a0b32615d4d4e1e974d7ab515a80d2f1f318d
-SIZE (biojppm-c4core-d35c7c9bf370134595699d791e6ff8db018ddc8d_GH0.tar.gz) = 262210
-SHA256 (biojppm-cmake-371982300ff5a076d7c3199057ebed77bbe3472f_GH0.tar.gz) = 1d3ded3a552a5993c8ebe5059a9829e0e26ae4f4780c179a11882d25da203de6
-SIZE (biojppm-cmake-371982300ff5a076d7c3199057ebed77bbe3472f_GH0.tar.gz) = 122880
-SHA256 (biojppm-debugbreak-5dcbe41d2bd4712c8014aa7e843723ad7b40fd74_GH0.tar.gz) = 4b424d23dad957937c57c142648d32571a78a6c6b2e473709748e5c1bb8a0f92
-SIZE (biojppm-debugbreak-5dcbe41d2bd4712c8014aa7e843723ad7b40fd74_GH0.tar.gz) = 7033
-SHA256 (fastfloat-fast_float-32d21dcecb404514f94fb58660b8029a4673c2c1_GH0.tar.gz) = 8035a9ca28a8e3dfee332c7960af3c06ef0ab5169d5f31228b89c469e882bef7
-SIZE (fastfloat-fast_float-32d21dcecb404514f94fb58660b8029a4673c2c1_GH0.tar.gz) = 76108
+TIMESTAMP = 1731685315
+SHA256 (pcsx2-pcsx2-v2.3.9_GH0.tar.gz) = e5daaa396b02f0617c8f65eb12d7f2084ba60d995694759611769d293785ac08
+SIZE (pcsx2-pcsx2-v2.3.9_GH0.tar.gz) = 17112802
diff --git a/emulators/pcsx2/files/gen_gh_tuple.sh b/emulators/pcsx2/files/gen_gh_tuple.sh
deleted file mode 100644
index ab014ef5f473..000000000000
--- a/emulators/pcsx2/files/gen_gh_tuple.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-echo "GH_TUPLE= \\"
-for _sm_root in $(find . -type f -name .gitmodules | sed 's/\.gitmodules$//' | sort)
-do
- (
- cd "${_sm_root}"
-
- # Crawl name|path|url list of submodules within _sm_root
- grep -e '^\[submodule "' -e 'path = ' -e 'url = ' .gitmodules | \
- sed -E -e 's|.*"([^"]+)".*|\1|' -e 's|.*= ||' | \
- paste - - - | \
- sed -E 's/[[:space:]]+/|/g' | \
- while read _sm
- do
- _sm_name=$(echo "${_sm}" | cut -d '|' -f 1)
- _sm_path=$(echo "${_sm}" | cut -d '|' -f 2)
- _sm_url=$(echo "${_sm}" | cut -d '|' -f 3)
-
- _sm_prefix=$(echo "${_sm_root}" | sed 's|^\./||')
-
- _account_project=$(echo "${_sm_url}" | sed -e 's|^https://github.com/||' -e 's|/|:|g' -e 's|\.git$||')
- _group=$(echo "${_account_project}" | cut -d ':' -f 2 | tr -cd 'a-zA-Z0-9_')
- _tagname_group_subdir=$(git submodule status "${_sm_path}" | sed -E -e 's|^.||' -e "s|[[:space:]]+|:${_group}/${_sm_prefix}|" -e 's|[[:space:]]+.*$||')
- echo -e "\t${_account_project}:${_tagname_group_subdir} \\"
- done
- )
-done
-echo ""
diff --git a/emulators/pcsx2/files/patch-3rdparty-cpuinfo.txt b/emulators/pcsx2/files/patch-3rdparty-cpuinfo.txt
deleted file mode 100644
index 33793354456d..000000000000
--- a/emulators/pcsx2/files/patch-3rdparty-cpuinfo.txt
+++ /dev/null
@@ -1,609 +0,0 @@
-From: https://github.com/pytorch/cpuinfo/pull/230
-
---- 3rdparty/cpuinfo/CMakeLists.txt.orig 2024-04-10 11:18:05 UTC
-+++ 3rdparty/cpuinfo/CMakeLists.txt
-@@ -67,6 +67,9 @@ SET(CPUINFO_TARGET_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR
-
- # -- [ Determine target processor
- SET(CPUINFO_TARGET_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
-+IF(CPUINFO_TARGET_PROCESSOR STREQUAL "amd64")
-+ SET(CPUINFO_TARGET_PROCESSOR "AMD64")
-+ENDIF()
- IF(IS_APPLE_OS AND CMAKE_OSX_ARCHITECTURES MATCHES "^(x86_64|arm64.*)$")
- SET(CPUINFO_TARGET_PROCESSOR "${CMAKE_OSX_ARCHITECTURES}")
- ELSEIF(CMAKE_GENERATOR MATCHES "^Visual Studio " AND CMAKE_VS_PLATFORM_NAME)
-@@ -105,7 +108,7 @@ IF(NOT CMAKE_SYSTEM_NAME)
- "Target operating system is not specified. "
- "cpuinfo will compile, but cpuinfo_initialize() will always fail.")
- SET(CPUINFO_SUPPORTED_PLATFORM FALSE)
--ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS|Darwin|Linux|Android)$")
-+ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS|Darwin|Linux|Android|FreeBSD)$")
- IF(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.14" AND NOT IS_APPLE_OS)
- MESSAGE(WARNING
- "Target operating system \"${CMAKE_SYSTEM_NAME}\" is not supported in cpuinfo. "
-@@ -178,6 +181,8 @@ IF(CPUINFO_SUPPORTED_PLATFORM)
- LIST(APPEND CPUINFO_SRCS src/x86/mach/init.c)
- ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS)$")
- LIST(APPEND CPUINFO_SRCS src/x86/windows/init.c)
-+ ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+ LIST(APPEND CPUINFO_SRCS src/x86/freebsd/init.c)
- ENDIF()
- ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^Windows" AND CPUINFO_TARGET_PROCESSOR MATCHES "^(ARM64|arm64)$")
- LIST(APPEND CPUINFO_SRCS
-@@ -234,9 +239,11 @@ IF(CPUINFO_SUPPORTED_PLATFORM)
- src/linux/processors.c)
- ELSEIF(IS_APPLE_OS)
- LIST(APPEND CPUINFO_SRCS src/mach/topology.c)
-+ ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+ LIST(APPEND CPUINFO_SRCS src/freebsd/topology.c)
- ENDIF()
-
-- IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android")
-+ IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
- SET(CMAKE_THREAD_PREFER_PTHREAD TRUE)
- SET(THREADS_PREFER_PTHREAD_FLAG TRUE)
- FIND_PACKAGE(Threads REQUIRED)
-@@ -301,6 +308,9 @@ IF(CPUINFO_SUPPORTED_PLATFORM)
- TARGET_LINK_LIBRARIES(cpuinfo_internals PUBLIC ${CMAKE_THREAD_LIBS_INIT})
- TARGET_COMPILE_DEFINITIONS(cpuinfo PRIVATE _GNU_SOURCE=1)
- TARGET_COMPILE_DEFINITIONS(cpuinfo_internals PRIVATE _GNU_SOURCE=1)
-+ ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+ TARGET_LINK_LIBRARIES(cpuinfo PUBLIC ${CMAKE_THREAD_LIBS_INIT})
-+ TARGET_LINK_LIBRARIES(cpuinfo_internals PUBLIC ${CMAKE_THREAD_LIBS_INIT})
- ENDIF()
- ELSE()
- TARGET_COMPILE_DEFINITIONS(cpuinfo INTERFACE CPUINFO_SUPPORTED_PLATFORM=0)
---- 3rdparty/cpuinfo/src/cpuinfo/internal-api.h.orig 2024-04-10 11:18:05 UTC
-+++ 3rdparty/cpuinfo/src/cpuinfo/internal-api.h
-@@ -50,6 +50,7 @@ CPUINFO_PRIVATE void cpuinfo_x86_linux_init(void);
-
- CPUINFO_PRIVATE void cpuinfo_x86_mach_init(void);
- CPUINFO_PRIVATE void cpuinfo_x86_linux_init(void);
-+CPUINFO_PRIVATE void cpuinfo_x86_freebsd_init(void);
- #if defined(_WIN32) || defined(__CYGWIN__)
- #if CPUINFO_ARCH_ARM64
- CPUINFO_PRIVATE BOOL CALLBACK cpuinfo_arm_windows_init(PINIT_ONCE init_once, PVOID parameter, PVOID* context);
---- 3rdparty/cpuinfo/src/freebsd/api.h.orig 2024-04-18 10:56:32 UTC
-+++ 3rdparty/cpuinfo/src/freebsd/api.h
-@@ -0,0 +1,12 @@
-+#pragma once
-+
-+#include <stdint.h>
-+
-+struct cpuinfo_freebsd_topology {
-+ uint32_t packages;
-+ uint32_t cores;
-+ uint32_t threads;
-+ uint32_t threads_per_core;
-+};
-+
-+struct cpuinfo_freebsd_topology cpuinfo_freebsd_detect_topology(void);
---- 3rdparty/cpuinfo/src/freebsd/topology.c.orig 2024-04-18 10:56:32 UTC
-+++ 3rdparty/cpuinfo/src/freebsd/topology.c
-@@ -0,0 +1,110 @@
-+#include <errno.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#include <sys/sysctl.h>
-+#include <sys/types.h>
-+
-+#include <cpuinfo/log.h>
-+#include <freebsd/api.h>
-+
-+static int sysctl_int(const char *name) {
-+ int value = 0;
-+ size_t value_size = sizeof(value);
-+ if (sysctlbyname(name, &value, &value_size, NULL, 0) != 0) {
-+ cpuinfo_log_error("sysctlbyname(\"%s\") failed: %s", name,
-+ strerror(errno));
-+ } else if (value <= 0) {
-+ cpuinfo_log_error(
-+ "sysctlbyname(\"%s\") returned invalid value %d %zu", name,
-+ value, value_size);
-+ value = 0;
-+ }
-+ return value;
-+}
-+
-+static char *sysctl_str(const char *name) {
-+ size_t value_size = 0;
-+ if (sysctlbyname(name, NULL, &value_size, NULL, 0) != 0) {
-+ cpuinfo_log_error("sysctlbyname(\"%s\") failed: %s", name,
-+ strerror(errno));
-+ } else if (value_size <= 0) {
-+ cpuinfo_log_error(
-+ "sysctlbyname(\"%s\") returned invalid value size %zu",
-+ name, value_size);
-+ }
-+ value_size += 1;
-+ char *value = calloc(value_size, 1);
-+ if (!value) {
-+ cpuinfo_log_error("calloc %zu bytes failed", value_size);
-+ return NULL;
-+ }
-+ if (sysctlbyname(name, value, &value_size, NULL, 0) != 0) {
-+ cpuinfo_log_error("sysctlbyname(\"%s\") failed: %s", name,
-+ strerror(errno));
-+ free(value);
-+ return NULL;
-+ }
-+ return value;
-+}
-+
-+struct cpuinfo_freebsd_topology cpuinfo_freebsd_detect_topology(void) {
-+ struct cpuinfo_freebsd_topology topology = {
-+ .packages = 0,
-+ .cores = 0,
-+ .threads_per_core = 0,
-+ .threads = 0,
-+ };
-+ char *topology_spec = sysctl_str("kern.sched.topology_spec");
-+ if (!topology_spec) {
-+ return topology;
-+ }
-+ const char *group_tag = "<group level=\"1\" cache-level=\"0\">";
-+ char *p = strstr(topology_spec, group_tag);
-+ while (p) {
-+ const char *cpu_tag = "cpu count=\"";
-+ char *q = strstr(p, cpu_tag);
-+ if (q) {
-+ p = q + strlen(cpu_tag);
-+ topology.packages += atoi(p);
-+ } else {
-+ break;
-+ }
-+ }
-+ if (topology.packages == 0) {
-+ const char *group_tag = "<group level=\"1\"";
-+ char *p = strstr(topology_spec, group_tag);
-+ while (p) {
-+ topology.packages += 1;
-+ p++;
-+ p = strstr(p, group_tag);
-+ }
-+ }
-+ if (topology.packages == 0) {
-+ cpuinfo_log_error("failed to parse topology_spec:%s",
-+ topology_spec);
-+ free(topology_spec);
-+ goto fail;
-+ }
-+ free(topology_spec);
-+ topology.cores = sysctl_int("kern.smp.cores");
-+ if (topology.cores == 0) {
-+ goto fail;
-+ }
-+ if (topology.cores < topology.packages) {
-+ goto fail;
-+ }
-+ topology.threads_per_core = sysctl_int("kern.smp.threads_per_core");
-+ if (topology.threads_per_core == 0) {
-+ goto fail;
-+ }
-+ cpuinfo_log_debug("freebsd topology: packages = %d, cores = %d, "
-+ "threads_per_core = %d",
-+ topology.packages, topology.cores,
-+ topology.threads_per_core);
-+ topology.threads = topology.threads_per_core * topology.cores;
-+ return topology;
-+fail:
-+ topology.packages = 0;
-+ return topology;
-+}
---- 3rdparty/cpuinfo/src/init.c.orig 2024-04-10 11:18:05 UTC
-+++ 3rdparty/cpuinfo/src/init.c
-@@ -27,6 +27,8 @@ bool CPUINFO_ABI cpuinfo_initialize(void) {
- pthread_once(&init_guard, &cpuinfo_x86_mach_init);
- #elif defined(__linux__)
- pthread_once(&init_guard, &cpuinfo_x86_linux_init);
-+ #elif defined(__FreeBSD__)
-+ pthread_once(&init_guard, &cpuinfo_x86_freebsd_init);
- #elif defined(_WIN32) || defined(__CYGWIN__)
- InitOnceExecuteOnce(&init_guard, &cpuinfo_x86_windows_init, NULL, NULL);
- #else
---- 3rdparty/cpuinfo/src/x86/freebsd/init.c.orig 2024-04-18 10:56:32 UTC
-+++ 3rdparty/cpuinfo/src/x86/freebsd/init.c
-@@ -0,0 +1,402 @@
-+#include <stdint.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#include <cpuinfo.h>
-+#include <cpuinfo/internal-api.h>
-+#include <cpuinfo/log.h>
-+#include <freebsd/api.h>
-+#include <x86/api.h>
-+
-+static inline uint32_t max(uint32_t a, uint32_t b) { return a > b ? a : b; }
-+
-+static inline uint32_t bit_mask(uint32_t bits) {
-+ return (UINT32_C(1) << bits) - UINT32_C(1);
-+}
-+
-+void cpuinfo_x86_freebsd_init(void) {
-+ struct cpuinfo_processor *processors = NULL;
-+ struct cpuinfo_core *cores = NULL;
-+ struct cpuinfo_cluster *clusters = NULL;
-+ struct cpuinfo_package *packages = NULL;
-+ struct cpuinfo_cache *l1i = NULL;
-+ struct cpuinfo_cache *l1d = NULL;
-+ struct cpuinfo_cache *l2 = NULL;
-+ struct cpuinfo_cache *l3 = NULL;
-+ struct cpuinfo_cache *l4 = NULL;
-+
-+ struct cpuinfo_freebsd_topology freebsd_topology =
-+ cpuinfo_freebsd_detect_topology();
-+ if (freebsd_topology.packages == 0) {
-+ cpuinfo_log_error("failed to detect topology");
-+ goto cleanup;
-+ }
-+ processors =
-+ calloc(freebsd_topology.threads, sizeof(struct cpuinfo_processor));
-+ if (processors == NULL) {
-+ cpuinfo_log_error(
-+ "failed to allocate %zu bytes for descriptions of %" PRIu32
-+ " logical processors",
-+ freebsd_topology.threads * sizeof(struct cpuinfo_processor),
-+ freebsd_topology.threads);
-+ goto cleanup;
-+ }
-+ cores = calloc(freebsd_topology.cores, sizeof(struct cpuinfo_core));
-+ if (cores == NULL) {
-+ cpuinfo_log_error(
-+ "failed to allocate %zu bytes for descriptions of %" PRIu32
-+ " cores",
-+ freebsd_topology.cores * sizeof(struct cpuinfo_core),
-+ freebsd_topology.cores);
-+ goto cleanup;
-+ }
-+ /* On x86 a cluster of cores is the biggest group of cores that shares a
-+ * cache. */
-+ clusters =
-+ calloc(freebsd_topology.packages, sizeof(struct cpuinfo_cluster));
-+ if (clusters == NULL) {
-+ cpuinfo_log_error(
-+ "failed to allocate %zu bytes for descriptions of %" PRIu32
-+ " core clusters",
-+ freebsd_topology.packages * sizeof(struct cpuinfo_cluster),
-+ freebsd_topology.packages);
-+ goto cleanup;
-+ }
-+ packages =
-+ calloc(freebsd_topology.packages, sizeof(struct cpuinfo_package));
-+ if (packages == NULL) {
-+ cpuinfo_log_error(
-+ "failed to allocate %zu bytes for descriptions of %" PRIu32
-+ " physical packages",
-+ freebsd_topology.packages * sizeof(struct cpuinfo_package),
-+ freebsd_topology.packages);
-+ goto cleanup;
-+ }
-+
-+ struct cpuinfo_x86_processor x86_processor;
-+ memset(&x86_processor, 0, sizeof(x86_processor));
-+ cpuinfo_x86_init_processor(&x86_processor);
-+ char brand_string[48];
-+ cpuinfo_x86_normalize_brand_string(x86_processor.brand_string,
-+ brand_string);
-+
-+ const uint32_t threads_per_core = freebsd_topology.threads_per_core;
-+ const uint32_t threads_per_package =
-+ freebsd_topology.threads / freebsd_topology.packages;
-+ const uint32_t cores_per_package =
-+ freebsd_topology.cores / freebsd_topology.packages;
-+ for (uint32_t i = 0; i < freebsd_topology.packages; i++) {
-+ clusters[i] = (struct cpuinfo_cluster){
-+ .processor_start = i * threads_per_package,
-+ .processor_count = threads_per_package,
-+ .core_start = i * cores_per_package,
-+ .core_count = cores_per_package,
-+ .cluster_id = 0,
-+ .package = packages + i,
-+ .vendor = x86_processor.vendor,
-+ .uarch = x86_processor.uarch,
-+ .cpuid = x86_processor.cpuid,
-+ };
-+ packages[i].processor_start = i * threads_per_package;
-+ packages[i].processor_count = threads_per_package;
-+ packages[i].core_start = i * cores_per_package;
-+ packages[i].core_count = cores_per_package;
-+ packages[i].cluster_start = i;
-+ packages[i].cluster_count = 1;
-+ cpuinfo_x86_format_package_name(x86_processor.vendor,
-+ brand_string, packages[i].name);
-+ }
-+ for (uint32_t i = 0; i < freebsd_topology.cores; i++) {
-+ cores[i] = (struct cpuinfo_core){
-+ .processor_start = i * threads_per_core,
-+ .processor_count = threads_per_core,
-+ .core_id = i % cores_per_package,
-+ .cluster = clusters + i / cores_per_package,
-+ .package = packages + i / cores_per_package,
-+ .vendor = x86_processor.vendor,
-+ .uarch = x86_processor.uarch,
-+ .cpuid = x86_processor.cpuid,
-+ };
-+ }
-+ for (uint32_t i = 0; i < freebsd_topology.threads; i++) {
-+ const uint32_t smt_id = i % threads_per_core;
-+ const uint32_t core_id = i / threads_per_core;
-+ const uint32_t package_id = i / threads_per_package;
-+
-+ /* Reconstruct APIC IDs from topology components */
-+ const uint32_t thread_bits_mask =
-+ bit_mask(x86_processor.topology.thread_bits_length);
-+ const uint32_t core_bits_mask =
-+ bit_mask(x86_processor.topology.core_bits_length);
-+ const uint32_t package_bits_offset =
-+ max(x86_processor.topology.thread_bits_offset +
-+ x86_processor.topology.thread_bits_length,
-+ x86_processor.topology.core_bits_offset +
-+ x86_processor.topology.core_bits_length);
-+ const uint32_t apic_id =
-+ ((smt_id & thread_bits_mask)
-+ << x86_processor.topology.thread_bits_offset) |
-+ ((core_id & core_bits_mask)
-+ << x86_processor.topology.core_bits_offset) |
-+ (package_id << package_bits_offset);
-+ cpuinfo_log_debug("reconstructed APIC ID 0x%08" PRIx32
-+ " for thread %" PRIu32,
-+ apic_id, i);
-+
-+ processors[i].smt_id = smt_id;
-+ processors[i].core = cores + i / threads_per_core;
-+ processors[i].cluster = clusters + i / threads_per_package;
-+ processors[i].package = packages + i / threads_per_package;
-+ processors[i].apic_id = apic_id;
-+ }
-+
-+ uint32_t threads_per_l1 = 0, l1_count = 0;
-+ if (x86_processor.cache.l1i.size != 0 ||
-+ x86_processor.cache.l1d.size != 0) {
-+ /* Assume that threads on the same core share L1 */
-+ threads_per_l1 =
-+ freebsd_topology.threads / freebsd_topology.cores;
-+ cpuinfo_log_warning("freebsd kernel did not report number of "
-+ "threads sharing L1 cache; assume %" PRIu32,
-+ threads_per_l1);
-+ l1_count = freebsd_topology.threads / threads_per_l1;
-+ cpuinfo_log_debug("detected %" PRIu32 " L1 caches", l1_count);
-+ }
-+
-+ uint32_t threads_per_l2 = 0, l2_count = 0;
-+ if (x86_processor.cache.l2.size != 0) {
-+ if (x86_processor.cache.l3.size != 0) {
-+ /* This is not a last-level cache; assume that threads
-+ * on the same core share L2 */
-+ threads_per_l2 =
-+ freebsd_topology.threads / freebsd_topology.cores;
-+ } else {
-+ /* This is a last-level cache; assume that threads on
-+ * the same package share L2 */
-+ threads_per_l2 = freebsd_topology.threads /
-+ freebsd_topology.packages;
-+ }
-+ cpuinfo_log_warning("freebsd kernel did not report number of "
-+ "threads sharing L2 cache; assume %" PRIu32,
-+ threads_per_l2);
-+ l2_count = freebsd_topology.threads / threads_per_l2;
-+ cpuinfo_log_debug("detected %" PRIu32 " L2 caches", l2_count);
-+ }
-+
-+ uint32_t threads_per_l3 = 0, l3_count = 0;
-+ if (x86_processor.cache.l3.size != 0) {
-+ /*
-+ * Assume that threads on the same package share L3.
-+ * However, is it not necessarily the last-level cache (there
-+ * may be L4 cache as well)
-+ */
-+ threads_per_l3 =
-+ freebsd_topology.threads / freebsd_topology.packages;
-+ cpuinfo_log_warning("freebsd kernel did not report number of "
-+ "threads sharing L3 cache; assume %" PRIu32,
-+ threads_per_l3);
-+ l3_count = freebsd_topology.threads / threads_per_l3;
-+ cpuinfo_log_debug("detected %" PRIu32 " L3 caches", l3_count);
-+ }
-+
-+ uint32_t threads_per_l4 = 0, l4_count = 0;
-+ if (x86_processor.cache.l4.size != 0) {
-+ /*
-+ * Assume that all threads share this L4.
-+ * As of now, L4 cache exists only on notebook x86 CPUs, which
-+ * are single-package, but multi-socket systems could have
-+ * shared L4 (like on IBM POWER8).
-+ */
-+ threads_per_l4 = freebsd_topology.threads;
-+ cpuinfo_log_warning("freebsd kernel did not report number of "
-+ "threads sharing L4 cache; assume %" PRIu32,
-+ threads_per_l4);
-+ l4_count = freebsd_topology.threads / threads_per_l4;
-+ cpuinfo_log_debug("detected %" PRIu32 " L4 caches", l4_count);
-+ }
-+
-+ if (x86_processor.cache.l1i.size != 0) {
-+ l1i = calloc(l1_count, sizeof(struct cpuinfo_cache));
-+ if (l1i == NULL) {
-+ cpuinfo_log_error(
-+ "failed to allocate %zu bytes for descriptions of "
-+ "%" PRIu32 " L1I caches",
-+ l1_count * sizeof(struct cpuinfo_cache), l1_count);
-+ return;
-+ }
-+ for (uint32_t c = 0; c < l1_count; c++) {
-+ l1i[c] = (struct cpuinfo_cache){
-+ .size = x86_processor.cache.l1i.size,
-+ .associativity =
-+ x86_processor.cache.l1i.associativity,
-+ .sets = x86_processor.cache.l1i.sets,
-+ .partitions = x86_processor.cache.l1i.partitions,
-+ .line_size = x86_processor.cache.l1i.line_size,
-+ .flags = x86_processor.cache.l1i.flags,
-+ .processor_start = c * threads_per_l1,
-+ .processor_count = threads_per_l1,
-+ };
-+ }
-+ for (uint32_t t = 0; t < freebsd_topology.threads; t++) {
-+ processors[t].cache.l1i = &l1i[t / threads_per_l1];
-+ }
-+ }
-+
-+ if (x86_processor.cache.l1d.size != 0) {
-+ l1d = calloc(l1_count, sizeof(struct cpuinfo_cache));
-+ if (l1d == NULL) {
-+ cpuinfo_log_error(
-+ "failed to allocate %zu bytes for descriptions of "
-+ "%" PRIu32 " L1D caches",
-+ l1_count * sizeof(struct cpuinfo_cache), l1_count);
-+ return;
-+ }
-+ for (uint32_t c = 0; c < l1_count; c++) {
-+ l1d[c] = (struct cpuinfo_cache){
-+ .size = x86_processor.cache.l1d.size,
-+ .associativity =
-+ x86_processor.cache.l1d.associativity,
-+ .sets = x86_processor.cache.l1d.sets,
-+ .partitions = x86_processor.cache.l1d.partitions,
-+ .line_size = x86_processor.cache.l1d.line_size,
-+ .flags = x86_processor.cache.l1d.flags,
-+ .processor_start = c * threads_per_l1,
-+ .processor_count = threads_per_l1,
-+ };
-+ }
-+ for (uint32_t t = 0; t < freebsd_topology.threads; t++) {
-+ processors[t].cache.l1d = &l1d[t / threads_per_l1];
-+ }
-+ }
-+
-+ if (l2_count != 0) {
-+ l2 = calloc(l2_count, sizeof(struct cpuinfo_cache));
-+ if (l2 == NULL) {
-+ cpuinfo_log_error(
-+ "failed to allocate %zu bytes for descriptions of "
-+ "%" PRIu32 " L2 caches",
-+ l2_count * sizeof(struct cpuinfo_cache), l2_count);
-+ return;
-+ }
-+ for (uint32_t c = 0; c < l2_count; c++) {
-+ l2[c] = (struct cpuinfo_cache){
-+ .size = x86_processor.cache.l2.size,
-+ .associativity =
-+ x86_processor.cache.l2.associativity,
-+ .sets = x86_processor.cache.l2.sets,
-+ .partitions = x86_processor.cache.l2.partitions,
-+ .line_size = x86_processor.cache.l2.line_size,
-+ .flags = x86_processor.cache.l2.flags,
-+ .processor_start = c * threads_per_l2,
-+ .processor_count = threads_per_l2,
-+ };
-+ }
-+ for (uint32_t t = 0; t < freebsd_topology.threads; t++) {
-+ processors[t].cache.l2 = &l2[t / threads_per_l2];
-+ }
-+ }
-+
-+ if (l3_count != 0) {
-+ l3 = calloc(l3_count, sizeof(struct cpuinfo_cache));
-+ if (l3 == NULL) {
-+ cpuinfo_log_error(
-+ "failed to allocate %zu bytes for descriptions of "
-+ "%" PRIu32 " L3 caches",
-+ l3_count * sizeof(struct cpuinfo_cache), l3_count);
-+ return;
-+ }
-+ for (uint32_t c = 0; c < l3_count; c++) {
-+ l3[c] = (struct cpuinfo_cache){
-+ .size = x86_processor.cache.l3.size,
-+ .associativity =
-+ x86_processor.cache.l3.associativity,
-+ .sets = x86_processor.cache.l3.sets,
-+ .partitions = x86_processor.cache.l3.partitions,
-+ .line_size = x86_processor.cache.l3.line_size,
-+ .flags = x86_processor.cache.l3.flags,
-+ .processor_start = c * threads_per_l3,
-+ .processor_count = threads_per_l3,
-+ };
-+ }
-+ for (uint32_t t = 0; t < freebsd_topology.threads; t++) {
-+ processors[t].cache.l3 = &l3[t / threads_per_l3];
-+ }
-+ }
-+
-+ if (l4_count != 0) {
-+ l4 = calloc(l4_count, sizeof(struct cpuinfo_cache));
-+ if (l4 == NULL) {
-+ cpuinfo_log_error(
-+ "failed to allocate %zu bytes for descriptions of "
-+ "%" PRIu32 " L4 caches",
-+ l4_count * sizeof(struct cpuinfo_cache), l4_count);
-+ return;
-+ }
-+ for (uint32_t c = 0; c < l4_count; c++) {
-+ l4[c] = (struct cpuinfo_cache){
-+ .size = x86_processor.cache.l4.size,
-+ .associativity =
-+ x86_processor.cache.l4.associativity,
-+ .sets = x86_processor.cache.l4.sets,
-+ .partitions = x86_processor.cache.l4.partitions,
-+ .line_size = x86_processor.cache.l4.line_size,
-+ .flags = x86_processor.cache.l4.flags,
-+ .processor_start = c * threads_per_l4,
-+ .processor_count = threads_per_l4,
-+ };
-+ }
-+ for (uint32_t t = 0; t < freebsd_topology.threads; t++) {
-+ processors[t].cache.l4 = &l4[t / threads_per_l4];
-+ }
-+ }
-+
-+ /* Commit changes */
-+ cpuinfo_processors = processors;
-+ cpuinfo_cores = cores;
-+ cpuinfo_clusters = clusters;
-+ cpuinfo_packages = packages;
-+ cpuinfo_cache[cpuinfo_cache_level_1i] = l1i;
-+ cpuinfo_cache[cpuinfo_cache_level_1d] = l1d;
-+ cpuinfo_cache[cpuinfo_cache_level_2] = l2;
-+ cpuinfo_cache[cpuinfo_cache_level_3] = l3;
-+ cpuinfo_cache[cpuinfo_cache_level_4] = l4;
-+
-+ cpuinfo_processors_count = freebsd_topology.threads;
-+ cpuinfo_cores_count = freebsd_topology.cores;
-+ cpuinfo_clusters_count = freebsd_topology.packages;
-+ cpuinfo_packages_count = freebsd_topology.packages;
-+ cpuinfo_cache_count[cpuinfo_cache_level_1i] = l1_count;
-+ cpuinfo_cache_count[cpuinfo_cache_level_1d] = l1_count;
-+ cpuinfo_cache_count[cpuinfo_cache_level_2] = l2_count;
-+ cpuinfo_cache_count[cpuinfo_cache_level_3] = l3_count;
-+ cpuinfo_cache_count[cpuinfo_cache_level_4] = l4_count;
-+ cpuinfo_max_cache_size = cpuinfo_compute_max_cache_size(&processors[0]);
-+
-+ cpuinfo_global_uarch = (struct cpuinfo_uarch_info){
-+ .uarch = x86_processor.uarch,
-+ .cpuid = x86_processor.cpuid,
-+ .processor_count = freebsd_topology.threads,
-+ .core_count = freebsd_topology.cores,
-+ };
-+
-+ __sync_synchronize();
-+
-+ cpuinfo_is_initialized = true;
-+
-+ processors = NULL;
-+ cores = NULL;
-+ clusters = NULL;
-+ packages = NULL;
-+ l1i = l1d = l2 = l3 = l4 = NULL;
-+
-+cleanup:
-+ free(processors);
-+ free(cores);
-+ free(clusters);
-+ free(packages);
-+ free(l1i);
-+ free(l1d);
-+ free(l2);
-+ free(l3);
-+ free(l4);
-+}
diff --git a/emulators/pcsx2/files/patch-pcsx2-GS-Renderers-Vulkan-GSDeviceVK.h b/emulators/pcsx2/files/patch-pcsx2-GS-Renderers-Vulkan-GSDeviceVK.h
deleted file mode 100644
index cb06827f623c..000000000000
--- a/emulators/pcsx2/files/patch-pcsx2-GS-Renderers-Vulkan-GSDeviceVK.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- pcsx2/GS/Renderers/Vulkan/GSDeviceVK.h.orig 2023-08-31 07:45:23 UTC
-+++ pcsx2/GS/Renderers/Vulkan/GSDeviceVK.h
-@@ -31,6 +31,7 @@
- #include <map>
- #include <memory>
- #include <mutex>
-+#include <unordered_map>
- #include <string>
- #include <thread>
- #include <vector>
diff --git a/emulators/pcsx2/files/patch-pcsx2-qt-AutoUpdaterDialog.cpp b/emulators/pcsx2/files/patch-pcsx2-qt-AutoUpdaterDialog.cpp
deleted file mode 100644
index 1f1d3b91cdbb..000000000000
--- a/emulators/pcsx2/files/patch-pcsx2-qt-AutoUpdaterDialog.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- pcsx2-qt/AutoUpdaterDialog.cpp.orig 2024-04-11 09:34:32 UTC
-+++ pcsx2-qt/AutoUpdaterDialog.cpp
-@@ -892,7 +892,7 @@ void AutoUpdaterDialog::cleanupAfterUpdate()
-
- #else
-
--bool AutoUpdaterDialog::processUpdate(const QByteArray& update_data, QProgressDialog& progress)
-+bool AutoUpdaterDialog::processUpdate(const std::vector<u8>& data, QProgressDialog&)
- {
- return false;
- }
diff --git a/emulators/pcsx2/pkg-plist b/emulators/pcsx2/pkg-plist
index eb1cef2681ba..e6c42d69090c 100644
--- a/emulators/pcsx2/pkg-plist
+++ b/emulators/pcsx2/pkg-plist
@@ -10,9 +10,16 @@ share/applications/PCSX2.desktop
%%DATADIR%%/resources/fonts/promptfont-license
%%DATADIR%%/resources/fonts/promptfont.otf
%%DATADIR%%/resources/fullscreenui/applications-system.png
+%%DATADIR%%/resources/fullscreenui/back-icon.png
+%%DATADIR%%/resources/fullscreenui/desktop-mode.png
+%%DATADIR%%/resources/fullscreenui/drive-cdrom.png
+%%DATADIR%%/resources/fullscreenui/exit.png
+%%DATADIR%%/resources/fullscreenui/game-list.png
%%DATADIR%%/resources/fullscreenui/media-cdrom.png
%%DATADIR%%/resources/fullscreenui/no-save.png
%%DATADIR%%/resources/fullscreenui/placeholder.png
+%%DATADIR%%/resources/fullscreenui/start-bios.png
+%%DATADIR%%/resources/fullscreenui/start-file.png
%%DATADIR%%/resources/game_controller_db.txt
%%DATADIR%%/resources/icons/AppIconLarge.png
%%DATADIR%%/resources/icons/flags/NTSC-B.png