sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-06 05:10:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

emulators/wine: Merge the VKD3D option into X11

Browse source 
Back port a26036d024 from the wine-devel
port (and integrate 8189a2a276):

  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
This commit is contained in:
Gerald Pfeifer 2021-10-21 06:00:17 +00:00
parent f99dd971a4
commit 1fce6b5d7d
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
emulators/wine/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= wine PORTNAME= wine
DISTVERSION= 6.0.1 DISTVERSION= 6.0.1
PORTREVISION= 2 PORTREVISION= 3
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= emulators CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/Source \ MASTER_SITES= SF/${PORTNAME}/Source \
@ -67,13 +67,12 @@ SUB_FILES= pkg-message
PORTDATA= wine.inf 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_DEFAULT=GNUTLS OPENAL X11
OPTIONS_SUB= yes OPTIONS_SUB= yes
DOSBOX_DESC= Use DOSBox to run MS-DOS programs DOSBOX_DESC= Use DOSBox to run MS-DOS programs
LIBXSLT_DESC= Use libxslt (only used by msxml3.dll) LIBXSLT_DESC= Use libxslt (only used by msxml3.dll)
VKD3D_DESC= Vulkan and Direct3D 12 support
WINEMAKER_DESC= Fully support winemaker (requires Perl) WINEMAKER_DESC= Fully support winemaker (requires Perl)
GECKO_DESC= Bundle Gecko MSI package for Wine GECKO_DESC= Bundle Gecko MSI package for Wine
MONO_DESC= Bundle Mono 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_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l 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 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_USES= gl jpeg xorg
X11_USE= GL=glu XORG=x11,xext,xcomposite,xcursor,xi,xinerama,xrandr,xrender X11_USE= GL=glu XORG=x11,xext,xcomposite,xcursor,xi,xinerama,xrandr,xrender
X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \ libfreetype.so:print/freetype2 \
liblcms2.so:graphics/lcms2 \ 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 # Include this only if it has not been already included by the
# i386-wine slave port. # i386-wine slave port.

6
emulators/wine/pkg-plist
View file

@ -1378,7 +1378,7 @@ lib/wine/d3d10.dll.so
lib/wine/d3d10_1.dll.so lib/wine/d3d10_1.dll.so
lib/wine/d3d10core.dll.so lib/wine/d3d10core.dll.so
lib/wine/d3d11.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/d3d8.dll.so
lib/wine/d3d8thk.dll.so lib/wine/d3d8thk.dll.so
lib/wine/d3d9.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/d3d10_1.dll
lib/wine/fakedlls/d3d10core.dll lib/wine/fakedlls/d3d10core.dll
lib/wine/fakedlls/d3d11.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/d3d8.dll
lib/wine/fakedlls/d3d8thk.dll lib/wine/fakedlls/d3d8thk.dll
lib/wine/fakedlls/d3d9.dll lib/wine/fakedlls/d3d9.dll
@ -2625,7 +2625,7 @@ lib/wine/libd3d10.def
lib/wine/libd3d10_1.def lib/wine/libd3d10_1.def
lib/wine/libd3d10core.def lib/wine/libd3d10core.def
lib/wine/libd3d11.def lib/wine/libd3d11.def
%%VKD3D%%lib/wine/libd3d12.def %%X11%%lib/wine/libd3d12.def
lib/wine/libd3d8.def lib/wine/libd3d8.def
lib/wine/libd3d9.def lib/wine/libd3d9.def
lib/wine/libd3dcompiler.def lib/wine/libd3dcompiler.def