Hi,
Please find attached 2 diffs, for graphics/volk and
graphics/vulkan-tools to move volk's files into vulkan_volk/ subdir.
After some experimentation with other solutions, this seems to be the
best and easiest to maintain going forward.
Background is that gnuradio has a dependency on another library also
called volk, so this is to de-conflict this.
Currently vulkan-tools is the only reverse dependency of graphics/volk,
so the diff for it addresses any fallout.
ok? comments?
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/vulkan-tools/Makefile,v
diff -u -p -r1.23 Makefile
--- Makefile 15 Nov 2024 15:22:13 -0000 1.23
+++ Makefile 4 Dec 2024 20:43:42 -0000
@@ -5,7 +5,7 @@ PKGNAME = vulkan-tools-${V}
GH_TAGNAME = vulkan-sdk-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = Vulkan-Tools
-REVISION = 0
+REVISION = 1
CATEGORIES = devel graphics
@@ -34,9 +34,12 @@ LIB_DEPENDS = graphics/vulkan-loader \
wayland/wayland
CONFIGURE_ARGS += -DGLSLANG_INSTALL_DIR="/usr/local"
+CONFIGURE_ENV += volk_DIR=${LOCALBASE}/lib/vulkan_volk/cmake/volk
NO_TEST = Yes
-CXXFLAGS += -I${X11BASE}/include
+CFLAGS += -I${LOCALBASE}/include/vulkan_volk
+CXXFLAGS += -I${LOCALBASE}/include/vulkan_volk \
+ -I${X11BASE}/include
.include <bsd.port.mk>
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/volk/Makefile,v
diff -u -p -r1.3 Makefile
--- Makefile 14 Nov 2024 00:35:48 -0000 1.3
+++ Makefile 4 Dec 2024 20:43:16 -0000
@@ -4,6 +4,7 @@ COMMENT = meta loader for Vulkan API
V = 1.3.296.0
PKGNAME = volk-${V}
DIST_TUPLE += github zeux volk vulkan-sdk-${V} .
+REVISION = 0
CATEGORIES = graphics
MAINTAINER = Thomas Frohwein <t...@openbsd.org>
@@ -15,6 +16,9 @@ MODULES = devel/cmake
BUILD_DEPENDS = graphics/vulkan-headers
LIB_DEPENDS = graphics/vulkan-loader
-CONFIGURE_ARGS = -DVOLK_INSTALL=ON
+CONFIGURE_ARGS = -DCMAKE_INSTALL_INCLUDEDIR=/usr/local/include/vulkan_volk \
+ -DCMAKE_INSTALL_LIBDIR=/usr/local/lib/vulkan_volk \
+ -DVOLK_INSTALL=ON
+
.include <bsd.port.mk>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/volk/pkg/PLIST,v
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 24 Feb 2024 14:48:00 -0000 1.1.1.1
+++ pkg/PLIST 4 Dec 2024 20:43:16 -0000
@@ -1,9 +1,11 @@
-include/volk.c
-include/volk.h
-lib/cmake/
-lib/cmake/volk/
-lib/cmake/volk/volkConfig.cmake
-lib/cmake/volk/volkConfigVersion.cmake
-lib/cmake/volk/volkTargets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/volk/volkTargets.cmake
-@static-lib lib/libvolk.a
+include/vulkan_volk/
+include/vulkan_volk/volk.c
+include/vulkan_volk/volk.h
+lib/vulkan_volk/
+lib/vulkan_volk/cmake/
+lib/vulkan_volk/cmake/volk/
+lib/vulkan_volk/cmake/volk/volkConfig.cmake
+lib/vulkan_volk/cmake/volk/volkConfigVersion.cmake
+lib/vulkan_volk/cmake/volk/volkTargets${MODCMAKE_BUILD_SUFFIX}
+lib/vulkan_volk/cmake/volk/volkTargets.cmake
+@static-lib lib/vulkan_volk/libvolk.a
