Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 20 Dec 2022 14:15:58 GMT
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 93b836bc9e65 - main - graphics/vulkan-headers: update to 1.3.238
Message-ID:  <202212201415.2BKEFwSf035168@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=93b836bc9e6566ff0866adcd5185f0ef6109ae26

commit 93b836bc9e6566ff0866adcd5185f0ef6109ae26
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-12-19 11:46:14 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-12-20 14:15:26 +0000

    graphics/vulkan-headers: update to 1.3.238
    
    Force rebuild vulkan-loader to make sure vulkaninfo shows the new version.
    
    Changes:        https://github.com/KhronosGroup/Vulkan-Headers/compare/v1.3.237...v1.3.238
    Reported by:    Repology, portscout
---
 emulators/yuzu/Makefile                    | 7 +++++++
 emulators/yuzu/distinfo                    | 2 ++
 graphics/vulkan-extension-layer/Makefile   | 5 +++++
 graphics/vulkan-extension-layer/distinfo   | 2 ++
 graphics/vulkan-headers/Makefile           | 2 +-
 graphics/vulkan-headers/distinfo           | 6 +++---
 graphics/vulkan-loader/Makefile            | 1 +
 graphics/vulkan-tools/Makefile             | 5 +++++
 graphics/vulkan-tools/distinfo             | 2 ++
 graphics/vulkan-validation-layers/Makefile | 5 +++++
 graphics/vulkan-validation-layers/distinfo | 2 ++
 11 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile
