diff --git a/graphics/vulkan-headers/Makefile b/graphics/vulkan-headers/Makefile index c0c578caf341..37670af049b0 100644 --- a/graphics/vulkan-headers/Makefile +++ b/graphics/vulkan-headers/Makefile @@ -1,29 +1,28 @@ PORTNAME= vulkan-headers DISTVERSIONPREFIX= v -DISTVERSION= 1.4.303 -PORTREVISION= 1 +DISTVERSION= 1.4.304 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Headers for the Vulkan graphics API WWW= https://github.com/KhronosGroup/Vulkan-Headers LICENSE= APACHE20 USES= cmake USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-Headers STRIP= # nothing to strip NO_ARCH= yes # XXX Add clang-scan-deps to WITH_CLANG_EXTRAS in src.conf(5) .if exists(/usr/bin/clang) && !exists(/usr/bin/clang-scan-deps) CMAKE_OFF+= VULKAN_HEADERS_ENABLE_MODULE .endif post-extract: # genvk.py requires docgenerator.py from Vulkan-Docs, so drop useless shebang @${FIND} ${WRKSRC}/registry -name \*.py -exec ${REINPLACE_CMD} -i '' '/^#!/d' {} + .include diff --git a/graphics/vulkan-headers/distinfo b/graphics/vulkan-headers/distinfo index a8cbe32f8f6b..de6e1d970ad4 100644 --- a/graphics/vulkan-headers/distinfo +++ b/graphics/vulkan-headers/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1733300347 -SHA256 (KhronosGroup-Vulkan-Headers-v1.4.303_GH0.tar.gz) = fdf0e2e05356b455137ff97f837c9689ba253ec7d20f87ad81575b9bdbe7fdd4 -SIZE (KhronosGroup-Vulkan-Headers-v1.4.303_GH0.tar.gz) = 2440533 +TIMESTAMP = 1734673432 +SHA256 (KhronosGroup-Vulkan-Headers-v1.4.304_GH0.tar.gz) = 5e1a06b3f27e7581b55d1dea176fd97ee0a2f299406db2f437c1d2f297ceba5b +SIZE (KhronosGroup-Vulkan-Headers-v1.4.304_GH0.tar.gz) = 2443071 diff --git a/graphics/vulkan-headers/files/patch-32bit b/graphics/vulkan-headers/files/patch-32bit deleted file mode 100644 index 2413e6fe2618..000000000000 --- a/graphics/vulkan-headers/files/patch-32bit +++ /dev/null @@ -1,62 +0,0 @@ -https://github.com/KhronosGroup/Vulkan-Hpp/commit/c2c49478e9f2 -https://github.com/KhronosGroup/Vulkan-Hpp/issues/2009 - ---- include/vulkan/vulkan_handles.hpp.orig 2024-12-04 08:19:07 UTC -+++ include/vulkan/vulkan_handles.hpp -@@ -17706,5 +17706,56 @@ namespace VULKAN_HPP_NAMESPACE - VULKAN_HPP_NODISCARD typename ResultValueType::type enumerateInstanceVersion( Dispatch const & d VULKAN_HPP_DEFAULT_DISPATCHER_ASSIGNMENT ); - #endif /* VULKAN_HPP_DISABLE_ENHANCED_MODE */ - -+// operators to compare vk::-handles -+#if defined( VULKAN_HPP_HAS_SPACESHIP_OPERATOR ) -+template ::value, int>::type = 0> -+bool operator<=>( T const & lhs, T const & rhs ) -+{ -+ return static_cast( lhs ) <=> static_cast( rhs ); -+} -+#else -+template ::value, int>::type = 0> -+bool operator==( T const & lhs, T const & rhs ) -+{ -+ return static_cast( lhs ) == static_cast( rhs ); -+} -+ -+template ::value, int>::type = 0> -+bool operator!=( T const & lhs, T const & rhs ) -+{ -+ return static_cast( lhs ) != static_cast( rhs ); -+} -+ -+template ::value, int>::type = 0> -+bool operator<( T const & lhs, T const & rhs ) -+{ -+ return static_cast( lhs ) < static_cast( rhs ); -+} -+#endif -+ -+template ::value, int>::type = 0> -+bool operator==( T const & v, std::nullptr_t ) -+{ -+ return !v; -+} -+ -+template ::value, int>::type = 0> -+bool operator==( std::nullptr_t, T const & v ) -+{ -+ return !v; -+} -+ -+template ::value, int>::type = 0> -+bool operator!=( T const & v, std::nullptr_t ) -+{ -+ return !!v; -+} -+ -+template ::value, int>::type = 0> -+bool operator!=( std::nullptr_t, T const & v ) -+{ -+ return !!v; -+} -+ - } // namespace VULKAN_HPP_NAMESPACE - #endif diff --git a/graphics/vulkan-loader/Makefile b/graphics/vulkan-loader/Makefile index 605e95e9b699..e3fb6e038a9b 100644 --- a/graphics/vulkan-loader/Makefile +++ b/graphics/vulkan-loader/Makefile @@ -1,50 +1,50 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v DISTVERSION= 1.4.303 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics devel MAINTAINER= jbeich@FreeBSD.org COMMENT= Driver loader for the Vulkan graphics API WWW= https://github.com/KhronosGroup/Vulkan-Loader LICENSE= APACHE20 BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers USES= alias cmake compiler:c++11-lib pkgconfig python:build USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-Loader CMAKE_ON= CMAKE_SKIP_RPATH CMAKE_OFF= BUILD_TESTS PLIST_SUB= VERSION=${DISTVERSION:C/-.*//} OPTIONS_DEFINE= WAYLAND XCB XLIB OPTIONS_DEFAULT=WAYLAND XCB XLIB WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland WAYLAND_CMAKE_BOOL= BUILD_WSI_WAYLAND_SUPPORT XCB_DESC= ${X11_DESC} via libxcb XCB_USES= xorg XCB_USE= XORG=xcb XCB_CMAKE_BOOL= BUILD_WSI_XCB_SUPPORT XLIB_DESC= ${X11_DESC} via libX11 XLIB_USES= xorg XLIB_USE= XORG=x11,xrandr XLIB_CMAKE_BOOL= BUILD_WSI_XLIB_SUPPORT post-patch: # Extract (snapshot) version from the port # Respect PREFIX when XDG_CONFIG_DIRS and XDG_DATA_DIRS are unset @${REINPLACE_CMD} -e '/find_.*Git/d' \ -e '/BRANCH/s/--unknown--/main/' \ -e '/TAG/s/--unknown--/${DISTVERSIONFULL}/' \ -e '/FALLBACK/s,/etc,${PREFIX}&,' \ -e 's,/usr/local,${PREFIX},' \ ${WRKSRC}/CMakeLists.txt .include diff --git a/graphics/vulkan-tools/Makefile b/graphics/vulkan-tools/Makefile index 6d858837ee35..1af3d3db8c42 100644 --- a/graphics/vulkan-tools/Makefile +++ b/graphics/vulkan-tools/Makefile @@ -1,42 +1,47 @@ PORTNAME= vulkan-tools DISTVERSIONPREFIX= v DISTVERSION= 1.4.303 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Tools and demos for the Vulkan graphics API WWW= https://github.com/KhronosGroup/Vulkan-Tools LICENSE= APACHE20 BUILD_DEPENDS= glslangValidator:graphics/glslang \ vulkan-headers>0:graphics/vulkan-headers USES= alias cmake compiler:c++11-lib pkgconfig python:build USE_GITHUB= yes GH_ACCOUNT= KhronosGroup GH_PROJECT= Vulkan-Tools GH_TUPLE= zeux:volk:1.3.295-23-ge767d0e:volk/volk CMAKE_OFF= BUILD_ICD CMAKE_ARGS= -DGLSLANG_INSTALL_DIR:PATH="${LOCALBASE}" +.if ${DISTVERSION:E} < 304 +GH_TUPLE+= KhronosGroup:Vulkan-Headers:${DISTVERSIONFULL}:vkheaders/Vulkan-Headers +CFLAGS+= -I${WRKSRC_vkheaders}/include +.endif + OPTIONS_DEFINE= WAYLAND XCB XLIB OPTIONS_DEFAULT= WAYLAND XCB XLIB WAYLAND_CATEGORIES= wayland WAYLAND_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>0:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland WAYLAND_CMAKE_BOOL= BUILD_WSI_WAYLAND_SUPPORT XCB_DESC= ${X11_DESC} via libxcb XCB_USES= xorg XCB_USE= XORG=xcb XCB_CMAKE_BOOL= BUILD_WSI_XCB_SUPPORT XLIB_DESC= ${X11_DESC} via libX11 XLIB_USES= xorg XLIB_USE= XORG=x11 XLIB_CMAKE_BOOL= BUILD_WSI_XLIB_SUPPORT .include diff --git a/graphics/vulkan-tools/distinfo b/graphics/vulkan-tools/distinfo index 9ee57be7d277..08b2041f3a2f 100644 --- a/graphics/vulkan-tools/distinfo +++ b/graphics/vulkan-tools/distinfo @@ -1,5 +1,7 @@ TIMESTAMP = 1733252608 SHA256 (KhronosGroup-Vulkan-Tools-v1.4.303_GH0.tar.gz) = 958b646bbc5ac0a54908342df30da8c183690f579dce7f7130ac93d433d9d3a8 SIZE (KhronosGroup-Vulkan-Tools-v1.4.303_GH0.tar.gz) = 758514 SHA256 (zeux-volk-1.3.295-23-ge767d0e_GH0.tar.gz) = 7e8e350717f3d30bc1bc4570c4a4d1896590dd4be21c872dbe3273e9cfea3b6e SIZE (zeux-volk-1.3.295-23-ge767d0e_GH0.tar.gz) = 65349 +SHA256 (KhronosGroup-Vulkan-Headers-v1.4.303_GH0.tar.gz) = fdf0e2e05356b455137ff97f837c9689ba253ec7d20f87ad81575b9bdbe7fdd4 +SIZE (KhronosGroup-Vulkan-Headers-v1.4.303_GH0.tar.gz) = 2440533