diff --git a/graphics/vkd3d/Makefile b/graphics/vkd3d/Makefile index cc8ebff7894d..767a13077c4f 100644 --- a/graphics/vkd3d/Makefile +++ b/graphics/vkd3d/Makefile @@ -1,49 +1,49 @@ PORTNAME= vkd3d -PORTVERSION= 1.8 +PORTVERSION= 1.9 CATEGORIES= graphics MASTER_SITES= https://dl.winehq.org/${PORTNAME}/source/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= jbeich@FreeBSD.org COMMENT= Direct3D 12 to Vulkan translation WWW= https://www.winehq.org/ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/include/spirv-tools/libspirv.h:graphics/spirv-tools \ ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers LIB_DEPENDS= libSPIRV-Tools-shared.so:graphics/spirv-tools \ libvulkan.so:graphics/vulkan-loader RUN_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers USES= bison gmake libtool localbase ncurses pkgconfig tar:xz USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-doxygen-doc --with-spirv-tools INSTALL_TARGET= install-strip TEST_TARGET= check # Override pkg-config support before https://cgit.freebsd.org/src/commit/?id=396851c20aeb # but only if devel/ncurses isn't installed .if !exists(/usr/libdata/pkgconfig/ncurses.pc) CONFIGURE_ENV+= NCURSES_CFLAGS=" " NCURSES_LIBS="-lncurses" NCURSES_VERSION=unused .endif # XXX Move to a separate port (a la graphics/vulkan-headers) and maybe make # graphics/spirv-tools depend on it as well USE_GITHUB= nodefault GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-245-g1feaf44:headers/external/spirv-headers CPPFLAGS+= -isystem${WRKSRC}/external/spirv-headers/include OPTIONS_DEFINE= EXAMPLES OPTIONS_SUB= yes EXAMPLES_BUILD_DEPENDS= x11/xcb-util-wm>0:x11/xcb-util-wm EXAMPLES_LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms EXAMPLES_USES= xorg EXAMPLES_USE= XORG=xcb EXAMPLES_CONFIGURE_ENABLE= demos EXAMPLES_LDFLAGS= -Wl,--as-needed # xcb-util, xcb-util-wm .include diff --git a/graphics/vkd3d/distinfo b/graphics/vkd3d/distinfo index 6bc41eab3df2..e5ea7712ca57 100644 --- a/graphics/vkd3d/distinfo +++ b/graphics/vkd3d/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1530528046 -SHA256 (vkd3d-1.8.tar.xz) = e0cec19cc9535715c72ec3a16cdec29dc14d5ccec73526387b5843cf75628ac5 -SIZE (vkd3d-1.8.tar.xz) = 829648 +TIMESTAMP = 1695316592 +SHA256 (vkd3d-1.9.tar.xz) = 9d1ebc6f36cccf40cffda3176851f73a0501b90c4d04e782abe79ca703057a4b +SIZE (vkd3d-1.9.tar.xz) = 902300 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-245-g1feaf44_GH0.tar.gz) = bf505456fb2fdd30af51dfe292a6688cf6a54f6a8a2e3a9479cf6895c93b362b SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-245-g1feaf44_GH0.tar.gz) = 450276 diff --git a/graphics/vkd3d/files/patch-libs_vkd3d-common_debug.c b/graphics/vkd3d/files/patch-libs_vkd3d-common_debug.c new file mode 100644 index 000000000000..f85884f9d3b6 --- /dev/null +++ b/graphics/vkd3d/files/patch-libs_vkd3d-common_debug.c @@ -0,0 +1,27 @@ +--- libs/vkd3d-common/debug.c.orig 2023-06-28 19:40:40 UTC ++++ libs/vkd3d-common/debug.c +@@ -35,6 +35,11 @@ + #ifdef HAVE_PTHREAD_H + #include + #endif ++#if defined(__DragonFly__) || defined(__FreeBSD__) ++#include ++#elif defined(__NetBSD__) ++#include ++#endif + + #include "vkd3d_memory.h" + +@@ -108,6 +113,12 @@ void vkd3d_dbg_printf(enum vkd3d_dbg_level level, cons + + #ifdef _WIN32 + vkd3d_dbg_output("vkd3d:%04lx:%s:%s ", GetCurrentThreadId(), debug_level_names[level], function); ++#elif defined(__DragonFly__) || defined(__FreeBSD__) ++ vkd3d_dbg_output("vkd3d:%u:%s:%s ", pthread_getthreadid_np(), debug_level_names[level], function); ++#elif defined(__NetBSD__) ++ vkd3d_dbg_output("vkd3d:%u:%s:%s ", _lwp_self(), debug_level_names[level], function); ++#elif defined(__OpenBSD__) ++ vkd3d_dbg_output("vkd3d:%u:%s:%s ", getthrid(), debug_level_names[level], function); + #elif HAVE_GETTID + vkd3d_dbg_output("vkd3d:%u:%s:%s ", gettid(), debug_level_names[level], function); + #else diff --git a/graphics/vkd3d/pkg-plist b/graphics/vkd3d/pkg-plist index b93ff947588e..42d38803eae2 100644 --- a/graphics/vkd3d/pkg-plist +++ b/graphics/vkd3d/pkg-plist @@ -1,31 +1,32 @@ bin/vkd3d-compiler +bin/vkd3d-dxbc %%EXAMPLES%%bin/vkd3d-gears %%EXAMPLES%%bin/vkd3d-triangle include/vkd3d/vkd3d.h include/vkd3d/vkd3d_d3d12.h include/vkd3d/vkd3d_d3d12sdklayers.h include/vkd3d/vkd3d_d3d9types.h include/vkd3d/vkd3d_d3dcommon.h include/vkd3d/vkd3d_d3dcompiler.h include/vkd3d/vkd3d_d3dx9shader.h include/vkd3d/vkd3d_dxgibase.h include/vkd3d/vkd3d_dxgiformat.h include/vkd3d/vkd3d_shader.h include/vkd3d/vkd3d_types.h include/vkd3d/vkd3d_utils.h include/vkd3d/vkd3d_windows.h lib/libvkd3d-shader.a lib/libvkd3d-shader.so lib/libvkd3d-shader.so.1 -lib/libvkd3d-shader.so.1.6.0 +lib/libvkd3d-shader.so.1.7.0 lib/libvkd3d-utils.a lib/libvkd3d-utils.so lib/libvkd3d-utils.so.1 -lib/libvkd3d-utils.so.1.3.4 +lib/libvkd3d-utils.so.1.3.5 lib/libvkd3d.a lib/libvkd3d.so lib/libvkd3d.so.1 -lib/libvkd3d.so.1.8.0 +lib/libvkd3d.so.1.9.0 libdata/pkgconfig/libvkd3d-shader.pc libdata/pkgconfig/libvkd3d-utils.pc libdata/pkgconfig/libvkd3d.pc