From nobody Thu Oct 21 06:00:44 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A5BE21802ABE; Thu, 21 Oct 2021 06:00:44 +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 4HZcKS4KBLz4YtF; Thu, 21 Oct 2021 06:00:44 +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 752D91612B; Thu, 21 Oct 2021 06:00:44 +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 19L60iwr090257; Thu, 21 Oct 2021 06:00:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19L60i0v090256; Thu, 21 Oct 2021 06:00:44 GMT (envelope-from git) Date: Thu, 21 Oct 2021 06:00:44 GMT Message-Id: <202110210600.19L60i0v090256@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: 1fce6b5d7da9 - main - emulators/wine: Merge the VKD3D option into X11 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org 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: 1fce6b5d7da9e8231fecc2a5724887e5d1e64414 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=1fce6b5d7da9e8231fecc2a5724887e5d1e64414 commit 1fce6b5d7da9e8231fecc2a5724887e5d1e64414 Author: Gerald Pfeifer AuthorDate: 2021-10-21 06:00:17 +0000 Commit: Gerald Pfeifer CommitDate: 2021-10-21 06:00:17 +0000 emulators/wine: Merge the VKD3D option into X11 Back port a26036d0241f76193758c6e4379834fc0ff142d9 from the wine-devel port (and integrate 8189a2a276f8dd30ee1b075b2cfa8cf171ac286a): Vulkan and vkd3d have few additional dependencies on top of OpenGL (via Mesa) so fold them into the general X11 switch. This further reduces the number of options in this port. PR: 258375 --- emulators/wine/Makefile | 15 ++++++--------- emulators/wine/pkg-plist | 6 +++--- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index dd7db9430468..0fd470058b09 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -2,7 +2,7 @@ PORTNAME= wine DISTVERSION= 6.0.1 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ @@ -67,13 +67,12 @@ SUB_FILES= pkg-message PORTDATA= wine.inf -OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS LDAP LIBXSLT MPG123 OPENAL V4L VKD3D WINEMAKER X11 GECKO MONO +OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS LDAP LIBXSLT MPG123 OPENAL V4L WINEMAKER X11 GECKO MONO OPTIONS_DEFAULT=GNUTLS OPENAL X11 OPTIONS_SUB= yes DOSBOX_DESC= Use DOSBox to run MS-DOS programs LIBXSLT_DESC= Use libxslt (only used by msxml3.dll) -VKD3D_DESC= Vulkan and Direct3D 12 support WINEMAKER_DESC= Fully support winemaker (requires Perl) GECKO_DESC= Bundle Gecko MSI package for Wine MONO_DESC= Bundle Mono MSI package for Wine @@ -108,19 +107,17 @@ V4L_CONFIGURE_WITH= v4l2 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= libvulkan.so:graphics/vulkan-loader \ - libvkd3d.so:graphics/vkd3d - WINEMAKER_RUN_DEPENDS= p5-XML-LibXML>0:textproc/p5-XML-LibXML -X11_CONFIGURE_WITH= x cms fontconfig freetype jpeg opengl png xinerama xinput2 xrandr xrender +X11_CONFIGURE_WITH= x cms fontconfig freetype jpeg opengl png vkd3d xinerama xinput2 xrandr xrender X11_USES= gl jpeg xorg X11_USE= GL=glu XORG=x11,xext,xcomposite,xcursor,xi,xinerama,xrandr,xrender X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ liblcms2.so:graphics/lcms2 \ - libpng.so:graphics/png + libpng.so:graphics/png \ + libvulkan.so:graphics/vulkan-loader \ + libvkd3d.so:graphics/vkd3d # Include this only if it has not been already included by the # i386-wine slave port. diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist index 722dc3d61f0a..04aeab1357be 100644 --- a/emulators/wine/pkg-plist +++ b/emulators/wine/pkg-plist @@ -1378,7 +1378,7 @@ lib/wine/d3d10.dll.so lib/wine/d3d10_1.dll.so lib/wine/d3d10core.dll.so lib/wine/d3d11.dll.so -%%VKD3D%%lib/wine/d3d12.dll.so +%%X11%%lib/wine/d3d12.dll.so lib/wine/d3d8.dll.so lib/wine/d3d8thk.dll.so lib/wine/d3d9.dll.so @@ -1844,7 +1844,7 @@ lib/wine/fakedlls/d3d10.dll lib/wine/fakedlls/d3d10_1.dll lib/wine/fakedlls/d3d10core.dll lib/wine/fakedlls/d3d11.dll -%%VKD3D%%lib/wine/fakedlls/d3d12.dll +%%X11%%lib/wine/fakedlls/d3d12.dll lib/wine/fakedlls/d3d8.dll lib/wine/fakedlls/d3d8thk.dll lib/wine/fakedlls/d3d9.dll @@ -2625,7 +2625,7 @@ lib/wine/libd3d10.def lib/wine/libd3d10_1.def lib/wine/libd3d10core.def lib/wine/libd3d11.def -%%VKD3D%%lib/wine/libd3d12.def +%%X11%%lib/wine/libd3d12.def lib/wine/libd3d8.def lib/wine/libd3d9.def lib/wine/libd3dcompiler.def