From nobody Fri Apr 26 08:54:19 2024 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 4VQmk40BLDz5JGGc; Fri, 26 Apr 2024 08:54:20 +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 4VQmk35BF0z46Tc; Fri, 26 Apr 2024 08:54:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714121659; 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=ld14VZAz2VyZkXQXaz7Edu5dxZz7bKz0sWGJPL7Q3V0=; b=hGp+qkJ2lQq072YOiNWef2IKEbxGcIcGH5WXPMKQ8TUrsmtml7/aajtUlmFlJdOHxF2ph7 787cJ80dKiQpMf5Lfu2KxKuWZ/PlnB062pw5PurrSdciVbsCJxOvGScryjYfp9Sp4Uk9U7 8UvIDFgcvDsX6kgMm00vyk5Ozt9mO5DjdqTaX6FGw6I+V//ue0/Ig/ncPRFvzeeSCPRX+B O8sVu0sXZ/vgxmdVkBcT1h8XPccLFKhyxkmcLx6+zaUUvQk8SnklJ4M+EMcHNMadE1znTa oR0FrTuE4T/MF9OmVrrrQLQtDgValJV6icz6OVplOGcZMflqJpqnqqL9VNu0Vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714121659; a=rsa-sha256; cv=none; b=ScI+ep264W/JJhHZEmBRmm7yboble9cK3BSBWX07ZRYyTF7FfG0Kghw0z3m+kDrQNA0Nyu 75Xe4HgpqhZWIunjQXZoV95qtWw10q7aUtWW2y9habNkb20CEDUIV60PL8oGkcmEb0aE7t CBbckjnUtsRsPjevmQIxEbi8f46MTi+WaB6jmtPMiJJDHlXqENXVYaaRcgbhWwJA5sr+hU TNV3xwLtIcEChSA+PqtaK/K3DPLGUKkdB/6pyX80pIYhNcNz9Zguwl14ICAE3vlzx6WRE3 sXhw9C+oEsoPEzVqFrov2eOt0em2Ml2unFo8kdn5wqrJNAD5zVX4LHqzNgTmHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714121659; 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=ld14VZAz2VyZkXQXaz7Edu5dxZz7bKz0sWGJPL7Q3V0=; b=N7ujgGgFP9k94dhXaxYJZoZeAOu4HprAmQatsZjyUUijroOipOvVOZRjDzpKvXM9KRPnv4 ErMJcLh3Tzr5u9uC0CZUbV+YQ+daPw8Cg3MK8bx0HQu0I/494ggkT4GE7m1xe3Rnx/tbXa KPHvMoWtwgBM7YZd+L3ed/1G2Boq/A8vli0RG90agTfgrLPrDxi1TiUxhsX0HjyBznPIPb BuNZXxkFw+2S9lhdGvMRIqQjB9yfd5kOMYCqg6uSyGtrLDOrvgE4XN7AkD3eCHRBYepRFZ mofPvmseE2CcEDu9a+E6eiwUStiMdiUeCpZ+hHa5/iqp6spcZrQieyz0iaoU0Q== 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 4VQmk34mPrzcc7; Fri, 26 Apr 2024 08:54:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43Q8sJWb086467; Fri, 26 Apr 2024 08:54:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43Q8sJ6a086464; Fri, 26 Apr 2024 08:54:19 GMT (envelope-from git) Date: Fri, 26 Apr 2024 08:54:19 GMT Message-Id: <202404260854.43Q8sJ6a086464@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: cb4943510ff1 - main - emulators/wine-proton: Update to 8.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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: cb4943510ff163609a697f02398b79d6c8a8d441 Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=cb4943510ff163609a697f02398b79d6c8a8d441 commit cb4943510ff163609a697f02398b79d6c8a8d441 Author: Bartek Jasicki AuthorDate: 2024-04-26 08:53:16 +0000 Commit: Gerald Pfeifer CommitDate: 2024-04-26 08:53:16 +0000 emulators/wine-proton: Update to 8.0-5 This brings two new patches on top of upstream (to maintain compilation). PR: 278288 Approved by: maintainer --- emulators/wine-proton/Makefile | 4 ++-- emulators/wine-proton/distinfo | 6 +++--- .../files/patch-dlls__ntdll__unix__virtual.c | 18 +++++++++++++++++ .../files/patch-dlls__winevulkan__vulkan.c | 23 ++++++++++++++++++++++ 4 files changed, 46 insertions(+), 5 deletions(-) diff --git a/emulators/wine-proton/Makefile b/emulators/wine-proton/Makefile index f2ccd8aef6ec..0d6cc6af9321 100644 --- a/emulators/wine-proton/Makefile +++ b/emulators/wine-proton/Makefile @@ -1,5 +1,5 @@ PORTNAME= wine-proton -DISTVERSION= 8.0-3 +DISTVERSION= 8.0-5 PORTREVISION= 0 CATEGORIES= emulators @@ -28,7 +28,7 @@ PIE_UNSAFE= yes USE_GITHUB= yes GH_ACCOUNT= ValveSoftware GH_PROJECT= wine -GH_TAGNAME= 8a8ec5f86d8ab1e1d4c6bc88dda016b5e8cf479e +GH_TAGNAME= bb66944d9d7a0fc7692f05d4a2db418b468d3021 USE_GL= gl USE_GNOME= glib20 diff --git a/emulators/wine-proton/distinfo b/emulators/wine-proton/distinfo index 2119a536c88c..a504be615dfd 100644 --- a/emulators/wine-proton/distinfo +++ b/emulators/wine-proton/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1693683407 -SHA256 (ValveSoftware-wine-8.0-3-8a8ec5f86d8ab1e1d4c6bc88dda016b5e8cf479e_GH0.tar.gz) = 4e1898853ef5ed4e14d3178dff39b8bcfd604e6f81f213a52b157eea38d976dc -SIZE (ValveSoftware-wine-8.0-3-8a8ec5f86d8ab1e1d4c6bc88dda016b5e8cf479e_GH0.tar.gz) = 48301869 +TIMESTAMP = 1711968876 +SHA256 (ValveSoftware-wine-8.0-5-bb66944d9d7a0fc7692f05d4a2db418b468d3021_GH0.tar.gz) = 3f8e7e58b235d3101c866ff367afe9745b6abaf6fd1d4d864953bc389abb192d +SIZE (ValveSoftware-wine-8.0-5-bb66944d9d7a0fc7692f05d4a2db418b468d3021_GH0.tar.gz) = 48756464 diff --git a/emulators/wine-proton/files/patch-dlls__ntdll__unix__virtual.c b/emulators/wine-proton/files/patch-dlls__ntdll__unix__virtual.c new file mode 100644 index 000000000000..780ddacc5388 --- /dev/null +++ b/emulators/wine-proton/files/patch-dlls__ntdll__unix__virtual.c @@ -0,0 +1,18 @@ +--- dlls/ntdll/unix/virtual.c.orig ++++ dlls/ntdll/unix/virtual.c +@@ -1562,7 +1562,6 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz + + if (vprot & VPROT_WRITEWATCH && use_kernel_writewatch) + { +- madvise( view->base, view->size, MADV_NOHUGEPAGE ); + reset_write_watches( view->base, view->size ); + } + +@@ -2158,7 +2157,6 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, + ERR("set_protection failed.\n"); + if (vprot & VPROT_WRITEWATCH) + { +- madvise( base, size, MADV_NOHUGEPAGE ); + reset_write_watches( base, size ); + } + return STATUS_SUCCESS; diff --git a/emulators/wine-proton/files/patch-dlls__winevulkan__vulkan.c b/emulators/wine-proton/files/patch-dlls__winevulkan__vulkan.c new file mode 100644 index 000000000000..b0f693c0909c --- /dev/null +++ b/emulators/wine-proton/files/patch-dlls__winevulkan__vulkan.c @@ -0,0 +1,23 @@ +--- dlls/winevulkan/vulkan.c.orig ++++ dlls/winevulkan/vulkan.c +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #ifdef HAVE_SYS_SYSCALL_H + # include + #endif +@@ -4332,11 +4333,7 @@ signal_op_complete: + + void *signaller_worker(void *arg) + { +-#ifdef HAVE_SYS_SYSCALL_H +- int unix_tid = syscall( __NR_gettid ); +-#else +- int unix_tid = -1; +-#endif ++ int unix_tid = pthread_getthreadid_np(); + struct wine_device *device = arg; + struct wine_semaphore *sem; + VkSemaphoreWaitInfo wait_info = { 0 };