From nobody Sat Oct 07 14:47:47 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 4S2p774qgXz4wbRP; Sat, 7 Oct 2023 14:47:47 +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 4S2p774Lpyz4gkf; Sat, 7 Oct 2023 14:47:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696690067; 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=pXQDWbj6bS2s7BgVaI4rfH/SIfruvhuPloCcwe77Z6E=; b=sYOR/1dun9qsnefIz2sXaR171634EWCacodDadUosegGYU5pKqvcKWNGu+pnx/5A1GS4ej zdNYwg21CnRThMQU0TKkB4l8PWbEnS/f3uz5xHtAu5IMU03JZd5pTMN/VTvJ3DU0PyH+d+ ejM0HGKEWbRuhDbP1/aLylRnatJF9QBM/PPJdOyKHRFyWNkJ0G5Z9DtXi0MBg70qQKGITP i83shYPx2oM4bpcargZbGVNvZqb5D2ruvWSjP7kUTeYpPGZjjYzkPc2CLF6l+2jC+WTnNW 6U8dKXreWIHX22Lb9xU13C9n5+wkgpJ+F+DS1XNrLyoZg4yEw3laLappZEekeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696690067; a=rsa-sha256; cv=none; b=r9dDHBk/PGY6XjqVSep3IRM6H7NymPt0XrLOz29sXt/x4gQMCNFn1eGglXwPyEJSWDoUBd V6PVKB1g3bVdbot33XASk9oMXyWg6BNG5PHc33P40dROay/Yd+5CfDFp0FQ7CrJ2dYCxHP bNPFHVvUaCXmZsDduzBa0rlht5EyFKdFvJRhEMTpMT2g/13MZo+dSlhUuCDT15lS4+qr46 wfWrMVqa6XefXRUpD/FVxV6tTw7rxcQYrNZ5yMpNJZv8XzDAgkjRai/WgL0R0F18PEYoqu KRGfPF7DI0WRjxj3wYKjbLad32oKcPq+/DFtH6BvW/jCuA2cwaK5+ZyVjcmWiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696690067; 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=pXQDWbj6bS2s7BgVaI4rfH/SIfruvhuPloCcwe77Z6E=; b=YPWFYFE9jGBo2BEO4aS98UVlbQ9TMwCMDIFSK1O2O11axjsEbrm0rF9F4NYHVYIlQUle+V 10sAxlDNAiVUE3Tcapj4F9oVW35LiHdlG9sA90hX9zJAYGtEd0ejnQeDaEnFlJPsIcqtuT fMxorZHA1jhNONd2Qoyo1SB7fS9Bkp9+dppu9sfvlO2n8LiKV4RYCjOn4uR70aLbefZxKU 2rRASAqt6fZ0pW4mgQei7wurw1lbyWACQYUQ7sfGQgOjOr0pLt8PtjYyLJJ6dlu/d5A89G 2B5dKgdeO9TVdzNx/pS4LG35G/sr/B5tRw2Oao7eTjwGM4/6vYS1rKyoEXMj9A== 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 4S2p773MsLzb3n; Sat, 7 Oct 2023 14:47:47 +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 397Ell5v020780; Sat, 7 Oct 2023 14:47:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 397Ell9a020777; Sat, 7 Oct 2023 14:47:47 GMT (envelope-from git) Date: Sat, 7 Oct 2023 14:47:47 GMT Message-Id: <202310071447.397Ell9a020777@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: 617bb9c62e29 - main - graphics/vulkan-loader: update to 1.3.267 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 617bb9c62e2994d0c93c5ef96a935d7c00fa5551 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=617bb9c62e2994d0c93c5ef96a935d7c00fa5551 commit 617bb9c62e2994d0c93c5ef96a935d7c00fa5551 Author: Jan Beich AuthorDate: 2023-10-06 16:33:44 +0000 Commit: Jan Beich CommitDate: 2023-10-07 14:44:02 +0000 graphics/vulkan-loader: update to 1.3.267 Changes: https://github.com/KhronosGroup/Vulkan-Loader/compare/v1.3.266...v1.3.267 Reported by: Repology, portscout --- graphics/vulkan-loader/Makefile | 7 +----- graphics/vulkan-loader/distinfo | 8 +++---- graphics/vulkan-loader/files/patch-pkg-config | 32 +++++++++++++++++++++++++++ graphics/vulkan-loader/pkg-plist | 2 +- 4 files changed, 37 insertions(+), 12 deletions(-) diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index 4f795d1c4890..cf6002db7f4f 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,6 +1,6 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v -DISTVERSION= 1.3.266 +DISTVERSION= 1.3.267 CATEGORIES= graphics devel MAINTAINER= jbeich@FreeBSD.org @@ -19,11 +19,6 @@ GH_PROJECT= Vulkan-Loader CMAKE_ON= CMAKE_SKIP_RPATH CMAKE_OFF= BUILD_TESTS -.if ${DISTVERSION:E} < 267 -GH_TUPLE+= KhronosGroup:Vulkan-Headers:v1.3.266:vkheaders/Vulkan-Headers -CFLAGS+= -isystem${WRKSRC_vkheaders}/include -isystem${LOCALBASE}/include -.endif - OPTIONS_DEFINE= WAYLAND XCB XLIB OPTIONS_DEFAULT=WAYLAND XCB XLIB diff --git a/graphics/vulkan-loader/distinfo b/graphics/vulkan-loader/distinfo index b86ec621465e..5750b398065f 100644 --- a/graphics/vulkan-loader/distinfo +++ b/graphics/vulkan-loader/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1696003691 -SHA256 (KhronosGroup-Vulkan-Loader-v1.3.266_GH0.tar.gz) = 85574be4e16fac78ab822576a2913141ad21aad5a51974cc798891643c677654 -SIZE (KhronosGroup-Vulkan-Loader-v1.3.266_GH0.tar.gz) = 1691293 -SHA256 (KhronosGroup-Vulkan-Headers-v1.3.266_GH0.tar.gz) = 0b3451c3dbda492be010738fb90e5cf80aa32f66705cadd9a12c573e0e351fd3 -SIZE (KhronosGroup-Vulkan-Headers-v1.3.266_GH0.tar.gz) = 2128115 +TIMESTAMP = 1696610024 +SHA256 (KhronosGroup-Vulkan-Loader-v1.3.267_GH0.tar.gz) = a5ddca95db1faa0bc3ad958d3979d063846252bd5dff1f3ed5833cb20dc0ace5 +SIZE (KhronosGroup-Vulkan-Loader-v1.3.267_GH0.tar.gz) = 1688789 diff --git a/graphics/vulkan-loader/files/patch-pkg-config b/graphics/vulkan-loader/files/patch-pkg-config new file mode 100644 index 000000000000..0821d30aa523 --- /dev/null +++ b/graphics/vulkan-loader/files/patch-pkg-config @@ -0,0 +1,32 @@ +https://github.com/KhronosGroup/Vulkan-Loader/issues/1318 +https://github.com/KhronosGroup/Vulkan-Loader/issues/1319 + +--- loader/CMakeLists.txt.orig 2023-10-06 16:33:44 UTC ++++ loader/CMakeLists.txt +@@ -446,13 +446,6 @@ if (PKG_CONFIG_FOUND) + endif() + endif() + +- # BUG: The following code will NOT work well with `cmake --install ... --prefix ` +- # due to this code relying on CMAKE_INSTALL_PREFIX being defined at configure time. +- if ("${CMAKE_INSTALL_PREFIX}" STREQUAL "") +- set(CMAKE_INSTALL_LIBDIR_PC ${CMAKE_INSTALL_FULL_LIBDIR}) +- else() +- file(RELATIVE_PATH CMAKE_INSTALL_LIBDIR_PC ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_LIBDIR}) +- endif() + configure_file("vulkan.pc.in" "vulkan.pc" @ONLY) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vulkan.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + endif() +--- loader/vulkan.pc.in.orig 2023-10-06 16:33:44 UTC ++++ loader/vulkan.pc.in +@@ -1,4 +1,9 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ ++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++ + Name: Vulkan-Loader + Description: Vulkan Loader + Version: @VULKAN_LOADER_VERSION@ +-Libs: -L@CMAKE_INSTALL_LIBDIR_PC@ -lvulkan@VULKAN_LIB_SUFFIX@ ++Libs: -L${libdir} -lvulkan@VULKAN_LIB_SUFFIX@ ++Cflags: -I${includedir} diff --git a/graphics/vulkan-loader/pkg-plist b/graphics/vulkan-loader/pkg-plist index 17473b8592d1..8c14ebfa3dd5 100644 --- a/graphics/vulkan-loader/pkg-plist +++ b/graphics/vulkan-loader/pkg-plist @@ -2,5 +2,5 @@ lib/cmake/VulkanLoader/VulkanLoaderConfig-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/VulkanLoader/VulkanLoaderConfig.cmake lib/libvulkan.so lib/libvulkan.so.1 -lib/libvulkan.so.1.3.266 +lib/libvulkan.so.1.3.267 libdata/pkgconfig/vulkan.pc