FreeBSD Bugzilla – Attachment 196973 Details for
Bug 231248
emulators/wine-devel: expose Vulkan support
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
v0
wine.vulkan.diff (text/plain), 5.19 KB, created by
Jan Beich
on 2018-09-08 22:21:17 UTC
(
hide
)
Description:
v0
Filename:
MIME Type:
Creator:
Jan Beich
Created:
2018-09-08 22:21:17 UTC
Size:
5.19 KB
patch
obsolete
>From 434f28ba0f82f60f2f596a0e870b8841fbb9e95d Mon Sep 17 00:00:00 2001 >From: Jan Beich <jbeich@FreeBSD.org> >Date: Sat, 8 Sep 2018 20:24:58 +0000 >Subject: [PATCH] emulators/wine-devel: expose Vulkan support > >PR: 231248 >Approved by: gerald (maintainer) >--- > emulators/wine-devel/Makefile | 11 ++++++++-- > graphics/Makefile | 1 + > graphics/vkd3d/Makefile | 39 +++++++++++++++++++++++++++++++++++ > graphics/vkd3d/distinfo | 4 ++++ > graphics/vkd3d/pkg-descr | 3 +++ > graphics/vkd3d/pkg-plist | 17 +++++++++++++++ > 6 files changed, 73 insertions(+), 2 deletions(-) > create mode 100644 graphics/vkd3d/Makefile > create mode 100644 graphics/vkd3d/distinfo > create mode 100644 graphics/vkd3d/pkg-descr > create mode 100644 graphics/vkd3d/pkg-plist > >diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile >index 127fa9b80175..6e28c624a2e0 100644 >--- a/emulators/wine-devel/Makefile >+++ b/emulators/wine-devel/Makefile >@@ -54,12 +54,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 >@@ -95,7 +97,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 > >diff --git a/graphics/Makefile b/graphics/Makefile >index a2ff57590dfd..6ec88d1268ad 100644 >--- a/graphics/Makefile >+++ b/graphics/Makefile >@@ -1123,6 +1123,7 @@ > SUBDIR += vigra > SUBDIR += vips > SUBDIR += visprint >+ SUBDIR += vkd3d > SUBDIR += volpack > SUBDIR += vp > SUBDIR += vulkan-loader >diff --git a/graphics/vkd3d/Makefile b/graphics/vkd3d/Makefile >new file mode 100644 >index 000000000000..6d93370e7db7 >--- /dev/null >+++ b/graphics/vkd3d/Makefile >@@ -0,0 +1,39 @@ >+# $FreeBSD$ >+ >+PORTNAME= vkd3d >+PORTVERSION= 1.0 >+CATEGORIES= graphics >+MASTER_SITES= https://dl.winehq.org/${PORTNAME}/source/ >+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} >+ >+MAINTAINER= gerald@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 \ >+ ${LOCALBASE}/include/xcb/xcb_keysyms.h:x11/xcb-util-keysyms \ >+ ${LOCALBASE}/include/xcb/xcb_icccm.h:x11/xcb-util-wm >+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 >+USE_XORG= xcb >+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> >diff --git a/graphics/vkd3d/distinfo b/graphics/vkd3d/distinfo >new file mode 100644 >index 000000000000..0049defaf015 >--- /dev/null >+++ b/graphics/vkd3d/distinfo >@@ -0,0 +1,4 @@ >+SHA256 (vkd3d-1.0.tar.xz) = 439d9eb22125b89f326e4055908e2e93b93b55c5bb2e47b1462caf2ad5c1df17 >+SIZE (vkd3d-1.0.tar.xz) = 461884 >+SHA256 (KhronosGroup-SPIRV-Headers-ff684ff_GH0.tar.gz) = dbeb5b65b290519b026f3eb280107929901d671a7f29ae536885bb72e6c38ebd >+SIZE (KhronosGroup-SPIRV-Headers-ff684ff_GH0.tar.gz) = 280884 >diff --git a/graphics/vkd3d/pkg-descr b/graphics/vkd3d/pkg-descr >new file mode 100644 >index 000000000000..20396cc685b0 >--- /dev/null >+++ b/graphics/vkd3d/pkg-descr >@@ -0,0 +1,3 @@ >+3D graphics library that provides an API similar to Direct3D 12. >+ >+WWW: http://www.winehq.org/ >diff --git a/graphics/vkd3d/pkg-plist b/graphics/vkd3d/pkg-plist >new file mode 100644 >index 000000000000..4c6aaaf6f71b >--- /dev/null >+++ b/graphics/vkd3d/pkg-plist >@@ -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.0 >+lib/libvkd3d.a >+lib/libvkd3d.so >+lib/libvkd3d.so.1 >+lib/libvkd3d.so.1.0.0 >+libdata/pkgconfig/libvkd3d-utils.pc >+libdata/pkgconfig/libvkd3d.pc
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
jbeich
:
maintainer-approval?
(
gerald
)
Actions:
View
|
Diff
Attachments on
bug 231248
: 196973