Date: Sunday, July 24, 2022 @ 17:49:35 Author: alucryd Revision: 1255992
upgpkg: pcsx2 1.7.3114-1 Added: pcsx2/trunk/pcsx2-resources-directory.patch Modified: pcsx2/trunk/PKGBUILD ---------------------------------+ PKGBUILD | 22 ++++++++++-------- pcsx2-resources-directory.patch | 45 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 10 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-07-24 17:14:32 UTC (rev 1255991) +++ PKGBUILD 2022-07-24 17:49:35 UTC (rev 1255992) @@ -3,7 +3,7 @@ # Contributor: vEX <[email protected]> pkgname=pcsx2 -pkgver=1.7.3074 +pkgver=1.7.3114 pkgrel=1 pkgdesc='A Sony PlayStation 2 emulator' arch=(x86_64) @@ -48,7 +48,7 @@ vulkan-headers zstd ) -_tag=2eb1134828e241b5f925da11c777a310265b97dc +_tag=94c83245dbb10e35fee099d3820fe9250879bc18 source=( git+https://github.com/PCSX2/pcsx2.git#tag=${_tag} git+https://github.com/mozilla/cubeb.git @@ -56,20 +56,21 @@ git+https://github.com/ocornut/imgui.git git+https://github.com/rtissera/libchdr.git pcsx2-system-libs.patch + pcsx2-resources-directory.patch ) -b2sums=( - SKIP - SKIP - SKIP - SKIP - SKIP - 29c8f279f96c67b3a35eb39440c6dfa134ef1cda36026f69f7b9931c59700e61431d7b38002bd811f6e38089296128a16c737e1c0eb2120b342790089c1e4017 -) +b2sums=('SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + '29c8f279f96c67b3a35eb39440c6dfa134ef1cda36026f69f7b9931c59700e61431d7b38002bd811f6e38089296128a16c737e1c0eb2120b342790089c1e4017' + '7e9ea4915021d48a619c2e37cc01de15ae239bb08fef367a9903edefcbc362cd2537f741b89f6c09144319bf2228bea0c7c366e5f0a85f1f282ef95ee3f05321') install=pcsx2.install prepare() { cd pcsx2 git apply -3 ../pcsx2-system-libs.patch + git apply -3 ../pcsx2-resources-directory.patch local submodule for submodule in \ @@ -115,6 +116,7 @@ package() { DESTDIR="${pkgdir}" cmake --install build + sed -i 's/Exec=env GDK_BACKEND=x11 MESA_NO_ERROR=1 pcsx2/Exec=env QT_QPA_PLATFORM=xcb MESA_NO_ERROR=1 pcsx2-qt/g' "${pkgdir}"/usr/share/applications/PCSX2.desktop } # vim: ts=2 sw=2 et: Added: pcsx2-resources-directory.patch =================================================================== --- pcsx2-resources-directory.patch (rev 0) +++ pcsx2-resources-directory.patch 2022-07-24 17:49:35 UTC (rev 1255992) @@ -0,0 +1,45 @@ +From acc799798362dae3bb8eac694041663f4073af12 Mon Sep 17 00:00:00 2001 +From: kenshen112 <[email protected]> +Date: Sun, 22 May 2022 16:44:51 -0700 +Subject: [PATCH] QtHost.cpp: Fixed Resources dir + +Fixed location of Resources Dir to proper usr/share location +--- + .gitignore | 1 + + pcsx2-qt/QtHost.cpp | 8 +++++--- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/.gitignore b/.gitignore +index 9cb112d2367a..67d4a5ee6831 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -74,6 +74,7 @@ oprofile_data/ + /bin/**/*.lib + /bin/**/*.pdb + /bin/pcsx2 ++/bin/pcsx2-qt + /bin/PCSX2-linux.sh + /bin/*ReplayLoader + /bin/GS*.txt +diff --git a/pcsx2-qt/QtHost.cpp b/pcsx2-qt/QtHost.cpp +index c40c4dabcad5..c1328bc02fe5 100644 +--- a/pcsx2-qt/QtHost.cpp ++++ b/pcsx2-qt/QtHost.cpp +@@ -130,12 +130,14 @@ void QtHost::SetAppRoot() + + void QtHost::SetResourcesDirectory() + { +-#ifndef __APPLE__ ++#ifdef __APPLE__ ++ // On macOS, this is in the bundle resources directory. ++ EmuFolders::Resources = Path::Canonicalize(Path::Combine(EmuFolders::AppRoot, "../Resources")); ++#elif !defined(PCSX2_APP_DATADIR) + // On Windows/Linux, these are in the binary directory. + EmuFolders::Resources = Path::Combine(EmuFolders::AppRoot, "resources"); + #else +- // On macOS, this is in the bundle resources directory. +- EmuFolders::Resources = Path::Canonicalize(Path::Combine(EmuFolders::AppRoot, "../Resources")); ++ EmuFolders::Resources = Path::Canonicalize(Path::Combine(EmuFolders::AppRoot, PCSX2_APP_DATADIR "/resources")); + #endif + } +
