pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/emulators/wine



Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Jun  1 05:05:55 UTC 2021

Modified Files:
        pkgsrc/emulators/wine: Makefile PLIST distinfo options.mk
        pkgsrc/emulators/wine/patches: patch-dlls_wininet_http.c
Added Files:
        pkgsrc/emulators/wine/patches: patch-tools_winegcc_winegcc.c
Removed Files:
        pkgsrc/emulators/wine/patches: patch-dlls_ntdll_thread.c

Log Message:
wine: updated to 5.0.5

5.0.5:
Fixes build failure when v4l is missing

5.0.4:
Various bug fixes

5.0.3:
Various bug fixes

5.0.2:
Various bug fixes

5.0.1:
Fix compilation with gcc 10
Add some timezones
Various bug fixes

5.0:
Builtin modules in PE format.
Multi-monitor support.
XAudio2 reimplementation.
Vulkan 1.1 support.


To generate a diff of this commit:
cvs rdiff -u -r1.228 -r1.229 pkgsrc/emulators/wine/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/emulators/wine/PLIST
cvs rdiff -u -r1.96 -r1.97 pkgsrc/emulators/wine/distinfo
cvs rdiff -u -r1.20 -r1.21 pkgsrc/emulators/wine/options.mk
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/emulators/wine/patches/patch-dlls_ntdll_thread.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/emulators/wine/patches/patch-dlls_wininet_http.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/wine/patches/patch-tools_winegcc_winegcc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/wine/Makefile
diff -u pkgsrc/emulators/wine/Makefile:1.228 pkgsrc/emulators/wine/Makefile:1.229
--- pkgsrc/emulators/wine/Makefile:1.228        Mon May 24 19:52:11 2021
+++ pkgsrc/emulators/wine/Makefile      Tue Jun  1 05:05:54 2021
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.228 2021/05/24 19:52:11 wiz Exp $
+# $NetBSD: Makefile,v 1.229 2021/06/01 05:05:54 adam Exp $
 
-DISTNAME=      wine-4.0.4
-PKGREVISION=   11
+DISTNAME=      wine-5.0.5
 CATEGORIES=    emulators
-MASTER_SITES=  https://dl.winehq.org/wine/source/4.0/
-MASTER_SITES+= http://mirrors.ibiblio.org/wine/source/4.0/
+MASTER_SITES=  https://dl.winehq.org/wine/source/${PKGVERSION_NOREV:R}/
+MASTER_SITES+= http://mirrors.ibiblio.org/wine/source/${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -12,10 +11,9 @@ HOMEPAGE=    https://www.winehq.org/
 COMMENT=       Compatibility layer for running Microsoft Windows applications
 LICENSE=       gnu-lgpl-v2.1
 
-GNU_CONFIGURE= yes
 USE_LANGUAGES= c c++
-USE_TOOLS+=    bison flex gmake mktemp msgfmt perl
-USE_TOOLS+=    pkg-config
+USE_TOOLS+=    bison flex gmake mktemp msgfmt perl pkg-config
+GNU_CONFIGURE= yes
 
 REPLACE_PERL+= tools/winemaker/winemaker
 REPLACE_PERL+= tools/winedump/function_grep.pl
@@ -32,7 +30,7 @@ CONFIGURE_ARGS+=      --without-hal
 CONFIGURE_ARGS+=       --without-krb5
 CONFIGURE_ARGS+=       --without-opencl
 CONFIGURE_ARGS+=       --without-udev
-CONFIGURE_ARGS+=       --without-v4l
+CONFIGURE_ARGS+=       --without-v4l2
 CONFIGURE_ARGS+=       --without-vkd3d
 CONFIGURE_ARGS+=       --without-vulkan
 

Index: pkgsrc/emulators/wine/PLIST
diff -u pkgsrc/emulators/wine/PLIST:1.72 pkgsrc/emulators/wine/PLIST:1.73
--- pkgsrc/emulators/wine/PLIST:1.72    Tue May 26 15:20:22 2020
+++ pkgsrc/emulators/wine/PLIST Tue Jun  1 05:05:54 2021
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.72 2020/05/26 15:20:22 adam Exp $
+@comment $NetBSD: PLIST,v 1.73 2021/06/01 05:05:54 adam Exp $
 bin/function_grep.pl
+bin/msidb
 bin/msiexec
 bin/notepad
 bin/regedit
@@ -30,6 +31,7 @@ include/wine/itss.idl
 include/wine/library.h
 include/wine/msvcrt/assert.h
 include/wine/msvcrt/conio.h
+include/wine/msvcrt/corecrt.h
 include/wine/msvcrt/crtdbg.h
 include/wine/msvcrt/crtdefs.h
 include/wine/msvcrt/ctype.h
@@ -41,6 +43,7 @@ include/wine/msvcrt/errno.h
 include/wine/msvcrt/fcntl.h
 include/wine/msvcrt/float.h
 include/wine/msvcrt/fpieee.h
+include/wine/msvcrt/inttypes.h
 include/wine/msvcrt/io.h
 include/wine/msvcrt/limits.h
 include/wine/msvcrt/locale.h
@@ -55,6 +58,7 @@ include/wine/msvcrt/setjmp.h
 include/wine/msvcrt/share.h
 include/wine/msvcrt/signal.h
 include/wine/msvcrt/stddef.h
+include/wine/msvcrt/stdint.h
 include/wine/msvcrt/stdio.h
 include/wine/msvcrt/stdlib.h
 include/wine/msvcrt/string.h
@@ -65,12 +69,12 @@ 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/uchar.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
@@ -87,6 +91,8 @@ include/wine/windows/adshlp.h
 include/wine/windows/advpub.h
 include/wine/windows/af_irda.h
 include/wine/windows/amaudio.h
+include/wine/windows/amsi.h
+include/wine/windows/amsi.idl
 include/wine/windows/amstream.h
 include/wine/windows/amstream.idl
 include/wine/windows/amvideo.h
