svn commit: r482194 - in head: emulators/wine-devel graphics graphics/vkd3d graphics/vkd3d/files

Jan Beich jbeich at FreeBSD.org
Tue Oct 16 00:00:49 UTC 2018 

Author: jbeich
Date: Tue Oct 16 00:00:46 2018
New Revision: 482194
URL: https://svnweb.freebsd.org/changeset/ports/482194

Log:
  emulators/wine-devel: expose Vulkan support
  
  VULKAN is for Vulkan-native while VKD3D is for Direct3D 12 games
  
  PR:		231248

Added:
  head/graphics/vkd3d/
  head/graphics/vkd3d/Makefile   (contents, props changed)
  head/graphics/vkd3d/distinfo   (contents, props changed)
  head/graphics/vkd3d/files/
  head/graphics/vkd3d/files/patch-libs_vkd3d_vkd3d__private.h   (contents, props changed)
  head/graphics/vkd3d/pkg-descr   (contents, props changed)
  head/graphics/vkd3d/pkg-plist   (contents, props changed)
Modified:
  head/emulators/wine-devel/Makefile   (contents, props changed)
  head/graphics/Makefile   (contents, props changed)

Modified: head/emulators/wine-devel/Makefile
==============================================================================
--- head/emulators/wine-devel/Makefile	Tue Oct 16 00:00:33 2018	(r482193)
+++ head/emulators/wine-devel/Makefile	Tue Oct 16 00:00:46 2018	(r482194)
@@ -55,12 +55,14 @@ SUB_FILES=	pkg-message
 
 PORTDATA=	l_intl.nls wine.inf
 
-OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL STAGING V4L VKD3D WINEMAKER X11 GECKO MONO
+OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL STAGING V4L VKD3D VULKAN WINEMAKER X11 GECKO MONO
 OPTIONS_DEFAULT=GNUTLS X11
 OPTIONS_SUB=	yes
 
 DOSBOX_DESC=	Use DOSBox to run MS-DOS programs
 LIBXSLT_DESC=	Use libxslt (only used by msxml3.dll)
+VKD3D_DESC=	Direct3D 12 support via Vulkan
+VULKAN_DESC=	Vulkan API support
 WINEMAKER_DESC=	Fully support winemaker (requires Perl)
 GECKO_DESC=	Bundle Gecko MSI package for Wine
 MONO_DESC=	Bundle Mono MSI package for Wine
@@ -96,7 +98,12 @@ V4L_CONFIGURE_WITH=	v4l
 V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l1.so:multimedia/libv4l
 
-VKD3D_IGNORE=		The VKD3D option is not supported (yet)
+VKD3D_CONFIGURE_WITH=	vkd3d
+VKD3D_USES=		pkgconfig
+VKD3D_LIB_DEPENDS=	libvkd3d.so:graphics/vkd3d
+
+VULKAN_CONFIGURE_WITH=	vulkan
+VULKAN_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
 
 WINEMAKER_RUN_DEPENDS=	p5-XML-LibXML>0:textproc/p5-XML-LibXML
 

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Tue Oct 16 00:00:33 2018	(r482193)
+++ head/graphics/Makefile	Tue Oct 16 00:00:46 2018	(r482194)
@@ -1123,6 +1123,7 @@
     SUBDIR += vigra
     SUBDIR += vips
     SUBDIR += visprint
+    SUBDIR += vkd3d
     SUBDIR += volpack
     SUBDIR += vp
     SUBDIR += vulkan-loader