index 8f7ebdfcbc9f..d4cf0444c8fb 100644
--- a/emulators/yuzu/Makefile
+++ b/emulators/yuzu/Makefile
@@ -11,6 +11,7 @@ EXTRACT_ONLY=	${DISTFILES:N*\:gamedb:C/\:.*//}
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	c17d71240b23.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/9042 mainline-merge
+PATCHFILES+=	b60a93a9363d.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/9480 post-extract
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Nintendo Switch emulator/debugger
@@ -134,6 +135,12 @@ WEBENGINE_IMPLIES=	GUI
 post-extract:
 	@${CP} ${DISTFILES:M*\:gamedb:C/\:.*//:S,^,${_DISTDIR},} \
 		${WRKSRC}/dist/compatibility_list/
+.if defined(PATCHFILES) && ${PATCHFILES:Mb60a93a9363d*}
+# Pretend to be a regular file for vendor patch to apply as is
+	@${RMDIR} ${WRKSRC}/externals/Vulkan-Headers
+	@${ECHO_CMD} "Subproject commit 2826791bed6a793f164bf534cd859968f13df8a9" \
+		>${WRKSRC}/externals/Vulkan-Headers
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/@GIT_BRANCH@/master/' \
diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo
index 96c9e295abbe..af9fd78f06fa 100644
--- a/emulators/yuzu/distinfo
+++ b/emulators/yuzu/distinfo
@@ -25,3 +25,5 @@ SHA256 (llvm-llvm-project-llvmorg-13.0.1_GH0.tar.gz) = 09c50d558bd975c4115736442
 SIZE (llvm-llvm-project-llvmorg-13.0.1_GH0.tar.gz) = 147290251
 SHA256 (c17d71240b23.patch) = 4aaf5522ec3f7d393cec59638220d6142489c4e946060ec94444ca3f47e2b2a7
 SIZE (c17d71240b23.patch) = 7562
+SHA256 (b60a93a9363d.patch) = e9bbe68024a815b3b67101deb0c907c351d4139e37ee1b8d3842d886c4c1f06e
+SIZE (b60a93a9363d.patch) = 2152
diff --git a/graphics/vulkan-extension-layer/Makefile b/graphics/vulkan-extension-layer/Makefile
index c065114c4045..7769c50309fb 100644
--- a/graphics/vulkan-extension-layer/Makefile
+++ b/graphics/vulkan-extension-layer/Makefile
@@ -18,4 +18,9 @@ GH_ACCOUNT=	KhronosGroup
 GH_PROJECT=	Vulkan-ExtensionLayer
 CMAKE_OFF=	BUILD_TESTS
 
+.if ${DISTVERSION:E} < 238
+GH_TUPLE+=	KhronosGroup:Vulkan-Headers:v1.3.237:vkheaders/Vulkan-Headers
+CFLAGS+=	-I${WRKSRC_vkheaders}/include
+.endif
+
 .include <bsd.port.mk>
diff --git a/graphics/vulkan-extension-layer/distinfo b/graphics/vulkan-extension-layer/distinfo
index 3ac26ce9586d..4dc0bc87813e 100644
--- a/graphics/vulkan-extension-layer/distinfo
+++ b/graphics/vulkan-extension-layer/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1670866262
 SHA256 (KhronosGroup-Vulkan-ExtensionLayer-v1.3.237_GH0.tar.gz) = f503cbbefc1d15c332b1e3eeed9759c86a19154ad4d1beb2be2afa098973a256
 SIZE (KhronosGroup-Vulkan-ExtensionLayer-v1.3.237_GH0.tar.gz) = 521395
+SHA256 (KhronosGroup-Vulkan-Headers-v1.3.237_GH0.tar.gz) = 3f0d9a01a7859efbf312f34140259fc90aa0ba04f635e98f8f36321de4bd509b
+SIZE (KhronosGroup-Vulkan-Headers-v1.3.237_GH0.tar.gz) = 1773832
diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile
index 4ee489dd7863..20885b714403 100644
--- a/graphics/vulkan-headers/Makefile
+++ b/graphics/vulkan-headers/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	vulkan-headers
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.3.237
+DISTVERSION=	1.3.238
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/graphics/vulkan-headers/distinfo b/graphics/vulkan-headers/distinfo
index 0d6e58279a02..234013627a10 100644
--- a/graphics/vulkan-headers/distinfo
+++ b/graphics/vulkan-headers/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1670509655
-SHA256 (KhronosGroup-Vulkan-Headers-v1.3.237_GH0.tar.gz) = 3f0d9a01a7859efbf312f34140259fc90aa0ba04f635e98f8f36321de4bd509b
-SIZE (KhronosGroup-Vulkan-Headers-v1.3.237_GH0.tar.gz) = 1773832
+TIMESTAMP = 1671450374
+SHA256 (KhronosGroup-Vulkan-Headers-v1.3.238_GH0.tar.gz) = c2b72c5e94bcabb5c276c0d55344f66d3486c9465beb74397aeb7d5bcf537143
+SIZE (KhronosGroup-Vulkan-Headers-v1.3.238_GH0.tar.gz) = 1684510
diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile
index 6b83e83107ed..37eeb92a40bf 100644
--- a/graphics/vulkan-loader/Makefile
+++ b/graphics/vulkan-loader/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	vulkan-loader
 DISTVERSIONPREFIX=	v
 PORTVERSION=	1.3.237
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/graphics/vulkan-tools/Makefile b/graphics/vulkan-tools/Makefile
index 38e4570d2aa0..4eed6a5c8451 100644
--- a/graphics/vulkan-tools/Makefile
+++ b/graphics/vulkan-tools/Makefile
@@ -20,6 +20,11 @@ GH_PROJECT=	Vulkan-Tools
 CMAKE_OFF=	BUILD_CUBE BUILD_ICD
 CMAKE_ARGS=	-DGLSLANG_INSTALL_DIR:PATH="${LOCALBASE}"
 
+.if ${DISTVERSION:E} < 238
+GH_TUPLE+=	KhronosGroup:Vulkan-Headers:v1.3.237:vkheaders/Vulkan-Headers
+CFLAGS+=	-I${WRKSRC_vkheaders}/include
+.endif
+
 OPTIONS_DEFINE=		WAYLAND XCB XLIB
 OPTIONS_DEFAULT=	WAYLAND XCB XLIB
 OPTIONS_SLAVE=		DISPLAY
diff --git a/graphics/vulkan-tools/distinfo b/graphics/vulkan-tools/distinfo
index 2d4054623d46..c3c3e71f8550 100644
--- a/graphics/vulkan-tools/distinfo
+++ b/graphics/vulkan-tools/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1670528116
 SHA256 (KhronosGroup-Vulkan-Tools-v1.3.237_GH0.tar.gz) = af35d59e601d20a83b9c2b555994cc8e9b5994b23d1b9702c2a1c354e223d593
 SIZE (KhronosGroup-Vulkan-Tools-v1.3.237_GH0.tar.gz) = 881690
+SHA256 (KhronosGroup-Vulkan-Headers-v1.3.237_GH0.tar.gz) = 3f0d9a01a7859efbf312f34140259fc90aa0ba04f635e98f8f36321de4bd509b
+SIZE (KhronosGroup-Vulkan-Headers-v1.3.237_GH0.tar.gz) = 1773832
diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile
index a4ea883610e1..4cca011ad6cb 100644
--- a/graphics/vulkan-validation-layers/Makefile
+++ b/graphics/vulkan-validation-layers/Makefile
@@ -23,6 +23,11 @@ CMAKE_OFF=	BUILD_TESTS
 CMAKE_ON=	BUILD_LAYER_SUPPORT_FILES
 CMAKE_ARGS=	-DSPIRV_HEADERS_INSTALL_DIR:PATH="${WRKSRC_headers}"
 
+.if ${DISTVERSION:E} < 238
+GH_TUPLE+=	KhronosGroup:Vulkan-Headers:v1.3.237:vkheaders/Vulkan-Headers
+CFLAGS+=	-I${WRKSRC_vkheaders}/include
+.endif
+
 OPTIONS_DEFINE=	WAYLAND XCB XLIB
 OPTIONS_DEFAULT=WAYLAND XCB XLIB
 
diff --git a/graphics/vulkan-validation-layers/distinfo b/graphics/vulkan-validation-layers/distinfo
index 67501d029370..0a7306f74735 100644
--- a/graphics/vulkan-validation-layers/distinfo
+++ b/graphics/vulkan-validation-layers/distinfo
@@ -3,3 +3,5 @@ SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.237_GH0.tar.gz) = d20487d2450c
 SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.237_GH0.tar.gz) = 4523891
 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-207-g1d31a10_GH0.tar.gz) = 696f3dddde6d732155140131eceba2b290e0e7a7eea18c39bc687a08fce733f1
 SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-207-g1d31a10_GH0.tar.gz) = 445575
+SHA256 (KhronosGroup-Vulkan-Headers-v1.3.237_GH0.tar.gz) = 3f0d9a01a7859efbf312f34140259fc90aa0ba04f635e98f8f36321de4bd509b
+SIZE (KhronosGroup-Vulkan-Headers-v1.3.237_GH0.tar.gz) = 1773832



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212201415.2BKEFwSf035168>