@@ -102,6 +108,7 @@ include/wine/windows/atlbase.h
 include/wine/windows/atlcom.h
 include/wine/windows/atliface.h
 include/wine/windows/atliface.idl
+include/wine/windows/atlthunk.h
 include/wine/windows/atlwin.h
 include/wine/windows/audevcod.h
 include/wine/windows/audioclient.h
@@ -148,6 +155,7 @@ include/wine/windows/cmdtxt.idl
 include/wine/windows/cmnquery.h
 include/wine/windows/cmnquery.idl
 include/wine/windows/colinf.idl
+include/wine/windows/colordlg.h
 include/wine/windows/comcat.h
 include/wine/windows/comcat.idl
 include/wine/windows/commctrl.h
@@ -256,6 +264,7 @@ include/wine/windows/davclnt.h
 include/wine/windows/dbccmd.idl
 include/wine/windows/dbcses.idl
 include/wine/windows/dbdsad.idl
+include/wine/windows/dbgeng.h
 include/wine/windows/dbghelp.h
 include/wine/windows/dbinit.idl
 include/wine/windows/dbprop.idl
@@ -382,10 +391,13 @@ include/wine/windows/dxgi1_6.h
 include/wine/windows/dxgi1_6.idl
 include/wine/windows/dxgicommon.h
 include/wine/windows/dxgicommon.idl
+include/wine/windows/dxgidebug.h
+include/wine/windows/dxgidebug.idl
 include/wine/windows/dxgiformat.h
 include/wine/windows/dxgiformat.idl
 include/wine/windows/dxgitype.h
 include/wine/windows/dxgitype.idl
+include/wine/windows/dxva.h
 include/wine/windows/dxva2api.h
 include/wine/windows/dxva2api.idl
 include/wine/windows/dyngraph.idl
@@ -406,6 +418,8 @@ include/wine/windows/exdispid.h
 include/wine/windows/fci.h
 include/wine/windows/fdi.h
 include/wine/windows/fileapi.h
+include/wine/windows/filter.h
+include/wine/windows/filter.idl
 include/wine/windows/fltdefs.h
 include/wine/windows/fontsub.h
 include/wine/windows/fusion.h
@@ -478,6 +492,7 @@ include/wine/windows/inspectable.h
 include/wine/windows/inspectable.idl
 include/wine/windows/interactioncontext.h
 include/wine/windows/intshcut.h
+include/wine/windows/ip2string.h
 include/wine/windows/ipexport.h
 include/wine/windows/iphlpapi.h
 include/wine/windows/ipifcons.h
@@ -529,8 +544,12 @@ include/wine/windows/mfapi.h
 include/wine/windows/mferror.h
 include/wine/windows/mfidl.h
 include/wine/windows/mfidl.idl
+include/wine/windows/mfmediaengine.h
+include/wine/windows/mfmediaengine.idl
 include/wine/windows/mfobjects.h
 include/wine/windows/mfobjects.idl
+include/wine/windows/mfplay.h
+include/wine/windows/mfplay.idl
 include/wine/windows/mfreadwrite.h
 include/wine/windows/mfreadwrite.idl
 include/wine/windows/mftransform.h
@@ -557,6 +576,8 @@ include/wine/windows/mprerror.h
 include/wine/windows/msacm.h
 include/wine/windows/msacmdlg.h
 include/wine/windows/msacmdrv.h
+include/wine/windows/msado15_backcompat.h
+include/wine/windows/msado15_backcompat.idl
 include/wine/windows/msasn1.h
 include/wine/windows/mscat.h
 include/wine/windows/mscoree.h
@@ -614,11 +635,13 @@ include/wine/windows/netfw.idl
 include/wine/windows/netioapi.h
 include/wine/windows/netlistmgr.h
 include/wine/windows/netlistmgr.idl
+include/wine/windows/newdev.h
 include/wine/windows/nldef.h
 include/wine/windows/npapi.h
 include/wine/windows/nserror.h
 include/wine/windows/nspapi.h
 include/wine/windows/ntddcdrm.h
+include/wine/windows/ntddmou.h
 include/wine/windows/ntddndis.h
 include/wine/windows/ntddscsi.h
 include/wine/windows/ntddstor.h
@@ -732,6 +755,7 @@ include/wine/windows/rtutils.h
 include/wine/windows/sal.h
 include/wine/windows/sapi.h
 include/wine/windows/sapi.idl
+include/wine/windows/sapiaut.idl
 include/wine/windows/sapiddk.h
 include/wine/windows/sapiddk.idl
 include/wine/windows/scarderr.h
@@ -784,6 +808,7 @@ include/wine/windows/sti.h
 include/wine/windows/storage.h
 include/wine/windows/strmif.h
 include/wine/windows/strmif.idl
+include/wine/windows/strongname.h
 include/wine/windows/strsafe.h
 include/wine/windows/structuredquerycondition.h
 include/wine/windows/structuredquerycondition.idl
@@ -799,12 +824,17 @@ include/wine/windows/tcpmib.h
 include/wine/windows/textserv.h
 include/wine/windows/textstor.h
 include/wine/windows/textstor.idl
+include/wine/windows/threadpoolapiset.h
+include/wine/windows/thumbcache.h
+include/wine/windows/thumbcache.idl
+include/wine/windows/timezoneapi.h
 include/wine/windows/tlhelp32.h
 include/wine/windows/tlogstg.h
 include/wine/windows/tlogstg.idl
 include/wine/windows/tmschema.h
 include/wine/windows/tom.h
 include/wine/windows/tom.idl
+include/wine/windows/tpcshrd.h
 include/wine/windows/traffic.h
 include/wine/windows/transact.h
 include/wine/windows/transact.idl
