Date: Tue, 21 Sep 2021 22:32:48 GMT From: Gerald Pfeifer <gerald@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 3d5484b92857 - main - emulators/wine-devel: Merge the VULKAN option into VKD3D Message-ID: <202109212232.18LMWmYi055076@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=3d5484b928571899d48e10ffa0e539042b63cedc commit 3d5484b928571899d48e10ffa0e539042b63cedc Author: Gerald Pfeifer <gerald@FreeBSD.org> AuthorDate: 2021-09-21 22:23:23 +0000 Commit: Gerald Pfeifer <gerald@FreeBSD.org> CommitDate: 2021-09-21 22:32:06 +0000 emulators/wine-devel: Merge the VULKAN option into VKD3D When Wine gained support for the Vulkan API and D3D support via Vulkan we added two options (both off by default): VULKAN and VKD3D. Simplify things, in particular also from a user perspective, by only keeping the VKD3D option which now subsumes the former VULKAN option (and hence Vulkan API support). No change in defaults - yet. On the way adjust CONFIGURE_ARGS to only feature on option per line, which was mostly the case already anyway. PR: 258375 --- emulators/wine-devel/Makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index ae303d246de5..4c6d511e07d0 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -33,9 +33,13 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--verbose \ --disable-kerberos \ --disable-tests \ - --without-alsa --without-capi --without-dbus \ + --without-alsa \ + --without-capi \ + --without-dbus \ --without-gettext --without-gettextpo \ - --without-gphoto --without-gsm --without-gstreamer \ + --without-gphoto \ + --without-gsm \ + --without-gstreamer \ --without-inotify \ --without-jxrlib \ --without-krb5 \ @@ -61,7 +65,7 @@ SUB_FILES= pkg-message PORTDATA= wine.inf -OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS LDAP LIBXSLT MPG123 OPENAL SDL STAGING V4L VKD3D VULKAN WINEMAKER X11 GECKO MONO +OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS LDAP LIBXSLT MPG123 OPENAL SDL STAGING V4L VKD3D WINEMAKER X11 GECKO MONO OPTIONS_DEFAULT=GNUTLS X11 OPTIONS_SUB= yes @@ -70,7 +74,6 @@ LIBXSLT_DESC= Use libxslt (only used by msxml3.dll) SDL_DESC= Use SDL for gamepad support (XInput only) STAGING_DESC= Include Wine Staging patchset (experimental&unsupported) 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 @@ -116,10 +119,8 @@ V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l VKD3D_CONFIGURE_WITH= vkd3d -VKD3D_LIB_DEPENDS= libvkd3d.so:graphics/vkd3d - -VULKAN_CONFIGURE_WITH= vulkan -VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader +VKD3D_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader \ + libvkd3d.so:graphics/vkd3d WINEMAKER_RUN_DEPENDS= p5-XML-LibXML>0:textproc/p5-XML-LibXML
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109212232.18LMWmYi055076>