update fmt patch

3 files changed, 3 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2bdfb09f7eb0..bdb38c3dcde9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -26,7 +26,7 @@ pkgbase = dynarmic-git
 	b2sums = SKIP
 	b2sums = 027a8eae057b4b4aeb1cd278719c49cc824206a9b1ab9ee1e2c2dd2b194efc114fde3f7c74d12f2b7d6dc199d208cdadf2c3da9575542b01c14536fe0335b5e9
 	b2sums = d5adb75e25b1f3cb297f781d4c00d978d234912ca7fcb4e206e7f7779ccbe9a9d747c652a6fc2d8af55442b457dc8d496f3708b67fa0072aba8cdf5aba15bdde
-	b2sums = 589f3fcce9f56eee59d9d19ac15db3a412477cb04193dafc9a269ab8c10094105daab8316ee0b68ca25b7613fc9c0d6fc4bd2e6d6158c9bb087f88b0c519219a
+	b2sums = 4bcf176ce2a82cbaf54f9eb0b463844e77c099e5824fb9d994817dd8a5b75ea1abebf17da4c01be14042ce36564d8df5836e9a02a5cbe92bb95d7232263123b4
 	b2sums = d474ec20f085832c73de96b19a06b5d8018d6fb429ea054a9e026c1d56f12035b83bc3b980487825ecb473b674a7b22f2b92733bdb53d71dcb1528318f2a5d80
 	b2sums = 92d760e22bebe7d07bee8fdcc4d142ae8bc11e73c1d6e89e3964d07a1618c3ad4516eeaa262b6f7046a8b483c4b56d2e509b170fe9acf48eea7523210c0e9fa7
 	b2sums = 1e6ff855e427df6c7f618c9507af5a267b26da54c9f154daa000c1da2797b963a3604a7a9e6d7b32395fc9084b5c49f425814ae169e45d4c4b08f3f34d1cf597
diff --git a/PKGBUILD b/PKGBUILD
index fd4b1fcb9d1a..672a66b4a5c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -32,7 +32,7 @@ b2sums=(
 	'SKIP'
 	'027a8eae057b4b4aeb1cd278719c49cc824206a9b1ab9ee1e2c2dd2b194efc114fde3f7c74d12f2b7d6dc199d208cdadf2c3da9575542b01c14536fe0335b5e9'
 	'd5adb75e25b1f3cb297f781d4c00d978d234912ca7fcb4e206e7f7779ccbe9a9d747c652a6fc2d8af55442b457dc8d496f3708b67fa0072aba8cdf5aba15bdde'
-	'589f3fcce9f56eee59d9d19ac15db3a412477cb04193dafc9a269ab8c10094105daab8316ee0b68ca25b7613fc9c0d6fc4bd2e6d6158c9bb087f88b0c519219a'
+	'4bcf176ce2a82cbaf54f9eb0b463844e77c099e5824fb9d994817dd8a5b75ea1abebf17da4c01be14042ce36564d8df5836e9a02a5cbe92bb95d7232263123b4'
 	'd474ec20f085832c73de96b19a06b5d8018d6fb429ea054a9e026c1d56f12035b83bc3b980487825ecb473b674a7b22f2b92733bdb53d71dcb1528318f2a5d80'
 	'92d760e22bebe7d07bee8fdcc4d142ae8bc11e73c1d6e89e3964d07a1618c3ad4516eeaa262b6f7046a8b483c4b56d2e509b170fe9acf48eea7523210c0e9fa7'
 	'1e6ff855e427df6c7f618c9507af5a267b26da54c9f154daa000c1da2797b963a3604a7a9e6d7b32395fc9084b5c49f425814ae169e45d4c4b08f3f34d1cf597'
@@ -59,6 +59,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=None \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DDYNARMIC_ENABLE_CPU_FEATURE_DETECTION=OFF \
+		-DDYNARMIC_NO_BUNDLED_FMT=ON \
 		-DDYNARMIC_TESTS="$CHECKFUNC" \
 		-Wno-dev
 	cmake --build build
diff --git a/unbundle-fmt.patch b/unbundle-fmt.patch
index 7f4dfef03f81..9e5ca505b1e9 100644
--- a/unbundle-fmt.patch
+++ b/unbundle-fmt.patch
@@ -10,14 +10,3 @@
  # Pull in externals CMakeLists for libs where available
  add_subdirectory(externals)
  
---- a/externals/CMakeLists.txt
-+++ b/externals/CMakeLists.txt
-@@ -9,7 +9,7 @@ target_include_directories(catch INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOU
- 
- # fmt
- 
--if (NOT DYNARMIC_NO_BUNDLED_FMT)
-+if (NOT DYNARMIC_NO_BUNDLED_FMT AND NOT TARGET fmt)
-     # fmtlib formatting library
-     add_subdirectory(fmt)
- endif()