ports/contrib (3.5): wine-staging: updated to version 5.5
commit d48ec4759bb433f31649730e28cdebcf5a5b69c8 Author: Matt Housh <jaeger@crux.ninja> Date: Thu Apr 2 17:11:27 2020 -0500 wine-staging: updated to version 5.5 diff --git a/wine-staging/.footprint b/wine-staging/.footprint index ecf2b8ea5..322126eaa 100644 --- a/wine-staging/.footprint +++ b/wine-staging/.footprint @@ -57,6 +57,7 @@ drwxr-xr-x root/root usr/include/wine/msvcrt/ -rw-r--r-- root/root usr/include/wine/msvcrt/eh.h -rw-r--r-- root/root usr/include/wine/msvcrt/errno.h -rw-r--r-- root/root usr/include/wine/msvcrt/fcntl.h +-rw-r--r-- root/root usr/include/wine/msvcrt/fenv.h -rw-r--r-- root/root usr/include/wine/msvcrt/float.h -rw-r--r-- root/root usr/include/wine/msvcrt/fpieee.h -rw-r--r-- root/root usr/include/wine/msvcrt/inttypes.h @@ -618,6 +619,7 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/ -rw-r--r-- root/root usr/include/wine/windows/msdaguid.h -rw-r--r-- root/root usr/include/wine/windows/msdasc.h -rw-r--r-- root/root usr/include/wine/windows/msdasc.idl +-rw-r--r-- root/root usr/include/wine/windows/msdasql.h -rw-r--r-- root/root usr/include/wine/windows/mshtmcid.h -rw-r--r-- root/root usr/include/wine/windows/mshtmdid.h -rw-r--r-- root/root usr/include/wine/windows/mshtmhst.h @@ -1151,6 +1153,7 @@ drwxr-xr-x root/root usr/lib/wine/ -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-realtime-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-registry-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-registry-l2-1-0.dll.so +-rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-registry-l2-2-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-registryuserspecific-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-rtlsupport-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib/wine/api-ms-win-core-rtlsupport-l1-2-0.dll.so @@ -1597,6 +1600,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/ -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-realtime-l1-1-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-registry-l1-1-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-registry-l2-1-0.dll +-rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-registry-l2-2-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-registryuserspecific-l1-1-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-rtlsupport-l1-1-0.dll -rw-r--r-- root/root usr/lib/wine/fakedlls/api-ms-win-core-rtlsupport-l1-2-0.dll @@ -3102,6 +3106,7 @@ drwxr-xr-x root/root usr/lib32/wine/ -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-realtime-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-registry-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-registry-l2-1-0.dll.so +-rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-registry-l2-2-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-registryuserspecific-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-rtlsupport-l1-1-0.dll.so -rwxr-xr-x root/root usr/lib32/wine/api-ms-win-core-rtlsupport-l1-2-0.dll.so @@ -3557,6 +3562,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/ -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-realtime-l1-1-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-registry-l1-1-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-registry-l2-1-0.dll +-rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-registry-l2-2-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-registryuserspecific-l1-1-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-rtlsupport-l1-1-0.dll -rw-r--r-- root/root usr/lib32/wine/fakedlls/api-ms-win-core-rtlsupport-l1-2-0.dll @@ -5241,6 +5247,7 @@ drwxr-xr-x root/root usr/share/wine/nls/ -rw-r--r-- root/root usr/share/wine/nls/normnfd.nls -rw-r--r-- root/root usr/share/wine/nls/normnfkc.nls -rw-r--r-- root/root usr/share/wine/nls/normnfkd.nls +-rw-r--r-- root/root usr/share/wine/nls/sortdefault.nls -rw-r--r-- root/root usr/share/wine/wine.inf -rw-r--r-- root/root usr/share/wine/winebus.inf -rw-r--r-- root/root usr/share/wine/winehid.inf diff --git a/wine-staging/.signature b/wine-staging/.signature index 28350d774..f225301e2 100644 --- a/wine-staging/.signature +++ b/wine-staging/.signature @@ -1,10 +1,9 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF34cXfK/Nxwamgd0iZrMZfy7NSiiZlvlOgR14rZWliaSoKt/pajDPrD3+mgr2FohRHFXipq4krfJk0x1F0rvMIwI= -SHA256 (Pkgfile) = 5a22aea6bc0e91d7f653008892539c52e8a6299fef676cb59b37af4ad7ec3283 -SHA256 (.footprint) = 19a5b365f403df76ec71d10c86a110f49d55800be9a0636d808ca84089e37551 -SHA256 (wine-5.4.tar.xz) = 4b3e2b0ffa5415f199540e6051c28c3976fce91ea5bfb2cf4a099c257317052c -SHA256 (wine-staging-5.4.tar.gz) = 6a6a1083fab694ccdcb834eb68b69afde607c22e0635ad143f8ec0e2fc50b757 +RWSagIOpLGJF38HBd+Iln0jNtkSEkAuRA0rAH/9h1uJV6g8OpXDk7UU8/0pthlIQ8TOQcZ/22U2BbkwpzB/drkSj/Jbk1zIdMgQ= +SHA256 (Pkgfile) = a133ee3b10a4daadac5977ef6bcff8e2f8752fd1deeba7df26c55bfe4a3315b5 +SHA256 (.footprint) = a3f686dbae565ad1e3e001f959375b7f0fe53957e67f7261c3e5e21a5bebe7fa +SHA256 (wine-5.5.tar.xz) = a0e3139b0beaa8cd0cd3fbafc96cd6097df615caa7045f377aeccce70cddf5fc +SHA256 (wine-staging-5.5.tar.gz) = 3559ed0f91dd9a863b4d3df70c41cdba385ce7a64f15102501a39e9f2c53b69c SHA256 (wine-gecko-2.47.1-x86.msi) = f00b0e2892404827e8ce6811dedfc25ae699a09955bb3df1bbb31753e51da051 SHA256 (wine-gecko-2.47.1-x86_64.msi) = 69312e79a988da3e7d292382005e92bc4d4b2a52a23c34440ae3007feb57474a SHA256 (wine-mono-4.9.4.msi) = 51a6ff38323fcda71d70ead90c252b5eaeacec542ba737dbd1d676787b210fdd -SHA256 (x3daudio1_7-fix.patch) = f7617361967fa28054708d232e2280e9432b5d2fb56a98c911c949e4cd1acc41 diff --git a/wine-staging/Pkgfile b/wine-staging/Pkgfile index d842e6808..13c17011e 100644 --- a/wine-staging/Pkgfile +++ b/wine-staging/Pkgfile @@ -4,19 +4,17 @@ # Depends on: fontconfig-32 freeglut-32 gnutls-32 lcms2-32 mpg123-32 openal-32 prelink xorg-libxcomposite-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxrandr-32 xorg-libxxf86dga-32 vkd3d-32 name=wine-staging -version=5.4 +version=5.5 release=1 source=(https://dl.winehq.org/wine/source/5.x/wine-$version.tar.xz \ https://github.com/$name/$name/archive/v${version}/$name-$version.tar.gz \ https://dl.winehq.org/wine/wine-gecko/2.47.1/wine-gecko-2.47.1-x86.msi \ https://dl.winehq.org/wine/wine-gecko/2.47.1/wine-gecko-2.47.1-x86_64.msi \ - https://dl.winehq.org/wine/wine-mono/4.9.4/wine-mono-4.9.4.msi \ - x3daudio1_7-fix.patch) + https://dl.winehq.org/wine/wine-mono/4.9.4/wine-mono-4.9.4.msi) build() { # apply staging patches cd $name-$version - patch -p1 -i $SRC/x3daudio1_7-fix.patch ./patches/patchinstall.sh DESTDIR=../wine-$version --all cd .. diff --git a/wine-staging/x3daudio1_7-fix.patch b/wine-staging/x3daudio1_7-fix.patch deleted file mode 100644 index e56b74a9d..000000000 --- a/wine-staging/x3daudio1_7-fix.patch +++ /dev/null @@ -1,67 +0,0 @@ -From a1246b5e921ea950851e4a971fb3dae535d7b982 Mon Sep 17 00:00:00 2001 -From: Zebediah Figura <z.figura12@gmail.com> -Date: Sat, 14 Mar 2020 11:52:09 -0500 -Subject: [PATCH] xactengine-initial: Build an import library for x3daudio1_7. - -Should fix test compilation. ---- - .../0016-xaudio2_7-tests-Add-more-tests.patch | 22 ++++++++++++++----- - 1 file changed, 17 insertions(+), 5 deletions(-) - -diff --git a/patches/xactengine-initial/0016-xaudio2_7-tests-Add-more-tests.patch b/patches/xactengine-initial/0016-xaudio2_7-tests-Add-more-tests.patch -index b9b8a2141..942f54e6b 100644 ---- a/patches/xactengine-initial/0016-xaudio2_7-tests-Add-more-tests.patch -+++ b/patches/xactengine-initial/0016-xaudio2_7-tests-Add-more-tests.patch -@@ -1,19 +1,31 @@ --From 26d4f62fcf18beb2ffc6b5bdd55b058b375f5c54 Mon Sep 17 00:00:00 2001 -+From 7212b91306542f5a71fe51a99b012a402db700ab Mon Sep 17 00:00:00 2001 - From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> - Date: Sat, 18 Jan 2020 18:50:34 +1100 - Subject: [PATCH] xaudio2_7/tests: Add more tests - - --- -+ dlls/x3daudio1_7/Makefile.in | 1 + - dlls/xaudio2_7/tests/Makefile.in | 5 +- - dlls/xaudio2_7/tests/globals.xgs | Bin 0 -> 440 bytes - dlls/xaudio2_7/tests/rsrc.rc | 22 +++++++ - dlls/xaudio2_7/tests/xact.c | 99 ++++++++++++++++++++++++++----- -- 4 files changed, 111 insertions(+), 15 deletions(-) -+ 5 files changed, 112 insertions(+), 15 deletions(-) - create mode 100644 dlls/xaudio2_7/tests/globals.xgs - create mode 100644 dlls/xaudio2_7/tests/rsrc.rc - -+diff --git a/dlls/x3daudio1_7/Makefile.in b/dlls/x3daudio1_7/Makefile.in -+index 267a93fd6..5438bc6d8 100644 -+--- a/dlls/x3daudio1_7/Makefile.in -++++ b/dlls/x3daudio1_7/Makefile.in -+@@ -1,5 +1,6 @@ -+ EXTRADEFS = -DX3DAUDIO1_VER=7 -DXAUDIO2_VER=7 -+ MODULE = x3daudio1_7.dll -++IMPORTLIB = x3daudio1_7 -+ PARENTSRC = ../xaudio2_7 -+ EXTRALIBS = $(FAUDIO_LIBS) -+ EXTRAINCL = $(FAUDIO_CFLAGS) - diff --git a/dlls/xaudio2_7/tests/Makefile.in b/dlls/xaudio2_7/tests/Makefile.in --index ecd728d659..1bb39cc562 100644 -+index ecd728d65..1bb39cc56 100644 - --- a/dlls/xaudio2_7/tests/Makefile.in - +++ b/dlls/xaudio2_7/tests/Makefile.in - @@ -1,6 +1,9 @@ -@@ -44,7 +56,7 @@ HcmV?d00001 - - diff --git a/dlls/xaudio2_7/tests/rsrc.rc b/dlls/xaudio2_7/tests/rsrc.rc - new file mode 100644 --index 0000000000..2c1961c727 -+index 000000000..2c1961c72 - --- /dev/null - +++ b/dlls/xaudio2_7/tests/rsrc.rc - @@ -0,0 +1,22 @@ -@@ -71,7 +83,7 @@ index 0000000000..2c1961c727 - +/* @makedep: globals.xgs*/ - +globals.xgs RCDATA "globals.xgs" - diff --git a/dlls/xaudio2_7/tests/xact.c b/dlls/xaudio2_7/tests/xact.c --index afe8e4d83a..881513668b 100644 -+index afe8e4d83..881513668 100644 - --- a/dlls/xaudio2_7/tests/xact.c - +++ b/dlls/xaudio2_7/tests/xact.c - @@ -18,14 +18,25 @@
participants (1)
-
crux＠crux.nu