From nobody Sat Jan 27 00:54:42 2024 X-Original-To: dev-commits-ports-branches@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 4TMGLC0gr2z59BX6; Sat, 27 Jan 2024 00:54:43 +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 4TMGLB5T7lz4vxx; Sat, 27 Jan 2024 00:54:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706316882; 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=1bwo1FdjVJTD9XFugYeEGpf03cICVAtLnwGfyeFZisA=; b=GiAyUXgJa9xtB2z0qusoa1f7JuEqbCvcJHV3UcVPmUjsWoQnNhMXHB0EpVL+uR5mNma9bx FdMBtH1fFfAzjAaM/DKxi1uT7J+LztU0F2SmB/T5/7cj51H8HJBd82d/LXtWZNBp1g7LWT 5UgE8WAB4vq5svjGAX8Imk9YfOdz2KgO90cKZ2FLiE8UFcIK2kt6drrwOs/Fzfjyb0pP3z UMTu4LToZz91TkT4iyU2YsY9ubVY9fZqvpK97a9RTCdg7C3QnY8FoJIDveHYcchXISKXT/ GlGFVs4NEU4BVvxZ0VosZ1wFl6kNammmOsBZ3VkzfBzWhznPT4zbF6bZ3f4eMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706316882; 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=1bwo1FdjVJTD9XFugYeEGpf03cICVAtLnwGfyeFZisA=; b=oKefzFVJIQLOQVivSVKHtm+8KU9ahukthHLG9MGlIgJXH9Bhe51gnExviHiw+XmSdQ3fM5 79ARD75810GUO+wkoOWOCzqmxUNO28f9K7WqlXGuvflXbz/qJNedZMmub9Ad31IPdiU4wd Q59yhPA5979uC7KAD9B0VShjdeW46pvzoY8GoxKJeOMby+aGGcIiBt9xjxjFYctXaDDMBL srdzfyv8FgN4S3oRAlhiQ7R/dwFBqp1fnZWJCjBJ7fAECG+NrxLOYPjhOnjdJLFbdRCYC5 z4dCObAWnXYgM7gIzwFUxjTiwHc4nukOszjUxkKR6vS1yaXsCtO56K8PRzQW6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706316882; a=rsa-sha256; cv=none; b=pZ42kVjZMILD61qHoVeakVQ4v8QVtnMNapJ+wohZHIsi4W/Y34crEn1K9MZNnCp6VZTAMP PnsAjjfbvXzoLTWd/213dfyV6OKo63R4y1W7LcKX7NWR7SwFNaXB1EzNLgwt29WL3ylzdm O6FZ1ujQV26nKNztgq2Y8gfZ7S8Ie8EnFcdAnRqPhXKcJ9SI+zjRogcSQm0IwitPu+X7jX pwCf1UTjvdu/uAfkhlq+R7W6xO8AYGZ30OL2kQZ2pK+O3SSI2vJod2DhI0ejz0stnXBj/U ZJ6cC/r5TT93jsdrgirvWZI2qdMn/L1iLvCjUp2pNiXZkGZ0Dl9SoM5xUFrd0w== 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 4TMGLB4PsTz14C5; Sat, 27 Jan 2024 00:54:42 +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 40R0sgAc071123; Sat, 27 Jan 2024 00:54:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40R0sgZ6071120; Sat, 27 Jan 2024 00:54:42 GMT (envelope-from git) Date: Sat, 27 Jan 2024 00:54:42 GMT Message-Id: <202401270054.40R0sgZ6071120@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 6d04b2d803e7 - 2024Q1 - emulators/yuzu: update to s20240126 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 6d04b2d803e73e0db7d5dde5bd816d2701baa509 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=6d04b2d803e73e0db7d5dde5bd816d2701baa509 commit 6d04b2d803e73e0db7d5dde5bd816d2701baa509 Author: Jan Beich AuthorDate: 2024-01-26 15:23:08 +0000 Commit: Jan Beich CommitDate: 2024-01-27 00:53:44 +0000 emulators/yuzu: update to s20240126 Changes: https://github.com/yuzu-emu/yuzu/compare/a76f6a2775...bd8635e26a (cherry picked from commit 8b7c7121994a7346a2517f8152a6edb671bc87c6) --- emulators/yuzu/Makefile | 4 ++-- emulators/yuzu/distinfo | 6 +++--- emulators/yuzu/files/patch-simpleini | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index 04d87d4e0269..62776cfa1797 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,5 +1,5 @@ PORTNAME= yuzu -PORTVERSION= s20240123 +PORTVERSION= s20240126 CATEGORIES= emulators wayland .if make(makesum) MASTER_SITES= https://api.yuzu-emu.org/gamedb/?dummy=/:gamedb @@ -46,7 +46,7 @@ qt6_OPTIONS_EXCLUDE= QT5 USE_GITHUB= yes GH_ACCOUNT= yuzu-emu -GH_TAGNAME= a76f6a2775 +GH_TAGNAME= bd8635e26a GH_TUPLE= yuzu-emu:mbedtls:v2.16.9-115-g8c88150ca:mbedtls/externals/mbedtls \ yuzu-emu:sirit:ab75463:sirit/externals/sirit \ GPUOpen-LibrariesAndSDKs:VulkanMemoryAllocator:v3.0.1-114-g2f382df:VulkanMemoryAllocator/externals/VulkanMemoryAllocator \ diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo index aecc94835c51..e80fdf456aee 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1706034701 +TIMESTAMP = 1706282588 SHA256 (yuzu-s20230424/compatibility_list.json) = 382db629d6b060af722a27dfa9cd6bb60ac16a7544c58322f63aa1be4c0c0fac SIZE (yuzu-s20230424/compatibility_list.json) = 1801327 -SHA256 (yuzu-emu-yuzu-s20240123-a76f6a2775_GH0.tar.gz) = 8ad942f9fe0ebb3382c6eb9d554856b0e59fd36359f290659330ea48821b9324 -SIZE (yuzu-emu-yuzu-s20240123-a76f6a2775_GH0.tar.gz) = 6849488 +SHA256 (yuzu-emu-yuzu-s20240126-bd8635e26a_GH0.tar.gz) = 063130385b8ca7a060f85095e7dff5533acfa55bf22b1b071ac63cb7482247fd +SIZE (yuzu-emu-yuzu-s20240126-bd8635e26a_GH0.tar.gz) = 6896053 SHA256 (yuzu-emu-mbedtls-v2.16.9-115-g8c88150ca_GH0.tar.gz) = 8cd6d075b4da0ad5fb995eb37390e2e6088be8d41ab1cdfc7e7e4256bd991450 SIZE (yuzu-emu-mbedtls-v2.16.9-115-g8c88150ca_GH0.tar.gz) = 2679189 SHA256 (yuzu-emu-sirit-ab75463_GH0.tar.gz) = 6b61e265be182b7a78075fc1b98ccf80fd33008343205dd0e22a10a439c45319 diff --git a/emulators/yuzu/files/patch-simpleini b/emulators/yuzu/files/patch-simpleini new file mode 100644 index 000000000000..3193801e9f05 --- /dev/null +++ b/emulators/yuzu/files/patch-simpleini @@ -0,0 +1,36 @@ +Temporarily revert https://github.com/yuzu-emu/yuzu/commit/645961613fd5 +until devel/simpleini installs CMake config and/or pkg-config files. + +--- CMakeModules/FindSimpleIni.cmake.orig 2024-01-26 15:23:08 UTC ++++ CMakeModules/FindSimpleIni.cmake +@@ -2,20 +2,18 @@ + # + # SPDX-License-Identifier: GPL-3.0-or-later + ++find_path(SimpleIni_INCLUDE_DIR SimpleIni.h) ++ + include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(SimpleIni ++ REQUIRED_VARS SimpleIni_INCLUDE_DIR ++) + +-find_package(SimpleIni QUIET CONFIG) +-if (SimpleIni_CONSIDERED_CONFIGS) +- find_package_handle_standard_args(SimpleIni CONFIG_MODE) +-else() +- find_package(PkgConfig QUIET) +- pkg_search_module(SIMPLEINI QUIET IMPORTED_TARGET simpleini) +- find_package_handle_standard_args(SimpleIni +- REQUIRED_VARS SIMPLEINI_INCLUDEDIR +- VERSION_VAR SIMPLEINI_VERSION ++if (SimpleIni_FOUND AND NOT TARGET SimpleIni::SimpleIni) ++ add_library(SimpleIni::SimpleIni INTERFACE IMPORTED) ++ set_target_properties(SimpleIni::SimpleIni PROPERTIES ++ INTERFACE_INCLUDE_DIRECTORIES "${SimpleIni_INCLUDE_DIR}" + ) + endif() + +-if (SimpleIni_FOUND AND NOT TARGET SimpleIni::SimpleIni) +- add_library(SimpleIni::SimpleIni ALIAS PkgConfig::SIMPLEINI) +-endif() ++mark_as_advanced(SimpleIni_INCLUDE_DIR)