Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/emulators/wine wine: Update to 4.0 (most recent stable...
details: https://anonhg.NetBSD.org/pkgsrc/rev/5907bd83cd71
branches: trunk
changeset: 432473:5907bd83cd71
user: nia <nia%pkgsrc.org@localhost>
date: Fri May 22 17:44:41 2020 +0000
description:
wine: Update to 4.0 (most recent stable version known to build on NetBSD)
The most recent stable version (5.0) is known to be problematic due to
the need for individual programs to link against msvcrt.
Based partially on zerous's "wine32" package in pkgsrc-wip.
Includes several years of changes.
This package does not include WoW64 support, so you can't run 32-bit
binaries on a 64-bit system. That's for later...
diffstat:
emulators/wine/DESCR | 15 +-
emulators/wine/MESSAGE.NetBSD | 11 +
emulators/wine/Makefile | 117 +-
emulators/wine/PLIST | 2943 ++++++++++
emulators/wine/PLIST.Darwin | 6 +-
emulators/wine/PLIST.common | 2051 ------
emulators/wine/buildlink3.mk | 13 +-
emulators/wine/distinfo | 22 +-
emulators/wine/options.mk | 90 +-
emulators/wine/patches/patch-configure | 37 +-
emulators/wine/patches/patch-dlls_ntdll_signal__i386.c | 15 -
emulators/wine/patches/patch-dlls_ntdll_thread.c | 16 +
emulators/wine/patches/patch-dlls_wbemprox_builtin.c | 20 -
emulators/wine/patches/patch-dlls_wineoss.drv_mmdevdrv.c | 311 -
emulators/wine/patches/patch-dlls_wininet_http.c | 24 +
emulators/wine/patches/patch-include_bcrypt.h | 16 +
emulators/wine/patches/patch-programs_wineconsole_Makefile.in | 16 +
emulators/wine/patches/patch-programs_wineconsole_curses.c | 24 +
emulators/wine/patches/patch-programs_winhlp32_macro.lex.l | 14 -
emulators/wine/patches/patch-tools_wrc_parser.l | 14 -
20 files changed, 3192 insertions(+), 2583 deletions(-)
diffs (truncated from 5926 to 300 lines):
diff -r 6d45c602f6f2 -r 5907bd83cd71 emulators/wine/DESCR
--- a/emulators/wine/DESCR Fri May 22 17:21:57 2020 +0000
+++ b/emulators/wine/DESCR Fri May 22 17:44:41 2020 +0000
@@ -1,6 +1,9 @@
-Wine is a program which allows running Microsoft Windows programs
-(including DOS, Windows 3.x and Win32 executables) on Unix. It consists
-of a program loader which loads and executes an Microsoft Windows binary,
-and a library that implements Windows API calls using their Unix or X11
-equivalents. The library may also be used for porting Win32 code into
-native Unix executables.
+Wine is a compatibility layer capable of running Windows applications on
+several POSIX-compliant operating systems. Instead of simulating internal
+Windows logic like a virtual machine or emulator, Wine translates Windows
+API calls into POSIX calls on-the-fly, eliminating the performance and memory
+penalties of other methods and allowing you to cleanly integrate Windows
+applications into your desktop.
+
+On 32-bit systems this package supports only 32-bit applications, and on
+64-bit systems it supports only 64-bit applications.
diff -r 6d45c602f6f2 -r 5907bd83cd71 emulators/wine/MESSAGE.NetBSD
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/wine/MESSAGE.NetBSD Fri May 22 17:44:41 2020 +0000
@@ -0,0 +1,11 @@
+===========================================================================
+$NetBSD: MESSAGE.NetBSD,v 1.1 2020/05/22 17:44:41 nia Exp $
+
+If you are experiencing crashes, it may be due to a security measure
+blocking the mapping of the NULL page.
+
+You can disable this (at a security cost) with the following command:
+
+# sysctl -w vm.user_va0_disable=0
+
+===========================================================================
diff -r 6d45c602f6f2 -r 5907bd83cd71 emulators/wine/Makefile
--- a/emulators/wine/Makefile Fri May 22 17:21:57 2020 +0000
+++ b/emulators/wine/Makefile Fri May 22 17:44:41 2020 +0000
@@ -1,74 +1,99 @@
-# $NetBSD: Makefile,v 1.212 2020/05/22 10:56:06 adam Exp $
+# $NetBSD: Makefile,v 1.213 2020/05/22 17:44:41 nia Exp $
-DISTNAME= wine-1.6.2
-PKGREVISION= 28
+DISTNAME= wine-4.0
CATEGORIES= emulators
-MASTER_SITES= http://ibiblio.org/pub/linux/system/emulators/wine/
-MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=wine/}
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES= https://dl.winehq.org/wine/source/4.0/
+MASTER_SITES+= http://mirrors.ibiblio.org/wine/source/4.0/
+EXTRACT_SUFX= .tar.xz
-MAINTAINER= adam%NetBSD.org@localhost
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://www.winehq.org/
-COMMENT= Free implementation of Windows on Unix
+COMMENT= Compatibility layer for running Microsoft Windows applications
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= fontforge-[0-9]*:../../fonts/fontforge
-
-ONLY_FOR_PLATFORM+= *-*-i386 #*-*-x86_64
-
-PKG_DESTDIR_SUPPORT= user-destdir
+GNU_CONFIGURE= yes
+USE_LANGUAGES= c c++
+USE_TOOLS+= bison flex gmake mktemp msgfmt perl
-USE_LANGUAGES= c c99
-USE_LIBTOOL= yes
-USE_NCURSES= yes
-USE_TOOLS+= bison flex gmake mktemp msgfmt
-FLEX_REQD= 2.5.33
-GNU_CONFIGURE= yes
+REPLACE_PERL+= tools/winemaker/winemaker
+REPLACE_PERL+= tools/winedump/function_grep.pl
+
+ONLY_FOR_PLATFORM+= *-*-i386 *-*-x86_64
+
UNLIMIT_RESOURCES= datasize
-REPLACE_PERL+= tools/winemaker tools/winedump/function_grep.pl
-
-# The Wine configure script has problems locating the libraries in the
-# buildlink directory, so prepend all of the LDFLAGS necessary to link
-# against the libraries.
-CONFIGURE_ENV+= X_LIBS=${LDFLAGS:M*:Q}
-CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q}\ -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
-CONFIGURE_ENV+= LDD=${LDD:Q}
-LIBS+= ${LDFLAGS}
+CONFIGURE_ARGS+= --without-capi
+CONFIGURE_ARGS+= --without-gphoto
+CONFIGURE_ARGS+= --without-gssapi
+CONFIGURE_ARGS+= --without-hal
+CONFIGURE_ARGS+= --without-krb5
+CONFIGURE_ARGS+= --without-opencl
+CONFIGURE_ARGS+= --without-udev
+CONFIGURE_ARGS+= --without-v4l
+CONFIGURE_ARGS+= --without-vkd3d
+CONFIGURE_ARGS+= --without-vulkan
-# If we're doing a 32-bit build, make sure that the appropriate multilib
-# options are passed through as these values are used with winegcc
-# (which wrapper doesn't handle).
.include "../../mk/bsd.prefs.mk"
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ENV+= ac_cv_prog_CC=${CC:Q}\ -m32
-CONFIGURE_ENV+= ac_cv_prog_CXX=${CXX:Q}\ -m32
-CONFIGURE_ENV+= ac_cv_prog_AS=${AS:Q}\ --32
-CONFIGURE_ENV+= ac_cv_prog_LD=${LD:Q}\ -m\ elf_i386
-.endif
-# Needs GCC >= 4.4
+
+PLIST_VARS+= lp32 lp64
.if ${MACHINE_ARCH} == "x86_64"
-CONFIGURE_ARGS+= --disable-win16
+PLIST.lp64= yes
CONFIGURE_ARGS+= --enable-win64
+NOT_PAX_MPROTECT_SAFE+= bin/wine64
+.else
+PLIST.lp32= yes
+NOT_PAX_MPROTECT_SAFE+= bin/wine
.endif
.if ${OPSYS} == "NetBSD"
+. if !empty(OS_VERSION:M[0-8].*)
+# Disable new_dtags as NetBSD versions prior to 9.0 don't honor DT_RUNPATH
+CONFIGURE_ENV+= ac_cv_cflags__Wl___enable_new_dtags=no
+. endif
# gethostbyname_r is in libc, but has a different calling convention
-CONFIGURE_ARGS+= wine_cv_linux_gethostbyname_r_6=no
+CONFIGURE_ENV+= wine_cv_linux_gethostbyname_r_6=no
.endif
-.include "options.mk"
+.include "../../mk/oss.buildlink3.mk"
+
+PLIST_VARS+= oss
+.if ${OSS_TYPE} != "none"
+PLIST.oss= yes
+LDFLAGS+= ${LIBOSSAUDIO}
+SUBST_CLASSES+= oss
+SUBST_STAGE.oss= pre-configure
+SUBST_MESSAGE.oss= Correcting the path to the OSS device.
+SUBST_FILES.oss+= dlls/wineoss.drv/mmdevdrv.c
+SUBST_SED.oss+= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
+.else
+CONFIGURE_ARGS+= --without-oss
+.endif
-.include "../../devel/ncurses/buildlink3.mk"
+# Fix warning due to _FORTIFY_SOURCE being redefined
+CONFIGURE_ENV+= ac_cv_c_fortify_enabled=no
+
+.include "options.mk"
+.include "../../audio/faudio/buildlink3.mk"
+.include "../../audio/gsm/buildlink3.mk"
+.include "../../audio/mpg123/buildlink3.mk"
+.include "../../audio/openal-soft/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
.include "../../graphics/lcms2/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
+.include "../../multimedia/gstreamer1/buildlink3.mk"
+.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
.include "../../security/gnutls/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../graphics/giflib/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 6d45c602f6f2 -r 5907bd83cd71 emulators/wine/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/wine/PLIST Fri May 22 17:44:41 2020 +0000
@@ -0,0 +1,2943 @@
+@comment $NetBSD: PLIST,v 1.70 2020/05/22 17:44:41 nia Exp $
+bin/function_grep.pl
+bin/msiexec
+bin/notepad
+bin/regedit
+bin/regsvr32
+bin/widl
+${PLIST.lp32}bin/wine
+${PLIST.lp64}bin/wine64
+bin/wineboot
+bin/winebuild
+bin/winecfg
+bin/wineconsole
+bin/winecpp
+bin/winedbg
+bin/winedump
+bin/winefile
+bin/wineg++
+bin/winegcc
+bin/winemaker
+bin/winemine
+bin/winepath
+bin/wineserver
+bin/wmc
+bin/wrc
+include/wine/debug.h
+include/wine/exception.h
+include/wine/itss.h
+include/wine/itss.idl
+include/wine/library.h
+include/wine/msvcrt/assert.h
+include/wine/msvcrt/conio.h
+include/wine/msvcrt/crtdbg.h
+include/wine/msvcrt/crtdefs.h
+include/wine/msvcrt/ctype.h
+include/wine/msvcrt/direct.h
+include/wine/msvcrt/dirent.h
+include/wine/msvcrt/dos.h
+include/wine/msvcrt/eh.h
+include/wine/msvcrt/errno.h
+include/wine/msvcrt/fcntl.h
+include/wine/msvcrt/float.h
+include/wine/msvcrt/fpieee.h
+include/wine/msvcrt/io.h
+include/wine/msvcrt/limits.h
+include/wine/msvcrt/locale.h
+include/wine/msvcrt/malloc.h
+include/wine/msvcrt/math.h
+include/wine/msvcrt/mbctype.h
+include/wine/msvcrt/mbstring.h
+include/wine/msvcrt/memory.h
+include/wine/msvcrt/process.h
+include/wine/msvcrt/search.h
+include/wine/msvcrt/setjmp.h
+include/wine/msvcrt/share.h
+include/wine/msvcrt/signal.h
+include/wine/msvcrt/stddef.h
+include/wine/msvcrt/stdio.h
+include/wine/msvcrt/stdlib.h
+include/wine/msvcrt/string.h
+include/wine/msvcrt/sys/locking.h
+include/wine/msvcrt/sys/stat.h
+include/wine/msvcrt/sys/timeb.h
+include/wine/msvcrt/sys/types.h
+include/wine/msvcrt/sys/unistd.h
+include/wine/msvcrt/sys/utime.h
+include/wine/msvcrt/time.h
+include/wine/msvcrt/unistd.h
+include/wine/msvcrt/wchar.h
+include/wine/msvcrt/wctype.h
+include/wine/svcctl.h
+include/wine/svcctl.idl
+include/wine/unicode.h
+include/wine/windows/accctrl.h
+include/wine/windows/access.idl
+include/wine/windows/aclapi.h
+include/wine/windows/aclui.h
+include/wine/windows/activation.h
+include/wine/windows/activation.idl
+include/wine/windows/activaut.h
+include/wine/windows/activaut.idl
+include/wine/windows/activdbg.h
+include/wine/windows/activdbg.idl
+include/wine/windows/activscp.h
+include/wine/windows/activscp.idl
+include/wine/windows/adshlp.h
+include/wine/windows/advpub.h
+include/wine/windows/af_irda.h
+include/wine/windows/amaudio.h
+include/wine/windows/amstream.h
+include/wine/windows/amstream.idl
+include/wine/windows/amvideo.h
+include/wine/windows/amvideo.idl
+include/wine/windows/appcompatapi.h
+include/wine/windows/appmgmt.h
+include/wine/windows/appmodel.h
+include/wine/windows/asptlb.h
+include/wine/windows/asptlb.idl
+include/wine/windows/asynot.idl
+include/wine/windows/asysta.idl
+include/wine/windows/atlbase.h
+include/wine/windows/atlcom.h
+include/wine/windows/atliface.h
+include/wine/windows/atliface.idl
+include/wine/windows/atlwin.h
+include/wine/windows/audevcod.h
+include/wine/windows/audioclient.h
+include/wine/windows/audioclient.idl
+include/wine/windows/audiopolicy.h
+include/wine/windows/audiopolicy.idl
+include/wine/windows/audiosessiontypes.h
+include/wine/windows/austream.h
+include/wine/windows/austream.idl
Home |
Main Index |
Thread Index |
Old Index