@@ -843,11 +873,14 @@ include/wine/windows/virtdisk.h
 include/wine/windows/vmr9.h
 include/wine/windows/vmr9.idl
 include/wine/windows/vmrender.idl
+include/wine/windows/vsbackup.h
+include/wine/windows/vsbackup.idl
 include/wine/windows/vss.h
 include/wine/windows/vss.idl
 include/wine/windows/vsstyle.h
 include/wine/windows/vssym32.h
 include/wine/windows/vswriter.h
+include/wine/windows/vswriter.idl
 include/wine/windows/wbemcli.h
 include/wine/windows/wbemcli.idl
 include/wine/windows/wbemdisp.h
@@ -985,6 +1018,7 @@ lib/wine/adsldp.dll.so
 lib/wine/adsldpc.dll.so
 lib/wine/advapi32.dll.so
 lib/wine/advpack.dll.so
+lib/wine/amsi.dll.so
 lib/wine/amstream.dll.so
 lib/wine/api-ms-win-appmodel-identity-l1-1-0.dll.so
 lib/wine/api-ms-win-appmodel-runtime-l1-1-1.dll.so
@@ -1210,6 +1244,7 @@ lib/wine/atl100.dll.so
 lib/wine/atl110.dll.so
 lib/wine/atl80.dll.so
 lib/wine/atl90.dll.so
+lib/wine/atlthunk.dll.so
 lib/wine/atmlib.dll.so
 lib/wine/attrib.exe.so
 lib/wine/authz.dll.so
@@ -1228,6 +1263,7 @@ lib/wine/capi2032.dll.so
 lib/wine/cards.dll.so
 lib/wine/cdosys.dll.so
 lib/wine/cfgmgr32.dll.so
+lib/wine/chcp.com.so
 lib/wine/clock.exe.so
 lib/wine/clusapi.dll.so
 lib/wine/cmd.exe.so
@@ -1350,6 +1386,7 @@ lib/wine/dpnsvr.exe.so
 lib/wine/dpvoice.dll.so
 lib/wine/dpwsockx.dll.so
 lib/wine/drmclien.dll.so
+lib/wine/dsdmo.dll.so
 lib/wine/dsound.dll.so
 lib/wine/dsquery.dll.so
 lib/wine/dssenh.dll.so
@@ -1370,17 +1407,25 @@ lib/wine/explorerframe.dll.so
 lib/wine/ext-ms-win-authz-context-l1-1-0.dll.so
 lib/wine/ext-ms-win-domainjoin-netjoin-l1-1-0.dll.so
 lib/wine/ext-ms-win-dwmapi-ext-l1-1-0.dll.so
+lib/wine/ext-ms-win-gdi-dc-create-l1-1-0.dll.so
 lib/wine/ext-ms-win-gdi-dc-create-l1-1-1.dll.so
 lib/wine/ext-ms-win-gdi-dc-l1-2-0.dll.so
 lib/wine/ext-ms-win-gdi-devcaps-l1-1-0.dll.so
+lib/wine/ext-ms-win-gdi-draw-l1-1-0.dll.so
 lib/wine/ext-ms-win-gdi-draw-l1-1-1.dll.so
+lib/wine/ext-ms-win-gdi-font-l1-1-0.dll.so
+lib/wine/ext-ms-win-gdi-font-l1-1-1.dll.so
 lib/wine/ext-ms-win-gdi-render-l1-1-0.dll.so
 lib/wine/ext-ms-win-kernel32-package-current-l1-1-0.dll.so
 lib/wine/ext-ms-win-kernel32-package-l1-1-1.dll.so
+lib/wine/ext-ms-win-ntuser-dialogbox-l1-1-0.dll.so
 lib/wine/ext-ms-win-ntuser-draw-l1-1-0.dll.so
+lib/wine/ext-ms-win-ntuser-gui-l1-1-0.dll.so
 lib/wine/ext-ms-win-ntuser-gui-l1-3-0.dll.so
 lib/wine/ext-ms-win-ntuser-keyboard-l1-3-0.dll.so
+lib/wine/ext-ms-win-ntuser-message-l1-1-0.dll.so
 lib/wine/ext-ms-win-ntuser-message-l1-1-1.dll.so
+lib/wine/ext-ms-win-ntuser-misc-l1-1-0.dll.so
 lib/wine/ext-ms-win-ntuser-misc-l1-2-0.dll.so
 lib/wine/ext-ms-win-ntuser-misc-l1-5-1.dll.so
 lib/wine/ext-ms-win-ntuser-mouse-l1-1-0.dll.so
@@ -1388,8 +1433,10 @@ lib/wine/ext-ms-win-ntuser-private-l1-1-
 lib/wine/ext-ms-win-ntuser-private-l1-3-1.dll.so
 lib/wine/ext-ms-win-ntuser-rectangle-ext-l1-1-0.dll.so
 lib/wine/ext-ms-win-ntuser-uicontext-ext-l1-1-0.dll.so
+lib/wine/ext-ms-win-ntuser-window-l1-1-0.dll.so
 lib/wine/ext-ms-win-ntuser-window-l1-1-1.dll.so
 lib/wine/ext-ms-win-ntuser-window-l1-1-4.dll.so
+lib/wine/ext-ms-win-ntuser-windowclass-l1-1-0.dll.so
 lib/wine/ext-ms-win-ntuser-windowclass-l1-1-1.dll.so
 lib/wine/ext-ms-win-oleacc-l1-1-0.dll.so
 lib/wine/ext-ms-win-ras-rasapi32-l1-1-0.dll.so
@@ -1405,6 +1452,9 @@ lib/wine/ext-ms-win-rtcore-ntuser-syscol
 lib/wine/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.dll.so
 lib/wine/ext-ms-win-security-credui-l1-1-0.dll.so
 lib/wine/ext-ms-win-security-cryptui-l1-1-0.dll.so
