From owner-dev-commits-ports-all@freebsd.org Tue Sep 21 22:32:49 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A691967DBBE; Tue, 21 Sep 2021 22:32:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HDbm13R3hz4ksT; Tue, 21 Sep 2021 22:32:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 169754745; Tue, 21 Sep 2021 22:32:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18LMWmGW055077; Tue, 21 Sep 2021 22:32:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18LMWmYi055076; Tue, 21 Sep 2021 22:32:48 GMT (envelope-from git) Date: Tue, 21 Sep 2021 22:32:48 GMT Message-Id: <202109212232.18LMWmYi055076@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: 3d5484b92857 - main - emulators/wine-devel: Merge the VULKAN option into VKD3D MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d5484b928571899d48e10ffa0e539042b63cedc Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Sep 2021 22:32:49 -0000 The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=3d5484b928571899d48e10ffa0e539042b63cedc commit 3d5484b928571899d48e10ffa0e539042b63cedc Author: Gerald Pfeifer AuthorDate: 2021-09-21 22:23:23 +0000 Commit: Gerald Pfeifer 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