Date: Mon, 8 May 2023 11:55:21 GMT From: Kai Knoblich <kai@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5a788a624932 - main - games/anki: Update to 2.1.62 Message-ID: <202305081155.348BtLBe097296@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=5a788a624932f69708a11d4470c157bd216d455d commit 5a788a624932f69708a11d4470c157bd216d455d Author: Kai Knoblich <kai@FreeBSD.org> AuthorDate: 2023-05-08 11:47:11 +0000 Commit: Kai Knoblich <kai@FreeBSD.org> CommitDate: 2023-05-08 11:54:44 +0000 games/anki: Update to 2.1.62 * Since release 2.1.55, upstream has changed the build system to a homebrew solution written in Rust, which generates the files for ninja(1) and then uses the latter also for building. As a result, quite a number of patches, that revolved around the Bazel build system, can now be removed and the Makefile can also be slimmed down considerably. By environment variables recognized by the build system, some required binaries (e.g. Python, Node.js, etc.) for the build can be directly defined instead downloading the binary tarballs from the official repositories, which saving quite a bit of patches at the end. In order to be able to build Anki successfully on FreeBSD, a few more environment variables have been introduced via custom patches. With this it's possible to use an offline cache for Node.js as well as a native Python environment instead of a venv. * Belatedly add devel/py-orjson as a fixed runtime dependency and although it's still optional in the code, the question is how long this will be the case. Thus update NOT_FOR_ARCH_REASON accordingly and keep ONLY_FOR_ARCH unchanged for now. Changelogs since 2.1.54: https://changes.ankiweb.net/changes/2.1.60-69.html https://changes.ankiweb.net/changes/2.1.50-59.html MFH: No (feature release) --- games/anki/Makefile | 938 +++++++------- games/anki/distinfo | 1344 ++++++++++++-------- games/anki/files/bazel/BUILD.bazel-local_esbuild | 1 - games/anki/files/bazel/BUILD.bazel-local_node | 1 - .../files/bazel/BUILD.bazel-protoc_bin_freebsd | 1 - games/anki/files/bazel/BUILD.bazel-pylib-rsbridge | 12 - games/anki/files/bazel/BUILD.bazel-rslib-i18n | 10 - .../bazel/BUILD.bazel-rust_output-librsbridge | 7 - .../bazel/BUILD.bazel-rust_output-strings_json | 7 - games/anki/files/bazel/repos.bzl | 93 -- games/anki/files/patch-build_configure_src_main.rs | 48 + .../anki/files/patch-build_configure_src_python.rs | 39 + games/anki/files/patch-build_configure_src_rust.rs | 69 + .../files/patch-build_ninja__gen_src_archives.rs | 29 + .../anki/files/patch-build_ninja__gen_src_cargo.rs | 13 + games/anki/files/patch-build_ninja__gen_src_git.rs | 34 + .../files/patch-build_ninja__gen_src_python.rs | 53 + games/anki/files/patch-build_runner_src_build.rs | 48 + games/anki/files/patch-build_runner_src_yarn.rs | 35 + games/anki/files/patch-defs.bzl | 55 - games/anki/files/patch-ftl_BUILD.bazel | 16 - games/anki/files/patch-late__deps.bzl | 16 - ...os_rules__nodejs_internal_node_node__patches.js | 13 - ...__nodejs_internal_npm__install_npm__install.bzl | 14 - ...repos_rules__nodejs_nodejs_private_os__name.bzl | 33 - ...nodejs_toolchains_esbuild_esbuild__packages.bzl | 23 - ...js_toolchains_esbuild_esbuild__repositories.bzl | 43 - ...repos_rules__nodejs_toolchains_node_BUILD.bazel | 50 - games/anki/files/patch-platforms_BUILD.bazel | 18 - games/anki/files/patch-proto_protobuf.bzl | 24 - games/anki/files/patch-pylib_BUILD.bazel | 52 - games/anki/files/patch-pylib_anki_BUILD.bazel | 35 - .../files/patch-pylib_anki___backend_BUILD.bazel | 29 - games/anki/files/patch-pylib_orjson.bzl | 15 - games/anki/files/patch-pylib_tools_BUILD.bazel | 27 - games/anki/files/patch-python_binary.bzl | 22 - games/anki/files/patch-python_pyqt_install.py | 30 - games/anki/files/patch-python_python.bzl | 13 - games/anki/files/patch-python_stubs_BUILD.bazel | 35 - games/anki/files/patch-qt_BUILD.bazel | 69 - games/anki/files/patch-qt_aqt_BUILD.bazel | 32 - games/anki/files/patch-qt_aqt_____init____.py | 4 +- games/anki/files/patch-tools_status.sh | 9 - games/anki/files/patch-ts_lib_BUILD.bazel | 21 - games/anki/pkg-message | 29 + games/anki/pkg-plist | 1159 +++++------------ 46 files changed, 1986 insertions(+), 2682 deletions(-) diff --git a/games/anki/Makefile b/games/anki/Makefile index 153ea7eee848..14e8801b0155 100644 --- a/games/anki/Makefile +++ b/games/anki/Makefile @@ -1,12 +1,9 @@ PORTNAME= anki -DISTVERSION= 2.1.54 -PORTREVISION= 17 +DISTVERSION= 2.1.62 # Don't forget to update ${_MY_BUILDHASH} if DISTVERSION changes CATEGORIES= games education python -MASTER_SITES= LOCAL/kai/:yarncache \ - LOCAL/kai/:npmcache -DISTFILES= anki-yarn-cache-${DISTVERSION}${EXTRACT_SUFX}:yarncache \ - anki-npm-cache-${DISTVERSION}${EXTRACT_SUFX}:npmcache +MASTER_SITES= LOCAL/kai/:yarncache +DISTFILES= anki-yarn-cache-${DISTVERSION}${EXTRACT_SUFX}:yarncache MAINTAINER= kai@FreeBSD.org COMMENT= Flashcard trainer with spaced repetition @@ -16,25 +13,15 @@ LICENSE= AGPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE NOT_FOR_ARCHS= armv6 armv7 i386 mips powerpc -NOT_FOR_ARCHS_REASON= the bazel build framework supports only 64-bit systems. +NOT_FOR_ARCHS_REASON= devel/py-orjson, which is required for runtime, is only available for 64-bit systems. -BUILD_DEPENDS= bash:shells/bash \ - bazel:devel/bazel \ - npm:www/npm \ - protoc:devel/protobuf \ +BUILD_DEPENDS= protoc:devel/protobuf \ rsync:net/rsync \ yarn:www/yarn \ - ${PYTHON_PKGNAMEPREFIX}mypy-protobuf>=1.21:devel/py-mypy-protobuf@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}stringcase>0:devel/py-stringcase@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}black>0:devel/py-black@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}fluent>0:devel/py-fluent@${PY_FLAVOR} \ - ${RUN_DEPENDS} - -# NB: For x64 architectures there's also a Python package devel/py-orjson. -# Chances are good that it'll be added to RUN_DEPENDS with the next release. -# -# Although the "orjson" package is required via the setup.py of Anki's Python -# library it's (still) optional in the code. + ${PYTHON_PKGNAMEPREFIX}mypy-protobuf>=1.21:devel/py-mypy-protobuf@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} +LIB_DEPENDS= libzstd.so:archivers/zstd RUN_DEPENDS= lame:audio/lame \ ${PYTHON_PKGNAMEPREFIX}pyaudio>0:audio/py-pyaudio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ @@ -42,98 +29,137 @@ RUN_DEPENDS= lame:audio/lame \ ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}send2trash>0:deskutils/py-send2trash@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}distro>0:sysutils/py-distro@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}orjson>0:devel/py-orjson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Flask-Cors>0:www/py-flask-cors@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}protobuf>=3.17:devel/py-protobuf@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}protobuf>=4.21:devel/py-protobuf@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}waitress>=2.0.0:www/py-waitress@${PY_FLAVOR} # USES=ssl is required for the compilation of the Rust code -USES= cargo desktop-file-utils go:modules,no_targets nodejs:build pyqt:6 \ - python:3.9+ shebangfix ssl +USES= cargo desktop-file-utils ninja nodejs:build pyqt:6 python:3.9+ \ + shebangfix ssl USE_GITHUB= yes GH_ACCOUNT= ankitects # Translation files -GH_TUPLE= ankitects:anki-core-i18n:f3f9912:ftlrslib \ - ankitects:anki-desktop-ftl:6e59ce7e:ftlextra -# Bazel Skylib framework and sets of bazel rules -GH_TUPLE+= bazelbuild:bazel-skylib:e59b620:bzlskylib \ - bazelbuild:rules_cc:40548a2:bzlrcc \ - bazelbuild:rules_java:c13e3ea:bzlrjava \ - bazelbuild:rules_nodejs:45e97fc:bzlrnodejs \ - bazelbuild:rules_proto:f7a30f6:bzlrproto \ - bazelbuild:rules_python:b842276:bzlrpython \ - ankitects:rules_rust:adf2790:bzlrrust \ - bazelbuild:rules_sass:d0cda22:bzlrsass -# esbuild dependencies -GH_TUPLE+= evanw:esbuild:${_MY_ESBUILDVER}:esbuild \ - golang:sys:aa78b53d3365:golang_sys +GH_TUPLE= ankitects:anki-core-i18n:7638cf0:ftlrslib \ + ankitects:anki-desktop-ftl:e1abce4:ftlextra USE_PYQT= pyqt6 sip:build webengine SHEBANG_FILES= qt/tools/runanki.system.in -CARGO_CRATES= adler-1.0.2 \ +CARGO_CRATES= addr2line-0.19.0 \ + adler-1.0.2 \ + aes-0.7.5 \ ahash-0.7.6 \ - aho-corasick-0.7.18 \ - ammonia-3.1.4 \ - anyhow-1.0.56 \ - arc-swap-1.5.0 \ - arrayref-0.3.6 \ - arrayvec-0.4.12 \ + aho-corasick-0.7.20 \ + ammonia-3.3.0 \ + android_system_properties-0.1.5 \ + anes-0.1.6 \ + anstream-0.2.6 \ + anstyle-0.3.5 \ + anstyle-parse-0.1.1 \ + anstyle-wincon-0.2.0 \ + anyhow-1.0.70 \ + apple-bundles-0.17.0 \ + arrayref-0.3.7 \ arrayvec-0.7.2 \ - async-trait-0.1.52 \ + assert-json-diff-2.0.2 \ + async-channel-1.8.0 \ + async-compression-0.3.15 \ + async-stream-0.3.4 \ + async-stream-impl-0.3.4 \ + async-trait-0.1.68 \ atty-0.2.14 \ autocfg-1.1.0 \ - base64-0.13.0 \ + axum-0.6.12 \ + axum-client-ip-0.3.1 \ + axum-core-0.3.3 \ + axum-macros-0.3.7 \ + backtrace-0.3.67 \ + base64-0.13.1 \ + base64-0.21.0 \ + base64ct-1.6.0 \ bitflags-1.3.2 \ - blake3-1.3.1 \ - block-buffer-0.10.2 \ + bitflags-2.0.2 \ + blake3-1.3.3 \ + block-buffer-0.10.4 \ + block-padding-0.3.2 \ bstr-0.2.17 \ - bumpalo-3.9.1 \ + bstr-1.4.0 \ + bumpalo-3.12.0 \ byteorder-1.4.3 \ - bytes-1.1.0 \ - cast-0.2.7 \ - cc-1.0.73 \ + bytes-1.4.0 \ + bzip2-0.4.4 \ + bzip2-sys-0.1.11+1.0.8 \ + camino-1.1.4 \ + cast-0.3.0 \ + cbc-0.1.2 \ + cc-1.0.79 \ cfg-if-1.0.0 \ - chrono-0.4.19 \ - clap-2.34.0 \ - coarsetime-0.1.21 \ + chrono-0.4.24 \ + ciborium-0.2.0 \ + ciborium-io-0.2.0 \ + ciborium-ll-0.2.0 \ + cipher-0.3.0 \ + cipher-0.4.4 \ + clap-3.2.23 \ + clap-4.2.1 \ + clap_builder-4.2.1 \ + clap_complete-4.2.0 \ + clap_derive-4.2.0 \ + clap_lex-0.2.4 \ + clap_lex-0.4.1 \ + coarsetime-0.1.23 \ codespan-0.11.1 \ codespan-reporting-0.11.1 \ + concolor-override-1.0.0 \ + concolor-query-0.3.3 \ + concurrent-queue-2.1.0 \ constant_time_eq-0.1.5 \ - convert_case-0.4.0 \ + constant_time_eq-0.2.5 \ + convert_case-0.6.0 \ core-foundation-0.9.3 \ core-foundation-sys-0.8.3 \ + cpufeatures-0.2.6 \ crc32fast-1.3.2 \ - criterion-0.3.5 \ - criterion-plot-0.4.4 \ - crossbeam-channel-0.5.2 \ - crossbeam-deque-0.8.1 \ - crossbeam-epoch-0.9.7 \ - crossbeam-utils-0.8.7 \ - crypto-common-0.1.3 \ - cssparser-0.27.2 \ - cssparser-macros-0.6.0 \ - csv-1.1.6 \ - csv-core-0.1.10 \ - derive_more-0.99.17 \ - digest-0.10.3 \ - dirs-next-2.0.0 \ - dirs-sys-next-0.1.2 \ - dtoa-0.4.8 \ - dtoa-short-0.3.3 \ - dunce-1.0.2 \ - either-1.6.1 \ - encoding_rs-0.8.30 \ - env_logger-0.9.0 \ + criterion-0.4.0 \ + criterion-plot-0.5.0 \ + crossbeam-channel-0.5.8 \ + crossbeam-deque-0.8.3 \ + crossbeam-epoch-0.9.14 \ + crossbeam-utils-0.8.15 \ + crypto-common-0.1.6 \ + cxx-1.0.94 \ + cxx-build-1.0.94 \ + cxxbridge-flags-1.0.94 \ + cxxbridge-macro-1.0.94 \ + deadpool-0.9.5 \ + deadpool-runtime-0.1.2 \ + des-0.8.1 \ + difflib-0.4.0 \ + digest-0.10.6 \ + displaydoc-0.2.3 \ + doc-comment-0.3.3 \ + duct-0.13.6 \ + dunce-1.0.3 \ + either-1.8.1 \ + elasticlunr-rs-3.0.2 \ + encoding_rs-0.8.32 \ + env_logger-0.10.0 \ + errno-0.3.0 \ + errno-dragonfly-0.1.2 \ + event-listener-2.5.3 \ fallible-iterator-0.2.0 \ fallible-streaming-iterator-0.1.9 \ - fastrand-1.7.0 \ - fixedbitset-0.4.1 \ - flate2-1.0.22 \ + fastrand-1.9.0 \ + filetime-0.2.20 \ + find-winsdk-0.2.0 \ + fixedbitset-0.4.2 \ + flate2-1.0.25 \ fluent-0.16.0 \ fluent-bundle-0.15.2 \ fluent-langneg-0.13.0 \ @@ -141,306 +167,408 @@ CARGO_CRATES= adler-1.0.2 \ fnv-1.0.7 \ foreign-types-0.3.2 \ foreign-types-shared-0.1.1 \ - form_urlencoded-1.0.1 \ + form_urlencoded-1.1.0 \ + forwarded-header-value-0.1.1 \ + fs2-0.4.3 \ + fsevent-sys-4.1.0 \ futf-0.1.5 \ - futures-0.3.21 \ - futures-channel-0.3.21 \ - futures-core-0.3.21 \ - futures-executor-0.3.21 \ - futures-io-0.3.21 \ - futures-macro-0.3.21 \ - futures-sink-0.3.21 \ - futures-task-0.3.21 \ - futures-util-0.3.21 \ - fxhash-0.2.1 \ - generic-array-0.14.5 \ + futures-0.3.28 \ + futures-channel-0.3.28 \ + futures-core-0.3.28 \ + futures-executor-0.3.28 \ + futures-io-0.3.28 \ + futures-lite-1.12.0 \ + futures-macro-0.3.28 \ + futures-sink-0.3.28 \ + futures-task-0.3.28 \ + futures-timer-3.0.2 \ + futures-util-0.3.28 \ + generic-array-0.14.7 \ getopts-0.2.21 \ getrandom-0.1.16 \ - getrandom-0.2.5 \ - h2-0.3.12 \ + getrandom-0.2.8 \ + gimli-0.27.2 \ + gitignore-1.0.7 \ + glob-0.3.1 \ + globset-0.4.10 \ + h2-0.3.18 \ half-1.8.2 \ - hashbrown-0.11.2 \ - hashlink-0.7.0 \ - heck-0.3.3 \ + handlebars-4.3.6 \ + hashbrown-0.12.3 \ + hashlink-0.8.1 \ + headers-0.3.8 \ + headers-core-0.2.0 \ + heck-0.4.1 \ hermit-abi-0.1.19 \ + hermit-abi-0.2.6 \ + hermit-abi-0.3.1 \ hex-0.4.3 \ - html5ever-0.25.1 \ + hmac-0.12.1 \ + html5ever-0.26.0 \ htmlescape-0.3.1 \ - http-0.2.6 \ - http-body-0.4.4 \ - httparse-1.6.0 \ + http-0.2.9 \ + http-body-0.4.5 \ + http-range-header-0.3.0 \ + http-types-2.12.0 \ + httparse-1.8.0 \ httpdate-1.0.2 \ humantime-2.1.0 \ - hyper-0.14.17 \ - hyper-rustls-0.22.1 \ + hyper-0.14.25 \ + hyper-rustls-0.23.2 \ hyper-tls-0.5.0 \ + iana-time-zone-0.1.56 \ + iana-time-zone-haiku-0.1.1 \ id_tree-1.8.0 \ - idna-0.2.3 \ - indexmap-1.8.0 \ - indoc-0.3.6 \ - indoc-impl-0.3.6 \ + idna-0.3.0 \ + indexmap-1.9.3 \ + indoc-1.0.9 \ + infer-0.2.3 \ inflections-1.1.1 \ + inotify-0.9.6 \ + inotify-sys-0.1.5 \ + inout-0.1.3 \ instant-0.1.12 \ intl-memoizer-0.5.1 \ - intl_pluralrules-7.0.1 \ - ipnet-2.4.0 \ - itertools-0.10.3 \ - itoa-0.4.8 \ - itoa-1.0.1 \ - jobserver-0.1.24 \ - js-sys-0.3.56 \ - kuchiki-0.8.1 \ + intl_pluralrules-7.0.2 \ + io-lifetimes-1.0.9 \ + ipnet-2.7.2 \ + is-terminal-0.4.6 \ + itertools-0.10.5 \ + itoa-1.0.6 \ + jobserver-0.1.26 \ + js-sys-0.3.61 \ + junction-1.0.0 \ + kqueue-1.0.7 \ + kqueue-sys-1.0.3 \ lazy_static-1.4.0 \ - libc-0.2.120 \ - libsqlite3-sys-0.23.2 \ - linkify-0.5.0 \ - lock_api-0.4.6 \ - log-0.4.14 \ + libc-0.2.140 \ + libsqlite3-sys-0.26.0 \ + line-wrap-0.1.1 \ + link-cplusplus-1.0.8 \ + linkify-0.7.0 \ + linux-raw-sys-0.3.1 \ + lock_api-0.4.9 \ + log-0.4.17 \ + lzma-sys-0.1.20 \ mac-0.1.1 \ maplit-1.0.2 \ - markup5ever-0.10.1 \ - markup5ever_rcdom-0.1.0 \ - matches-0.1.9 \ - memchr-2.4.1 \ - memoffset-0.6.5 \ - mime-0.3.16 \ + markup5ever-0.11.0 \ + markup5ever_rcdom-0.2.0 \ + matchers-0.1.0 \ + matches-0.1.10 \ + matchit-0.7.0 \ + mdbook-0.4.28 \ + memchr-2.5.0 \ + memoffset-0.8.0 \ + mime-0.3.17 \ mime_guess-2.0.4 \ minimal-lexical-0.2.1 \ - miniz_oxide-0.4.4 \ - mio-0.8.1 \ - miow-0.3.7 \ + miniz_oxide-0.6.2 \ + mio-0.8.6 \ + multer-2.0.4 \ multimap-0.8.3 \ - native-tls-0.2.8 \ + native-tls-0.2.11 \ new_debug_unreachable-1.0.4 \ - nodrop-0.1.14 \ - nom-7.1.1 \ - ntapi-0.3.7 \ - num-format-0.4.0 \ - num-integer-0.1.44 \ - num-traits-0.2.14 \ - num_cpus-1.13.1 \ - num_enum-0.5.7 \ - num_enum_derive-0.5.7 \ - num_threads-0.1.4 \ - once_cell-1.10.0 \ + nom-7.1.3 \ + nonempty-0.7.0 \ + notify-5.1.0 \ + notify-debouncer-mini-0.2.1 \ + nu-ansi-term-0.46.0 \ + num-format-0.4.4 \ + num-integer-0.1.45 \ + num-traits-0.2.15 \ + num_cpus-1.15.0 \ + num_enum-0.5.11 \ + num_enum_derive-0.5.11 \ + object-0.30.3 \ + once_cell-1.17.1 \ oorandom-11.1.3 \ - openssl-0.10.38 \ + opaque-debug-0.3.0 \ + opener-0.5.2 \ + openssl-0.10.48 \ + openssl-macros-0.1.0 \ openssl-probe-0.1.5 \ - openssl-sys-0.9.72 \ - parking_lot-0.11.2 \ - parking_lot-0.12.0 \ - parking_lot_core-0.8.5 \ - parking_lot_core-0.9.1 \ - paste-0.1.18 \ - paste-impl-0.1.18 \ - percent-encoding-2.1.0 \ - petgraph-0.6.0 \ - phf-0.8.0 \ + openssl-sys-0.9.83 \ + os_pipe-1.1.3 \ + os_str_bytes-6.5.0 \ + overload-0.1.1 \ + p12-0.6.3 \ + parking-2.0.0 \ + parking_lot-0.12.1 \ + parking_lot_core-0.9.7 \ + password-hash-0.4.2 \ + pbkdf2-0.11.0 \ + pem-1.1.1 \ + percent-encoding-2.2.0 \ + pest-2.5.7 \ + pest_derive-2.5.7 \ + pest_generator-2.5.7 \ + pest_meta-2.5.7 \ + petgraph-0.6.3 \ phf-0.10.1 \ - phf_codegen-0.8.0 \ - phf_generator-0.8.0 \ + phf-0.11.1 \ + phf_codegen-0.10.0 \ phf_generator-0.10.0 \ - phf_macros-0.8.0 \ - phf_macros-0.10.0 \ - phf_shared-0.8.0 \ + phf_generator-0.11.1 \ + phf_macros-0.11.1 \ phf_shared-0.10.0 \ - pin-project-1.0.10 \ - pin-project-internal-1.0.10 \ - pin-project-lite-0.2.8 \ + phf_shared-0.11.1 \ + pin-project-1.0.12 \ + pin-project-internal-1.0.12 \ + pin-project-lite-0.2.9 \ pin-utils-0.1.0 \ - pkg-config-0.3.24 \ - plotters-0.3.1 \ - plotters-backend-0.3.2 \ - plotters-svg-0.3.1 \ - ppv-lite86-0.2.16 \ + pkg-config-0.3.26 \ + plist-1.4.3 \ + plotters-0.3.4 \ + plotters-backend-0.3.4 \ + plotters-svg-0.3.3 \ + ppv-lite86-0.2.17 \ precomputed-hash-0.1.1 \ - proc-macro-crate-1.1.3 \ - proc-macro-hack-0.5.19 \ - proc-macro-nested-0.1.7 \ - proc-macro2-1.0.36 \ - prost-0.9.0 \ - prost-build-0.9.0 \ - prost-derive-0.9.0 \ - prost-types-0.9.0 \ + prettyplease-0.1.25 \ + proc-macro-crate-1.3.1 \ + proc-macro-hack-0.5.20+deprecated \ + proc-macro2-1.0.54 \ + prost-0.11.8 \ + prost-build-0.11.8 \ + prost-derive-0.11.8 \ + prost-types-0.11.8 \ pulldown-cmark-0.8.0 \ - pyo3-0.15.1 \ - pyo3-build-config-0.15.1 \ - pyo3-macros-0.15.1 \ - pyo3-macros-backend-0.15.1 \ - quote-1.0.15 \ + pulldown-cmark-0.9.2 \ + pyo3-0.18.2 \ + pyo3-build-config-0.18.2 \ + pyo3-ffi-0.18.2 \ + pyo3-macros-0.18.2 \ + pyo3-macros-backend-0.18.2 \ + quick-xml-0.28.1 \ + quote-1.0.26 \ rand-0.7.3 \ rand-0.8.5 \ rand_chacha-0.2.2 \ rand_chacha-0.3.1 \ rand_core-0.5.1 \ - rand_core-0.6.3 \ + rand_core-0.6.4 \ rand_hc-0.2.0 \ rand_pcg-0.2.1 \ - rayon-1.5.1 \ - rayon-core-1.9.1 \ - redox_syscall-0.2.11 \ - redox_users-0.4.0 \ - regex-1.5.6 \ + rayon-1.7.0 \ + rayon-core-1.11.0 \ + rc2-0.8.1 \ + rcgen-0.10.0 \ + redox_syscall-0.2.16 \ + redox_syscall-0.3.5 \ + regex-1.7.3 \ regex-automata-0.1.10 \ - regex-syntax-0.6.26 \ - remove_dir_all-0.5.3 \ + regex-syntax-0.6.29 \ + reqwest-0.11.16 \ + retain_mut-0.1.9 \ ring-0.16.20 \ - rusqlite-0.26.3 \ + rusqlite-0.29.0 \ + rustc-demangle-0.1.22 \ rustc-hash-1.1.0 \ - rustc_version-0.4.0 \ - rustls-0.19.1 \ - rustls-native-certs-0.5.0 \ - rustversion-1.0.6 \ - ryu-1.0.9 \ + rustix-0.37.5 \ + rustls-0.20.8 \ + rustls-native-certs-0.6.2 \ + rustls-pemfile-1.0.2 \ + rustversion-1.0.12 \ + ryu-1.0.13 \ + safemem-0.3.3 \ same-file-1.0.6 \ - schannel-0.1.19 \ + schannel-0.1.21 \ + scoped-tls-1.0.1 \ scopeguard-1.1.0 \ - sct-0.6.1 \ - security-framework-2.6.1 \ - security-framework-sys-2.6.1 \ - selectors-0.22.0 \ + scratch-1.0.5 \ + sct-0.7.0 \ + security-framework-2.8.2 \ + security-framework-sys-2.8.0 \ self_cell-0.10.2 \ - semver-1.0.6 \ - serde-1.0.136 \ - serde-aux-3.0.1 \ - serde_cbor-0.11.2 \ - serde_derive-1.0.136 \ - serde_json-1.0.79 \ - serde_repr-0.1.7 \ + semver-1.0.17 \ + serde-1.0.159 \ + serde-aux-4.1.2 \ + serde_derive-1.0.159 \ + serde_json-1.0.95 \ + serde_path_to_error-0.1.11 \ + serde_qs-0.8.5 \ + serde_repr-0.1.12 \ serde_tuple-0.5.0 \ serde_tuple_macros-0.5.0 \ serde_urlencoded-0.7.1 \ - servo_arc-0.1.1 \ - sha1-0.6.1 \ - sha1_smol-1.0.0 \ - signal-hook-registry-1.4.0 \ + sha1-0.10.5 \ + sha2-0.10.6 \ + sharded-slab-0.1.4 \ + shared_child-1.0.0 \ + shlex-1.1.0 \ + signal-hook-registry-1.4.1 \ + simple-file-manifest-0.11.0 \ siphasher-0.3.10 \ - slab-0.4.5 \ - slog-2.7.0 \ - slog-async-2.7.0 \ - slog-envlogger-2.2.0 \ - slog-scope-4.4.0 \ - slog-stdlog-4.1.0 \ - slog-term-2.9.0 \ - smallvec-1.8.0 \ + slab-0.4.8 \ + smallvec-1.10.0 \ + snafu-0.7.4 \ + snafu-derive-0.7.4 \ snowflake-1.3.0 \ - socket2-0.4.4 \ + socket2-0.4.9 \ spin-0.5.2 \ - stable_deref_trait-1.2.0 \ - string_cache-0.8.3 \ - string_cache_codegen-0.5.1 \ - strum-0.23.0 \ - strum_macros-0.23.1 \ + spin-0.9.8 \ + string_cache-0.8.7 \ + string_cache_codegen-0.5.2 \ + strsim-0.10.0 \ + strum-0.24.1 \ + strum_macros-0.24.3 \ subtle-2.4.1 \ - syn-1.0.88 \ - take_mut-0.2.2 \ - tempfile-3.3.0 \ - tendril-0.4.2 \ - term-0.7.0 \ - termcolor-1.1.3 \ - textwrap-0.11.0 \ - thin-slice-0.1.1 \ - thiserror-1.0.30 \ - thiserror-impl-1.0.30 \ - thread_local-1.1.4 \ - time-0.1.44 \ - time-0.3.7 \ - time-macros-0.2.3 \ - tinystr-0.3.4 \ + syn-1.0.109 \ + syn-2.0.12 \ + sync_wrapper-0.1.2 \ + tar-0.4.38 \ + target-lexicon-0.12.6 \ + tempfile-3.5.0 \ + tendril-0.4.3 \ + termcolor-1.2.0 \ + terminal_size-0.2.6 \ + textwrap-0.16.0 \ + thiserror-1.0.40 \ + thiserror-impl-1.0.40 \ + thread_local-1.1.7 \ + time-0.3.20 \ + time-core-0.1.0 \ + time-macros-0.2.8 \ + tinystr-0.7.1 \ tinytemplate-1.2.1 \ - tinyvec-1.5.1 \ - tinyvec_macros-0.1.0 \ - tokio-1.17.0 \ - tokio-macros-1.7.0 \ - tokio-native-tls-0.3.0 \ - tokio-rustls-0.22.0 \ + tinyvec-1.6.0 \ + tinyvec_macros-0.1.1 \ + tokio-1.27.0 \ + tokio-macros-2.0.0 \ + tokio-native-tls-0.3.1 \ + tokio-rustls-0.23.4 \ tokio-socks-0.5.1 \ - tokio-util-0.6.9 \ - toml-0.5.8 \ - tower-service-0.3.1 \ - tracing-0.1.32 \ - tracing-core-0.1.23 \ - try-lock-0.2.3 \ + tokio-stream-0.1.12 \ + tokio-tungstenite-0.18.0 \ + tokio-util-0.7.7 \ + toml-0.5.11 \ + toml_datetime-0.6.1 \ + toml_edit-0.19.8 \ + topological-sort-0.2.2 \ + tower-0.4.13 \ + tower-http-0.4.0 \ + tower-layer-0.3.2 \ + tower-service-0.3.2 \ + tracing-0.1.37 \ + tracing-appender-0.2.2 \ + tracing-attributes-0.1.23 \ + tracing-core-0.1.30 \ + tracing-log-0.1.3 \ + tracing-subscriber-0.3.16 \ + try-lock-0.2.4 \ + tugger-common-0.10.0 \ + tugger-windows-0.10.0 \ + tugger-windows-codesign-0.10.0 \ + tungstenite-0.18.0 \ type-map-0.4.0 \ - typenum-1.15.0 \ + typenum-1.16.0 \ + ucd-trie-0.1.5 \ unic-char-property-0.9.0 \ unic-char-range-0.9.0 \ unic-common-0.9.0 \ - unic-langid-0.9.0 \ - unic-langid-impl-0.9.0 \ - unic-langid-macros-0.9.0 \ - unic-langid-macros-impl-0.9.0 \ + unic-langid-0.9.1 \ + unic-langid-impl-0.9.1 \ + unic-langid-macros-0.9.1 \ + unic-langid-macros-impl-0.9.1 \ unic-ucd-category-0.9.0 \ unic-ucd-version-0.9.0 \ unicase-2.6.0 \ - unicode-bidi-0.3.7 \ - unicode-normalization-0.1.19 \ - unicode-segmentation-1.9.0 \ - unicode-width-0.1.9 \ - unicode-xid-0.2.2 \ - unindent-0.1.8 \ + unicode-bidi-0.3.13 \ + unicode-ident-1.0.8 \ + unicode-normalization-0.1.22 \ + unicode-segmentation-1.10.1 \ + unicode-width-0.1.10 \ + unindent-0.1.11 \ untrusted-0.7.1 \ - url-2.2.2 \ + url-2.3.1 \ utf-8-0.7.6 \ - utf8-decode-1.0.1 \ + utf8parse-0.2.1 \ utime-0.3.1 \ + valuable-0.1.0 \ vcpkg-0.2.15 \ version_check-0.9.4 \ - walkdir-2.3.2 \ + waker-fn-1.1.0 \ + walkdir-2.3.3 \ want-0.3.0 \ + warp-0.3.4 \ wasi-0.9.0+wasi-snapshot-preview1 \ - wasi-0.10.0+wasi-snapshot-preview1 \ wasi-0.11.0+wasi-snapshot-preview1 \ - wasm-bindgen-0.2.79 \ - wasm-bindgen-backend-0.2.79 \ - wasm-bindgen-futures-0.4.29 \ - wasm-bindgen-macro-0.2.79 \ - wasm-bindgen-macro-support-0.2.79 \ - wasm-bindgen-shared-0.2.79 \ - web-sys-0.3.56 \ - webpki-0.21.4 \ - webpki-roots-0.21.1 \ - which-4.2.4 \ + wasm-bindgen-0.2.84 \ + wasm-bindgen-backend-0.2.84 \ + wasm-bindgen-futures-0.4.34 \ + wasm-bindgen-macro-0.2.84 \ + wasm-bindgen-macro-support-0.2.84 \ + wasm-bindgen-shared-0.2.84 \ + wasm-streams-0.2.3 \ + web-sys-0.3.61 \ + webpki-0.22.0 \ + webpki-roots-0.22.6 \ + which-4.4.0 \ winapi-0.3.9 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-util-0.1.5 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ - windows-sys-0.32.0 \ - windows_aarch64_msvc-0.32.0 \ - windows_i686_gnu-0.32.0 \ - windows_i686_msvc-0.32.0 \ - windows_x86_64_gnu-0.32.0 \ - windows_x86_64_msvc-0.32.0 \ - winreg-0.7.0 \ - xml5ever-0.16.2 \ - zip-0.5.13 \ - zstd-0.10.0+zstd.1.5.2 \ - zstd-safe-4.1.4+zstd.1.5.2 \ - zstd-sys-1.6.3+zstd.1.5.2 \ - reqwest@git+https://github.com/ankitects/reqwest.git?rev=7591444614de02b658ddab125efba7b2bb4e2335\#7591444614de02b658ddab125efba7b2bb4e2335 \ - hyper-timeout@git+https://github.com/ankitects/hyper-timeout.git?rev=0cb6f7d14c62819e37cd221736f8b0555e823712\#0cb6f7d14c62819e37cd221736f8b0555e823712 \ + windows-0.48.0 \ + windows-sys-0.42.0 \ + windows-sys-0.45.0 \ + windows-sys-0.48.0 \ + windows-targets-0.42.2 \ + windows-targets-0.48.0 \ + windows_aarch64_gnullvm-0.42.2 \ + windows_aarch64_gnullvm-0.48.0 \ + windows_aarch64_msvc-0.42.2 \ + windows_aarch64_msvc-0.48.0 \ + windows_i686_gnu-0.42.2 \ + windows_i686_gnu-0.48.0 \ + windows_i686_msvc-0.42.2 \ + windows_i686_msvc-0.48.0 \ + windows_x86_64_gnu-0.42.2 \ + windows_x86_64_gnu-0.48.0 \ + windows_x86_64_gnullvm-0.42.2 \ + windows_x86_64_gnullvm-0.48.0 \ + windows_x86_64_msvc-0.42.2 \ + windows_x86_64_msvc-0.48.0 \ + winnow-0.4.1 \ + winreg-0.5.1 \ + winreg-0.10.1 \ + wiremock-0.5.17 \ + xattr-0.2.3 \ + xml5ever-0.17.0 \ + xz2-0.1.7 \ + yasna-0.5.1 \ + zip-0.6.4 \ + zstd-0.11.2+zstd.1.5.2 \ + zstd-0.12.3+zstd.1.5.2 \ + zstd-safe-5.0.2+zstd.1.5.2 \ + zstd-safe-6.0.4+zstd.1.5.4 \ + zstd-sys-2.0.7+zstd.1.5.4 \ + percent-encoding@git+https://github.com/ankitects/rust-url.git?rev=06a87b6c31c7e9a856a3fb058cb30b204c05b650\#06a87b6c31c7e9a856a3fb058cb30b204c05b650 \ csv,csv-core@git+https://github.com/ankitects/rust-csv.git?rev=1c9d3aab6f79a7d815c69f925a46a4590c115f90\#1c9d3aab6f79a7d815c69f925a46a4590c115f90 \ - linkcheck@git+https://github.com/ankitects/linkcheck.git?rev=2f20798ce521cc594d510d4e417e76d5eac04d4b\#2f20798ce521cc594d510d4e417e76d5eac04d4b \ - tokio-io-timeout@git+https://github.com/ankitects/tokio-io-timeout.git?rev=1ee0892217e9a76bba4bb369ec5fab8854935a3c\#1ee0892217e9a76bba4bb369ec5fab8854935a3c \ - pct-str@git+https://github.com/timothee-haudebourg/pct-str.git?rev=4adccd8d4a222ab2672350a102f06ae832a0572d\#4adccd8d4a222ab2672350a102f06ae832a0572d + linkcheck@git+https://github.com/ankitects/linkcheck.git?rev=184b2ca50ed39ca43da13f0b830a463861adb9ca\#184b2ca50ed39ca43da13f0b830a463861adb9ca -CARGO_CARGOTOML= ${WRKSRC}/pylib/rsbridge/Cargo.toml +CARGO_CARGOTOML= ${WRKSRC}/Cargo.toml CARGO_BUILD= no CARGO_INSTALL= no -# BAZEL=1 is required otherwise ${WRKSRC}/rslib/build/main.rs produces a dummy -# buildinfo.txt that doesn't contain the actual build hash. -CARGO_ENV= BAZEL=1 \ - BUILDINFO=${_MY_LOCALREPO}/rust_output/buildinfo.txt \ - PYO3_PYTHON=${PYTHON_CMD} \ - PROTO_TOP=${WRKSRC}/proto/.top_level \ - PROTOC=${LOCALBASE}/bin/protoc \ - BACKEND_PROTO=${WRKSRC}/rslib/backend.proto \ - RSLIB_FTL_ROOT=${WRKSRC_ftlrslib}/l10n.toml \ - EXTRA_FTL_ROOT=${WRKSRC_ftlextra}/l10n.toml +CARGO_TARGET_DIR= ${WRKSRC}/out/rust -GO_TARGET= ./cmd/esbuild:esbuild +# Custom variables introduced to the runner build system via patches +MAKE_ENV+= NO_BUNDLE=1 \ + NO_VENV=1 \ + OFFLINE_BUILD=1 \ + OFFLINE_YARNCACHE=${_MY_YARNCACHE} +# Variables already known and used by the "runner" build system +MAKE_ENV+= NODE_BINARY=${LOCALBASE}/bin/node \ + PROTOC_BINARY=${LOCALBASE}/bin/protoc \ + PYTHON_BINARY=${PYTHON_CMD} \ + YARN_BINARY=${LOCALBASE}/bin/yarn \ + out=${WRKSRC}/out +# If RELEASE is unset the "runner" build system omits the +# "--release" flag for cargo(1). +.if !defined(WITH_DEBUG) +MAKE_ENV+= RELEASE=1 +.endif OPTIONS_DEFAULT= MPV OPTIONS_GROUP= PLAYER @@ -455,162 +583,69 @@ MPV_RUN_DEPENDS= mpv:multimedia/mpv # Should contain the most recent commit that reflects ${DISTVERSION} and must # be exactly 8 digits otherwise the check for newer versions won't work as # expected. -_MY_BUILDHASH= b6a7760c -# Required version of esbuild that is pre-built. This is because the JS -# counterpart of esbuild, which is used by the NodeJS ruleset for Bazel, has a -# fixed version check for the binary version. -_MY_ESBUILDVER= v0.14.11 -# Path of the local bazel repositories -_MY_LOCALREPO= ${WRKSRC}/local_repos -# Path of caches that are used by www/npm and www/yarn *** 4571 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305081155.348BtLBe097296>