Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Jul 2020 12:42:20 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r540955 - in head/emulators/yuzu: . files
Message-ID:  <202007011242.061CgKoP089851@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Jul  1 12:42:19 2020
New Revision: 540955
URL: https://svnweb.freebsd.org/changeset/ports/540955

Log:
  emulators/yuzu: update to s20200628
  
  Compared to r540846
  - Avoid crashes using slightly older version
  - System libzip to allow OpenSSL 1.0
  - Drop bundled cryptopp unused since r459140
  
  Changes:	https://github.com/yuzu-emu/yuzu/compare/50c27d5ae...8596a1277

Added:
  head/emulators/yuzu/files/patch-openssl   (contents, props changed)
Modified:
  head/emulators/yuzu/Makefile   (contents, props changed)
  head/emulators/yuzu/distinfo   (contents, props changed)
  head/emulators/yuzu/files/patch-CMakeLists.txt   (contents, props changed)

Modified: head/emulators/yuzu/Makefile
==============================================================================
--- head/emulators/yuzu/Makefile	Wed Jul  1 12:34:18 2020	(r540954)
+++ head/emulators/yuzu/Makefile	Wed Jul  1 12:42:19 2020	(r540955)
@@ -1,58 +1,58 @@
 # $FreeBSD$
 
 PORTNAME=	yuzu
-PORTVERSION=	s20200508
+PORTVERSION=	s20200628
 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+=	3b1683a15261.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 BSD2CLAUSE BSD3CLAUSE BSL GPLv2+ ISCL LGPL21+ LGPL3+ MIT OpenSSL UNLICENSE
+LICENSE=	APACHE20 BSD3CLAUSE GPLv2+ ISCL LGPL21+ LGPL3+ MIT UNLICENSE
 LICENSE_COMB=	multi
-LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/externals/fmt/LICENSE.rst
 LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/externals/inih/inih/LICENSE.txt
-LICENSE_FILE_BSL=	${WRKSRC}/externals/catch/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=	boost-libs>=1.66:devel/boost-libs \
-		gmake:devel/gmake
+BUILD_DEPENDS=	catch>0:devel/catch \
+		gmake:devel/gmake \
+		nlohmann-json>0:devel/nlohmann-json
+LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
+		libzip.so:archivers/libzip \
+		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=	50c27d5ae
+GH_TAGNAME=	8596a1277
 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-1-ge7166e8b:dynarmic/externals/dynarmic \
-		ReinUsesLisp:sirit:414fc4d:sirit/externals/sirit \
+		ReinUsesLisp:sirit:eefca56:sirit/externals/sirit \
 		arsenm:sanitizers-cmake:aab6948:sanitizers_cmake/externals/cubeb/cmake/sanitizers-cmake \
-		catchorg:Catch2:v2.3.0:catch/externals/catch \
-		citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \
 		citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \
-		facebook:zstd:v1.3.8:zstd/externals/zstd \
-		fmtlib:fmt:6.2.0:fmt/externals/fmt \
+		herumi:xbyak:v5.911:xbyak/externals/xbyak \
 		kinetiknz:cubeb:cubeb-0.2-1194-g616d773:cubeb/externals/cubeb \
-		lz4:lz4:v1.8.0-8-g4db65c1:lz4/externals/lz4 \
-		madler:zlib:v1.2.11:zlib/externals/zlib/zlib \
-		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 \
-		xiph:opus:v1.3.1-4-gad8fe90d:opus/externals/opus/opus
+		svn2github:inih:603729d:inih/externals/inih/inih
 
 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

Modified: head/emulators/yuzu/distinfo
==============================================================================
--- head/emulators/yuzu/distinfo	Wed Jul  1 12:34:18 2020	(r540954)
+++ head/emulators/yuzu/distinfo	Wed Jul  1 12:42:19 2020	(r540955)
@@ -1,6 +1,6 @@
-TIMESTAMP = 1588965413
-SHA256 (yuzu-emu-yuzu-s20200508-50c27d5ae_GH0.tar.gz) = 1c9bc5e7a638dd3ed47cc98047e56885f45217c829fbadf28ad47fd60767f731
-SIZE (yuzu-emu-yuzu-s20200508-50c27d5ae_GH0.tar.gz) = 2802360
+TIMESTAMP = 1593359755
+SHA256 (yuzu-emu-yuzu-s20200628-8596a1277_GH0.tar.gz) = 42f2be0cc681137f97471ae1403493be6660cc7934c0f361cf3cd2ed52492e9e
+SIZE (yuzu-emu-yuzu-s20200628-8596a1277_GH0.tar.gz) = 2747088
 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
