emulators/yuzu: update to s20201030

Changes:	https://github.com/yuzu-emu/yuzu/compare/2f6ba5448...6db0c0d8d


git-svn-id: http://svn.freebsd.org/ports/head@553722 35697150-7ecd-e111-bb59-0022644237b5

4 files changed, 25 insertions, 76 deletions

diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile
index 9e93e76c48eb..c9bbf6a08122 100644
--- a/emulators/yuzu/Makefile
+++ b/emulators/yuzu/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	yuzu
-PORTVERSION=	s20201025
+PORTVERSION=	s20201030
 PORTREVISION?=	0
 CATEGORIES=	emulators
 
@@ -31,11 +31,12 @@ LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
 		libzstd.so:archivers/zstd \
 		libopus.so:audio/opus \
 		libboost_context.so:devel/boost-libs \
-		libfmt.so:devel/libfmt
+		libfmt.so:devel/libfmt \
+		libavcodec.so:multimedia/ffmpeg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	yuzu-emu
-GH_TAGNAME=	2f6ba5448
+GH_TAGNAME=	6db0c0d8d
 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 \
@@ -46,7 +47,7 @@ GH_TUPLE=	yuzu-emu:unicorn:1.0.1-153-g73f45735:unicorn/externals/unicorn \
 		citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \
 		herumi:xbyak:v5.96:xbyak/externals/xbyak \
 		kinetiknz:cubeb:cubeb-0.2-1251-ga7e83aa:cubeb/externals/cubeb \
-		svn2github:inih:603729d:inih/externals/inih/inih
+		benhoyt:inih:r52:inih/externals/inih/inih
 
 USES=		cmake compiler:c++17-lang localbase:ldflags python:build sdl ssl
 USE_SDL=	sdl2
diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo
index ca9fd918b967..3f977cb28f39 100644
--- a/emulators/yuzu/distinfo
+++ b/emulators/yuzu/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1603655790
+TIMESTAMP = 1604085100
 SHA256 (libcxx-10.0.1.src.tar.xz) = def674535f22f83131353b3c382ccebfef4ba6a35c488bdb76f10b68b25be86c
 SIZE (libcxx-10.0.1.src.tar.xz) = 1839172
-SHA256 (yuzu-emu-yuzu-s20201025-2f6ba5448_GH0.tar.gz) = a5bcdb14ccf79b2a85a1c93ef5918b3cf78daed95a70034d8ab03b11df568ae5
-SIZE (yuzu-emu-yuzu-s20201025-2f6ba5448_GH0.tar.gz) = 4015908
+SHA256 (yuzu-emu-yuzu-s20201030-6db0c0d8d_GH0.tar.gz) = d7eccdb4fc557548af5d532a6a607d41e84d2d462cb95fd079e42a2accf11621
+SIZE (yuzu-emu-yuzu-s20201030-6db0c0d8d_GH0.tar.gz) = 4049243
 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
@@ -23,7 +23,7 @@ SHA256 (herumi-xbyak-v5.96_GH0.tar.gz) = 727f15d3ed786cae255ebfed1829a84a357c0e4
 SIZE (herumi-xbyak-v5.96_GH0.tar.gz) = 226999
 SHA256 (kinetiknz-cubeb-cubeb-0.2-1251-ga7e83aa_GH0.tar.gz) = ded9dbd4a35aaba5a5e15883da17111ec46395241f283223683590adb1cfaf19
 SIZE (kinetiknz-cubeb-cubeb-0.2-1251-ga7e83aa_GH0.tar.gz) = 206804
-SHA256 (svn2github-inih-603729d_GH0.tar.gz) = b4faa364c3e33261707d4b669e1c669ca3818d7b9515c15fe0befd9df3f1f00a
-SIZE (svn2github-inih-603729d_GH0.tar.gz) = 8342
+SHA256 (benhoyt-inih-r52_GH0.tar.gz) = 439cff9ce9a8afc52d08772ac3e93b3cecd79c7707f871fb4534fb3a48201880
+SIZE (benhoyt-inih-r52_GH0.tar.gz) = 16808
 SHA256 (905e8016a04e.patch) = cecc02f098917ee236ace0a350f37a9ffbb4aae92232f6c105a520476f7b23b5
 SIZE (905e8016a04e.patch) = 2545
diff --git a/emulators/yuzu/files/patch-fmt b/emulators/yuzu/files/patch-fmt
new file mode 100644
index 000000000000..8e70d7c242bc
--- /dev/null
+++ b/emulators/yuzu/files/patch-fmt
@@ -0,0 +1,15 @@
+Allow building against devel/libfmt until it's upgraded
+
+-- Packages fmt/7.1.0 not found!
+
+--- CMakeLists.txt.orig	2020-10-30 07:35:40 UTC
++++ CMakeLists.txt
+@@ -161,7 +161,7 @@ macro(yuzu_find_packages)
+     #    Cmake Pkg Prefix  Version     Conan Pkg
+         "Boost             1.72        boost/1.72.0"
+         "Catch2            2.13        catch2/2.13.0"
+-        "fmt               7.1         fmt/7.1.0"
++        "fmt               7.0         fmt/7.0.3"
+     # 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"
diff --git a/emulators/yuzu/files/patch-openssl b/emulators/yuzu/files/patch-openssl
deleted file mode 100644
index c4f37dbfdac2..000000000000
--- a/emulators/yuzu/files/patch-openssl
+++ /dev/null
@@ -1,67 +0,0 @@
-Revert https://github.com/yuzu-emu/yuzu/commit/2a3d4cad63f8
-
---- .gitmodules.orig	2020-09-02 16:49:39 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 "libusb"]
- 	path = externals/libusb/libusb
- 	url = https://github.com/libusb/libusb.git
---- CMakeLists.txt.orig	2020-10-16 03:59:34 UTC
-+++ CMakeLists.txt
-@@ -162,6 +161,7 @@ macro(yuzu_find_packages)
-         "Boost             1.72        boost/1.72.0"
-         "Catch2            2.13        catch2/2.13.0"
-         "fmt               7.0         fmt/7.0.3"
-+        "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"
-@@ -326,6 +326,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-10-16 03:59:34 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,7 +80,7 @@ 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)
-     if (WIN32)
-         target_link_libraries(httplib INTERFACE crypt32 cryptui ws2_32)
-     endif()