From nobody Thu Jan 20 10:31:20 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D0222197184C; Thu, 20 Jan 2022 10:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jff1h5Cgfz4gXG; Thu, 20 Jan 2022 10:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642674680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vg1V+6/bEL5pvUk2M4I7MkFR9Vca3ZJzsQARe5mDFlM=; b=ySAwRQiGhKO8izHPoTxmgpxlzxnQ4EeSBFc8ry7y8sA9FDzrm4YcUINQYiKvVuXzd5oihg ylHpEgB6w039Ql2BbLewU3T1xp1EbvXQH6BgF/MqBGwYsJprRxySwp0vN/B0iRB6WcvOtS LCzDZ7Pp5f3gW/pQkOWEMoyCiZ6JmwFbjarpEokMeDGhLojbHnBGdGJQmR63ua63YLRucZ N3+QKK4xFE7X1dwZerfSw9FZ36MKtm/x5/q4NKx91t0aALmDX0aw/oTmNtZlDB9t1wsdoW dQdGKiiEF36E3j9Hfccqq1cye8JNpJlzm2G5/UYhynmQYqcxRlHgT1gDUiV6uw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8C54626BA8; Thu, 20 Jan 2022 10:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20KAVKpr031165; Thu, 20 Jan 2022 10:31:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20KAVKbj031164; Thu, 20 Jan 2022 10:31:20 GMT (envelope-from git) Date: Thu, 20 Jan 2022 10:31:20 GMT Message-Id: <202201201031.20KAVKbj031164@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 57c6f7e1cbc6 - main - emulators/yuzu: merge -qt5 port as QT5 option List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57c6f7e1cbc6667455b50a022c9388e10ca83646 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642674680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vg1V+6/bEL5pvUk2M4I7MkFR9Vca3ZJzsQARe5mDFlM=; b=lyH/n1Ta1zdA+Ng8uDO52CFzaDRaaen561vMIzdrNarZRm2tdw8i61DzMuEAFerW2Dml0T sBcoQ2cPBzP4JIXvsPhzJozzme/O9qZX6UeRFT1bRFvDW66PELZhI4MY1NGNuRctWReadv +TAvlZPXUvFDD2d1HIoT5RSjohAFllpU7jKZiS2UOqbIwOqUx5tWgtPcWMCfBsfg6Nhnne Rcq44xyoyxZvdNZizSxD+bTTCI9YNT3zjBkCYTh/sA2PJLhkmrQepG3o1yspCxG8bQwRXq Rp5ItLu77kYOeqfZUOZX/xPKS2QPQQLsqOF6bTHm9CudW/iWfwOPCZL6vg0KSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642674680; a=rsa-sha256; cv=none; b=lHdnyDdAF2xJFFv2jIbMa1o0AIu4OUFOmMd9/z5fp/BerehsR45eZOmfVJSi4O2TonI5i8 7DwgxXlqotlsdHAuUrab4GrOUrcubMi096ET9u0nXv5SHjDV78vUGMwy0DZnhJEXP+Mpeq /GQOKXq/D2EUk4b1KulPWJe/ul87qBRjIQLEnS1O2bUxXVoOQuyZxsBY27m+tu9xMzSLh/ O/ZDtrBq/u7Y3mi47JwuEMWq/UYRT3pJGUwAt5+tYwtDP+5G0ZJYrOzhqPfrXNz0x+8gR7 mbqSZsnJWwy0KxZmkFf3HWbMkSLezgRqS3QqhlHGnnYpyRaU4AcLNvrxuht0hQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=57c6f7e1cbc6667455b50a022c9388e10ca83646 commit 57c6f7e1cbc6667455b50a022c9388e10ca83646 Author: Jan Beich AuthorDate: 2022-01-20 09:11:16 +0000 Commit: Jan Beich 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