+lib/wine/ext-ms-win-shell-comctl32-init-l1-1-0.dll.so
+lib/wine/ext-ms-win-shell-comdlg32-l1-1-0.dll.so
+lib/wine/ext-ms-win-shell-shell32-l1-2-0.dll.so
 lib/wine/ext-ms-win-uxtheme-themes-l1-1-0.dll.so
 lib/wine/extrac32.exe.so
 lib/wine/fakedlls/acledit.dll
@@ -1415,6 +1465,7 @@ lib/wine/fakedlls/adsldp.dll
 lib/wine/fakedlls/adsldpc.dll
 lib/wine/fakedlls/advapi32.dll
 lib/wine/fakedlls/advpack.dll
+lib/wine/fakedlls/amsi.dll
 lib/wine/fakedlls/amstream.dll
 lib/wine/fakedlls/api-ms-win-appmodel-identity-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-appmodel-runtime-l1-1-1.dll
@@ -1640,6 +1691,7 @@ lib/wine/fakedlls/atl100.dll
 lib/wine/fakedlls/atl110.dll
 lib/wine/fakedlls/atl80.dll
 lib/wine/fakedlls/atl90.dll
+lib/wine/fakedlls/atlthunk.dll
 lib/wine/fakedlls/atmlib.dll
 lib/wine/fakedlls/attrib.exe
 lib/wine/fakedlls/authz.dll
@@ -1658,6 +1710,7 @@ lib/wine/fakedlls/capi2032.dll
 lib/wine/fakedlls/cards.dll
 lib/wine/fakedlls/cdosys.dll
 lib/wine/fakedlls/cfgmgr32.dll
+lib/wine/fakedlls/chcp.com
 lib/wine/fakedlls/clock.exe
 lib/wine/fakedlls/clusapi.dll
 lib/wine/fakedlls/cmd.exe
@@ -1780,6 +1833,7 @@ lib/wine/fakedlls/dpnsvr.exe
 lib/wine/fakedlls/dpvoice.dll
 lib/wine/fakedlls/dpwsockx.dll
 lib/wine/fakedlls/drmclien.dll
+lib/wine/fakedlls/dsdmo.dll
 lib/wine/fakedlls/dsound.dll
 lib/wine/fakedlls/dsquery.dll
 lib/wine/fakedlls/dssenh.dll
@@ -1800,17 +1854,25 @@ lib/wine/fakedlls/explorerframe.dll
 lib/wine/fakedlls/ext-ms-win-authz-context-l1-1-0.dll
 lib/wine/fakedlls/ext-ms-win-domainjoin-netjoin-l1-1-0.dll
 lib/wine/fakedlls/ext-ms-win-dwmapi-ext-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-gdi-dc-create-l1-1-0.dll
 lib/wine/fakedlls/ext-ms-win-gdi-dc-create-l1-1-1.dll
 lib/wine/fakedlls/ext-ms-win-gdi-dc-l1-2-0.dll
 lib/wine/fakedlls/ext-ms-win-gdi-devcaps-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-gdi-draw-l1-1-0.dll
 lib/wine/fakedlls/ext-ms-win-gdi-draw-l1-1-1.dll
+lib/wine/fakedlls/ext-ms-win-gdi-font-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-gdi-font-l1-1-1.dll
 lib/wine/fakedlls/ext-ms-win-gdi-render-l1-1-0.dll
 lib/wine/fakedlls/ext-ms-win-kernel32-package-current-l1-1-0.dll
 lib/wine/fakedlls/ext-ms-win-kernel32-package-l1-1-1.dll
+lib/wine/fakedlls/ext-ms-win-ntuser-dialogbox-l1-1-0.dll
 lib/wine/fakedlls/ext-ms-win-ntuser-draw-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-ntuser-gui-l1-1-0.dll
 lib/wine/fakedlls/ext-ms-win-ntuser-gui-l1-3-0.dll
 lib/wine/fakedlls/ext-ms-win-ntuser-keyboard-l1-3-0.dll
+lib/wine/fakedlls/ext-ms-win-ntuser-message-l1-1-0.dll
 lib/wine/fakedlls/ext-ms-win-ntuser-message-l1-1-1.dll
+lib/wine/fakedlls/ext-ms-win-ntuser-misc-l1-1-0.dll
 lib/wine/fakedlls/ext-ms-win-ntuser-misc-l1-2-0.dll
 lib/wine/fakedlls/ext-ms-win-ntuser-misc-l1-5-1.dll
 lib/wine/fakedlls/ext-ms-win-ntuser-mouse-l1-1-0.dll
@@ -1818,8 +1880,10 @@ lib/wine/fakedlls/ext-ms-win-ntuser-priv
 lib/wine/fakedlls/ext-ms-win-ntuser-private-l1-3-1.dll
 lib/wine/fakedlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0.dll
 lib/wine/fakedlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-ntuser-window-l1-1-0.dll
 lib/wine/fakedlls/ext-ms-win-ntuser-window-l1-1-1.dll
 lib/wine/fakedlls/ext-ms-win-ntuser-window-l1-1-4.dll
+lib/wine/fakedlls/ext-ms-win-ntuser-windowclass-l1-1-0.dll
 lib/wine/fakedlls/ext-ms-win-ntuser-windowclass-l1-1-1.dll
 lib/wine/fakedlls/ext-ms-win-oleacc-l1-1-0.dll
 lib/wine/fakedlls/ext-ms-win-ras-rasapi32-l1-1-0.dll
@@ -1835,6 +1899,9 @@ lib/wine/fakedlls/ext-ms-win-rtcore-ntus
 lib/wine/fakedlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.dll
 lib/wine/fakedlls/ext-ms-win-security-credui-l1-1-0.dll
 lib/wine/fakedlls/ext-ms-win-security-cryptui-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-shell-comctl32-init-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-shell-comdlg32-l1-1-0.dll
