From nobody Tue Sep 3 18:56:02 2024 X-Original-To: dev-commits-ports-all@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 4WyvwL4sWYz5Tmnc; Tue, 03 Sep 2024 18:56:02 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WyvwL4N76z4T8f; Tue, 3 Sep 2024 18:56:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725389762; 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=hdMppqhKq76m6WyFScEwL52XHrb6QZn5ULDB/bVPuvI=; b=xSUqIpHFTpJJCnQexTrG6iqZf657C3bLKqzjpOfLpywxc6IrbYOSGEJf3RcQXk3H3xBVDs Xa3oxdJw2kN8kIbjDRgn8kN+OSyQY5iNP6QPm83hatNeriSJkNAybq3wG7MCn94c9p47tX je2NDZRLw2W2TPg5K3gEqZaVdc9nIj0RPfNqCa3uZ8UPO9SAoHbKfBbPgOXha4Ve+fC1Hl BM8DHjjgJtxET6Jz3V1/Gv5BO234AWYNwBYZFLdyHUoKeCnRSxtQlO7Pc/ovaHkFTm6J9/ PumX81GhVnciDzRVp4tKVH1c0HEavyPp7Zk0UKpxwqEP9Z25VDdMYfO/ZQeK2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725389762; a=rsa-sha256; cv=none; b=ecUeQX1HtZNsLa08mnTyWzaGB7YebJ5G4uEIDjn5CKqXbCyRfQfs3go6zINT0GzdK/94Tu WJBjmv48Fy2yYIdMFspRyBZADwwVU5hpWO3kAnHsScXFZnx1IK+rfPF+tyFhBs6UrVZCVc nxL3HpynsSqyP8+j7cNKrvvG9dDHMYMHi6LWHkYDfe0H2s4QHoT3C0/XHf4egPdzlWtwbW D4+Njn0TknT4z9wvHhf2wXalJjTOuxtmlw7inPFtjvCrvlXkcDgrk6ZcJ2qtcnMg/mP8W5 62dJHIHowGKgqxWWNYMMw/QlK4dUqV4WoFse6vX1CFiR/fm4VuZXqxJ0CTPy4Q== 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=1725389762; 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=hdMppqhKq76m6WyFScEwL52XHrb6QZn5ULDB/bVPuvI=; b=Esl9aB7Nt7Q+HLJYif2t2C6lN7kN81HDxMLzT7axTtV4TYIdpuLNtYGVTL8U90an+uDXUF ECes7Yk9YPAU3Sbts0RPKLH+6J5WY3kceCXRT+UdqA7oh3PuQB+nwTIrucP+jBAWd9Daqh 2102vRsYxv8sd53D+sSKuPNHDAOauZUFUR0Sm3Pdv/+NdN07P96CSXioznGL0cvsEtYjb9 wXt12cWrQkMoX5peCnWUXUdnG2D8e/pSBJ8Xfh63KHNmVDjBow+rMmdKwhAt+hj5RrZEde l0Qwm7lmp862/WekfWsH8lm0201B+7NEICk2+xnuzHU02EdEj6Ud/XUpX/HNtQ== 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 4WyvwL3sS6zsYY; Tue, 3 Sep 2024 18:56:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 483Iu2gS079172; Tue, 3 Sep 2024 18:56:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483Iu2jo079169; Tue, 3 Sep 2024 18:56:02 GMT (envelope-from git) Date: Tue, 3 Sep 2024 18:56:02 GMT Message-Id: <202409031856.483Iu2jo079169@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: f162675ecbee - main - emulators/ares: Update 139.20240825 =?utf-8?Q?=E2=86=92?= 140 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f162675ecbeed6c01c00fb9e3841bdc2a8aab59e Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=f162675ecbeed6c01c00fb9e3841bdc2a8aab59e commit f162675ecbeed6c01c00fb9e3841bdc2a8aab59e Author: Stefan Schlosser AuthorDate: 2024-09-03 18:51:13 +0000 Commit: Vladimir Druzenko CommitDate: 2024-09-03 18:53:27 +0000 emulators/ares: Update 139.20240825 → 140 Release note: https://ares-emu.net/news/ares-v140-released Starting with version v140, emulators/ares will track release versions instead of development versions. The port applies an upstreamed patch to version v140, which resolves the issues with NVIDIA GPUs. This obsoletes the NVIDIA port option. PR: 281221 --- emulators/ares/Makefile | 20 ++++++++++++-------- emulators/ares/distinfo | 8 +++++--- ...patch-ares_n64_vulkan_parallel-rdp_util_timer.cpp | 13 ------------- ...ch-ares_n64_vulkan_parallel-rdp_vulkan_device.cpp | 13 ------------- emulators/ares/pkg-message | 9 --------- 5 files changed, 17 insertions(+), 46 deletions(-) diff --git a/emulators/ares/Makefile b/emulators/ares/Makefile index 0f3c9edd7c7a..a19403b61a7f 100644 --- a/emulators/ares/Makefile +++ b/emulators/ares/Makefile @@ -1,7 +1,17 @@ PORTNAME= ares -DISTVERSION= 139.20240825 +DISTVERSIONPREFIX= v +DISTVERSION= 140 CATEGORIES= emulators +# committed upstream, remove with next version update +# * contains 'unbreak FreeBSD build' +# https://github.com/Themaister/Granite/pull/135 +# * contains 'NVIDIA fix' +# https://github.com/ares-emulator/ares/issues/1547 +# https://github.com/Themaister/Granite/issues/133 +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ +PATCHFILES= 7135646c447ab7eb3eff18132dbddf7dc03135fa.patch:-p1 + MAINTAINER= bsdcode@disroot.org COMMENT= Multi-system emulator WWW= https://ares-emu.net @@ -13,7 +23,6 @@ USES= compiler:c++17-lang gmake gnome localbase:ldflags pkgconfig \ xorg USE_GITHUB= yes GH_ACCOUNT= ares-emulator -GH_TAGNAME= efb7f61 USE_GNOME= gtksourceview3 USE_XORG= x11 xext xrandr @@ -29,7 +38,7 @@ MAKE_ARGS= compiler=${CC} \ symbols=false \ threaded=true -OPTIONS_DEFINE= DEBUG DOCS HOTKEYS NVIDIA OPENMP SHADER +OPTIONS_DEFINE= DEBUG DOCS HOTKEYS OPENMP SHADER OPTIONS_DEFAULT= A26 ALSA AO CV FC GB GBA GLX MD MS MSX MYVISION N64 NG \ NGP OPENAL OPENMP OSS PCE PERFORMANCE PS1 SDLAUDIO \ SDLINPUT SFC SG SHADER SPEC UDEV UHID WS XLIB XVIDEO @@ -56,7 +65,6 @@ MYVISION_DESC= My Vision N64_DESC= Nintendo 64 NGP_DESC= Neo Geo Pocket NG_DESC= Neo Geo (AES/MVS) -NVIDIA_DESC= Apply shader cache workaround (implies ${NVIDIA_IMPLIES}) PCE_DESC= PC-Engine / TurboGrafx PERFORMANCE_DESC= Faster but less accurate PROFILE_DESC= @@ -112,15 +120,11 @@ N64_RUN_DEPENDS= ${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader N64_MAKE_ARGS= cores+=n64 \ vulkan=true N64_MAKE_ARGS_OFF= vulkan=false -N64_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ares_n64_vulkan_parallel-rdp_util_timer.cpp NGP_MAKE_ARGS= cores+=ngp NG_MAKE_ARGS= cores+=ng -NVIDIA_IMPLIES= N64 -NVIDIA_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ares_n64_vulkan_parallel-rdp_vulkan_device.cpp - OPENAL_USES= openal OPENAL_MAKE_ARGS= ruby+=audio.openal diff --git a/emulators/ares/distinfo b/emulators/ares/distinfo index 3ad7898531d2..5b52ba6e87f1 100644 --- a/emulators/ares/distinfo +++ b/emulators/ares/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1724663853 -SHA256 (ares-emulator-ares-139.20240825-efb7f61_GH0.tar.gz) = 8d4a410b9141399ec0d592edc34ca8dd35d582a87cae3f4ec5fdacc8a1c3c64e -SIZE (ares-emulator-ares-139.20240825-efb7f61_GH0.tar.gz) = 50956365 +TIMESTAMP = 1725355457 +SHA256 (ares-emulator-ares-v140_GH0.tar.gz) = 126464881ca1111a46627cb299516f60ad076bf3015da0b9325d6cac14339f4d +SIZE (ares-emulator-ares-v140_GH0.tar.gz) = 50954599 +SHA256 (7135646c447ab7eb3eff18132dbddf7dc03135fa.patch) = 8a33c760618adf6bcd90894a2002d1aa60ef1cd68458980c341d2175881381a5 +SIZE (7135646c447ab7eb3eff18132dbddf7dc03135fa.patch) = 11018024 diff --git a/emulators/ares/files/extra-patch-ares_n64_vulkan_parallel-rdp_util_timer.cpp b/emulators/ares/files/extra-patch-ares_n64_vulkan_parallel-rdp_util_timer.cpp deleted file mode 100644 index a17e90da8779..000000000000 --- a/emulators/ares/files/extra-patch-ares_n64_vulkan_parallel-rdp_util_timer.cpp +++ /dev/null @@ -1,13 +0,0 @@ -https://github.com/Themaister/Granite/pull/135 - ---- ares/n64/vulkan/parallel-rdp/util/timer.cpp.orig 2024-07-28 10:49:58 UTC -+++ ares/n64/vulkan/parallel-rdp/util/timer.cpp -@@ -107,7 +107,7 @@ int64_t get_current_time_nsecs() - return int64_t(double(li.QuadPart) * static_qpc_freq.inv_freq); - #else - struct timespec ts = {}; --#ifdef ANDROID -+#if defined(ANDROID) || defined(__FreeBSD__) - constexpr auto timebase = CLOCK_MONOTONIC; - #else - constexpr auto timebase = CLOCK_MONOTONIC_RAW; diff --git a/emulators/ares/files/extra-patch-ares_n64_vulkan_parallel-rdp_vulkan_device.cpp b/emulators/ares/files/extra-patch-ares_n64_vulkan_parallel-rdp_vulkan_device.cpp deleted file mode 100644 index ac7c91bee2c2..000000000000 --- a/emulators/ares/files/extra-patch-ares_n64_vulkan_parallel-rdp_vulkan_device.cpp +++ /dev/null @@ -1,13 +0,0 @@ -https://github.com/Themaister/Granite/issues/133 - ---- ares/n64/vulkan/parallel-rdp/vulkan/device.cpp.orig 2024-08-11 00:29:27 UTC -+++ ares/n64/vulkan/parallel-rdp/vulkan/device.cpp -@@ -874,7 +874,7 @@ void Device::init_workarounds() - workarounds.emulate_event_as_pipeline_barrier = true; - } - -- if (ext.driver_id == VK_DRIVER_ID_NVIDIA_PROPRIETARY && gpu_props.driverVersion < VK_VERSION_MAJOR(535)) -+ if (ext.driver_id == VK_DRIVER_ID_NVIDIA_PROPRIETARY) - { - LOGW("Disabling pipeline cache control.\n"); - workarounds.broken_pipeline_cache_control = true; diff --git a/emulators/ares/pkg-message b/emulators/ares/pkg-message index 839b14b86e30..50cb22a05134 100644 --- a/emulators/ares/pkg-message +++ b/emulators/ares/pkg-message @@ -9,15 +9,6 @@ Users are encouraged to compile the port on their systems with This can improve the performance of demanding cores like the N64. -NVIDIA GPU users with versions >= 535 of the x11/nvidia-driver could encounter -crashes or freezes while using the N64 core, see -https://github.com/ares-emulator/ares/issues/1547 and -https://github.com/Themaister/Granite/issues/133. As a workaround either try to -compile the port with the NVIDIA option set (recommended), or disable the NVIDIA -shader disk cache at startup with - - $ __GL_SHADER_DISK_CACHE=0 ares - The port provides the HOTKEYS option. This applies an inofficial patch which locks all hotkey execution in the unpaused state of the emulator. This can be a convenience for gamepad-only users who want to assign hotkey actions to gamepad