@@ -11,31 +11,21 @@ SHA256 (KhronosGroup-Vulkan-Headers-v1.2.140_GH0.tar.g
 SIZE (KhronosGroup-Vulkan-Headers-v1.2.140_GH0.tar.gz) = 755873
 SHA256 (MerryMage-dynarmic-r3-1-ge7166e8b_GH0.tar.gz) = a0a29e8726df53e249f6b7573cbf6c97fa07994485a84d17ff9e04b20680ffe1
 SIZE (MerryMage-dynarmic-r3-1-ge7166e8b_GH0.tar.gz) = 1551535
-SHA256 (ReinUsesLisp-sirit-414fc4d_GH0.tar.gz) = 4561c2a4d36ce2a554aff9b681dfe3060fa564f6b8604e84cf22a07937267142
-SIZE (ReinUsesLisp-sirit-414fc4d_GH0.tar.gz) = 21897
+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 (catchorg-Catch2-v2.3.0_GH0.tar.gz) = aaf6bbf81ce8522131bae2ea4d013a77b003bbb2017614f5872d5787687f8f5f
-SIZE (catchorg-Catch2-v2.3.0_GH0.tar.gz) = 506374
-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 (facebook-zstd-v1.3.8_GH0.tar.gz) = 90d902a1282cc4e197a8023b6d6e8d331c1fd1dfe60f7f8e4ee9da40da886dc3
-SIZE (facebook-zstd-v1.3.8_GH0.tar.gz) = 1875233
-SHA256 (fmtlib-fmt-6.2.0_GH0.tar.gz) = fe6e4ff397e01c379fc4532519339c93da47404b9f6674184a458a9967a76575
-SIZE (fmtlib-fmt-6.2.0_GH0.tar.gz) = 733403
+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 (lz4-lz4-v1.8.0-8-g4db65c1_GH0.tar.gz) = 31a61b29dcb0204c9ac283d24cd53ae4d7e15e6f4e7dd88919d965ff9cf8ced5
-SIZE (lz4-lz4-v1.8.0-8-g4db65c1_GH0.tar.gz) = 222985
-SHA256 (madler-zlib-v1.2.11_GH0.tar.gz) = 629380c90a77b964d896ed37163f5c3a34f6e6d897311f1df2a7016355c45eff
-SIZE (madler-zlib-v1.2.11_GH0.tar.gz) = 644492
-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 (xiph-opus-v1.3.1-4-gad8fe90d_GH0.tar.gz) = a5169e4de7266dca46f8fe08cdc3b9d331c14eaaffc7d9d8abc02d70c4f555da
-SIZE (xiph-opus-v1.3.1-4-gad8fe90d_GH0.tar.gz) = 828993
+SHA256 (e6085ea35f0b.patch) = c5b49c4512bb88f1aca85b10341f4d5f587af940026c4b52a461de101f07957b
+SIZE (e6085ea35f0b.patch) = 1867
+SHA256 (3b1683a15261.patch) = dbc7f2c628527b487ff3cfa93c0a8ad899b38a16eb68c3baec8974ff956a17e7
+SIZE (3b1683a15261.patch) = 1709
+SHA256 (dda90ce1c249.patch) = 7664619a899860339dec98dceb27b1beb5ca0faafb996a469dd096c55cf87da3
+SIZE (dda90ce1c249.patch) = 1029

Modified: head/emulators/yuzu/files/patch-CMakeLists.txt
==============================================================================
--- head/emulators/yuzu/files/patch-CMakeLists.txt	Wed Jul  1 12:34:18 2020	(r540954)
+++ head/emulators/yuzu/files/patch-CMakeLists.txt	Wed Jul  1 12:42:19 2020	(r540955)
@@ -1,37 +1,15 @@
 yuzu (Qt) currently needs SDL for input
 
---- CMakeLists.txt.orig	2020-02-19 21:13:50 UTC
+--- CMakeLists.txt.orig	2020-06-29 05:12:38 UTC
 +++ CMakeLists.txt
-@@ -157,19 +157,21 @@ if (ENABLE_SDL2)
-         target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")
-     else()
-         find_package(SDL2 REQUIRED)
--
--        # Some installations don't set SDL2_LIBRARIES
--        if("${SDL2_LIBRARIES}" STREQUAL "")
--            message(WARNING "SDL2_LIBRARIES wasn't set, manually setting to SDL2::SDL2")
--            set(SDL2_LIBRARIES "SDL2::SDL2")
--        endif()
--
--        include_directories(SYSTEM ${SDL2_INCLUDE_DIRS})
--        add_library(SDL2 INTERFACE)
--        target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}")
+@@ -225,7 +225,9 @@ if(ENABLE_SDL2)
+         list(APPEND CMAKE_MODULE_PATH "${CONAN_SDL2_ROOT_RELEASE}")
+         list(APPEND CMAKE_PREFIX_PATH "${CONAN_SDL2_ROOT_RELEASE}")
      endif()
- else()
--    set(SDL2_FOUND NO)
-+    find_package(SDL2)
+-    find_package(SDL2)
 +endif()
-+
-+if (SDL2_FOUND)
-+    # Some installations don't set SDL2_LIBRARIES
-+    if("${SDL2_LIBRARIES}" STREQUAL "")
-+        message(WARNING "SDL2_LIBRARIES wasn't set, manually setting to SDL2::SDL2")
-+        set(SDL2_LIBRARIES "SDL2::SDL2")
-+    endif()
-+
-+    include_directories(SYSTEM ${SDL2_INCLUDE_DIRS})
-+    add_library(SDL2 INTERFACE)
-+    target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}")
- endif()
- 
- # If unicorn isn't found, msvc -> download bundled unicorn; everyone else -> build external
++find_package(SDL2)
++if(ENABLE_SDL2)
+     if (NOT SDL2_FOUND)
+         # otherwise add this to the list of libraries to install
+         list(APPEND CONAN_REQUIRED_LIBS "sdl2/2.0.12@bincrafters/stable")

Added: head/emulators/yuzu/files/patch-openssl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/yuzu/files/patch-openssl	Wed Jul  1 12:42:19 2020	(r540955)
@@ -0,0 +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"
++        "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()



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007011242.061CgKoP089851>