Date: Monday, October 19, 2020 @ 14:13:14 Author: alucryd Revision: 727159
upgpkg: pcsx2 1.7.0.r469.51976aa06-1 Added: pcsx2/trunk/pcsx2-system-fmt.patch Modified: pcsx2/trunk/PKGBUILD ------------------------+ PKGBUILD | 19 +++++++++++++++---- pcsx2-system-fmt.patch | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-10-19 14:09:50 UTC (rev 727158) +++ PKGBUILD 2020-10-19 14:13:14 UTC (rev 727159) @@ -3,7 +3,7 @@ # Contributor: vEX <[email protected]> pkgname=pcsx2 -pkgver=1.7.0.r441.92171ddba +pkgver=1.7.0.r469.51976aa06 pkgrel=1 pkgdesc='A Sony PlayStation 2 emulator' arch=(x86_64) @@ -19,6 +19,7 @@ glibc libaio libasound.so + libfmt.so libfreetype.so libgdk-3.so libgio-2.0.so @@ -47,9 +48,13 @@ ninja png++ ) -_commit=92171ddbaa8a90bed7e0228337bd0dbecd0ed03e -source=(git+https://github.com/PCSX2/pcsx2.git#commit=${_commit}) -sha256sums=(SKIP) +_commit=51976aa06b63174718383f2309d759a97edd79b3 +source=( + git+https://github.com/PCSX2/pcsx2.git#commit=${_commit} + pcsx2-system-fmt.patch +) +b2sums=('SKIP' + 'af63faeb85d79a99d05605b937f7ac2fe83a2b3bcfebb0ca20d9ead014fd076bb744ae90e75dc2083ccf02657b56414142e796f005d68f89e067ba0270cd54cd') pkgver() { cd pcsx2 @@ -57,6 +62,12 @@ git describe --tags | sed 's/^v//; s/-dev//; s/-/.r/; s/-g/./' } +prepare() { + cd pcsx2 + + patch -Np1 -i ../pcsx2-system-fmt.patch +} + build() { cmake -S pcsx2 -B build -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ Added: pcsx2-system-fmt.patch =================================================================== --- pcsx2-system-fmt.patch (rev 0) +++ pcsx2-system-fmt.patch 2020-10-19 14:13:14 UTC (rev 727159) @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1bc43a8e3..a8dd6e2ea 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,11 +41,6 @@ if(NOT NO_TRANSLATION) + endif() + endif() + +-# 3rdpary Libraries +-if(EXISTS "${CMAKE_SOURCE_DIR}/3rdparty/fmt/fmt") +- add_subdirectory(3rdparty/fmt/fmt) +-endif() +- + # make common + if(common_libs) + add_subdirectory(common/src/Utilities) +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index 7a3871535..236682e6a 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -74,6 +74,11 @@ endif() + find_package(wxWidgets COMPONENTS base core adv) + find_package(ZLIB) + ++find_package(fmt) ++if(NOT fmt_FOUND) ++ add_subdirectory(${CMAKE_SOURCE_DIR}/3rdparty/fmt/fmt) ++endif() ++ + ## Use pcsx2 package to find module + include(FindLibc) + + Property changes on: pcsx2/trunk/pcsx2-system-fmt.patch ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property
