Index: head/emulators/wine-devel/Makefile =================================================================== --- head/emulators/wine-devel/Makefile (revision 558080) +++ head/emulators/wine-devel/Makefile (revision 558081) @@ -1,197 +1,195 @@ # Created by: Gerald Pfeifer # $FreeBSD$ PORTNAME= wine -DISTVERSION= 6.0-rc1 +DISTVERSION= 6.0-rc2 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ http://mirrors.ibiblio.org/wine/source/5.x/ PKGNAMESUFFIX?= -devel DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER?= gerald@FreeBSD.org COMMENT?= Microsoft Windows compatibility environment LICENSE= LGPL21 LGPL3 LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 i386 BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex LIB_DEPENDS= libFAudio.so:audio/faudio \ libxml2.so:textproc/libxml2 USES= bison desktop-file-utils gmake localbase pkgconfig shebangfix tar:xz CONFLICTS_INSTALL= wine-[0-9]* i386-wine-[0-9]* i386-wine-devel-[0-9]* GNU_CONFIGURE= yes CONFIGURE_ARGS+=--verbose \ --disable-kerberos \ --disable-tests \ --without-alsa --without-capi --without-dbus \ --without-gettext --without-gettextpo \ --without-gphoto --without-gsm --without-gstreamer \ --without-inotify \ --without-krb5 \ --without-mingw \ --without-opencl \ --without-osmesa \ --with-oss \ --without-pulse \ --without-sane \ --without-tiff \ --without-udev \ --without-unwind \ --without-usb CONFIGURE_ENV= CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex" WINELIBDIR?= ${PREFIX}/lib .if !defined(USE_LDCONFIG32) USE_LDCONFIG= ${WINELIBDIR} ${WINELIBDIR}/wine .endif SHEBANG_FILES= tools/make_requests tools/winemaker/winemaker \ tools/winedump/function_grep.pl SUB_FILES= pkg-message PORTDATA= wine.inf OPTIONS_DEFINE= CUPS DOCS DOSBOX GCC GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL SDL STAGING V4L VKD3D VULKAN WINEMAKER X11 GECKO MONO OPTIONS_DEFAULT=GCC GNUTLS X11 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 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 CUPS_CONFIGURE_WITH= cups CUPS_LIB_DEPENDS= libcups.so:print/cups DOSBOX_RUN_DEPENDS= dosbox:emulators/dosbox GCC_USE= gcc=yes GCC_USES_OFF= compiler:c11 GECKO_RUN_DEPENDS= ${DATADIR}/gecko/wine-gecko-2.47.2-x86.msi:emulators/wine-gecko-devel GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls HAL_CONFIGURE_WITH= hal HAL_LIB_DEPENDS= libhal.so:sysutils/hal LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes LIBXSLT_CONFIGURE_WITH= xslt LIBXSLT_LIB_DEPENDS= libxslt.so:textproc/libxslt MONO_RUN_DEPENDS= ${DATADIR}/mono/wine-mono-5.1.1-x86.msi:emulators/wine-mono-devel MPG123_CONFIGURE_WITH= mpg123 MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 OPENAL_CONFIGURE_WITH= openal OPENAL_USES= openal SDL_CONFIGURE_WITH= sdl SDL_USES= sdl SDL_USE= SDL=sdl2 STAGING_MASTER_SITES= https://github.com/wine-staging/wine-staging/archive/:staging -STAGING_DIST= v${DISTVERSION:S/-//}.tar.gz +STAGING_DIST= v${DISTVERSION}.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 \ - ${PATCHDIR}/extrapatch-staging-server-fd.c 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= libvkd3d.so:graphics/vkd3d VULKAN_CONFIGURE_WITH= vulkan VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader WINEMAKER_RUN_DEPENDS= p5-XML-LibXML>0:textproc/p5-XML-LibXML X11_CONFIGURE_WITH= x cms fontconfig freetype glu jpeg opengl png 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 # Include this only if it has not been already included by the # i386-wine-devel slave port. .ifndef WINE_SLAVE_BUILD .include .endif .if ${ARCH} == amd64 # Wine is composed of three parts: # - wine (aka this port) is the 32-bit component and runs 32-bit programs (on FreeBSD/i386) # - wine64 (aka this part of this port) is the 64-bit component and runs 64-bit programs # (on FreeBSD/amd64) # - wow64 (a subset of emulators/i386-wine-devel) is a part of the 64-bit component that runs # 32-bit programs (on FreeBSD/amd64) # We also currently have: # - "wine32" (aka emulators/i386-wine-devel) is the 32-bit component and runs 32-bit programs # (on FreeBSD/amd64). This will be superseded by wow64. # --libdir is required since Wine defaults to "${PREFIX}/lib64" on amd64. CONFIGURE_ARGS+= --enable-win64 --libdir=${PREFIX}/lib PLIST_SUB+= WINE32="@comment " WINE64="" # Wine assumes a WoW64 package is available, which is not the case on # FreeBSD yet. post-patch: ${REINPLACE_CMD} '/Exec/s|wine|wine64|g' ${WRKSRC}/loader/wine.desktop .else PLIST_SUB+= WINE32="" WINE64="@comment " .endif post-extract-STAGING-on: fix-shebang cd ${WRKSRC} && ${TAR} xf ${DISTDIR}/${STAGING_DIST} --strip-components 1 cd ${WRKSRC} && bash ./patches/patchinstall.sh --backend=patch DESTDIR=${WRKSRC} --all pre-build: cd ${WRKSRC} && ${MAKE_CMD} depend post-install: @${MV} -f ${STAGEDIR}${WINELIBDIR}/libwine.so.1.0 \ ${STAGEDIR}${WINELIBDIR}/libwine.so.1 @${LN} -sf libwine.so.1 ${STAGEDIR}/${WINELIBDIR}/libwine.so @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in README ANNOUNCE AUTHORS ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor ${INSTALL_DATA} ${WRKSRC}/programs/winedbg/README ${STAGEDIR}${DOCSDIR}/README.winedbg ${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${STAGEDIR}${DOCSDIR}/README.winedump check-wine-devel-vs-staging: @${GREP} %%STAGING%% pkg-plist | while read f; do \ f=`echo $$f | ${SED} -e 's:%%STAGING%%::' -e "s:%%DATADIR%%:${DATADIR}:"`; \ if [ -f "$$STAGEDIR/$$PREFIX/$$f" ] || [ -f "$$STAGEDIR/$$f" ]; then \ ${PRINTF} "%s no longer contingent on %%STAGING%%?\n" "$$f"; \ fi \ done .ifndef WINE_SLAVE_BUILD .include .endif Index: head/emulators/wine-devel/distinfo =================================================================== --- head/emulators/wine-devel/distinfo (revision 558080) +++ head/emulators/wine-devel/distinfo (revision 558081) @@ -1,5 +1,5 @@ -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 +TIMESTAMP = 1607854914 +SHA256 (wine-6.0-rc2.tar.xz) = f20887cbe62cc42539b21f5823d64fdc310018b1533ebf042da81927f3920d76 +SIZE (wine-6.0-rc2.tar.xz) = 24190236 +SHA256 (v6.0-rc2.tar.gz) = 35b3790a7d8260cfc3e19c09b7868b46187c059b8c35d758934579e6344e710f +SIZE (v6.0-rc2.tar.gz) = 9815463 Index: head/emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-file.c =================================================================== --- head/emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-file.c (revision 558080) +++ head/emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-file.c (nonexistent) @@ -1,21 +0,0 @@ ---- dlls/ntdll/unix/file.c.orig 2020-11-07 09:33:27.083812000 +0000 -+++ dlls/ntdll/unix/file.c 2020-11-07 09:53:55.641522000 +0000 -@@ -394,6 +394,18 @@ - #define XATTR_USER_PREFIX_LEN (sizeof(XATTR_USER_PREFIX) - 1) - #endif - -+#ifdef HAVE_SYS_EXTATTR_H -+static inline int xattr_valid_namespace( const char *name ) -+{ -+ if (strncmp( XATTR_USER_PREFIX, name, XATTR_USER_PREFIX_LEN ) != 0) -+ { -+ errno = EPERM; -+ return 0; -+ } -+ return 1; -+} -+#endif -+ - static int xattr_fremove( int filedes, const char *name ) - { - #if defined(XATTR_ADDITIONAL_OPTIONS) Property changes on: head/emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-file.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/wine-devel/files/extrapatch-staging-server-fd.c =================================================================== --- head/emulators/wine-devel/files/extrapatch-staging-server-fd.c (revision 558080) +++ head/emulators/wine-devel/files/extrapatch-staging-server-fd.c (nonexistent) @@ -1,15 +0,0 @@ -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) - { Property changes on: head/emulators/wine-devel/files/extrapatch-staging-server-fd.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property