Index: head/emulators/yuzu/files/patch-fmt =================================================================== --- head/emulators/yuzu/files/patch-fmt (revision 542660) +++ head/emulators/yuzu/files/patch-fmt (nonexistent) @@ -1,13 +0,0 @@ -Lower required version until devel/libfmt catches up - ---- CMakeLists.txt.orig 2020-07-10 17:02:21 UTC -+++ CMakeLists.txt -@@ -151,7 +151,7 @@ macro(yuzu_find_packages) - # Cmake Pkg Prefix Version Conan Pkg - "Boost 1.71 boost/1.72.0" - "Catch2 2.11 catch2/2.11.0" -- "fmt 7.0 fmt/7.0.1" -+ "fmt 6.2 fmt/6.2.0" - # can't use until https://github.com/bincrafters/community/issues/1173 - #"libzip 1.5 libzip/1.5.2@bincrafters/stable" - "lz4 1.8 lz4/1.9.2" Property changes on: head/emulators/yuzu/files/patch-fmt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/yuzu/files/patch-openssl =================================================================== --- head/emulators/yuzu/files/patch-openssl (revision 542660) +++ head/emulators/yuzu/files/patch-openssl (revision 542661) @@ -1,65 +1,65 @@ Revert https://github.com/yuzu-emu/yuzu/commit/2a3d4cad63f8 --- .gitmodules.orig 2020-06-29 05:12:38 UTC +++ .gitmodules @@ -13,9 +13,6 @@ [submodule "soundtouch"] path = externals/soundtouch url = https://github.com/citra-emu/ext-soundtouch.git -[submodule "libressl"] - path = externals/libressl - url = https://github.com/citra-emu/ext-libressl-portable.git [submodule "discord-rpc"] path = externals/discord-rpc url = https://github.com/discordapp/discord-rpc.git --- CMakeLists.txt.orig 2020-06-30 00:16:03 UTC +++ CMakeLists.txt @@ -152,6 +152,7 @@ macro(yuzu_find_packages) "Boost 1.71 boost/1.72.0" "Catch2 2.11 catch2/2.11.0" - "fmt 6.2 fmt/6.2.0" + "fmt 7.0 fmt/7.0.1" + "OpenSSL 1.0 openssl/1.1.1f" # can't use until https://github.com/bincrafters/community/issues/1173 #"libzip 1.5 libzip/1.5.2@bincrafters/stable" "lz4 1.8 lz4/1.9.2" @@ -312,6 +313,15 @@ if (TARGET Boost::Boost) elseif (TARGET Boost::boost) set_target_properties(Boost::boost PROPERTIES IMPORTED_GLOBAL TRUE) add_library(boost ALIAS Boost::boost) +endif() + +if (NOT TARGET OpenSSL::SSL) + set_target_properties(OpenSSL::OpenSSL PROPERTIES IMPORTED_GLOBAL TRUE) + add_library(OpenSSL::SSL ALIAS OpenSSL::OpenSSL) +endif() +if (NOT TARGET OpenSSL::Crypto) + set_target_properties(OpenSSL::OpenSSL PROPERTIES IMPORTED_GLOBAL TRUE) + add_library(OpenSSL::Crypto ALIAS OpenSSL::OpenSSL) endif() if (TARGET sdl2::sdl2) --- externals/CMakeLists.txt.orig 2020-06-29 05:12:38 UTC +++ externals/CMakeLists.txt @@ -73,15 +73,6 @@ if (NOT LIBZIP_FOUND) endif() if (ENABLE_WEB_SERVICE) - # LibreSSL - set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "") - add_subdirectory(libressl EXCLUDE_FROM_ALL) - target_include_directories(ssl INTERFACE ./libressl/include) - target_compile_definitions(ssl PRIVATE -DHAVE_INET_NTOP) - get_directory_property(OPENSSL_LIBRARIES - DIRECTORY libressl - DEFINITION OPENSSL_LIBS) - # lurlparser add_subdirectory(lurlparser EXCLUDE_FROM_ALL) @@ -89,5 +80,5 @@ if (ENABLE_WEB_SERVICE) add_library(httplib INTERFACE) target_include_directories(httplib INTERFACE ./httplib) target_compile_definitions(httplib INTERFACE -DCPPHTTPLIB_OPENSSL_SUPPORT) - target_link_libraries(httplib INTERFACE ${OPENSSL_LIBRARIES}) + target_link_libraries(httplib INTERFACE OpenSSL::SSL OpenSSL::Crypto) endif()