+lib/wine/fakedlls/ext-ms-win-shell-shell32-l1-2-0.dll
 lib/wine/fakedlls/ext-ms-win-uxtheme-themes-l1-1-0.dll
 lib/wine/fakedlls/extrac32.exe
 lib/wine/fakedlls/faultrep.dll
@@ -1864,6 +1931,7 @@ lib/wine/fakedlls/hidclass.sys
 lib/wine/fakedlls/hlink.dll
 lib/wine/fakedlls/hnetcfg.dll
 lib/wine/fakedlls/hostname.exe
+lib/wine/fakedlls/http.sys
 lib/wine/fakedlls/httpapi.dll
 lib/wine/fakedlls/icacls.exe
 lib/wine/fakedlls/iccvid.dll
@@ -1898,6 +1966,7 @@ lib/wine/fakedlls/kernel32.dll
 lib/wine/fakedlls/kernelbase.dll
 ${PLIST.lp32}lib/wine/fakedlls/keyboard.drv16
 ${PLIST.lp32}lib/wine/fakedlls/krnl386.exe16
+lib/wine/fakedlls/ksecdd.sys
 lib/wine/fakedlls/ksuser.dll
 lib/wine/fakedlls/ktmw32.dll
 lib/wine/fakedlls/l3codeca.acm
@@ -1916,7 +1985,10 @@ lib/wine/fakedlls/mciseq.dll
 lib/wine/fakedlls/mciwave.dll
 lib/wine/fakedlls/mf.dll
 lib/wine/fakedlls/mf3216.dll
+lib/wine/fakedlls/mferror.dll
+lib/wine/fakedlls/mfmediaengine.dll
 lib/wine/fakedlls/mfplat.dll
+lib/wine/fakedlls/mfplay.dll
 lib/wine/fakedlls/mfreadwrite.dll
 lib/wine/fakedlls/mgmtapi.dll
 lib/wine/fakedlls/midimap.dll
@@ -1935,11 +2007,13 @@ lib/wine/fakedlls/mprapi.dll
 ${PLIST.lp32}lib/wine/fakedlls/msacm.dll16
 lib/wine/fakedlls/msacm32.dll
 lib/wine/fakedlls/msacm32.drv
+lib/wine/fakedlls/msado15.dll
 lib/wine/fakedlls/msadp32.acm
 lib/wine/fakedlls/msasn1.dll
 lib/wine/fakedlls/mscat32.dll
 lib/wine/fakedlls/mscms.dll
 lib/wine/fakedlls/mscoree.dll
+lib/wine/fakedlls/mscorwks.dll
 lib/wine/fakedlls/msctf.dll
 lib/wine/fakedlls/msctfp.dll
 lib/wine/fakedlls/msdaps.dll
@@ -1953,6 +2027,7 @@ lib/wine/fakedlls/mshta.exe
 lib/wine/fakedlls/mshtml.dll
 lib/wine/fakedlls/mshtml.tlb
 lib/wine/fakedlls/msi.dll
+lib/wine/fakedlls/msidb.exe
 lib/wine/fakedlls/msident.dll
 lib/wine/fakedlls/msiexec.exe
 lib/wine/fakedlls/msimg32.dll
@@ -2027,6 +2102,7 @@ lib/wine/fakedlls/ntoskrnl.exe
 lib/wine/fakedlls/ntprint.dll
 lib/wine/fakedlls/objsel.dll
 lib/wine/fakedlls/odbc32.dll
+lib/wine/fakedlls/odbcbcp.dll
 lib/wine/fakedlls/odbccp32.dll
 lib/wine/fakedlls/odbccu32.dll
 ${PLIST.lp32}lib/wine/fakedlls/ole2.dll16
@@ -2079,6 +2155,7 @@ lib/wine/fakedlls/reg.exe
 lib/wine/fakedlls/regapi.dll
 lib/wine/fakedlls/regasm.exe
 lib/wine/fakedlls/regedit.exe
+lib/wine/fakedlls/regini.exe
 lib/wine/fakedlls/regsvcs.exe
 lib/wine/fakedlls/regsvr32.exe
 lib/wine/fakedlls/resutils.dll
@@ -2163,6 +2240,7 @@ lib/wine/fakedlls/twain_32.dll
 ${PLIST.lp32}lib/wine/fakedlls/typelib.dll16
 lib/wine/fakedlls/tzres.dll
 lib/wine/fakedlls/ucrtbase.dll
+lib/wine/fakedlls/uianimation.dll
 lib/wine/fakedlls/uiautomationcore.dll
 lib/wine/fakedlls/uiribbon.dll
 lib/wine/fakedlls/unicows.dll
@@ -2176,6 +2254,7 @@ ${PLIST.lp32}lib/wine/fakedlls/user.exe1
 lib/wine/fakedlls/user32.dll
 lib/wine/fakedlls/userenv.dll
 lib/wine/fakedlls/usp10.dll
+lib/wine/fakedlls/utildll.dll
 lib/wine/fakedlls/uxtheme.dll
 lib/wine/fakedlls/vbscript.dll
 lib/wine/fakedlls/vcomp.dll
@@ -2207,6 +2286,8 @@ lib/wine/fakedlls/webservices.dll
 lib/wine/fakedlls/wer.dll
 lib/wine/fakedlls/wevtapi.dll
 lib/wine/fakedlls/wevtutil.exe
+lib/wine/fakedlls/where.exe
+lib/wine/fakedlls/whoami.exe
 lib/wine/fakedlls/wiaservc.dll
 lib/wine/fakedlls/wimgapi.dll
 ${PLIST.lp32}lib/wine/fakedlls/win32s16.dll16
@@ -2260,6 +2341,7 @@ lib/wine/fakedlls/wintrust.dll
 lib/wine/fakedlls/winusb.dll
 lib/wine/fakedlls/winver.exe
 lib/wine/fakedlls/wlanapi.dll
