From nobody Mon Nov 13 11:11:27 2023 X-Original-To: dev-commits-ports-all@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 4STRZR2Bhsz519Tw; Mon, 13 Nov 2023 11:11:27 +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 4STRZR1mc3z4MQx; Mon, 13 Nov 2023 11:11:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699873887; 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=v/CBBjrnYc/q/T/DR86hchfOmpKvGF2trYnM3FMyH+c=; b=VPnDyDfLq1pbZDR0yUp5kEUTexh5wB19JqZpTd2V1SnmApmiw2Rp723m8FWYRJrVom6kN8 i/shjPNVBe2XrpXlHIl/5GJoZwyXpM9ykIky9yQI8407mvuhLSg2z/oiaXPeOzcYYLE3lz 9Y90oKLImUotejj/CI7XFRIJJpn+8BfkFST5EY2mvCcjmxTKak4MurNtpTmo7CeXR3Md33 rlaR245wrVnFjzZVeK6vJmf2T/RgTnEmAa0sIuTL0Hm7WXaX6OE94B/Yww3X/PPG8fNwfj L4EGlzOETLI6LmD2yddvDihkHPV2j5h3z0nNxPpWVpMN5MicjUSaNW6c8WQHPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699873887; 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=v/CBBjrnYc/q/T/DR86hchfOmpKvGF2trYnM3FMyH+c=; b=K9fvm8wCUz9a/BNEJRsJMM2O6udUXdkKG/OZFgQ7mPKsf+FrUdYfkSKEbBZr1tbDFyZuDi xcaQQrKFQhJeriJ7JqG0SoTIx8FH4KVRl+3brQA7QqcBLODzYPhjnfALhvkBsEMPrSAzGZ zgHyQPgzPa4cY0iSQiM2VEGcHmHWmg3jw+IFxfa/WwHaLVaBFgD82O5R/a+qygKwFaQSEe cO3GAzpH6X7LXyr49JuYUlSTdn2AKEKVu7DjBnyoEmyj8LNe1OiJ7XTD6nshMTWtrFI47Z PIQmEsSlLRqkJ2TDS1Mqi4qqvj3QYKu804ZJnii3lD0jgnIfQdCaAS/HsahuNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699873887; a=rsa-sha256; cv=none; b=FwN/5bIBJ4FvlBM8rGK+ruh+coB8b4ZIB0XdO1UUxBhCOMjCLx22ZoH3G9o9gNkMy26pAA GXSKvpdEktRlo4oLp4Lgu7Tv6X2DOlrZTsCpmRUTKQHK7kI1Ga9uJlzWiYuy8CGaxpxWYg CTXikzfYsD7r7mAyd93/w/xXdu2Ad3ZY6u0mGlR5mNBDv7VGmFuXx2IyM1054MHLh9KnkI l7PCHCQ0N2CXSUvUghKXXbXVw9+zKTBXlZg5HOKDyq8beThefHOSen5tmel7XmMxV9+3m8 eDO/6R5kRfIYxl8de2Cwp8DdFpC01XCCNdUP2dkQTf1T/K9cVM6QrKTbmrxU5A== 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 4STRZR0qgJz13V8; Mon, 13 Nov 2023 11:11:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ADBBRZ6037618; Mon, 13 Nov 2023 11:11:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ADBBRh2037615; Mon, 13 Nov 2023 11:11:27 GMT (envelope-from git) Date: Mon, 13 Nov 2023 11:11:27 GMT Message-Id: <202311131111.3ADBBRh2037615@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ganael LAPLANCHE Subject: git: 176c20f399a3 - main - emulators/pcsx2: Enable Vulkan backend List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: martymac X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 176c20f399a33b856cb7a3d80e69245a0d27f775 Auto-Submitted: auto-generated The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=176c20f399a33b856cb7a3d80e69245a0d27f775 commit 176c20f399a33b856cb7a3d80e69245a0d27f775 Author: Ganael LAPLANCHE AuthorDate: 2023-11-13 11:10:34 +0000 Commit: Ganael LAPLANCHE CommitDate: 2023-11-13 11:11:14 +0000 emulators/pcsx2: Enable Vulkan backend --- emulators/pcsx2/Makefile | 6 ++++-- emulators/pcsx2/Makefile.tuples | 2 ++ emulators/pcsx2/distinfo | 4 ++++ .../pcsx2/files/patch-pcsx2-GS-Renderers-Vulkan-GSDeviceVK.h | 10 ++++++++++ emulators/pcsx2/files/patch-relocate-resources.txt | 6 +++--- 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/emulators/pcsx2/Makefile b/emulators/pcsx2/Makefile index 6f917ba94d19..0a1ac1dcdaff 100644 --- a/emulators/pcsx2/Makefile +++ b/emulators/pcsx2/Makefile @@ -1,7 +1,7 @@ PORTNAME= pcsx2 PORTVERSION= 1.7.4970 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MAINTAINER= martymac@FreeBSD.org @@ -29,6 +29,9 @@ LIB_DEPENDS= libpng.so:graphics/png \ libjack.so:audio/jack \ libsndio.so:audio/sndio \ libbacktrace.so:devel/libbacktrace +# XXX Necessary for Qt6/FindWrapVulkanHeaders.cmake +# then vulkan-haders and glslang are unconditionnaly included from 3rdparty/ +BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers USES= cmake compiler:c++20-lang \ desktop-file-utils elfctl gl pkgconfig qt:6 sdl xorg @@ -58,7 +61,6 @@ CMAKE_ARGS+= \ -DCMAKE_REQUIRED_INCLUDES:STRING=${LOCALBASE}/include/ \ -DPCSX2_RESOURCES_PATH:STRING=${DATADIR}/resources \ -DUSE_VTUNE:BOOL=OFF \ - -DUSE_VULKAN:BOOL=OFF \ -DWAYLAND_API=OFF \ -DENABLE_TESTS:BOOL=OFF diff --git a/emulators/pcsx2/Makefile.tuples b/emulators/pcsx2/Makefile.tuples index fe3593f99e02..e04f9da14434 100644 --- a/emulators/pcsx2/Makefile.tuples +++ b/emulators/pcsx2/Makefile.tuples @@ -2,6 +2,8 @@ GH_TUPLE= \ fmtlib:fmt:b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9:fmt/3rdparty/fmt/fmt \ rtissera:libchdr:fec8ab94212cc65d9d9a62cb3da924f5830c04b0:libchdr/3rdparty/libchdr/libchdr \ biojppm:rapidyaml:213b201d264139cd1b887790197e08850af628e3:rapidyaml/3rdparty/rapidyaml/rapidyaml \ + KhronosGroup:glslang:c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5:glslang/3rdparty/glslang/glslang \ + KhronosGroup:Vulkan-Headers:9f4c61a31435a7a90a314fc68aeb386c92a09c0f:VulkanHeaders/3rdparty/vulkan-headers \ facebook:zstd:e47e674cd09583ff0503f0f6defd6d23d8b718d3:zstd/3rdparty/zstd/zstd \ RetroAchievements:rcheevos:3af1e2fc5188d6e932ee379942f4049ea877e648:rcheevos/3rdparty/rcheevos/rcheevos \ biojppm:c4core:d35c7c9bf370134595699d791e6ff8db018ddc8d:c4core/3rdparty/rapidyaml/rapidyaml/ext/c4core \ diff --git a/emulators/pcsx2/distinfo b/emulators/pcsx2/distinfo index a90c71e3bebc..c1d43fa38f75 100644 --- a/emulators/pcsx2/distinfo +++ b/emulators/pcsx2/distinfo @@ -7,6 +7,10 @@ SHA256 (rtissera-libchdr-fec8ab94212cc65d9d9a62cb3da924f5830c04b0_GH0.tar.gz) = SIZE (rtissera-libchdr-fec8ab94212cc65d9d9a62cb3da924f5830c04b0_GH0.tar.gz) = 1748513 SHA256 (biojppm-rapidyaml-213b201d264139cd1b887790197e08850af628e3_GH0.tar.gz) = c206d4565ccfa721991a8df90821d1a1f747e68385a0f3f5b9ab995e191c06be SIZE (biojppm-rapidyaml-213b201d264139cd1b887790197e08850af628e3_GH0.tar.gz) = 446070 +SHA256 (KhronosGroup-glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5_GH0.tar.gz) = 9ed562b906c3480b29730e46eb1536af2c82ae6a59d4d2ac93b7e764a2896372 +SIZE (KhronosGroup-glslang-c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5_GH0.tar.gz) = 3433325 +SHA256 (KhronosGroup-Vulkan-Headers-9f4c61a31435a7a90a314fc68aeb386c92a09c0f_GH0.tar.gz) = 682e0be6805949da18c5cacbad878493984d3aaf5ac1fbd968d285da78d44ae5 +SIZE (KhronosGroup-Vulkan-Headers-9f4c61a31435a7a90a314fc68aeb386c92a09c0f_GH0.tar.gz) = 1554220 SHA256 (facebook-zstd-e47e674cd09583ff0503f0f6defd6d23d8b718d3_GH0.tar.gz) = 2a7b7e5d3f8c759894f0fea9917a590733600574d20cb53f3be827c7c62862e1 SIZE (facebook-zstd-e47e674cd09583ff0503f0f6defd6d23d8b718d3_GH0.tar.gz) = 1952167 SHA256 (RetroAchievements-rcheevos-3af1e2fc5188d6e932ee379942f4049ea877e648_GH0.tar.gz) = 2350d4479a9ca725a269eee5c1aeccf3e54ea2cf7bf9dd82bd0f07c59f96f5bd diff --git a/emulators/pcsx2/files/patch-pcsx2-GS-Renderers-Vulkan-GSDeviceVK.h b/emulators/pcsx2/files/patch-pcsx2-GS-Renderers-Vulkan-GSDeviceVK.h new file mode 100644 index 000000000000..cb06827f623c --- /dev/null +++ b/emulators/pcsx2/files/patch-pcsx2-GS-Renderers-Vulkan-GSDeviceVK.h @@ -0,0 +1,10 @@ +--- pcsx2/GS/Renderers/Vulkan/GSDeviceVK.h.orig 2023-08-31 07:45:23 UTC ++++ pcsx2/GS/Renderers/Vulkan/GSDeviceVK.h +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/emulators/pcsx2/files/patch-relocate-resources.txt b/emulators/pcsx2/files/patch-relocate-resources.txt index f2be4ea8e074..316626ecb61f 100644 --- a/emulators/pcsx2/files/patch-relocate-resources.txt +++ b/emulators/pcsx2/files/patch-relocate-resources.txt @@ -1,8 +1,8 @@ Allow relocation of resource files ---- cmake/BuildParameters.cmake.orig 2023-02-10 03:43:10 UTC +--- cmake/BuildParameters.cmake.orig 2023-11-10 10:14:25 UTC +++ cmake/BuildParameters.cmake -@@ -260,6 +260,10 @@ +@@ -259,6 +259,10 @@ endif() list(APPEND PCSX2_DEFS DISABLE_BUILD_DATE) endif() @@ -15,7 +15,7 @@ Allow relocation of resource files #------------------------------------------------------------------------------- --- pcsx2/Pcsx2Config.cpp.orig 2023-08-31 07:45:23 UTC +++ pcsx2/Pcsx2Config.cpp -@@ -1676,6 +1676,10 @@ void EmuFolders::SetAppRoot() +@@ -1676,6 +1676,10 @@ void EmuFolders::SetResourcesDirectory() void EmuFolders::SetResourcesDirectory() {