diff options
| author | Gerald Pfeifer <gerald@FreeBSD.org> | 2021-09-29 11:56:01 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2021-09-29 11:56:01 +0000 |
| commit | 9688dadd0b9603356b5b4e0a76f66be1c2deb5e5 (patch) | |
| tree | 4624c098413c1cecd275a02358f630a70011064d /emulators/wine-devel | |
| parent | 4886d3afe2edc47f40839f972a1891c0dbd64d65 (diff) | |
emulators/wine-devel: Update to Wine 6.18
This includes the following changes:
- Shell32 and WineBus libraries converted to PE.
- Unicode data updated to Unicode version 14.
- More work towards Dwarf 3/4 debug support.
- HID joystick enabled by default.
- Various bug fixes.
files/patch-amd64-vs-x86-64, which I submitted upstream, is obsolete
now and the issue has been addressed upstream even more thoroughly,
so drop our local patch.
Diffstat (limited to 'emulators/wine-devel')
| -rw-r--r-- | emulators/wine-devel/Makefile | 3 | ||||
| -rw-r--r-- | emulators/wine-devel/distinfo | 10 | ||||
| -rw-r--r-- | emulators/wine-devel/files/patch-amd64-vs-x86-64 | 17 | ||||
| -rw-r--r-- | emulators/wine-devel/pkg-plist | 8 |
4 files changed, 14 insertions, 24 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index d6eb6e8d42b1..7e8ef27c1051 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -1,8 +1,7 @@ # Created by: Gerald Pfeifer <gerald@FreeBSD.org> PORTNAME= wine -DISTVERSION= 6.17 -PORTREVISION= 1 +DISTVERSION= 6.18 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index 8a9d16bdf4a5..a727c372f986 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1631388772 -SHA256 (wine-6.17.tar.xz) = 9db1f2435d80262c3777317df075855aeea3e6a52cb77c630ec1b2b1fb948f08 -SIZE (wine-6.17.tar.xz) = 24838704 -SHA256 (v6.17.tar.gz) = 5fc7027a772fcc89afb54c9461144c51a5e7fa35cb4ef1f60eead8362704dd82 -SIZE (v6.17.tar.gz) = 9655082 +TIMESTAMP = 1632811478 +SHA256 (wine-6.18.tar.xz) = fd22e8d64d7333bda4096d73e87ca88f5dd9eda92103d8f79d0673ca7ce6b1d0 +SIZE (wine-6.18.tar.xz) = 24860880 +SHA256 (v6.18.tar.gz) = 6d252d3501431b241a2e37d841e287918b51889917b07382ed204703fb77cae4 +SIZE (v6.18.tar.gz) = 9663936 diff --git a/emulators/wine-devel/files/patch-amd64-vs-x86-64 b/emulators/wine-devel/files/patch-amd64-vs-x86-64 deleted file mode 100644 index 36865ce7979c..000000000000 --- a/emulators/wine-devel/files/patch-amd64-vs-x86-64 +++ /dev/null @@ -1,17 +0,0 @@ -index 59857762edd..ed7a58ed1f9 100644 ---- tools/makedep.c -+++ tools/makedep.c -@@ -4446,6 +4446,13 @@ int main( int argc, char *argv[] ) - if (!man_ext) man_ext = "3w"; - if (arch) - { -+ /* For historic reasons FreeBSD calls x86_64 by the name of amd64 -+ * and features a variable ARCH with that value in the environment -+ * when building ports. This breaks Wine in interesting ways, so -+ * revert to the industry standard name when we enouncter amd64. -+ */ -+ if ( !strcmp(arch,"amd64") ) -+ arch = "x86_64"; - so_dir = strmake( "$(dlldir)/%s-unix", arch ); - pe_dir = strmake( "$(dlldir)/%s-windows", arch ); - } diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index 1d4974cc2bb1..a4be825adb34 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -497,6 +497,8 @@ include/wine/windows/icftypes.h include/wine/windows/icftypes.idl include/wine/windows/icm.h include/wine/windows/icmpapi.h +include/wine/windows/icodecapi.h +include/wine/windows/icodecapi.idl include/wine/windows/idispids.h include/wine/windows/ieautomation.h include/wine/windows/ieautomation.idl @@ -1730,6 +1732,10 @@ lib/wine/%%WINEARCH%%-unix/libd3dcompiler_43.def lib/wine/%%WINEARCH%%-unix/libd3dcompiler_46.def lib/wine/%%WINEARCH%%-unix/libd3drm.def lib/wine/%%WINEARCH%%-unix/libd3dx10.def +lib/wine/%%WINEARCH%%-unix/libd3dx10_34.def +lib/wine/%%WINEARCH%%-unix/libd3dx10_35.def +lib/wine/%%WINEARCH%%-unix/libd3dx10_36.def +lib/wine/%%WINEARCH%%-unix/libd3dx10_37.def lib/wine/%%WINEARCH%%-unix/libd3dx10_38.def lib/wine/%%WINEARCH%%-unix/libd3dx10_39.def lib/wine/%%WINEARCH%%-unix/libd3dx10_40.def @@ -1760,6 +1766,7 @@ lib/wine/%%WINEARCH%%-unix/libdxguid.a lib/wine/%%WINEARCH%%-unix/libdxva2.def lib/wine/%%WINEARCH%%-unix/libevr.def lib/wine/%%WINEARCH%%-unix/libfaultrep.def +%%STAGING%%lib/wine/%%WINEARCH%%-unix/libfltmgr.def lib/wine/%%WINEARCH%%-unix/libgdi32.def lib/wine/%%WINEARCH%%-unix/libgdiplus.def lib/wine/%%WINEARCH%%-unix/libglu32.def @@ -2284,6 +2291,7 @@ lib/wine/%%WINEARCH%%-unix/windowscodecs.so lib/wine/%%WINEARCH%%-unix/windowscodecsext.dll.so lib/wine/%%WINEARCH%%-unix/wineboot.exe.so lib/wine/%%WINEARCH%%-unix/winebrowser.exe.so +lib/wine/%%WINEARCH%%-unix/winebus.so lib/wine/%%WINEARCH%%-unix/winebus.sys.so lib/wine/%%WINEARCH%%-unix/winecfg.exe.so lib/wine/%%WINEARCH%%-unix/wineconsole.exe.so |