diff --git a/.patch/openssl-cmake/0004-use-shell-wrapper.patch b/.patch/openssl-cmake/0004-use-shell-wrapper.patch deleted file mode 100644 index 76a19644df..0000000000 --- a/.patch/openssl-cmake/0004-use-shell-wrapper.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/CMakeLists.txt 2026-06-01 23:53:16.498043856 -0400 -+++ b/CMakeLists.txt 2026-06-01 23:53:23.910543615 -0400 -@@ -312,13 +312,29 @@ - ${OPENSSL_SHARED_CRYPTO_LIBRARY} - ${OPENSSL_SHARED_SSL_LIBRARY} - ) --add_custom_command( -- OUTPUT ${OPENSSL_BUILD_OUTPUT} -- COMMAND ${OPENSSL_BUILD_COMMAND} -- DEPENDS ${OPENSSL_SOURCES} -- WORKING_DIRECTORY ${OpenSSL_BINARY_DIR} -- VERBATIM --) -+if (WIN32) -+ add_custom_command( -+ OUTPUT ${OPENSSL_BUILD_OUTPUT} -+ COMMAND ${OPENSSL_BUILD_COMMAND} -+ DEPENDS ${OPENSSL_SOURCES} -+ WORKING_DIRECTORY ${OpenSSL_BINARY_DIR} -+ VERBATIM) -+else() -+ set(_openssl_build_script "${CMAKE_CURRENT_BINARY_DIR}/BuildOpenSSL.cmake") -+ file(WRITE ${_openssl_build_script} -+ "execute_process(\n" -+ " COMMAND ${OPENSSL_BUILD_COMMAND}\n" -+ " WORKING_DIRECTORY ${OpenSSL_BINARY_DIR}\n" -+ " RESULT_VARIABLE _r)\n" -+ "if(_r)\n" -+ " message(FATAL_ERROR \"OpenSSL build failed: \${_r}\")\n" -+ "endif()\n") -+ add_custom_command( -+ OUTPUT ${OPENSSL_BUILD_OUTPUT} -+ COMMAND ${CMAKE_COMMAND} -P ${_openssl_build_script} -+ DEPENDS ${OPENSSL_SOURCES} -+ VERBATIM) -+endif() - - if(PROJECT_IS_TOP_LEVEL) - add_custom_target(openssl-build ALL DEPENDS ${OPENSSL_BUILD_OUTPUT}) diff --git a/cpmfile.json b/cpmfile.json index 792ec217f8..1d6f217b01 100644 --- a/cpmfile.json +++ b/cpmfile.json @@ -9,8 +9,8 @@ }, "openssl-cmake": { "repo": "jimmy-park/openssl-cmake", - "hash": "2cc185c924fd70e7d886257ca0caa42b3b8f7f712f2052b4f94dde74759e27022de76178460e18c9bdfc57c366583999e198fbb6052d4e7d91c099d15a0ca63e", - "git_version": "3.6.2", + "hash": "bc73a6c035f299711bb90e20b16fa3521e8ffdab32d8d17f9e7f5cde1ff5def37ec6f9e03de25c3466d18885815c0874331f56e592b8a2f7deeb484c69c5c621", + "git_version": "4.0.1", "tag": "%VERSION%", "bundled": true, "options": [ @@ -28,8 +28,8 @@ "package": "OpenSSL", "min_version": "3", "version": "3", - "hash": "29002ce50cb95a4f4f1d0e9d3f684401fbd4eac34203dc2eef3b6334af5d44aa46bf788b63a6f5c139c383eafb7269ae87a58a9a3ad5912903b9773e545ccc0a", - "git_version": "3.6.2", + "hash": "f3781cbb4e9e190df38c3fe7fa80ba69bf6f9dbafb158e0426dd4604f2f1ba794450679005a38d0f9f1dad0696e2f22b8b086b2d7d08a0f99bb4fd3b0f7ed5d8", + "git_version": "rsaref", "tag": "openssl-%VERSION%", "patches": [ "0001-add-bundled-cert.patch" diff --git a/externals/cpmfile.json b/externals/cpmfile.json index 07addeac5d..56cbe34a83 100644 --- a/externals/cpmfile.json +++ b/externals/cpmfile.json @@ -56,8 +56,8 @@ "package": "xbyak", "repo": "herumi/xbyak", "tag": "v%VERSION%", - "hash": "b6475276b2faaeb315734ea8f4f8bd87ededcee768961b39679bee547e7f3e98884d8b7851e176d861dab30a80a76e6ea302f8c111483607dde969b4797ea95a", - "git_version": "7.35.2" + "hash": "03d870f63741ff8c00501329bf9947bdf58e7cc4c3884e3de9b827f31942438887555f601a5f80d405946854eb54ab907b4e2a3ad955ca4ad890a243917dd4ae", + "git_version": "7.37.3" }, "oaknut": { "repo": "eden-emulator/oaknut", @@ -203,8 +203,8 @@ }, "ffmpeg": { "repo": "FFmpeg/FFmpeg", - "sha": "c7b5f1537d", - "hash": "ed177621176b3961bdcaa339187d3a7688c1c8b060b79c4bb0257cbc67ad7021ae5d5adca5303b45625abbbe3d9aafdd87ce777b8690ac295290d744c875489a", + "sha": "5f998e304d", + "hash": "fd0382bbef971273a494f2139234fd87a79812621d161cc612920e0247d157835b188b946484bf3bc44edce59070c924f141c71636ad12b2fb722b9f496998fa", "bundled": true }, "ffmpeg-ci": { @@ -229,15 +229,15 @@ "repo": "KhronosGroup/Vulkan-Headers", "package": "VulkanHeaders", "version": "1.4.317", - "hash": "d2846ea228415772645eea4b52a9efd33e6a563043dd3de059e798be6391a8f0ca089f455ae420ff22574939ed0f48ed7c6ff3d5a9987d5231dbf3b3f89b484b", - "git_version": "1.4.345", + "hash": "a248d5bdaddf0f983ca56259bee2395ca709623b99ea30e4aa75790fee6a3de7f37bb94beed0fab918dde5af7dc4c0190d07817a00715b66fbd450789d83e33b", + "git_version": "1.4.353", "tag": "v%VERSION%" }, "vulkan-utility-libraries": { "repo": "KhronosGroup/Vulkan-Utility-Libraries", "package": "VulkanUtilityLibraries", - "hash": "114f6b237a6dcba923ccc576befb5dea3f1c9b3a30de7dc741f234a831d1c2d52d8a224afb37dd57dffca67ac0df461eaaab6a5ab5e503b393f91c166680c3e1", - "git_version": "1.4.345", + "hash": "494d829c25e4cb026f02186b67d7fd2305667c3dd964380564000ce9f5079e9c77babbe6b0ffb249400cedb983448ad50a3ac048d2b54974d0d987f07febdeef", + "git_version": "1.4.353", "tag": "v%VERSION%" }, "frozen": {