Skip to content

Commit

Permalink
emulators/yuzu: merge -qt5 port as QT5 option
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jbeich committed Jan 20, 2022
1 parent 43e3964 commit 57c6f7e
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 54 deletions.
1 change: 1 addition & 0 deletions MOVED
Expand Up @@ -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
1 change: 0 additions & 1 deletion emulators/Makefile
Expand Up @@ -178,7 +178,6 @@
SUBDIR += xzx
SUBDIR += yaze-ag
SUBDIR += yuzu
SUBDIR += yuzu-qt5
SUBDIR += z80pack
SUBDIR += zsnes

Expand Down
8 changes: 0 additions & 8 deletions emulators/yuzu-qt5/Makefile

This file was deleted.

14 changes: 4 additions & 10 deletions 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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
35 changes: 0 additions & 35 deletions emulators/yuzu/files/patch-CMakeLists.txt

This file was deleted.

0 comments on commit 57c6f7e

Please sign in to comment.