From owner-dev-commits-ports-main@freebsd.org Thu Sep 16 21:58:26 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9FC5C6A9425; Thu, 16 Sep 2021 21:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H9WDf3tjkz3nG7; Thu, 16 Sep 2021 21:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 61BC0157D; Thu, 16 Sep 2021 21:58:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18GLwQSY066238; Thu, 16 Sep 2021 21:58:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18GLwQ9F066237; Thu, 16 Sep 2021 21:58:26 GMT (envelope-from git) Date: Thu, 16 Sep 2021 21:58:26 GMT Message-Id: <202109162158.18GLwQ9F066237@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: a02e3c6686d6 - main - emulators/wine-devel: Update to Wine 6.17 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a02e3c6686d68350132a88379fc3d99445b9b80d Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2021 21:58:26 -0000 The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=a02e3c6686d68350132a88379fc3d99445b9b80d commit a02e3c6686d68350132a88379fc3d99445b9b80d Author: Gerald Pfeifer AuthorDate: 2021-09-16 21:54:47 +0000 Commit: Gerald Pfeifer CommitDate: 2021-09-16 21:57:50 +0000 emulators/wine-devel: Update to Wine 6.17 This includes the following changes: - WineCfg program converted to PE. - Better high-DPI support in builtin applications. - More preparation work for the GDI syscall interface. - Improved debugger support in Wow64 mode. - Various bug fixes. My patch files/patch-dlls-nsiproxy.sys has been accepted upstream, so remove it on our end. Work around FreeBSD calling x86-64 by the name of amd64 and the Ports Collection using this in a variable ARCH, which interferes with Wine's variable of the same name and messes things up badly. I have hope to be able to upstream files/patch-amd64-vs-x86-64. [1] PR: 257020 [1] Inspired by: Ivan Rozhuk [1] --- emulators/wine-devel/Makefile | 5 ++-- emulators/wine-devel/distinfo | 10 +++---- emulators/wine-devel/files/patch-amd64-vs-x86-64 | 17 ++++++++++++ emulators/wine-devel/files/patch-dlls-nsiproxy.sys | 31 ---------------------- emulators/wine-devel/pkg-plist | 11 ++++++++ 5 files changed, 35 insertions(+), 39 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index ba5782dbb8fc..7b1f2ea32179 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -1,8 +1,7 @@ # Created by: Gerald Pfeifer PORTNAME= wine -DISTVERSION= 6.16 -PORTREVISION= 1 +DISTVERSION= 6.17 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ @@ -151,7 +150,7 @@ X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ # --libdir is required since Wine defaults to "${PREFIX}/lib64" on amd64. CONFIGURE_ARGS+= --enable-win64 --libdir=${PREFIX}/lib -PLIST_SUB+= WINE32="@comment " WINE64="" WINEARCH="amd64" +PLIST_SUB+= WINE32="@comment " WINE64="" WINEARCH="x86-64" # Wine assumes a WoW64 package is available, which is not the case on # FreeBSD yet. diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index 5ba8fd470dfb..8a9d16bdf4a5 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1630139136 -SHA256 (wine-6.16.tar.xz) = 695092050d98a129c4d7f3153cb0e4923248bae5f3d920639fa4ab1a73f8fae8 -SIZE (wine-6.16.tar.xz) = 24789520 -SHA256 (v6.16.tar.gz) = 5b5b57b3419192b4b83f22774cade770fb33ffb415e62a7374703e3b5720f836 -SIZE (v6.16.tar.gz) = 9655388 +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 diff --git a/emulators/wine-devel/files/patch-amd64-vs-x86-64 b/emulators/wine-devel/files/patch-amd64-vs-x86-64 new file mode 100644 index 000000000000..d20d34baca1b --- /dev/null +++ b/emulators/wine-devel/files/patch-amd64-vs-x86-64 @@ -0,0 +1,17 @@ +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/files/patch-dlls-nsiproxy.sys b/emulators/wine-devel/files/patch-dlls-nsiproxy.sys deleted file mode 100644 index 73c77e1aee35..000000000000 --- a/emulators/wine-devel/files/patch-dlls-nsiproxy.sys +++ /dev/null @@ -1,31 +0,0 @@ -Yet another recent breakage in dlls/nsiproxy.sys, yet another patch -submitted upstream. - -Plus I've adjusted my autobuilders to focus on newer versions of FreeBSD. - - -commit cd10f9b73cdae715e4a1ef32ade50c65a097ebf1 -Author: Gerald Pfeifer -Date: Mon Sep 6 17:54:53 2021 +0000 - - nsiproxy: Include sys/param.h from udp.c. - - udp.c features specific code to handle versions of FreeBSD past early - 12.0 snapshots. This is guarded by a check on __FreeBSD_version which - is defined in sys/param.h. Actually including that, like tcp.c already - does, activates that check and adjusted code and unbreaks the build. - ---- UTC ---- dlls/nsiproxy.sys/udp.c -+++ dlls/nsiproxy.sys/udp.c -@@ -22,6 +22,10 @@ - #include - #include - -+#ifdef HAVE_SYS_PARAM_H -+#include -+#endif -+ - #ifdef HAVE_SYS_TYPES_H - #include - #endif diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index 17a9cf21fa5d..6521d901e4ac 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -1234,6 +1234,7 @@ lib/wine/%%WINEARCH%%-unix/api-ms-win-core-processthreads-l1-1-0.dll.so lib/wine/%%WINEARCH%%-unix/api-ms-win-core-processthreads-l1-1-1.dll.so lib/wine/%%WINEARCH%%-unix/api-ms-win-core-processthreads-l1-1-2.dll.so lib/wine/%%WINEARCH%%-unix/api-ms-win-core-processthreads-l1-1-3.dll.so +lib/wine/%%WINEARCH%%-unix/api-ms-win-core-processtopology-l1-1-0.dll.so lib/wine/%%WINEARCH%%-unix/api-ms-win-core-processtopology-obsolete-l1-1-0.dll.so lib/wine/%%WINEARCH%%-unix/api-ms-win-core-profile-l1-1-0.dll.so lib/wine/%%WINEARCH%%-unix/api-ms-win-core-psapi-ansi-l1-1-0.dll.so @@ -1390,6 +1391,7 @@ lib/wine/%%WINEARCH%%-unix/atmlib.dll.so lib/wine/%%WINEARCH%%-unix/attrib.exe.so lib/wine/%%WINEARCH%%-unix/authz.dll.so lib/wine/%%WINEARCH%%-unix/avicap32.dll.so +lib/wine/%%WINEARCH%%-unix/avicap32.so lib/wine/%%WINEARCH%%-unix/avifil32.dll.so %%WINE32%%lib/wine/%%WINEARCH%%-unix/avifile.dll16.so lib/wine/%%WINEARCH%%-unix/avrt.dll.so @@ -1724,8 +1726,12 @@ lib/wine/%%WINEARCH%%-unix/libd3d11.def lib/wine/%%WINEARCH%%-unix/libd3d8.def lib/wine/%%WINEARCH%%-unix/libd3d9.def lib/wine/%%WINEARCH%%-unix/libd3dcompiler.def +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_38.def +lib/wine/%%WINEARCH%%-unix/libd3dx10_39.def lib/wine/%%WINEARCH%%-unix/libd3dx10_40.def lib/wine/%%WINEARCH%%-unix/libd3dx10_41.def lib/wine/%%WINEARCH%%-unix/libd3dx10_42.def @@ -1877,6 +1883,7 @@ lib/wine/%%WINEARCH%%-unix/libwbemuuid.a lib/wine/%%WINEARCH%%-unix/libwebservices.def lib/wine/%%WINEARCH%%-unix/libwer.def lib/wine/%%WINEARCH%%-unix/libwevtapi.def +lib/wine/%%WINEARCH%%-unix/libwin32u.def lib/wine/%%WINEARCH%%-unix/libwindowscodecs.a lib/wine/%%WINEARCH%%-unix/libwindowscodecsext.def lib/wine/%%WINEARCH%%-unix/libwine.so.1 @@ -2263,6 +2270,7 @@ lib/wine/%%WINEARCH%%-unix/wimgapi.dll.so %%STAGING%%%%WINE32%%lib/wine/%%WINEARCH%%-unix/win32k.sys.so %%WINE32%%lib/wine/%%WINEARCH%%-unix/win32s16.dll16.so %%WINE32%%lib/wine/%%WINEARCH%%-unix/win32u.dll.so +lib/wine/%%WINEARCH%%-unix/win32u.so %%WINE32%%lib/wine/%%WINEARCH%%-unix/win87em.dll16.so %%WINE32%%lib/wine/%%WINEARCH%%-unix/winaspi.dll16.so %%WINE32%%lib/wine/%%WINEARCH%%-unix/windebug.dll16.so @@ -2296,6 +2304,7 @@ lib/wine/%%WINEARCH%%-unix/wineps.drv.so lib/wine/%%WINEARCH%%-unix/winevulkan.dll.so lib/wine/%%WINEARCH%%-unix/winevulkan.so %%X11%%lib/wine/%%WINEARCH%%-unix/winex11.drv.so +%%X11%%lib/wine/%%WINEARCH%%-unix/winexinput.sys.so %%WINE32%%lib/wine/%%WINEARCH%%-unix/wing.dll16.so lib/wine/%%WINEARCH%%-unix/wing32.dll.so %%WINE32%%lib/wine/%%WINEARCH%%-unix/winhelp.exe16.so @@ -2499,6 +2508,7 @@ lib/wine/%%WINEARCH%%-windows/api-ms-win-core-processthreads-l1-1-0.dll lib/wine/%%WINEARCH%%-windows/api-ms-win-core-processthreads-l1-1-1.dll lib/wine/%%WINEARCH%%-windows/api-ms-win-core-processthreads-l1-1-2.dll lib/wine/%%WINEARCH%%-windows/api-ms-win-core-processthreads-l1-1-3.dll +lib/wine/%%WINEARCH%%-windows/api-ms-win-core-processtopology-l1-1-0.dll lib/wine/%%WINEARCH%%-windows/api-ms-win-core-processtopology-obsolete-l1-1-0.dll lib/wine/%%WINEARCH%%-windows/api-ms-win-core-profile-l1-1-0.dll lib/wine/%%WINEARCH%%-windows/api-ms-win-core-psapi-ansi-l1-1-0.dll @@ -3326,6 +3336,7 @@ lib/wine/%%WINEARCH%%-windows/wineps.drv %%WINE32%%lib/wine/%%WINEARCH%%-windows/winevdm.exe lib/wine/%%WINEARCH%%-windows/winevulkan.dll %%X11%%lib/wine/%%WINEARCH%%-windows/winex11.drv +%%X11%%lib/wine/%%WINEARCH%%-windows/winexinput.sys %%WINE32%%lib/wine/%%WINEARCH%%-windows/wing.dll16 lib/wine/%%WINEARCH%%-windows/wing32.dll %%WINE32%%lib/wine/%%WINEARCH%%-windows/winhelp.exe16