git: dc72f2fe3f7b - 2025Q1 - emulators/rpcs3: unbreak build after d458041ef5aa
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 23 Jan 2025 15:20:06 UTC
The branch 2025Q1 has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=dc72f2fe3f7b275a123497420cdcc0551a2f5075
commit dc72f2fe3f7b275a123497420cdcc0551a2f5075
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2025-01-23 15:16:00 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2025-01-23 15:19:28 +0000
emulators/rpcs3: unbreak build after d458041ef5aa
-- Checking for module 'pugixml>=1.15'
-- Package dependency requirement 'pugixml >= 1.15' could not be satisfied.
Package 'pugixml' has version '1.14', required version is '>= 1.15'
CMake Error at /usr/local/share/cmake/Modules/FindPkgConfig.cmake:645 (message):
The following required packages were not found:
- pugixml>=1.15
Reported by: pkg-fallout
(direct commit to 2025Q1 as bbc08dcb46a3 is missing on the branch)
---
emulators/rpcs3/files/patch-pugixml-1.14 | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/emulators/rpcs3/files/patch-pugixml-1.14 b/emulators/rpcs3/files/patch-pugixml-1.14
index c22392a8a9c0..7b51e0e2469e 100644
--- a/emulators/rpcs3/files/patch-pugixml-1.14
+++ b/emulators/rpcs3/files/patch-pugixml-1.14
@@ -1,6 +1,18 @@
Revert https://github.com/RPCS3/rpcs3/commit/196617183870
+and https://github.com/RPCS3/rpcs3/commit/9c5584956e32
until textproc/pugixml >= 1.15 update
+--- 3rdparty/CMakeLists.txt.orig 2025-01-22 19:47:07 UTC
++++ 3rdparty/CMakeLists.txt
+@@ -44,7 +44,7 @@ if (USE_SYSTEM_PUGIXML)
+
+ # pugixml
+ if (USE_SYSTEM_PUGIXML)
+- pkg_check_modules(PUGIXML REQUIRED IMPORTED_TARGET pugixml>=1.15)
++ pkg_check_modules(PUGIXML REQUIRED IMPORTED_TARGET pugixml>=1.11)
+ add_library(pugixml INTERFACE)
+ target_link_libraries(pugixml INTERFACE PkgConfig::PUGIXML)
+ else()
--- Utilities/File.cpp.orig 2025-01-15 23:43:33 UTC
+++ Utilities/File.cpp
@@ -21,7 +21,7 @@ using namespace std::literals::string_literals;