+lib/wine/fakedlls/wlanui.dll
 lib/wine/fakedlls/wldap32.dll
 lib/wine/fakedlls/wmasf.dll
 lib/wine/fakedlls/wmi.dll
@@ -2284,6 +2366,7 @@ lib/wine/fakedlls/wsock32.dll
 lib/wine/fakedlls/wtsapi32.dll
 lib/wine/fakedlls/wuapi.dll
 lib/wine/fakedlls/wuaueng.dll
+lib/wine/fakedlls/wuauserv.exe
 lib/wine/fakedlls/wusa.exe
 lib/wine/fakedlls/x3daudio1_0.dll
 lib/wine/fakedlls/x3daudio1_1.dll
@@ -2345,6 +2428,7 @@ lib/wine/hidclass.sys.so
 lib/wine/hlink.dll.so
 lib/wine/hnetcfg.dll.so
 lib/wine/hostname.exe.so
+lib/wine/http.sys.so
 lib/wine/httpapi.dll.so
 lib/wine/icacls.exe.so
 lib/wine/iccvid.dll.so
@@ -2379,6 +2463,7 @@ lib/wine/kernel32.dll.so
 lib/wine/kernelbase.dll.so
 ${PLIST.lp32}lib/wine/keyboard.drv16.so
 ${PLIST.lp32}lib/wine/krnl386.exe16.so
+lib/wine/ksecdd.sys.so
 lib/wine/ksuser.dll.so
 lib/wine/ktmw32.dll.so
 lib/wine/l3codeca.acm.so
@@ -2390,6 +2475,7 @@ lib/wine/libadvpack.def
 lib/wine/libatl.def
 lib/wine/libatl100.def
 lib/wine/libatl80.def
+lib/wine/libatlthunk.def
 lib/wine/libavicap32.def
 lib/wine/libavifil32.def
 lib/wine/libavrt.def
@@ -2425,6 +2511,7 @@ lib/wine/libdbgeng.def
 lib/wine/libdbghelp.def
 lib/wine/libdciman32.def
 lib/wine/libddraw.def
+lib/wine/libdhcpcsvc.def
 lib/wine/libdinput.a
 lib/wine/libdinput8.a
 lib/wine/libdmoguids.a
@@ -2442,6 +2529,7 @@ lib/wine/libfaultrep.def
 lib/wine/libgdi32.def
 lib/wine/libgdiplus.def
 lib/wine/libglu32.def
+lib/wine/libhal.def
 lib/wine/libhid.def
 lib/wine/libhidclass.def
 lib/wine/libhlink.def
@@ -2455,11 +2543,14 @@ lib/wine/libiphlpapi.def
 lib/wine/libjsproxy.def
 ${PLIST.lp32}lib/wine/libkernel.def
 lib/wine/libkernel32.def
+lib/wine/libkernelbase.def
 lib/wine/libloadperf.def
 lib/wine/liblz32.def
 lib/wine/libmapi32.def
 lib/wine/libmf.def
+lib/wine/libmfmediaengine.def
 lib/wine/libmfplat.def
+lib/wine/libmfreadwrite.def
 lib/wine/libmfuuid.a
 lib/wine/libmlang.def
 lib/wine/libmpr.def
@@ -2472,15 +2563,15 @@ lib/wine/libmshtml.def
 lib/wine/libmsi.def
 lib/wine/libmsimg32.def
 lib/wine/libmspatcha.def
-lib/wine/libmsvcr100.def
-lib/wine/libmsvcr110.def
-lib/wine/libmsvcr120.def
-lib/wine/libmsvcr70.def
-lib/wine/libmsvcr71.def
-lib/wine/libmsvcr80.def
-lib/wine/libmsvcr90.def
-lib/wine/libmsvcrt.def
-lib/wine/libmsvcrtd.def
+lib/wine/libmsvcr100.a
+lib/wine/libmsvcr110.a
+lib/wine/libmsvcr120.a
+lib/wine/libmsvcr70.a
+lib/wine/libmsvcr71.a
+lib/wine/libmsvcr80.a
+lib/wine/libmsvcr90.a
+lib/wine/libmsvcrt.a
+lib/wine/libmsvcrtd.a
 lib/wine/libmsvfw32.def
 lib/wine/libmswsock.def
 lib/wine/libnddeapi.def
@@ -2506,6 +2597,7 @@ lib/wine/libpowrprof.def
 lib/wine/libpropsys.def
 lib/wine/libpsapi.def
 lib/wine/libquartz.def
+lib/wine/libqwave.def
 lib/wine/librasapi32.def
 lib/wine/librasdlg.def
 lib/wine/libresutils.def
@@ -2531,7 +2623,8 @@ lib/wine/libstrmiids.a
 lib/wine/libsxs.def
 lib/wine/libt2embed.def
 lib/wine/libtapi32.def
-lib/wine/libucrtbase.def
+lib/wine/libucrtbase.a
+lib/wine/libuiautomationcore.def
 lib/wine/libunicows.def
 lib/wine/liburl.def
 lib/wine/liburlmon.def
@@ -2587,7 +2680,10 @@ lib/wine/mciseq.dll.so
 lib/wine/mciwave.dll.so
 lib/wine/mf.dll.so
 lib/wine/mf3216.dll.so
+lib/wine/mferror.dll.so
+lib/wine/mfmediaengine.dll.so
 lib/wine/mfplat.dll.so
+lib/wine/mfplay.dll.so
 lib/wine/mfreadwrite.dll.so
 lib/wine/mgmtapi.dll.so
 lib/wine/midimap.dll.so
@@ -2606,11 +2702,13 @@ lib/wine/mprapi.dll.so
 ${PLIST.lp32}lib/wine/msacm.dll16.so
 lib/wine/msacm32.dll.so
 lib/wine/msacm32.drv.so
