From nobody Sat Jun 24 00:59:46 2023 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 4QnwkB4spRz4gd8d; Sat, 24 Jun 2023 00:59:46 +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 4QnwkB4McMz3CK9; Sat, 24 Jun 2023 00:59:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687568386; 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=rXubl/ztWTxxK89B5A7i9yQB6G+2cVh7qy3WY6x9QL8=; b=vPVLtm5DqpGnQbNomrDf5d/uudylYk0gt4odtMDowEPcU/eS4Nhps3ES+OJjJ+vwrySE/v xNdB0cCcblq6H03HymiPpJMm+LACK5B3sFBPPVhapb4hBN1eff8831vLKTUr+gIOikAI07 ccJJTovI7t8oPmBKarzTeu7cdKvnQWsGAudxMubHHRTdGRk2WGgmUrcRSFZwWgsp/Uh7O0 diSXT0vNF5OGJGyuwmrjCtJdOg2/Tt1382BvUGaAi3ydCxNkFn3P6vwE1d7YSHOU1wVQVO Hgjo5Pzh7zeEv/aeMnkwm8V9l2orh8+oeXLcbfv37949Y0gcpp1076AasGEw+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687568386; 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=rXubl/ztWTxxK89B5A7i9yQB6G+2cVh7qy3WY6x9QL8=; b=CzVHmOJmeGWpxuEY8hhQV9L7pKDEhW/+ob/xl7e9s/F1vBHApuYcXd14c2olf6GMeUyd9k HGfzwI8XHqPtRFOfgVQmUyqDEJZQ5oP/agY+Ew2G2vohiPLLW6iST+GLvR65/FRKvS/s0P Ou86KXrABiCJe4jgFmpISjfKoQb63limOaUlvV8W807O/7TDpfUlLgYaVyfUC42OFWGjP9 2wIZkL9G+0hxRfmkMVsM2A13zgVr0paii4eZcGpaCoFNlNbprxjzEDH+ojjK4qMVBvcOY+ GlKe5nwht1X6Rcp70gihUrEQvlxFaBdfkLS29T5uBlncvoav472/pNYnme9kqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687568386; a=rsa-sha256; cv=none; b=A8TIVuCbCKYeUGXAqgK6uHzoIAxwFv5BYvCvMbJVeBJpkhKqa7pPVBp1Vuqv37tGsSnzir hzJrMuH0kirtF4OxBdjUxGOxXG1tS7kG5CWmel3cYOa992/6WZ9SAw8s7s1dTI+bCC7wDn xGdWMgJ4lp6MmpU54tX1xNLjnsFwy9wCGSlmeyORMMgeRvF5rhj63N9MieIRyYr2iYdWrA laCGTg74XFuoORSyp7+S6l531nxU6ukToAOgoQ4ZQBUfOwy+CB4NQx5xgHygB8bQZW+uwe GnCtqDCZ7R5ql4FVNVt59UZm/Jfn/E3mnjcQq7ICMUNVzsm+ouCuI4QV0J1TKw== 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 4QnwkB3LGhzQkV; Sat, 24 Jun 2023 00:59:46 +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 35O0xkTP008847; Sat, 24 Jun 2023 00:59:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35O0xkru008846; Sat, 24 Jun 2023 00:59:46 GMT (envelope-from git) Date: Sat, 24 Jun 2023 00:59:46 GMT Message-Id: <202306240059.35O0xkru008846@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: e12ef5ffa74c - 2023Q2 - emulators/yuzu: update to s20230623 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/2023Q2 X-Git-Reftype: branch X-Git-Commit: e12ef5ffa74c21595b416338a52cd4dd8951409f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=e12ef5ffa74c21595b416338a52cd4dd8951409f commit e12ef5ffa74c21595b416338a52cd4dd8951409f Author: Jan Beich AuthorDate: 2023-06-18 13:43:12 +0000 Commit: Jan Beich CommitDate: 2023-06-24 00:59:38 +0000 emulators/yuzu: update to s20230623 Changes: https://github.com/yuzu-emu/yuzu/compare/27a36cd51...5ab4aa1ed (cherry picked from commit d64d2c5fcf5a236e0aa1ffea0374c261fca57d82) --- emulators/yuzu/Makefile | 6 +++-- emulators/yuzu/distinfo | 10 +++++--- emulators/yuzu/files/patch-nogit | 55 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 5 deletions(-) diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index 46bb8edbdddb..c2c5b0e91835 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,5 +1,5 @@ PORTNAME= yuzu -PORTVERSION= s20230617 +PORTVERSION= s20230623 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= 27a36cd51 +GH_TAGNAME= 5ab4aa1ed GH_TUPLE= yuzu-emu:mbedtls:v2.16.9-115-g8c88150ca:mbedtls/externals/mbedtls \ yuzu-emu:sirit:ab75463:sirit/externals/sirit \ KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-201-gc214f6f:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \ @@ -54,7 +54,9 @@ GH_TUPLE= yuzu-emu:mbedtls:v2.16.9-115-g8c88150ca:mbedtls/externals/mbedtls \ arun11299:cpp-jwt:v1.4-14-ge12ef06:cpp_jwt/externals/cpp-jwt \ arsenm:sanitizers-cmake:aab6948:sanitizers_cmake/externals/cubeb/cmake/sanitizers-cmake \ benhoyt:inih:r52:inih/externals/inih/inih \ + eggert:tz:2022c:tz/externals/nx_tzdb/tzdb_to_nx/externals/tz/tz \ kinetiknz:cubeb:cubeb-0.2-1452-g48689ae:cubeb/externals/cubeb \ + lat9nq:tzdb_to_nx:220816-25-g10cde7f:tzdb_to_nx/externals/nx_tzdb/tzdb_to_nx \ yhirose:cpp-httplib:v0.12.0-3-g6d963fb:cpp_httplib/externals/cpp-httplib USES= cmake:testing elfctl localbase:ldflags pkgconfig sdl ssl diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo index 5636a0229c71..fe4586896f94 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1687039325 +TIMESTAMP = 1687526848 SHA256 (yuzu-s20230424/compatibility_list.json) = 382db629d6b060af722a27dfa9cd6bb60ac16a7544c58322f63aa1be4c0c0fac SIZE (yuzu-s20230424/compatibility_list.json) = 1801327 -SHA256 (yuzu-emu-yuzu-s20230617-27a36cd51_GH0.tar.gz) = 3e89131c0b24ef8badb26ab1be810b20e29f6a6d7bfd8bd089c93619c2195167 -SIZE (yuzu-emu-yuzu-s20230617-27a36cd51_GH0.tar.gz) = 6099054 +SHA256 (yuzu-emu-yuzu-s20230623-5ab4aa1ed_GH0.tar.gz) = 4248b76a26dfcbac2c8f04c84a23bd76db880f0a54a6f792e218347800de3a1c +SIZE (yuzu-emu-yuzu-s20230623-5ab4aa1ed_GH0.tar.gz) = 6107918 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 @@ -17,8 +17,12 @@ SHA256 (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = d9009e17948aff769a6f6e16b5 SIZE (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = 7240 SHA256 (benhoyt-inih-r52_GH0.tar.gz) = 439cff9ce9a8afc52d08772ac3e93b3cecd79c7707f871fb4534fb3a48201880 SIZE (benhoyt-inih-r52_GH0.tar.gz) = 16808 +SHA256 (eggert-tz-2022c_GH0.tar.gz) = 067f0f4bee8e509b3eca502c5bd7c8f98073ab49b6c05654a157cbffd07aa3a4 +SIZE (eggert-tz-2022c_GH0.tar.gz) = 582060 SHA256 (kinetiknz-cubeb-cubeb-0.2-1452-g48689ae_GH0.tar.gz) = c0f83a493f1d54a92e16baf56f27813ff294ce78bc42fbcc3935580852a624de SIZE (kinetiknz-cubeb-cubeb-0.2-1452-g48689ae_GH0.tar.gz) = 228346 +SHA256 (lat9nq-tzdb_to_nx-220816-25-g10cde7f_GH0.tar.gz) = 086227ec8f85efb4c37810945b4f9c670085239b4dc48a4dd72fc866e8ec5c5a +SIZE (lat9nq-tzdb_to_nx-220816-25-g10cde7f_GH0.tar.gz) = 8022 SHA256 (yhirose-cpp-httplib-v0.12.0-3-g6d963fb_GH0.tar.gz) = f64f5c3494196a032be5bc93c81a87bd7e0fbc1b541cab113fce1a4473b4078d SIZE (yhirose-cpp-httplib-v0.12.0-3-g6d963fb_GH0.tar.gz) = 637612 SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271 diff --git a/emulators/yuzu/files/patch-nogit b/emulators/yuzu/files/patch-nogit new file mode 100644 index 000000000000..b433f719a438 --- /dev/null +++ b/emulators/yuzu/files/patch-nogit @@ -0,0 +1,55 @@ +Don't depend on devel/git as distfiles are generated by git-archive(1) +thus don't contain .git subdirs. + +--- externals/nx_tzdb/CMakeLists.txt.orig 2023-06-23 13:27:28 UTC ++++ externals/nx_tzdb/CMakeLists.txt +@@ -5,15 +5,11 @@ add_library(nx_tzdb INTERFACE) + + add_library(nx_tzdb INTERFACE) + +-find_program(GIT git) + find_program(GNU_MAKE make) + find_program(DATE_PROG date) + + set(CAN_BUILD_NX_TZDB true) + +-if (NOT GIT) +- set(CAN_BUILD_NX_TZDB false) +-endif() + if (NOT GNU_MAKE) + set(CAN_BUILD_NX_TZDB false) + endif() +--- externals/nx_tzdb/tzdb_to_nx/externals/tz/tz/version.orig 2023-06-23 13:27:28 UTC ++++ externals/nx_tzdb/tzdb_to_nx/externals/tz/tz/version +@@ -0,0 +1 @@ ++2022c +--- externals/nx_tzdb/tzdb_to_nx/src/tzdb/CMakeLists.txt.orig 2023-06-23 19:37:14 UTC ++++ externals/nx_tzdb/tzdb_to_nx/src/tzdb/CMakeLists.txt +@@ -1,8 +1,3 @@ +-find_program(GIT_PROGRAM git) +-if ("${GIT_PROGRAM}" STREQUAL "GIT_PROGRAM-NOTFOUND") +- message(FATAL_ERROR "git program not found") +-endif() +- + find_program(GNU_DATE date) + if ("${GNU_DATE}" STREQUAL "GNU_DATE-NOTFOUND") + message(FATAL_ERROR "date program not found") +@@ -12,17 +7,7 @@ set(TZDB_VERSION_FILE ${TZ_SOURCE_DIR}/NEWS) + set(NX_ZONEINFO_DIR "${NX_TZDB_DIR}/zoneinfo") + + set(TZDB_VERSION_FILE ${TZ_SOURCE_DIR}/NEWS) +- +-execute_process( +- COMMAND +- ${GIT_PROGRAM} log --pretty=%at -n1 NEWS +- OUTPUT_VARIABLE +- TZ_COMMIT_TIME +- WORKING_DIRECTORY +- ${TZ_SOURCE_DIR} +- COMMAND_ERROR_IS_FATAL ANY) +- +-string(REPLACE "\n" "" TZ_COMMIT_TIME "${TZ_COMMIT_TIME}") ++set(TZ_COMMIT_TIME 1687220316) + + if (APPLE) + set(VERSION_COMMAND ${GNU_DATE} -r ${TZ_COMMIT_TIME} +%y%m%d)