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,57 +1,52 @@ PORTNAME= vulkan-loader DISTVERSIONPREFIX= v -DISTVERSION= 1.3.266 +DISTVERSION= 1.3.267 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 -.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 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 # https://github.com/llvm/llvm-project/issues/46692 @if [ "${CHOSEN_COMPILER_TYPE}-${ARCH}-${_OSRELEASE:C/.*-//}" = "clang-i386-CURRENT" ]; then \ ${ECHO} "disabled" >${WRKSRC}/loader/asm_test_x86.S; \ fi .include 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 @@ -1,6 +1,6 @@ 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