From nobody Thu Dec 29 14:51:10 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 4NjWYB5kVhz2c858; Thu, 29 Dec 2022 14:51:10 +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 4NjWYB57hcz49Vd; Thu, 29 Dec 2022 14:51:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672325470; 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=Ucu3l2QkTaEQ+kQroeL+hfd4hTRTVDHi9gaedffLpAc=; b=xyKbh9fKwLcSkCb2r+IWj/MHsGKsTOR6lemxUhEyJ0GEptjG2q49sAJCeV3zbJQFuPqBnx NTQmsEm//YV2LCdCFs7mu7OUNdtx0zFyErJDe5ZpWNuLMYW+j2Y3kXcHvKRk7kIQwuBRWK pUJNF7htFZm1fW6xlEWTBmtYfNJ/1FfAy1vH19O591bfUQH1o6PZ7Az5B21sj1Hok2Vdj8 jraHHY3JpDQLbG50tZjT3HLis0zRgdYOm8C7QZ0QFR3CMXrvb9/hbf0EBTnSLRX2Gh+VHG CX4TLW9TDInIpSvijkEPk5X/ZRZrFWB338nAShOO8GOGjJKargJ/bm/xf1fOzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672325470; 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=Ucu3l2QkTaEQ+kQroeL+hfd4hTRTVDHi9gaedffLpAc=; b=poKjEjCSMAAUcTvtIljVV85D5zL0GVGuih+TMCDn6lpp3tuz+lN/Y9Slb5qBHFT+/avjtx BHtcpZBMrd3hQQIKm+3YWRNWJL76byu5IxWWCyv1WowcsXpkx9lpl5dSV8ST7yCSJ+DgBq FZncAUjAVs50/Vj41+KUQ01LwDNYJu2ek5ZPfs2Ln+kn/S1PRXgZb3m1wZ/h6JXxFJq6fu B3r7iqdEv+ps0P8GOuXFrhZ7NAiVrP6R0H4VOExiZtm0laTcrCvb7KVikX4Twe3azLDrHD HmMVtl3y7fCXn/NtGruUqfIBQUc8/HefipLu35VKSAGTARzNy2PsTj9y3ShnHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672325470; a=rsa-sha256; cv=none; b=pMK2r+E2xtX3ttyjsw3vgpVyqXeUErAuXZx1PxDVHvP9hptI8icFQjtBV7z+YVAmO/ZIOm 9lhD2TFAv6K28zr1Su08CPf2JRz6mi4pTFQfljAsW4B0CgpfYeXNwfuChzsxI2SdYG3VS2 xQv//oy4XpATNpnuN3lKSra65YYQ8yc2+mUtjn4XzQDHgbeCNZNe0IX3wgA2KUp4boQ/jz rbN2EdMQTfGNNgH8ulyvxZa0ct8sBoIvlhhnvFRID2kZ5GJZkZdwtH2xZG/9vgSTmH3y8c jx44BAHFKLxjNBFWXb24Hi/PPPYreyKE/I/A5H+6S5ZoKt/2oYFXXFXJ4lSV3g== 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 4NjWYB4C1vzXfg; Thu, 29 Dec 2022 14:51:10 +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 2BTEpA6Z026911; Thu, 29 Dec 2022 14:51:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BTEpAY8026910; Thu, 29 Dec 2022 14:51:10 GMT (envelope-from git) Date: Thu, 29 Dec 2022 14:51:10 GMT Message-Id: <202212291451.2BTEpAY8026910@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Li-Wen Hsu Subject: git: a64072aa5b5e - main - emulators/wine-proton: Update to 7.0-5 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: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a64072aa5b5e4381a1c756790c449cb09ffbc855 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=a64072aa5b5e4381a1c756790c449cb09ffbc855 commit a64072aa5b5e4381a1c756790c449cb09ffbc855 Author: Alex S AuthorDate: 2022-12-29 14:48:57 +0000 Commit: Li-Wen Hsu CommitDate: 2022-12-29 14:50:32 +0000 emulators/wine-proton: Update to 7.0-5 Mark IGNORE on 12. PR: 268450 --- emulators/wine-proton/Makefile | 7 ++++--- emulators/wine-proton/distinfo | 6 +++--- emulators/wine-proton/files/patch-server_token.c | 24 ++++++++++++++++++++++++ emulators/wine-proton/pkg-plist | 6 ++++++ 4 files changed, 37 insertions(+), 6 deletions(-) diff --git a/emulators/wine-proton/Makefile b/emulators/wine-proton/Makefile index f4bc0af17c3c..cb74154a45cb 100644 --- a/emulators/wine-proton/Makefile +++ b/emulators/wine-proton/Makefile @@ -1,5 +1,5 @@ PORTNAME= wine-proton -DISTVERSION= 7.0-4 +DISTVERSION= 7.0-5 CATEGORIES= emulators MAINTAINER= iwtcex@gmail.com @@ -10,6 +10,7 @@ LICENSE= LGPL21 LGPL3 LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/LICENSE +IGNORE_FreeBSD_12=requires F_ADD_SEALS ONLY_FOR_ARCHS= amd64 i386 BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex \ @@ -26,11 +27,11 @@ USE_GCC= yes USE_GITHUB= yes GH_ACCOUNT= ValveSoftware GH_PROJECT= wine -GH_TAGNAME= fb6e6af8928a29660e8cf797d43e028ea5bf8d23 +GH_TAGNAME= 492470267af486cb24ad0deaa028168eb94618a4 USE_GL= gl USE_GNOME= glib20 -USE_GSTREAMER= good +USE_GSTREAMER= gl mpeg2dec x264 # https://github.com/ValveSoftware/wine/commit/8cdd506d7e68c27cd564c317320bfc8d3a999eda USE_SDL= sdl2 USE_XORG= x11 xext xcomposite xcursor xi xinerama xrandr xrender diff --git a/emulators/wine-proton/distinfo b/emulators/wine-proton/distinfo index 254c9cac73cb..6d7fe1bf80ae 100644 --- a/emulators/wine-proton/distinfo +++ b/emulators/wine-proton/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1667663396 -SHA256 (ValveSoftware-wine-7.0-4-fb6e6af8928a29660e8cf797d43e028ea5bf8d23_GH0.tar.gz) = 2eb1b45cb49131a9dc017334088f1ea7e1c9598584d512a244f5dcafc45f44bf -SIZE (ValveSoftware-wine-7.0-4-fb6e6af8928a29660e8cf797d43e028ea5bf8d23_GH0.tar.gz) = 45609190 +TIMESTAMP = 1671353238 +SHA256 (ValveSoftware-wine-7.0-5-492470267af486cb24ad0deaa028168eb94618a4_GH0.tar.gz) = bd45309e78278b50777508bd4b52e12d4b23ec170031a5591331a35e56e9eddc +SIZE (ValveSoftware-wine-7.0-5-492470267af486cb24ad0deaa028168eb94618a4_GH0.tar.gz) = 45764004 diff --git a/emulators/wine-proton/files/patch-server_token.c b/emulators/wine-proton/files/patch-server_token.c new file mode 100644 index 000000000000..384adf3085b8 --- /dev/null +++ b/emulators/wine-proton/files/patch-server_token.c @@ -0,0 +1,24 @@ +--- server/token.c.orig 2022-12-18 11:53:01.498015000 +0300 ++++ server/token.c 2022-12-18 11:53:14.540515000 +0300 +@@ -212,10 +212,10 @@ void init_user_sid(void) + size_t n; + FILE *f; + +- f = fopen( "/etc/machine-id", "r" ); ++ f = fopen( "/var/lib/dbus/machine-id", "r" ); + if (!f) + { +- fprintf( stderr, "Failed to open /etc/machine-id, error %s.\n", strerror( errno )); ++ fprintf( stderr, "Failed to open /var/lib/dbus/machine-id, error %s.\n", strerror( errno )); + return; + } + +@@ -224,7 +224,7 @@ void init_user_sid(void) + + if (n != 16) + { +- fprintf( stderr, "Failed to read /etc/machine-id, error %s.\n", strerror( errno )); ++ fprintf( stderr, "Failed to read /var/lib/dbus/machine-id, error %s.\n", strerror( errno )); + return; + } + machine_id[n] = 0; diff --git a/emulators/wine-proton/pkg-plist b/emulators/wine-proton/pkg-plist index dabae6e0206a..ad00fdefcc31 100644 --- a/emulators/wine-proton/pkg-plist +++ b/emulators/wine-proton/pkg-plist @@ -301,6 +301,7 @@ wine-proton/lib/wine/%%WINEARCH%%-unix/libuserenv.a wine-proton/lib/wine/%%WINEARCH%%-unix/libusp10.a wine-proton/lib/wine/%%WINEARCH%%-unix/libuuid.a wine-proton/lib/wine/%%WINEARCH%%-unix/libuxtheme.a +wine-proton/lib/wine/%%WINEARCH%%-unix/libvcruntime140.a wine-proton/lib/wine/%%WINEARCH%%-unix/libvdmdbg.a wine-proton/lib/wine/%%WINEARCH%%-unix/libversion.a wine-proton/lib/wine/%%WINEARCH%%-unix/libvulkan-1.a @@ -660,6 +661,7 @@ wine-proton/lib/wine/%%WINEARCH%%-windows/cryptdlg.dll wine-proton/lib/wine/%%WINEARCH%%-windows/cryptdll.dll wine-proton/lib/wine/%%WINEARCH%%-windows/cryptext.dll wine-proton/lib/wine/%%WINEARCH%%-windows/cryptnet.dll +wine-proton/lib/wine/%%WINEARCH%%-windows/cryptowinrt.dll wine-proton/lib/wine/%%WINEARCH%%-windows/cryptsp.dll wine-proton/lib/wine/%%WINEARCH%%-windows/cryptui.dll wine-proton/lib/wine/%%WINEARCH%%-windows/cscript.exe @@ -854,6 +856,7 @@ wine-proton/lib/wine/%%WINEARCH%%-windows/gameux.dll wine-proton/lib/wine/%%WINEARCH%%-windows/gamingtcui.dll wine-proton/lib/wine/%%WINEARCH%%-windows/gdi32.dll wine-proton/lib/wine/%%WINEARCH%%-windows/gdiplus.dll +wine-proton/lib/wine/%%WINEARCH%%-windows/getminidump.exe wine-proton/lib/wine/%%WINEARCH%%-windows/glu32.dll wine-proton/lib/wine/%%WINEARCH%%-windows/gpkcsp.dll wine-proton/lib/wine/%%WINEARCH%%-windows/hal.dll @@ -1091,6 +1094,7 @@ wine-proton/lib/wine/%%WINEARCH%%-windows/libuserenv.a wine-proton/lib/wine/%%WINEARCH%%-windows/libusp10.a wine-proton/lib/wine/%%WINEARCH%%-windows/libuuid.a wine-proton/lib/wine/%%WINEARCH%%-windows/libuxtheme.a +wine-proton/lib/wine/%%WINEARCH%%-windows/libvcruntime140.a wine-proton/lib/wine/%%WINEARCH%%-windows/libvdmdbg.a wine-proton/lib/wine/%%WINEARCH%%-windows/libversion.a wine-proton/lib/wine/%%WINEARCH%%-windows/libvulkan-1.a @@ -1385,6 +1389,7 @@ wine-proton/lib/wine/%%WINEARCH%%-windows/tbs.dll wine-proton/lib/wine/%%WINEARCH%%-windows/tdh.dll wine-proton/lib/wine/%%WINEARCH%%-windows/tdi.sys wine-proton/lib/wine/%%WINEARCH%%-windows/termsv.exe +wine-proton/lib/wine/%%WINEARCH%%-windows/threadpoolwinrt.dll wine-proton/lib/wine/%%WINEARCH%%-windows/traffic.dll wine-proton/lib/wine/%%WINEARCH%%-windows/twain_32.dll wine-proton/lib/wine/%%WINEARCH%%-windows/twinapi.appcore.dll @@ -1437,6 +1442,7 @@ wine-proton/lib/wine/%%WINEARCH%%-windows/wimgapi.dll wine-proton/lib/wine/%%WINEARCH%%-windows/win32u.dll wine-proton/lib/wine/%%WINEARCH%%-windows/windows.devices.enumeration.dll wine-proton/lib/wine/%%WINEARCH%%-windows/windows.gaming.input.dll +wine-proton/lib/wine/%%WINEARCH%%-windows/windows.gaming.ui.gamebar.dll wine-proton/lib/wine/%%WINEARCH%%-windows/windows.globalization.dll wine-proton/lib/wine/%%WINEARCH%%-windows/windows.media.devices.dll wine-proton/lib/wine/%%WINEARCH%%-windows/windows.media.speech.dll