Index: head/emulators/wine-devel/Makefile =================================================================== --- head/emulators/wine-devel/Makefile (revision 536391) +++ head/emulators/wine-devel/Makefile (revision 536392) @@ -1,191 +1,192 @@ # Created by: Gerald Pfeifer # $FreeBSD$ PORTNAME= wine DISTVERSION= 5.9 +PORTREVISION= 1 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 \ prelink:sysutils/prelink 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-opencl \ --without-osmesa \ --with-oss \ --without-pulse \ --without-sane \ --without-sdl \ --without-tiff \ --without-udev \ --without-unwind 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 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) STAGING_DESC= Include the Wine Staging patchset 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.1-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.0.0-x86.msi:emulators/wine-mono-devel MPG123_CONFIGURE_WITH= mpg123 MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 OPENAL_CONFIGURE_WITH= openal OPENAL_USES= openal STAGING_MASTER_SITES= https://github.com/wine-staging/wine-staging/archive/:staging COMP_DIST= v${DISTVERSION}.tar.gz STAGING_DISTFILES= ${COMP_DIST}:staging STAGING_EXTRACT_DEPENDS= bash:shells/bash \ git:devel/git \ autoconf>0:devel/autoconf STAGING_LIB_DEPENDS= libtxc_dxtn.so:graphics/s2tc 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, however WoW64 is not yet # available on FreeBSD. Also fix the desktop file. post-patch: ${REINPLACE_CMD} 's|/wine|/wine64|g' ${WRKSRC}/tools/wineapploader.in ${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}/${COMP_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/files/patch-tools-winegcc =================================================================== --- head/emulators/wine-devel/files/patch-tools-winegcc (revision 536391) +++ head/emulators/wine-devel/files/patch-tools-winegcc (nonexistent) @@ -1,33 +0,0 @@ -Revert commit 1ccd638b1aa85fb3c43b49d69d279cd509ebdc21 -Author: Alexandre Julliard -Date: Tue Apr 21 11:27:53 2020 +0200 - - winegcc: No longer use a constructor for module initialization. - - Signed-off-by: Alexandre Julliard - ---- UTC -diff --git tools/winegcc/winegcc.c tools/winegcc/winegcc.c -index 8a7db2ad34..9008c457bd 100644 ---- tools/winegcc/winegcc.c -+++ tools/winegcc/winegcc.c -@@ -553,6 +553,8 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) - strarray_add( flags, "-Wl,--no-wchar-size-warning" ); - if (!try_link( opts->prefix, link_args, "-Wl,-z,defs" )) - strarray_add( flags, "-Wl,-z,defs" ); -+ if (opts->shared && !try_link( opts->prefix, link_args, "-Wl,-init,__wine_spec_init" )) -+ strarray_add( flags, "-Wl,-init,__wine_spec_init" ); - - strarray_addall( link_args, flags ); - return link_args; -@@ -1408,8 +1410,8 @@ static void build(struct options* opts) - } - } - -- if (!is_pe) fixup_constructors( opts, output_path ); -- else if (opts->wine_builtin) make_wine_builtin( opts, output_path ); -+ if (!is_pe && !opts->shared) fixup_constructors( opts, output_path ); -+ if (is_pe && opts->wine_builtin) make_wine_builtin( opts, output_path ); - - /* create the loader script */ - if (generate_app_loader) Property changes on: head/emulators/wine-devel/files/patch-tools-winegcc ___________________________________________________________________ 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/patch-libs-wine-mmap.c =================================================================== --- head/emulators/wine-devel/files/patch-libs-wine-mmap.c (nonexistent) +++ head/emulators/wine-devel/files/patch-libs-wine-mmap.c (revision 536392) @@ -0,0 +1,27 @@ +From: Damjan Jovanovic +Subject: [PATCH] libwine: Fix a regression in the return value check for mmap() on FreeBSD +Message-Id: +Date: Sat, 23 May 2020 11:01:49 +0200 + +This fixes a regression from my previous patch in commit +55ba3648379d90642f174e74809b84130d6d1ddc, which was +checking for mmap() returning NULL instead of MAP_FAILED. + +Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49225 +Signed-off-by: Damjan Jovanovic + +--- UTC +diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c +index 0fbe2efea7..af91b3e352 100644 +--- libs/wine/mmap.c ++++ libs/wine/mmap.c +@@ -215,7 +215,7 @@ void *wine_anon_mmap( void *start, size_t size, int prot, int flags ) + /* If available, this will attempt a fixed mapping in-kernel */ + flags |= MAP_TRYFIXED; + #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +- if ( start && mmap( start, size, prot, flags | MAP_FIXED | MAP_EXCL, get_fdzero(), 0 ) ) ++ if ( start && mmap( start, size, prot, flags | MAP_FIXED | MAP_EXCL, get_fdzero(), 0 ) != MAP_FAILED ) + return start; + #elif defined(__svr4__) || defined(__NetBSD__) || defined(__APPLE__) + if ( try_mmap_fixed( start, size, prot, flags, get_fdzero(), 0 ) ) + Property changes on: head/emulators/wine-devel/files/patch-libs-wine-mmap.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property