+lib/wine/msado15.dll.so
 lib/wine/msadp32.acm.so
 lib/wine/msasn1.dll.so
 lib/wine/mscat32.dll.so
 lib/wine/mscms.dll.so
 lib/wine/mscoree.dll.so
+lib/wine/mscorwks.dll.so
 lib/wine/msctf.dll.so
 lib/wine/msctfp.dll.so
 lib/wine/msdaps.dll.so
@@ -2624,6 +2722,7 @@ lib/wine/mshta.exe.so
 lib/wine/mshtml.dll.so
 lib/wine/mshtml.tlb.so
 lib/wine/msi.dll.so
+lib/wine/msidb.exe.so
 lib/wine/msident.dll.so
 lib/wine/msiexec.exe.so
 lib/wine/msimg32.dll.so
@@ -2698,6 +2797,7 @@ lib/wine/ntoskrnl.exe.so
 lib/wine/ntprint.dll.so
 lib/wine/objsel.dll.so
 lib/wine/odbc32.dll.so
+lib/wine/odbcbcp.dll.so
 lib/wine/odbccp32.dll.so
 lib/wine/odbccu32.dll.so
 ${PLIST.lp32}lib/wine/ole2.dll16.so
@@ -2750,6 +2850,7 @@ lib/wine/reg.exe.so
 lib/wine/regapi.dll.so
 lib/wine/regasm.exe.so
 lib/wine/regedit.exe.so
+lib/wine/regini.exe.so
 lib/wine/regsvcs.exe.so
 lib/wine/regsvr32.exe.so
 lib/wine/resutils.dll.so
@@ -2834,6 +2935,7 @@ lib/wine/twain_32.dll.so
 ${PLIST.lp32}lib/wine/typelib.dll16.so
 lib/wine/tzres.dll.so
 lib/wine/ucrtbase.dll.so
+lib/wine/uianimation.dll.so
 lib/wine/uiautomationcore.dll.so
 lib/wine/uiribbon.dll.so
 lib/wine/unicows.dll.so
@@ -2847,6 +2949,7 @@ ${PLIST.lp32}lib/wine/user.exe16.so
 lib/wine/user32.dll.so
 lib/wine/userenv.dll.so
 lib/wine/usp10.dll.so
+lib/wine/utildll.dll.so
 lib/wine/uxtheme.dll.so
 lib/wine/vbscript.dll.so
 lib/wine/vcomp.dll.so
@@ -2878,6 +2981,8 @@ lib/wine/webservices.dll.so
 lib/wine/wer.dll.so
 lib/wine/wevtapi.dll.so
 lib/wine/wevtutil.exe.so
+lib/wine/where.exe.so
+lib/wine/whoami.exe.so
 lib/wine/wiaservc.dll.so
 lib/wine/wimgapi.dll.so
 ${PLIST.lp32}lib/wine/win32s16.dll16.so
@@ -2931,6 +3036,7 @@ lib/wine/wintrust.dll.so
 lib/wine/winusb.dll.so
 lib/wine/winver.exe.so
 lib/wine/wlanapi.dll.so
+lib/wine/wlanui.dll.so
 lib/wine/wldap32.dll.so
 lib/wine/wmasf.dll.so
 lib/wine/wmi.dll.so
@@ -2955,6 +3061,7 @@ lib/wine/wsock32.dll.so
 lib/wine/wtsapi32.dll.so
 lib/wine/wuapi.dll.so
 lib/wine/wuaueng.dll.so
+lib/wine/wuauserv.exe.so
 lib/wine/wusa.exe.so
 lib/wine/x3daudio1_0.dll.so
 lib/wine/x3daudio1_1.dll.so
@@ -3076,3 +3183,5 @@ share/wine/fonts/vgasyst.fon
 share/wine/fonts/wingding.ttf
 share/wine/l_intl.nls
 share/wine/wine.inf
+share/wine/winebus.inf
+share/wine/winehid.inf

Index: pkgsrc/emulators/wine/distinfo
diff -u pkgsrc/emulators/wine/distinfo:1.96 pkgsrc/emulators/wine/distinfo:1.97
--- pkgsrc/emulators/wine/distinfo:1.96 Tue May 26 15:20:23 2020
+++ pkgsrc/emulators/wine/distinfo      Tue Jun  1 05:05:54 2021
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.96 2020/05/26 15:20:23 adam Exp $
+$NetBSD: distinfo,v 1.97 2021/06/01 05:05:54 adam Exp $
 
-SHA1 (wine-4.0.4.tar.xz) = 1e1bd3e65a4a2eb0f5a7179c0e4ad79842348f18
-RMD160 (wine-4.0.4.tar.xz) = 2362b565e0e710712f1e4f22e0415c32db869794
-SHA512 (wine-4.0.4.tar.xz) = 21780b3c846bfa7a54572fe78939d7a2579a2b96654fc578e8e70d20b50262b4bfb43a0431f4089264cf8f83202c2fc67dd6a4c89257e951b64e7c91ee3bdf4e
-Size (wine-4.0.4.tar.xz) = 21686868 bytes
+SHA1 (wine-5.0.5.tar.xz) = 6ce0a63fefc529690aec568bde7f55d6effc8b72
+RMD160 (wine-5.0.5.tar.xz) = 4799ce1fade9d51dd7bf9fc5c568ade496cd71db
+SHA512 (wine-5.0.5.tar.xz) = 3cf0ccb2eac0868f700296a62aeea9b856522ac63861beb49deed50136a334c450f2d1172f9d0195b4fe0bbf8f808f7350a79122726da1cbf5d21161f6dfca36
+Size (wine-5.0.5.tar.xz) = 22501416 bytes
 SHA1 (patch-configure) = c326ade452067d50504a546d2a9b81c822b14ec9
