Index: head/emulators/yuzu/Makefile =================================================================== --- head/emulators/yuzu/Makefile (revision 540848) +++ head/emulators/yuzu/Makefile (revision 540849) @@ -1,103 +1,104 @@ # $FreeBSD$ PORTNAME= yuzu PORTVERSION= s20200629 PORTREVISION?= 0 CATEGORIES= emulators PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= e6085ea35f0b.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/4208 PATCHFILES+= dda90ce1c249.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/4209 MAINTAINER= jbeich@FreeBSD.org COMMENT= Nintendo Switch emulator/debugger LICENSE= APACHE20 BSD3CLAUSE GPLv2+ ISCL LGPL21+ LGPL3+ MIT OpenSSL UNLICENSE LICENSE_COMB= multi LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/externals/inih/inih/LICENSE.txt LICENSE_FILE_GPLv2+ = ${WRKSRC}/license.txt 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 BUILD_DEPENDS= catch>0:devel/catch \ gmake:devel/gmake \ nlohmann-json>0:devel/nlohmann-json LIB_DEPENDS= liblz4.so:archivers/liblz4 \ libzstd.so:archivers/zstd \ libopus.so:audio/opus \ libboost_context.so:devel/boost-libs \ libfmt.so:devel/libfmt USE_GITHUB= yes GH_ACCOUNT= yuzu-emu GH_TAGNAME= f84cbf642 GH_TUPLE= yuzu-emu:unicorn:1.0.1-153-g73f45735:unicorn/externals/unicorn \ DarkLordZach:mbedtls:a280e60:mbedtls/externals/mbedtls \ KhronosGroup:SPIRV-Headers:2c51218:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \ KhronosGroup:Vulkan-Headers:v1.2.140:Vulkan_Headers/externals/Vulkan-Headers \ 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 \ nih-at:libzip:rel-1-5-2-93-g89bd6d63:libzip/externals/libzip/libzip \ svn2github:inih:603729d:inih/externals/inih/inih \ weidai11:cryptopp:CRYPTOPP_7_0_0-23-gf320e7d9:cryptopp/externals/cryptopp/cryptopp 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 OPTIONS_DEFINE= ALSA PULSEAUDIO JACK SNDIO VULKAN OPTIONS_DEFAULT=ALSA PULSEAUDIO JACK SNDIO VULKAN OPTIONS_MULTI= GUI OPTIONS_MULTI_GUI= QT5 SDL OPTIONS_SLAVE?= SDL OPTIONS_EXCLUDE:= ${OPTIONS_MULTI_GUI} ALSA_BUILD_DEPENDS= alsa-lib>0:audio/alsa-lib ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins ALSA_CMAKE_BOOL= USE_ALSA JACK_BUILD_DEPENDS= jackit>0:audio/jack JACK_CMAKE_BOOL= USE_JACK PULSEAUDIO_BUILD_DEPENDS=pulseaudio>0:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= USE_PULSE SNDIO_BUILD_DEPENDS= sndio>0:audio/sndio SNDIO_CMAKE_BOOL= USE_SNDIO SDL_CMAKE_BOOL= ENABLE_SDL2 SDL_PLIST_FILES=bin/${PORTNAME}-cmd \ bin/${PORTNAME}-tester QT5_USES= desktop-file-utils qt:5 shared-mime-info QT5_USE= QT=qmake_build,buildtools_build,concurrent_build,core,gui,opengl,webengine,widgets QT5_CMAKE_BOOL= ENABLE_QT YUZU_USE_QT_WEB_ENGINE QT5_PLIST_FILES=bin/${PORTNAME} \ share/applications/${PORTNAME}.desktop \ share/icons/hicolor/scalable/apps/${PORTNAME}.svg \ share/mime/packages/${PORTNAME}.xml VULKAN_DESC= Vulkan renderer VULKAN_RUN_DEPENDS= ${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader post-patch: @${REINPLACE_CMD} -e '/check_submodules_present()/d' \ ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's/@GIT_BRANCH@/master/' \ -e 's/@GIT_DESC@/${GH_TAGNAME}/' \ ${WRKSRC}/src/common/scm_rev.cpp.in .include Index: head/emulators/yuzu/distinfo =================================================================== --- head/emulators/yuzu/distinfo (revision 540848) +++ head/emulators/yuzu/distinfo (revision 540849) @@ -1,33 +1,35 @@ TIMESTAMP = 1593407558 SHA256 (yuzu-emu-yuzu-s20200629-f84cbf642_GH0.tar.gz) = 8a887316476f4b094d0b370d59bd363e3042dc47d73853b67665534a462be042 SIZE (yuzu-emu-yuzu-s20200629-f84cbf642_GH0.tar.gz) = 2754796 SHA256 (yuzu-emu-unicorn-1.0.1-153-g73f45735_GH0.tar.gz) = 8f7b4d8eb998c2a4c146268d83b44fc22ca8d4d276f26d6af1071e51f4b5bd4f SIZE (yuzu-emu-unicorn-1.0.1-153-g73f45735_GH0.tar.gz) = 3296254 SHA256 (DarkLordZach-mbedtls-a280e60_GH0.tar.gz) = 4fc6ddc256bc75b975fd5ad8bb7d31ff79c62d49daafb0108585c9ef80c6c5a7 SIZE (DarkLordZach-mbedtls-a280e60_GH0.tar.gz) = 2283313 SHA256 (KhronosGroup-SPIRV-Headers-2c51218_GH0.tar.gz) = 08f70947b69e17c7e322156adcd471cf02b4b3f63e7baf8ee0f02d32603ac5ff SIZE (KhronosGroup-SPIRV-Headers-2c51218_GH0.tar.gz) = 280829 SHA256 (KhronosGroup-Vulkan-Headers-v1.2.140_GH0.tar.gz) = c708a05b0ef673ae783f8968c5396dc207b9f8c7cde2ddb4a9a281e04661185a SIZE (KhronosGroup-Vulkan-Headers-v1.2.140_GH0.tar.gz) = 755873 SHA256 (MerryMage-dynarmic-r3-220-g4f967387_GH0.tar.gz) = f5d9d9c9a86222814204ed177ad5041cd048169976f64e8f50590f8185ba3b7d SIZE (MerryMage-dynarmic-r3-220-g4f967387_GH0.tar.gz) = 1643717 SHA256 (ReinUsesLisp-sirit-eefca56_GH0.tar.gz) = cc95e8155e14e596526c378d0a3cc2bb4bfe7da68773a79f224d48f89b20685a 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 SIZE (herumi-xbyak-v5.911_GH0.tar.gz) = 224126 SHA256 (kinetiknz-cubeb-cubeb-0.2-1194-g616d773_GH0.tar.gz) = 651694a3b29936f0e96ff2cf2e6342906e781fbe6ca6a1d84ec5671368de1df9 SIZE (kinetiknz-cubeb-cubeb-0.2-1194-g616d773_GH0.tar.gz) = 195355 SHA256 (nih-at-libzip-rel-1-5-2-93-g89bd6d63_GH0.tar.gz) = 63050daee06c5bcf0f8fd82103e3e84e83772f3a646f42bfa3851afc7aca4ce1 SIZE (nih-at-libzip-rel-1-5-2-93-g89bd6d63_GH0.tar.gz) = 1211650 SHA256 (svn2github-inih-603729d_GH0.tar.gz) = b4faa364c3e33261707d4b669e1c669ca3818d7b9515c15fe0befd9df3f1f00a SIZE (svn2github-inih-603729d_GH0.tar.gz) = 8342 SHA256 (weidai11-cryptopp-CRYPTOPP_7_0_0-23-gf320e7d9_GH0.tar.gz) = 1d6f029b83a230561e75bab26b5aaf98055b8439363a25bf113ac9ff6f9d2ef4 SIZE (weidai11-cryptopp-CRYPTOPP_7_0_0-23-gf320e7d9_GH0.tar.gz) = 7209489 SHA256 (e6085ea35f0b.patch) = c5b49c4512bb88f1aca85b10341f4d5f587af940026c4b52a461de101f07957b SIZE (e6085ea35f0b.patch) = 1867 SHA256 (dda90ce1c249.patch) = 7664619a899860339dec98dceb27b1beb5ca0faafb996a469dd096c55cf87da3 SIZE (dda90ce1c249.patch) = 1029 Index: head/emulators/yuzu/files/patch-openssl =================================================================== --- head/emulators/yuzu/files/patch-openssl (revision 540848) +++ head/emulators/yuzu/files/patch-openssl (nonexistent) @@ -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() Property changes on: head/emulators/yuzu/files/patch-openssl ___________________________________________________________________ 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