svn commit: r557223 - in head/emulators/wine-devel: . files

Gerald Pfeifer gerald at FreeBSD.org
Mon Dec 7 10:03:03 UTC 2020 

Author: gerald
Date: Mon Dec  7 10:03:02 2020
New Revision: 557223
URL: https://svnweb.freebsd.org/changeset/ports/557223

Log:
  Adjust the download of the Staging patchset to the Wine 6.0 RC1 release
  and hence re-enable it. [1]
  
  Temporarily include a patch of mine to address a build breakage with
  that patchset, files/extrapatch-staging-server-fd.c.
  
  Update the description for the STAGING option and explicitly label it
  as unsupported.
  
  PR:		251606 [1]

Added:
  head/emulators/wine-devel/files/extrapatch-staging-server-fd.c   (contents, props changed)
Modified:
  head/emulators/wine-devel/Makefile
  head/emulators/wine-devel/distinfo
  head/emulators/wine-devel/pkg-plist

Modified: head/emulators/wine-devel/Makefile
==============================================================================
--- head/emulators/wine-devel/Makefile	Mon Dec  7 09:37:38 2020	(r557222)
+++ head/emulators/wine-devel/Makefile	Mon Dec  7 10:03:02 2020	(r557223)
@@ -66,7 +66,7 @@ OPTIONS_SUB=	yes
 DOSBOX_DESC=	Use DOSBox to run MS-DOS programs
 LIBXSLT_DESC=	Use libxslt (only used by msxml3.dll)
 SDL_DESC=	Use SDL for gamepad support (XInput only)
-STAGING_DESC=	Include the Wine Staging patchset (experimental)
+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)
@@ -108,13 +108,14 @@ SDL_USES=		sdl
 SDL_USE=		SDL=sdl2
 
 STAGING_MASTER_SITES=	https://github.com/wine-staging/wine-staging/archive/:staging
