Date: Thu, 30 May 2024 14:01:38 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7d6295f36631 - main - graphics/vkd3d: update to 1.12 Message-ID: <202405301401.44UE1ckj075958@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=7d6295f366313a32f8a6348608574b178b4eb474 commit 7d6295f366313a32f8a6348608574b178b4eb474 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-05-29 20:05:28 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2024-05-30 14:00:12 +0000 graphics/vkd3d: update to 1.12 Changes: https://gitlab.winehq.org/wine/vkd3d/-/releases/vkd3d-1.12 Reported by: Repology, portscout --- graphics/vkd3d/Makefile | 5 +++-- graphics/vkd3d/distinfo | 10 +++++----- .../vkd3d/files/patch-include_private_vkd3d__common.h | 15 +++++++++++++++ graphics/vkd3d/pkg-plist | 6 +++--- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/graphics/vkd3d/Makefile b/graphics/vkd3d/Makefile index 8996b1f9a448..07fc60e72340 100644 --- a/graphics/vkd3d/Makefile +++ b/graphics/vkd3d/Makefile @@ -1,5 +1,5 @@ PORTNAME= vkd3d -PORTVERSION= 1.11 +PORTVERSION= 1.12 CATEGORIES= graphics MASTER_SITES= https://dl.winehq.org/${PORTNAME}/source/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -20,6 +20,7 @@ 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_ENV= vkd3d_cv_cflags__flto_auto=no # XXX strip(1) and llvm-strip(1) fail CONFIGURE_ARGS= --disable-doxygen-doc --with-spirv-tools INSTALL_TARGET= install-strip TEST_TARGET= check @@ -33,7 +34,7 @@ CONFIGURE_ENV+= NCURSES_CFLAGS=" " NCURSES_LIBS="-lncurses" NCURSES_VERSION=unus # 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-350-gb73e168:headers/external/spirv-headers +GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-357-g49a1fce:headers/external/spirv-headers CPPFLAGS+= -isystem${WRKSRC}/external/spirv-headers/include OPTIONS_DEFINE= EXAMPLES diff --git a/graphics/vkd3d/distinfo b/graphics/vkd3d/distinfo index e45a64cf4d3d..a0744ba31f8d 100644 --- a/graphics/vkd3d/distinfo +++ b/graphics/vkd3d/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1530528046 -SHA256 (vkd3d-1.11.tar.xz) = 4912271f1be49ab1ca9b59fc4faa9c4de8a873b4cebe11e7f422d61ae13e7410 -SIZE (vkd3d-1.11.tar.xz) = 1016132 -SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-350-gb73e168_GH0.tar.gz) = 80bfde4b932c156bc1f556f47bdca1721c0c4b3b40f550da78fe1f77ffc9cb79 -SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-350-gb73e168_GH0.tar.gz) = 471476 +TIMESTAMP = 1717013128 +SHA256 (vkd3d-1.12.tar.xz) = 1ad1fa0e2c6c7b160fcd11856e263476960e0ab762e13102d5e73a177d791d8b +SIZE (vkd3d-1.12.tar.xz) = 1095416 +SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-357-g49a1fce_GH0.tar.gz) = 73a82a0d8e0586a15f707380d983e3af457fe1476fc160b67e82b77b76320ea4 +SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-357-g49a1fce_GH0.tar.gz) = 520123 diff --git a/graphics/vkd3d/files/patch-include_private_vkd3d__common.h b/graphics/vkd3d/files/patch-include_private_vkd3d__common.h new file mode 100644 index 000000000000..546088a60557 --- /dev/null +++ b/graphics/vkd3d/files/patch-include_private_vkd3d__common.h @@ -0,0 +1,15 @@ +libs/vkd3d/device.c:2615:27: error: initializing 'struct vkd3d_mutex' with an expression of incompatible type 'void *' + 2615 | static struct vkd3d_mutex cache_list_mutex = VKD3D_MUTEX_INITIALIZER; + | ^ ~~~~~~~~~~~~~~~~~~~~~~~ + +--- include/private/vkd3d_common.h.orig 2024-04-24 21:49:15 UTC ++++ include/private/vkd3d_common.h +@@ -506,7 +506,7 @@ struct vkd3d_mutex + #ifdef _WIN32 + #define VKD3D_MUTEX_INITIALIZER {{NULL, -1, 0, 0, 0, 0}} + #else +-#define VKD3D_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER ++#define VKD3D_MUTEX_INITIALIZER {{{0}}} + #endif + + static inline void vkd3d_mutex_init(struct vkd3d_mutex *lock) diff --git a/graphics/vkd3d/pkg-plist b/graphics/vkd3d/pkg-plist index 644017640fae..a0f0782d800f 100644 --- a/graphics/vkd3d/pkg-plist +++ b/graphics/vkd3d/pkg-plist @@ -20,15 +20,15 @@ include/vkd3d/vkd3d_windows.h lib/libvkd3d-shader.a lib/libvkd3d-shader.so lib/libvkd3d-shader.so.1 -lib/libvkd3d-shader.so.1.9.0 +lib/libvkd3d-shader.so.1.10.0 lib/libvkd3d-utils.a lib/libvkd3d-utils.so lib/libvkd3d-utils.so.1 -lib/libvkd3d-utils.so.1.5.0 +lib/libvkd3d-utils.so.1.5.1 lib/libvkd3d.a lib/libvkd3d.so lib/libvkd3d.so.1 -lib/libvkd3d.so.1.11.0 +lib/libvkd3d.so.1.12.0 libdata/pkgconfig/libvkd3d-shader.pc libdata/pkgconfig/libvkd3d-utils.pc libdata/pkgconfig/libvkd3d.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405301401.44UE1ckj075958>