git: 57c6f7e1cbc6 - main - emulators/yuzu: merge -qt5 port as QT5 option

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=57c6f7e1cbc6667455b50a022c9388e10ca83646

commit 57c6f7e1cbc6667455b50a022c9388e10ca83646
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-01-20 09:11:16 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-01-20 10:26:33 +0000

    emulators/yuzu: merge -qt5 port as QT5 option
    
    yuzu package provided "yuzu-cmd" executable but it's very buggy and
    hard to use. yuzu-qt5 package provided stable "yuzu" executable.
    The split was inspired by citra{,-qt5} but in yuzu confused new users.
---
 MOVED                                     |  1 +
 emulators/Makefile                        |  1 -
 emulators/yuzu-qt5/Makefile               |  8 -------
 emulators/yuzu/Makefile                   | 14 ++++---------
 emulators/yuzu/files/patch-CMakeLists.txt | 35 -------------------------------
 5 files changed, 5 insertions(+), 54 deletions(-)

diff --git a/MOVED b/MOVED
index a8bbe08d4ac7..ac970b27df57 100644
--- a/MOVED
+++ b/MOVED
@@ -16773,3 +16773,4 @@ devel/wasi-compiler-rt12||2022-01-15|Has expired: this ports exists solely for b
 devel/e2fsprogs-libss||2022-01-17|Folded back into sysutils/e2fsprogs, which was the sole user
 lang/spidermonkey60|lang/spidermonkey78|2022-01-18|Has expired: Requires python2 to build
 shells/ammonite|devel/ammonite|2022-01-18|Ammonite dropped built-in shell support
+emulators/yuzu-qt5|emulators/yuzu|2022-01-20|Merged as QT5 port option
diff --git a/emulators/Makefile b/emulators/Makefile
index 68eac809d3c3..61674dd70ad5 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -178,7 +178,6 @@
     SUBDIR += xzx
     SUBDIR += yaze-ag
     SUBDIR += yuzu
-    SUBDIR += yuzu-qt5
     SUBDIR += z80pack
     SUBDIR += zsnes
 
diff --git a/emulators/yuzu-qt5/Makefile b/emulators/yuzu-qt5/Makefile
deleted file mode 100644
index 30c667b9c82a..000000000000
--- a/emulators/yuzu-qt5/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-PORTREVISION=	0
-PKGNAMESUFFIX=	-qt5
-
-MASTERDIR=	${.CURDIR}/../yuzu
-
-OPTIONS_SLAVE=	QT5
-
-.include "${MASTERDIR}/Makefile"
diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile
index 11ffd2cac856..3d6aaa5131b1 100644
--- a/emulators/yuzu/Makefile
+++ b/emulators/yuzu/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	yuzu
 PORTVERSION=	s20220119
-PORTREVISION?=	0
+PORTREVISION=	1
 CATEGORIES=	emulators
 .if make(makesum)
 MASTER_SITES=	https://api.yuzu-emu.org/gamedb/?dummy=/:gamedb
@@ -67,13 +67,10 @@ CMAKE_OFF+=	${CMAKE_TESTING_ON}
 CMAKE_TESTING_ON=	YUZU_TESTS
 LDFLAGS+=	-static-libstdc++ # avoid libc++ conflict, requires files/patch-fmt
 LDFLAGS+=	-Wl,--as-needed # Qt5Network
+PLIST_FILES=	bin/${PORTNAME}-cmd
 
-OPTIONS_DEFINE=	ALSA PULSEAUDIO JACK SNDIO VAAPI VULKAN
-OPTIONS_DEFAULT=PULSEAUDIO JACK SNDIO VAAPI VULKAN
-OPTIONS_MULTI=	GUI
-OPTIONS_MULTI_GUI=	QT5 SDL
-OPTIONS_SLAVE?=	SDL
-OPTIONS_EXCLUDE:=	${OPTIONS_MULTI_GUI}
+OPTIONS_DEFINE=	ALSA PULSEAUDIO JACK QT5 SNDIO VAAPI VULKAN
+OPTIONS_DEFAULT=PULSEAUDIO JACK QT5 SNDIO VAAPI VULKAN
 
 ALSA_BUILD_DEPENDS=	alsa-lib>0:audio/alsa-lib
 ALSA_CMAKE_BOOL=	USE_ALSA
@@ -87,9 +84,6 @@ 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
-
 QT5_USES=	desktop-file-utils qt:5 shared-mime-info
 QT5_USE=	QT=qmake_build,buildtools_build,linguisttools_build,concurrent_build,core,gui,webengine,widgets
 QT5_CMAKE_BOOL=	ENABLE_QT ENABLE_QT_TRANSLATION YUZU_USE_QT_WEB_ENGINE
diff --git a/emulators/yuzu/files/patch-CMakeLists.txt b/emulators/yuzu/files/patch-CMakeLists.txt
deleted file mode 100644
index 43638c95a8bc..000000000000
--- a/emulators/yuzu/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-yuzu (Qt) currently needs SDL for input
-
---- CMakeLists.txt.orig	2021-12-06 23:09:30 UTC
-+++ CMakeLists.txt
-@@ -395,7 +395,10 @@ if (ENABLE_SDL2)
-         target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")
-     elseif (YUZU_USE_EXTERNAL_SDL2)
-         message(STATUS "Using SDL2 from externals.")
--    else()
-+    endif()
-+endif()
-+
-+if (NOT YUZU_USE_BUNDLED_SDL2 AND NOT YUZU_USE_EXTERNAL_SDL2)
-         find_package(SDL2 2.0.18 REQUIRED)
- 
-         # Some installations don't set SDL2_LIBRARIES
-@@ -407,7 +410,6 @@ if (ENABLE_SDL2)
-         include_directories(SYSTEM ${SDL2_INCLUDE_DIRS})
-         add_library(SDL2 INTERFACE)
-         target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}")
--    endif()
- endif()
- 
- # Install any missing dependencies with conan install
---- src/input_common/CMakeLists.txt.orig	2021-04-21 21:36:33 UTC
-+++ src/input_common/CMakeLists.txt
-@@ -62,7 +62,7 @@ else()
-     )
- endif()
- 
--if (ENABLE_SDL2)
-+if (SDL2_FOUND)
-     target_sources(input_common PRIVATE
-         sdl/sdl_impl.cpp
-         sdl/sdl_impl.h