-SHA1 (patch-dlls_ntdll_thread.c) = 8a13e956e6622cc215fbe6e9943a704b3a926168
-SHA1 (patch-dlls_wininet_http.c) = 9e539ed70a5bf010e50c7beb1c3b3c877ed5e5d8
+SHA1 (patch-dlls_wininet_http.c) = 5ca2fa79d4177f8503232c5960220249bdda1b8d
 SHA1 (patch-dlls_ws2__32_socket.c) = 600f8e24c26569354e62a9dfe3434c9da9df5ae4
 SHA1 (patch-programs_wineconsole_Makefile.in) = 73f274eef6759accc0dfae5d5de21c76573b8e7b
 SHA1 (patch-programs_wineconsole_curses.c) = 195be3c65bc272b0e8412d108d75ee3100dc18d9
+SHA1 (patch-tools_winegcc_winegcc.c) = d5db5531e9be56beedeb526dcf2a3be996adec46

Index: pkgsrc/emulators/wine/options.mk
diff -u pkgsrc/emulators/wine/options.mk:1.20 pkgsrc/emulators/wine/options.mk:1.21
--- pkgsrc/emulators/wine/options.mk:1.20       Fri May 22 17:44:41 2020
+++ pkgsrc/emulators/wine/options.mk    Tue Jun  1 05:05:54 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.20 2020/05/22 17:44:41 nia Exp $
+# $NetBSD: options.mk,v 1.21 2021/06/01 05:05:54 adam Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.wine
 PKG_SUPPORTED_OPTIONS=         alsa cups dbus pulseaudio sane x11
@@ -46,6 +46,7 @@ PLIST_VARS+=  x11
 PLIST.x11=             yes
 .  include "../../x11/libX11/buildlink3.mk"
 .  include "../../x11/libICE/buildlink3.mk"
+.  include "../../x11/libXcomposite/buildlink3.mk"
 .  include "../../x11/libXcursor/buildlink3.mk"
 .  include "../../x11/libXext/buildlink3.mk"
 .  include "../../x11/libXfixes/buildlink3.mk"

Index: pkgsrc/emulators/wine/patches/patch-dlls_wininet_http.c
diff -u pkgsrc/emulators/wine/patches/patch-dlls_wininet_http.c:1.1 pkgsrc/emulators/wine/patches/patch-dlls_wininet_http.c:1.2
--- pkgsrc/emulators/wine/patches/patch-dlls_wininet_http.c:1.1 Fri May 22 17:44:42 2020
+++ pkgsrc/emulators/wine/patches/patch-dlls_wininet_http.c     Tue Jun  1 05:05:54 2021
@@ -1,12 +1,12 @@
-$NetBSD: patch-dlls_wininet_http.c,v 1.1 2020/05/22 17:44:42 nia Exp $
+$NetBSD: patch-dlls_wininet_http.c,v 1.2 2021/06/01 05:05:54 adam Exp $
 
 Fix headers
 
---- dlls/wininet/http.c.orig   2019-03-15 20:18:31.000000000 +0000
+--- dlls/wininet/http.c.orig   2020-06-02 13:09:41.000000000 +0000
 +++ dlls/wininet/http.c
-@@ -35,14 +35,14 @@
- #  include <zlib.h>
- #endif
+@@ -29,9 +29,6 @@
+ 
+ #include <stdlib.h>
  
 -#include "winsock2.h"
 -#include "ws2ipdef.h"
@@ -14,7 +14,9 @@ Fix headers
  #include <stdarg.h>
  #include <stdio.h>
  #include <time.h>
- #include <assert.h>
+@@ -39,6 +36,9 @@
+ #include <errno.h>
+ #include <limits.h>
  
 +#include "winsock2.h"
 +#include "ws2ipdef.h"

Added files:

Index: pkgsrc/emulators/wine/patches/patch-tools_winegcc_winegcc.c
diff -u /dev/null pkgsrc/emulators/wine/patches/patch-tools_winegcc_winegcc.c:1.1
--- /dev/null   Tue Jun  1 05:05:55 2021
+++ pkgsrc/emulators/wine/patches/patch-tools_winegcc_winegcc.c Tue Jun  1 05:05:54 2021
@@ -0,0 +1,41 @@
+$NetBSD: patch-tools_winegcc_winegcc.c,v 1.1 2021/06/01 05:05:54 adam Exp $
+
+Move -lxxx args to the end of argument list, to fix linking on NetBSD.
+
+--- tools/winegcc/winegcc.c.orig       2021-04-16 14:34:12.000000000 +0000
++++ tools/winegcc/winegcc.c
+@@ -953,6 +953,7 @@ static void build(struct options* opts)
+ {
+     strarray *lib_dirs, *files;
+     strarray *spec_args, *link_args;
++    strarray *link_libs = strarray_alloc();
+     char *output_file, *output_path;
+     const char *spec_o_name, *libgcc = NULL;
+     const char *output_name, *spec_file, *lang;
+@@ -1210,7 +1211,7 @@ static void build(struct options* opts)
+       switch(files->base[j][1])
+       {
+           case 'l':
+-              strarray_add(link_args, strmake("-l%s", name));
++              strarray_add(link_libs, strmake("-l%s", name));
+               break;
+           case 's':
+           case 'o':
+@@ -1246,12 +1247,14 @@ static void build(struct options* opts)
+ 
+     if (!opts->nostdlib && !is_pe)
+     {
+-      strarray_add(link_args, "-lm");
+-      strarray_add(link_args, "-lc");
++      strarray_add(link_libs, "-lm");
++      strarray_add(link_libs, "-lc");
+     }
+ 
+-    if (libgcc) strarray_add(link_args, libgcc);
++    if (libgcc) strarray_add(link_libs, libgcc);
+ 
++    strarray_addall(link_args, link_libs);
++    strarray_free(link_libs);
+     spawn(opts->prefix, link_args, 0);
+     strarray_free (link_args);
+ 



Home | Main Index | Thread Index | Old Index