emulators/yuzu: unbreak on FreeBSD < 12 after r540846

-- Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR: Found unsuitable version "1.0.2s", but required is at least "1.1" (found /usr/lib/libcrypto.so) -- Packages openssl/1.1.1f not found! -- Downloading conan.cmake from https://github.com/conan-io/cmake-conan CMake Error at CMakeLists.txt:256 (conan_check): Unknown CMake command "conan_check".
svn path=/head/; revision=540849
2025-01-11 07:22:22 +00:00 · 2020-06-30 01:01:42 +00:00 · 2020-06-30 01:01:42 +00:00 · 998ead7fa8 · 2021-03-31 03:12:20 +00:00
commit 998ead7fa8
parent ac6d774bb2
3 changed files with 4 additions and 66 deletions
--- a/emulators/yuzu/Makefile
+++ b/emulators/yuzu/Makefile
@ -20,6 +20,7 @@ LICENSE_FILE_ISCL=	${WRKSRC}/externals/cubeb/LICENSE
 LICENSE_FILE_LGPL21+ =	${_LICENSE_STORE}/LGPL21 # soundtouch
 LICENSE_FILE_LGPL3+ =	${_LICENSE_STORE}/LGPL3 # sirit
 LICENSE_FILE_MIT=	${WRKSRC}/externals/sirit/externals/SPIRV-Headers/LICENSE
+LICENSE_FILE_OpenSSL=	${WRKSRC}/externals/libressl/COPYING

 ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64
 ONLY_FOR_ARCHS_REASON=	requires int128
@ -43,6 +44,7 @@ GH_TUPLE=	yuzu-emu:unicorn:1.0.1-153-g73f45735:unicorn/externals/unicorn \
 		MerryMage:dynarmic:r3-220-g4f967387:dynarmic/externals/dynarmic \
 		ReinUsesLisp:sirit:eefca56:sirit/externals/sirit \
 		arsenm:sanitizers-cmake:aab6948:sanitizers_cmake/externals/cubeb/cmake/sanitizers-cmake \
+		citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \
 		citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \
 		herumi:xbyak:v5.911:xbyak/externals/xbyak \
 		kinetiknz:cubeb:cubeb-0.2-1194-g616d773:cubeb/externals/cubeb \
@ -53,7 +55,6 @@ GH_TUPLE=	yuzu-emu:unicorn:1.0.1-153-g73f45735:unicorn/externals/unicorn \
 USES=		cmake compiler:c++17-lang iconv localbase:ldflags \
 		python:build sdl ssl
 USE_SDL=	sdl2
-CMAKE_OFF=	ENABLE_GNUTLS ENABLE_MBEDTLS
 CXXFLAGS+=	-Wno-narrowing # https://github.com/yuzu-emu/yuzu/issues/3407
 LDFLAGS+=	-Wl,--as-needed # Qt5Network
 TEST_TARGET=	test
--- a/emulators/yuzu/distinfo
+++ b/emulators/yuzu/distinfo
@ -15,6 +15,8 @@ SHA256 (ReinUsesLisp-sirit-eefca56_GH0.tar.gz) = cc95e8155e14e596526c378d0a3cc2b
 SIZE (ReinUsesLisp-sirit-eefca56_GH0.tar.gz) = 22035
 SHA256 (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = d9009e17948aff769a6f6e16b52d4d8752c5cc2cab1e9c381d3a31fd1a680b58
 SIZE (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = 7240
+SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3
+SIZE (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = 1762942
 SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c
 SIZE (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = 59514
 SHA256 (herumi-xbyak-v5.911_GH0.tar.gz) = 7b5ec57fb887a25c563e24bd82a0a350d68b8b0219e94b680c040f6cd59bdc40
--- a/emulators/yuzu/files/patch-openssl
+++ b/emulators/yuzu/files/patch-openssl
@ -1,65 +0,0 @@
-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"
-+        "OpenSSL           1.1         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()