-STAGING_DIST=		v${DISTVERSION}.tar.gz
+STAGING_DIST=		v${DISTVERSION:S/-//}.tar.gz
 STAGING_DISTFILES=	${STAGING_DIST}:staging
 STAGING_EXTRACT_DEPENDS=	bash:shells/bash \
 				git:devel/git \
 				autoconf>0:devel/autoconf
 STAGING_LIB_DEPENDS=	libtxc_dxtn.so:graphics/s2tc
-STAGING_EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-dlls-ntdll-unix-file.c
+STAGING_EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-dlls-ntdll-unix-file.c \
+			${PATCHDIR}/extrapatch-staging-server-fd.c
 
 V4L_CONFIGURE_WITH=	v4l2
 V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat

Modified: head/emulators/wine-devel/distinfo
==============================================================================
--- head/emulators/wine-devel/distinfo	Mon Dec  7 09:37:38 2020	(r557222)
+++ head/emulators/wine-devel/distinfo	Mon Dec  7 10:03:02 2020	(r557223)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1607126664
+TIMESTAMP = 1607184256
 SHA256 (wine-6.0-rc1.tar.xz) = 78ddc948f946c662779bd5943d91812740480021bc951cbcadeb102c38b53bc8
 SIZE (wine-6.0-rc1.tar.xz) = 24194552
+SHA256 (v6.0rc1.tar.gz) = 8de3866030ccd2e8387a3079dd543406c739850ab0fcc16e3bf66b55d2d230c6
+SIZE (v6.0rc1.tar.gz) = 10331511

Added: head/emulators/wine-devel/files/extrapatch-staging-server-fd.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/wine-devel/files/extrapatch-staging-server-fd.c	Mon Dec  7 10:03:02 2020	(r557223)
@@ -0,0 +1,15 @@
+https://bugs.winehq.org/show_bug.cgi?id=50255
+
+--- server/fd.c.orig	2020-12-05 16:14:40.336431000 +0000
++++ server/fd.c	2020-12-05 16:14:42.435171000 +0000
+@@ -1982,8 +1982,10 @@
+     }
+     else rw_mode = O_RDONLY;
+ 
++#if defined(O_SYMLINK)
+     if ((options & FILE_OPEN_REPARSE_POINT) && !(flags & O_CREAT))
+         flags |= O_SYMLINK;
++#endif
+ 
+     if ((fd->unix_fd = open( name, rw_mode | (flags & ~O_TRUNC), *mode )) == -1)
+     {

Modified: head/emulators/wine-devel/pkg-plist
==============================================================================
--- head/emulators/wine-devel/pkg-plist	Mon Dec  7 09:37:38 2020	(r557222)
+++ head/emulators/wine-devel/pkg-plist	Mon Dec  7 10:03:02 2020	(r557223)
@@ -118,6 +118,8 @@ include/wine/windows/appmodel.h
 include/wine/windows/asferr.h
 include/wine/windows/asptlb.h
 include/wine/windows/asptlb.idl
+%%STAGING%%include/wine/windows/asyncinfo.h
+%%STAGING%%include/wine/windows/asyncinfo.idl
 include/wine/windows/asynot.idl
 include/wine/windows/asysta.idl
 include/wine/windows/atlbase.h
@@ -951,7 +953,19 @@ include/wine/windows/windef.h
 include/wine/windows/windns.h
 include/wine/windows/windows.foundation.h
 include/wine/windows/windows.foundation.idl
+%%STAGING%%include/wine/windows/windows.gaming.input.forcefeedback.h
+%%STAGING%%include/wine/windows/windows.gaming.input.forcefeedback.idl
+%%STAGING%%include/wine/windows/windows.gaming.input.h
+%%STAGING%%include/wine/windows/windows.gaming.input.idl
+%%STAGING%%include/wine/windows/windows.globalization.h
+%%STAGING%%include/wine/windows/windows.globalization.idl
 include/wine/windows/windows.h
+%%STAGING%%include/wine/windows/windows.media.speechsynthesis.h
+%%STAGING%%include/wine/windows/windows.media.speechsynthesis.idl
+%%STAGING%%include/wine/windows/windows.system.h
+%%STAGING%%include/wine/windows/windows.system.idl
+%%STAGING%%include/wine/windows/windows.system.userprofile.h
+%%STAGING%%include/wine/windows/windows.system.userprofile.idl
 include/wine/windows/windowscontracts.h
 include/wine/windows/windowscontracts.idl
 include/wine/windows/windowsx.h
@@ -2437,6 +2451,10 @@ lib/wine/fakedlls/wimgapi.dll
 %%WINE32%%lib/wine/fakedlls/win87em.dll16
 %%WINE32%%lib/wine/fakedlls/winaspi.dll16
 %%WINE32%%lib/wine/fakedlls/windebug.dll16
+%%STAGING%%lib/wine/fakedlls/windows.gaming.input.dll
+%%STAGING%%lib/wine/fakedlls/windows.globalization.dll
+%%STAGING%%lib/wine/fakedlls/windows.media.speech.dll
+%%STAGING%%lib/wine/fakedlls/windows.networking.connectivity.dll
 lib/wine/fakedlls/windowscodecs.dll
 lib/wine/fakedlls/windowscodecsext.dll
 lib/wine/fakedlls/wineboot.exe
@@ -3196,6 +3214,10 @@ lib/wine/wimgapi.dll.so
 %%WINE32%%lib/wine/win87em.dll16.so
 %%WINE32%%lib/wine/winaspi.dll16.so
 %%WINE32%%lib/wine/windebug.dll16.so
+%%STAGING%%lib/wine/windows.gaming.input.dll.so
+%%STAGING%%lib/wine/windows.globalization.dll.so
+%%STAGING%%lib/wine/windows.media.speech.dll.so
+%%STAGING%%lib/wine/windows.networking.connectivity.dll.so
 lib/wine/windowscodecs.dll.so
 lib/wine/windowscodecs.so
 lib/wine/windowscodecsext.dll.so

More information about the svn-ports-all mailing list