Added: head/graphics/vkd3d/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/vkd3d/Makefile	Tue Oct 16 00:00:46 2018	(r482194)
@@ -0,0 +1,36 @@
+# $FreeBSD$
+
+PORTNAME=	vkd3d
+PORTVERSION=	1.1
+CATEGORIES=	graphics
+MASTER_SITES=	https://dl.winehq.org/${PORTNAME}/source/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+
+MAINTAINER=	jbeich at FreeBSD.org
+COMMENT=	Direct3D 12 to Vulkan translation
+
+LICENSE=	LGPL21+
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${LOCALBASE}/include/spirv-tools/libspirv.h:devel/spirv-tools \
+		${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers
+LIB_DEPENDS=	libSPIRV-Tools-shared.so:devel/spirv-tools \
+		libvulkan.so:graphics/vulkan-loader
+RUN_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers
+
+USES=		gmake libtool localbase pkgconfig tar:xz
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-spirv-tools
+TEST_TARGET=	check
+
+# XXX Move to a separate port (a la devel/vulkan-headers) and maybe make
+#     devel/spirv-tools depend on it as well
+USE_GITHUB=	nodefault
+GH_TUPLE=	KhronosGroup:SPIRV-Headers:ff684ff:headers/external/spirv-headers
+CPPFLAGS+=	-isystem${WRKSRC}/external/spirv-headers/include
+
+post-patch:
+	@${REINPLACE_CMD} '/libdl not found/d' ${WRKSRC}/configure
+
+.include <bsd.port.mk>

Added: head/graphics/vkd3d/distinfo
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/vkd3d/distinfo	Tue Oct 16 00:00:46 2018	(r482194)
@@ -0,0 +1,5 @@
+TIMESTAMP = 1538761416
+SHA256 (vkd3d-1.1.tar.xz) = 495adc61cc80c65d54b2f5b52092ea05d3797cc2c17a610f0fc98457d2f56ab6
+SIZE (vkd3d-1.1.tar.xz) = 487452
+SHA256 (KhronosGroup-SPIRV-Headers-ff684ff_GH0.tar.gz) = dbeb5b65b290519b026f3eb280107929901d671a7f29ae536885bb72e6c38ebd
+SIZE (KhronosGroup-SPIRV-Headers-ff684ff_GH0.tar.gz) = 280884

Added: head/graphics/vkd3d/files/patch-libs_vkd3d_vkd3d__private.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/vkd3d/files/patch-libs_vkd3d_vkd3d__private.h	Tue Oct 16 00:00:46 2018	(r482194)
@@ -0,0 +1,24 @@
+--- libs/vkd3d/vkd3d_private.h.orig	2018-10-01 14:41:12 UTC
++++ libs/vkd3d/vkd3d_private.h
+@@ -37,6 +37,10 @@
+ #include <pthread.h>
+ #include <stdbool.h>
+ 
++#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__)
++#include <pthread_np.h>
++#endif
++
+ #define VK_CALL(f) (vk_procs->f)
+ 
+ #define VKD3D_DESCRIPTOR_MAGIC_FREE    0x00000000u
+@@ -894,6 +898,10 @@ static inline void vkd3d_set_thread_name(const char *n
+     pthread_setname_np(pthread_self(), name);
+ #elif defined(HAVE_PTHREAD_SETNAME_NP_1)
+     pthread_setname_np(name);
++#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__)
++    pthread_set_name_np(pthread_self(), name);
++#elif defined(__NetBSD__) /* XXX Convert to HAVE_PTHREAD_SETNAME_NP_3 */
++    pthread_setname_np(pthread_self(), "%s", (void*)name);
+ #endif
+ }
+ 

Added: head/graphics/vkd3d/pkg-descr
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/vkd3d/pkg-descr	Tue Oct 16 00:00:46 2018	(r482194)
@@ -0,0 +1,3 @@
+3D graphics library that provides an API similar to Direct3D 12.
+
+WWW: https://www.winehq.org/

Added: head/graphics/vkd3d/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/vkd3d/pkg-plist	Tue Oct 16 00:00:46 2018	(r482194)
@@ -0,0 +1,17 @@
+include/vkd3d/vkd3d.h
+include/vkd3d/vkd3d_d3d12.h
+include/vkd3d/vkd3d_d3dcommon.h
+include/vkd3d/vkd3d_dxgibase.h
+include/vkd3d/vkd3d_dxgiformat.h
+include/vkd3d/vkd3d_utils.h
+include/vkd3d/vkd3d_windows.h
+lib/libvkd3d-utils.a
+lib/libvkd3d-utils.so
+lib/libvkd3d-utils.so.1
+lib/libvkd3d-utils.so.1.0.1
+lib/libvkd3d.a
+lib/libvkd3d.so
+lib/libvkd3d.so.1
+lib/libvkd3d.so.1.1.0
+libdata/pkgconfig/libvkd3d-utils.pc
+libdata/pkgconfig/libvkd3d.pc

More information about the svn-ports-all mailing list