From nobody Sat Jan 22 00:59:49 2022 X-Original-To: dev-commits-ports-branches@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 2C01F197D164; Sat, 22 Jan 2022 00:59:50 +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 4JgdFK6tf6z3v8p; Sat, 22 Jan 2022 00:59:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642813190; 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=CMoH+KbBf6uziyqJ6KHFyawYPY6VpUduLq4FGqU706Q=; b=wKbXMiPbnAA7eVD2yS++5AbmL5eWUw1Dc1+MEQ1Skavbgip1cXxURXfbL7qPNeFri1RRS9 5Ngg2o+iBTv1I1bIvHqKR/u9W4LBSwi7CXIlNzT+a3YNMSUy7t9qnhnqMR9IX+1OhdzrsO 3YPD170OZGsBRUCFbr/AjWDYGhW48O3ZgPyicZK3ozw59OG6JIgpa5Eohqoz0NKDaPp6zD i+DuoXlTcCh20y5vdf529WVjsp2v3sZLX3AwvGKh55UJxDW3Tf4wa78QIVsKrrng5j7MfF X+Psle2mAbmaihaj75qM+xbtwKNVPkPVpg1LBFCXrGTFomxlCwRzr9WdhXHyFg== 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 B968E25BD0; Sat, 22 Jan 2022 00:59:49 +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 20M0xnuF004908; Sat, 22 Jan 2022 00:59:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20M0xn9l004907; Sat, 22 Jan 2022 00:59:49 GMT (envelope-from git) Date: Sat, 22 Jan 2022 00:59:49 GMT Message-Id: <202201220059.20M0xn9l004907@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 41944891b2a0 - 2022Q1 - emulators/yuzu: merge -qt5 port as QT5 option List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q1 X-Git-Reftype: branch X-Git-Commit: 41944891b2a0af2d90a9104712f07722937e5be4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642813190; 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=CMoH+KbBf6uziyqJ6KHFyawYPY6VpUduLq4FGqU706Q=; b=K9bqbudEi/+piNGUHs58TDZ36ZNmycpd68iOJWmqfLQwrtzz1iJuKJaI+7fAfBt/Pg8+dB fLIcsGvVDGtam+D1607bo2Xh19aydBCxkgaMS+lqAQ7Z9IRIEn/1UoZ81bwz4oeLB2ef+F l76lMgdQswfmSQyuj0zMknD+qovmDQ2ah/uINVvK+DefXQXTTgNUjO3/nduCmxhbTxxzw6 zlRgZ0/mhFvUZPRIDeOLn7NX6lJghw58FgmG1W9mqWeRJKUzDO3qlBiNsTkVq9uealTQMi nUeo7eadMAK59TBFLNrmYhAyzKhAACRnsK+McsB/CESkI4ONjRHHEbuPQm2riA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642813190; a=rsa-sha256; cv=none; b=bX47GcmcxzufEgAHKKSv8MqhRR6CoUnscVWgILLjDBuKL714rXdK4VFBrG1jEnRfGzvwMy XYX+iSOdjC/2DcPm0yt3YrFvp/nzkBbigqfzvxUuJX1lTOzHdqJiQHpdSIeq3V+FuNPehK jLTpefLagw3qEAUbSyDGOXw94t4zDub3giaGxlapNztjYqrqJANeRXoARxWKqXSEYsibwd S+Mt6JmuY/eLk3wjIh/6wqhdJc8/1NolZ85wI6ncFxvJ901hhypdjJ/oHZwhEB2LqI2VTl Ggg5szi5N48j8l+OLzpHbuGfZm1S5C5JOwTeWWD1i02QlPyE9kzE5X374piWNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=41944891b2a0af2d90a9104712f07722937e5be4 commit 41944891b2a0af2d90a9104712f07722937e5be4 Author: Jan Beich AuthorDate: 2022-01-20 09:11:16 +0000 Commit: Jan Beich CommitDate: 2022-01-22 00:59:39 +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. (cherry picked from commit 57c6f7e1cbc6667455b50a022c9388e10ca83646) --- 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 22cdab471915..9ba71e670fb0 100644 --- a/MOVED +++ b/MOVED @@ -16759,3 +16759,4 @@ www/py-dj31-djangorestframework||2021-12-31|Has expired: Extended support of Dja astro/google-earth||2022-01-01|Has expired: Needs newer version to connect to server net/tramp||2022-01-01|Has expired: Not updated in 5 years and now part of Emacs archivers/p7zip-codec-rar||2022-01-01|Has expired: Unmaintained for years and has known vulnerabilities +emulators/yuzu-qt5|emulators/yuzu|2022-01-20|Merged as QT5 port option diff --git a/emulators/Makefile b/emulators/Makefile index a5926fd975fc..223ecc1d146f 100644 --- a/emulators/Makefile +++ b/emulators/Makefile @@ -179,7 +179,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