From nobody Tue Nov 15 08:00:00 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NBJW46S73z4hGDY; Tue, 15 Nov 2022 08:00:00 +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 4NBJW461dSz3qWB; Tue, 15 Nov 2022 08:00:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668499200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fVrglz54VFEy0yusv7/XoonPfT9jglEK0HMv2EsqFfg=; b=qElW1UL/wZHowPQdm8momzkjy1i4Jc49WtdX//uOF9vAO6R6jmFydGgZlA/+ZVb9hvnOMf 4Cn3LgO4zhuxLozV9FWP6vfYtAheEtGjXYA6FcoYjDcax0ecY4/zcF/FbXci3bN7uUE1FJ N6jYh7t5yZU1X6N4jxsIThm0gaEuRtGp++FXhwTJmYqFDtlDwhMekZSLSCWID4UrYvUcX8 FV0tWVFg92agrN0Kk5TiEyrhzypCnDpwpiaTmxvbcacP8hlATj1CpSDwg/YtsiqKmErF8O QLhdD0n8zc105zyAVm5MbvyqLXDW+71PDdbceEvS4oWUtcjVGYn1uviFY1hvFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668499200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fVrglz54VFEy0yusv7/XoonPfT9jglEK0HMv2EsqFfg=; b=yAuuij7BFfMt8t2NRJs6UxH+G3Wt88suxI95kLka7dLQdLH2LMjYCvAtMDC919ziZJjKNk fWGHsnnGHxKMg5SL2SyaWgF2adO3Hp6HL9TnXynSiwqEwYaHbW0H9jQlqT8QX+E7/D5rBW /0rEaJFjw7gR+ImbpE5RMq8TkBYtMSVH3IwN32CZ8C/v6Kmpskn1WLbr0t0c7SfV2uA5sp Bfw0RpgwKLI+d6Ruu49TaxcuNWcjsl0mCrOKHiSoFY+0ai5YFncu/21MZFsgyHqsFv8FW0 xEcg3SCTdSnNoy8kQNz4gRZkDRbLcwk7iNbeE1zphWStZADLJ+srH2XikpesTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668499200; a=rsa-sha256; cv=none; b=O59teYn59Ac+/5geZ3TganmTyVlmOP6PrlNgSeFrVhAtMDUAfUIsT7lQh6PBNQVq2G3f/f TcHNQtT/rBVgqumNWRwrmNbzh/YEmEJM9cs1yEWhX4InRY4orkizBjkmI25EQ6tkhvk0qS OmoKwzDYfNddzebjcaomf933QDpln5fzkZzFA6SuS/vhFd702IsoXDnx+r0bo3+g+UU9lc HzhgXN+c1n3e8LiGwtIaHSac3HQTlOmC5anX++TXy3TC+vjyxw2/fwYkc2xLCdlUndCz1I cTtEUr1tv3GT9QvlK2SfDFVpw+0emEZNjpt5OjvHdkr4gkDMLzkqB7FDE9TW6A== 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 4NBJW455g5zF41; Tue, 15 Nov 2022 08:00:00 +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 2AF800Mp091233; Tue, 15 Nov 2022 08:00:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AF8002L091210; Tue, 15 Nov 2022 08:00:00 GMT (envelope-from git) Date: Tue, 15 Nov 2022 08:00:00 GMT Message-Id: <202211150800.2AF8002L091210@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: 0d591db5617c - main - emulators/wine-devel: Update to Wine 7.19 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org 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: 0d591db5617cdb3eecf80f93923a7224804a1c41 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=0d591db5617cdb3eecf80f93923a7224804a1c41 commit 0d591db5617cdb3eecf80f93923a7224804a1c41 Author: Damjan Jovanovic AuthorDate: 2022-11-15 07:54:51 +0000 Commit: Gerald Pfeifer CommitDate: 2022-11-15 07:59:16 +0000 emulators/wine-devel: Update to Wine 7.19 This includes the following changes: - Support for storing DOS attributes on disk. - Bundled vkd3d upgraded to version 1.5. - Support for MPEG-4 audio format. - Various bug fixes. This version also requires a patch for the ENODATA error code which does not consistently exist on FreeBSD. [1] Submitted by: gerald [1] --- emulators/wine-devel/Makefile | 2 +- emulators/wine-devel/distinfo | 10 ++--- .../wine-devel/files/patch-dlls-ntdll-unix-file.c | 49 ++++++++++++++++++++++ emulators/wine-devel/pkg-plist | 2 + 4 files changed, 57 insertions(+), 6 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index e9b10bffde56..dac92e814d72 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= wine -DISTVERSION= 7.18 +DISTVERSION= 7.19 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= https://dl.winehq.org/wine/source/7.x/ diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index 7644dc98332b..f6c2aa68d70f 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1665963806 -SHA256 (wine-7.18.tar.xz) = 3edf62793f2599b0bb17142d2e588670055497545e1943fe80673b9267cfe9f6 -SIZE (wine-7.18.tar.xz) = 28412876 -SHA256 (v7.18.tar.gz) = 15fc964776f61c1508124b38e7ac850a5917916587309125bc274889920744b1 -SIZE (v7.18.tar.gz) = 9535819 +TIMESTAMP = 1666968876 +SHA256 (wine-7.19.tar.xz) = 43ac497e6e1d7fded492c32a68b554c57b76f2be8dc787e7335a0dd4e68b9d21 +SIZE (wine-7.19.tar.xz) = 28502612 +SHA256 (v7.19.tar.gz) = 83347f27a77685f6c4b08a171a432254d93f797b1a9457276bba2ddd21c60840 +SIZE (v7.19.tar.gz) = 9523048 diff --git a/emulators/wine-devel/files/patch-dlls-ntdll-unix-file.c b/emulators/wine-devel/files/patch-dlls-ntdll-unix-file.c new file mode 100644 index 000000000000..4bb1325af847 --- /dev/null +++ b/emulators/wine-devel/files/patch-dlls-ntdll-unix-file.c @@ -0,0 +1,49 @@ +commit d7541508936b9ed776e8a39a0bc2a4cc875514d3 +Author: Gerald Pfeifer +Date: Tue Oct 18 23:41:49 2022 +0200 + + ntdll: Fix build on systems without ENODATA. + + On FreeBSD 12 and 14 ENODATA is not regularly defined. Cater to that + in fd_get_file_info() and get_file_info(). + +diff --git dlls/ntdll/unix/file.c dlls/ntdll/unix/file.c +index c7ba12a5c13..8a599a289f8 100644 +--- dlls/ntdll/unix/file.c ++++ dlls/ntdll/unix/file.c +@@ -1565,10 +1565,15 @@ static int fd_get_file_info( int fd, unsigned int options, struct stat *st, ULON + attr_len = xattr_fget( fd, SAMBA_XATTR_DOS_ATTRIB, attr_data, sizeof(attr_data)-1 ); + if (attr_len != -1) + *attr |= parse_samba_dos_attrib_data( attr_data, attr_len ); +- else if (errno != ENODATA && errno != ENOTSUP) ++ else ++ { ++ if (errno == ENOTSUP) return ret; ++#ifdef ENODATA ++ if (errno == ENODATA) return ret; ++#endif + WARN( "Failed to get extended attribute " SAMBA_XATTR_DOS_ATTRIB ". errno %d (%s)\n", + errno, strerror( errno ) ); +- ++ } + return ret; + } + +@@ -1653,10 +1658,15 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr ) + attr_len = xattr_get( path, SAMBA_XATTR_DOS_ATTRIB, attr_data, sizeof(attr_data)-1 ); + if (attr_len != -1) + *attr |= parse_samba_dos_attrib_data( attr_data, attr_len ); +- else if (errno != ENODATA && errno != ENOTSUP) ++ else ++ { ++ if (errno == ENOTSUP) return ret; ++#ifdef ENODATA ++ if (errno == ENODATA) return ret; ++#endif + WARN( "Failed to get extended attribute " SAMBA_XATTR_DOS_ATTRIB " from \"%s\". errno %d (%s)\n", + path, errno, strerror( errno ) ); +- ++ } + return ret; + } + diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index 6a83a27be75d..05ee476fc93c 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -1404,6 +1404,7 @@ lib/wine/%%WINEARCH%%-unix/libuserenv.a lib/wine/%%WINEARCH%%-unix/libusp10.a lib/wine/%%WINEARCH%%-unix/libuuid.a lib/wine/%%WINEARCH%%-unix/libuxtheme.a +lib/wine/%%WINEARCH%%-unix/libvcruntime140.a lib/wine/%%WINEARCH%%-unix/libvdmdbg.a lib/wine/%%WINEARCH%%-unix/libversion.a lib/wine/%%WINEARCH%%-unix/libvulkan-1.a @@ -1929,6 +1930,7 @@ lib/wine/%%WINEARCH%%-windows/libuserenv.a lib/wine/%%WINEARCH%%-windows/libusp10.a lib/wine/%%WINEARCH%%-windows/libuuid.a lib/wine/%%WINEARCH%%-windows/libuxtheme.a +lib/wine/%%WINEARCH%%-windows/libvcruntime140.a lib/wine/%%WINEARCH%%-windows/libvdmdbg.a lib/wine/%%WINEARCH%%-windows/libversion.a lib/wine/%%WINEARCH%%-windows/libvulkan-1.a