diff options
author | Marek Szuba <marecki@gentoo.org> | 2022-07-27 14:07:14 +0100 |
---|---|---|
committer | Marek Szuba <marecki@gentoo.org> | 2022-07-27 14:10:48 +0100 |
commit | b4fabe3321f48b90f0e4700284af92b857425456 (patch) | |
tree | 718b2eea480b962b8983586822785bdd36238579 /sys-apps/fwupd | |
parent | sys-cluster/knem: Remove unused patch (diff) | |
download | gentoo-b4fabe3321f48b90f0e4700284af92b857425456.tar.gz gentoo-b4fabe3321f48b90f0e4700284af92b857425456.tar.bz2 gentoo-b4fabe3321f48b90f0e4700284af92b857425456.zip |
sys-apps/fwupd: add 1.8.3
Closes: https://bugs.gentoo.org/841767
Closes: https://bugs.gentoo.org/859331
Signed-off-by: Marek Szuba <marecki@gentoo.org>
Diffstat (limited to 'sys-apps/fwupd')
-rw-r--r-- | sys-apps/fwupd/Manifest | 1 | ||||
-rw-r--r-- | sys-apps/fwupd/files/fwupd-1.8.3-docgen_deps_test.patch | 16 | ||||
-rw-r--r-- | sys-apps/fwupd/fwupd-1.8.3.ebuild | 198 |
3 files changed, 215 insertions, 0 deletions
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index 6f34e1f61853..5c1ae4a880be 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -2,3 +2,4 @@ DIST fwupd-1.7.5.tar.gz 4014523 BLAKE2B b7297bbf3358209464691b928b928fa029c68ae6 DIST fwupd-1.7.7.tar.gz 4057638 BLAKE2B 197d7b8a8de64094d267bb4e2de30101373bcc52fd54d12dc2590a50f2bcebbcfe00847d19c0088d2c778743d219ee73c0237db711ad27e36f7126f7c615ccf7 SHA512 a787ffdff93f483ad97547d335c50a4db7b61bce1bc27d737b077bbedfa4676c8d6d37db94ac24083c50e3bfde8aefd4d1adb3d0e473303f454a46dde136df0a DIST fwupd-1.8.0.tar.gz 4103239 BLAKE2B 15d06a261be1f529573a0f3b21a54066b1b286e1d1c68ac24f3862f7e3a8855661775b369016d67fbc9797fd13dea88000e78d1a6973e489ecaa6f7f6855b3cf SHA512 8977e0b0878e46480565a32935cc008d57d3978609c01877e3a90dc594b122bed0c94613a53f0f2d3f50d8a039b09cb93787aaf7e0b5d8cf1ec1a6247fe1610b DIST fwupd-1.8.1.tar.gz 4143691 BLAKE2B 1606bc35e0bf15efe202ec906161e5c526d4fdd1ef1469da6aeb141539c3196cbdd603b124e805c4eb43c020fed5049b1813d6301211fa02fa4c0c2c2b8222b3 SHA512 9f3e15b977b335058d1430049f19de8a17260cdbc4e84aa728ff4e6db3deebc8725f532e9b3edb7d51a0ddc9cc9f8272449417e7345009d447b9f4b3378a4819 +DIST fwupd-1.8.3.tar.gz 4267315 BLAKE2B 35e5855ea0d314fa5b1cc33ed4efa71e54c35b57c742748a5d6c7f4c1f88bfd9c2e5a84f2af72f6e5e63ddfc4f6521312fb7b1446922c76917f9abdd4d90e618 SHA512 271a1c2547f35322a7a7d83adc84d729ba73d810f6ac526d1c6aa2a9774dea1edc986b7d62481ebb70d43653577ced19f13f695dedf4012c82d814da70cb83f4 diff --git a/sys-apps/fwupd/files/fwupd-1.8.3-docgen_deps_test.patch b/sys-apps/fwupd/files/fwupd-1.8.3-docgen_deps_test.patch new file mode 100644 index 000000000000..297bde7d1740 --- /dev/null +++ b/sys-apps/fwupd/files/fwupd-1.8.3-docgen_deps_test.patch @@ -0,0 +1,16 @@ +test-deps.py attempts to check the version of dev-python/markdown used +by dev-util/gi-docgen by importing it. However, on Gentoo there is no +guarantee that the gi-docgen executable and fwupd build scripts use +the same Python interpreter. + +--- a/meson.build ++++ b/meson.build +@@ -542,7 +542,7 @@ + fwupd_gir = [] + introspection = get_option('introspection').disable_auto_if(host_machine.system() != 'linux') + r = run_command([python3, 'docs/test-deps.py']) +-docs_python_deps = get_option('docs').require(r.returncode() == 0, error_message: r.stdout()) ++docs_python_deps = get_option('docs') + gidocgen_dep = dependency('gi-docgen', + version: '>= 2021.1', + native: true, diff --git a/sys-apps/fwupd/fwupd-1.8.3.ebuild b/sys-apps/fwupd/fwupd-1.8.3.ebuild new file mode 100644 index 000000000000..4b5782ab7029 --- /dev/null +++ b/sys-apps/fwupd/fwupd-1.8.3.ebuild @@ -0,0 +1,198 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) + +inherit linux-info meson python-single-r1 vala udev xdg + +DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable" +HOMEPAGE="https://fwupd.org" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="amt archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test tpm uefi" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ^^ ( elogind minimal systemd ) + dell? ( uefi ) + fastboot? ( gusb ) + logitech? ( gusb ) + minimal? ( !introspection ) + modemmanager ( gusb ) + spi? ( lzma ) + synaptics? ( gnutls ) + uefi? ( gnutls ) +" +RESTRICT="!test? ( test )" + +BDEPEND="$(vala_depend) + >=dev-util/meson-0.60.0 + virtual/pkgconfig + gtk-doc? ( + >=dev-util/gi-docgen-2021.1 + ) + bash-completion? ( >=app-shells/bash-completion-2.0 ) + introspection? ( dev-libs/gobject-introspection ) + man? ( + app-text/docbook-sgml-utils + sys-apps/help2man + ) + test? ( + dev-util/umockdev + net-libs/gnutls[tools] + ) +" +COMMON_DEPEND="${PYTHON_DEPS} + >=app-arch/gcab-1.0 + app-arch/xz-utils + >=dev-libs/glib-2.58:2 + dev-libs/json-glib + dev-libs/libgudev:= + >=dev-libs/libjcat-0.1.4[gpg,pkcs7] + >=dev-libs/libxmlb-0.1.13:=[introspection?] + $(python_gen_cond_dep ' + dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] + ') + >=net-libs/libsoup-2.51.92:2.4[introspection?] + net-misc/curl + archive? ( app-arch/libarchive:= ) + cbor? ( dev-libs/libcbor ) + dell? ( + >=app-crypt/tpm2-tss-2.0 + >=sys-libs/libsmbios-2.4.0 + ) + elogind? ( >=sys-auth/elogind-211 ) + flashrom? ( >=sys-apps/flashrom-1.2-r3 ) + gnutls? ( net-libs/gnutls ) + gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) + logitech? ( dev-libs/protobuf-c:= ) + lzma? ( app-arch/xz-utils ) + modemmanager? ( net-misc/modemmanager[qmi] ) + policykit? ( >=sys-auth/polkit-0.114 ) + sqlite? ( dev-db/sqlite ) + systemd? ( >=sys-apps/systemd-211 ) + tpm? ( app-crypt/tpm2-tss:= ) + uefi? ( + sys-apps/fwupd-efi + sys-boot/efibootmgr + sys-fs/udisks + sys-libs/efivar + ) +" +RDEPEND=" + ${COMMON_DEPEND} + sys-apps/dbus +" + +DEPEND=" + ${COMMON_DEPEND} + x11-libs/pango[introspection] +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.8.3-docgen_deps_test.patch +) + +pkg_setup() { + python-single-r1_pkg_setup + vala_setup + if use nvme ; then + kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4" + fi +} + +src_prepare() { + default + # c.f. https://github.com/fwupd/fwupd/issues/1414 + sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \ + -i plugins/thunderbolt/meson.build || die + + sed -e '/platform-integrity/d' \ + -i plugins/meson.build || die #753521 + + sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \ + -i data/builder/meson.build || die + sed -e "/install_dir.*'doc'/s/doc/gtk-doc/" \ + -i docs/meson.build || die +} + +src_configure() { + # TODO (maybe): acpi_phat, bcm57xx, cfu, cpu, emmc, ep963x, mtd, nitrokey, + # parade_lspcon, pixart_rf, realtek_mst, scsi, redfish, upower + local plugins=( + -Dplugin_gpio="enabled" + $(meson_feature amt plugin_amt) + $(meson_feature dell plugin_dell) + $(meson_feature fastboot plugin_fastboot) + $(meson_feature flashrom plugin_flashrom) + $(meson_feature gusb plugin_uf2) + $(meson_feature logitech plugin_logitech_bulkcontroller) + $(meson_feature modemmanager plugin_modem_manager) + $(meson_feature nvme plugin_nvme) + $(meson_use spi plugin_intel_spi) + $(meson_feature synaptics plugin_synaptics_mst) + $(meson_feature synaptics plugin_synaptics_rmi) + $(meson_feature tpm plugin_tpm) + $(meson_feature uefi plugin_uefi_capsule) + $(meson_use uefi plugin_uefi_capsule_splash) + $(meson_feature uefi plugin_uefi_pk) + ) + if use ppc64 || use riscv ; then + plugins+=( -Dplugin_msr="disabled" ) + fi + + local emesonargs=( + --localstatedir "${EPREFIX}"/var + -Dbuild="$(usex minimal standalone all)" + -Dconsolekit="disabled" + -Dcurl="enabled" + -Defi_binary="false" + -Dsupported_build="enabled" + -Dudevdir="${EPREFIX}$(get_udevdir)" + $(meson_feature archive libarchive) + $(meson_use bash-completion bash_completion) + $(meson_feature bluetooth bluez) + $(meson_feature cbor) + $(meson_feature elogind) + $(meson_feature gnutls) + $(meson_feature gtk-doc docs) + $(meson_feature gusb) + $(meson_feature lzma) + $(meson_use man) + $(meson_feature introspection) + $(meson_feature policykit polkit) + $(meson_feature sqlite) + $(meson_feature systemd) + $(meson_use test tests) + + ${plugins[@]} + ) + use uefi && emesonargs+=( -Defi_os_dir="gentoo" ) + export CACHE_DIRECTORY="${T}" + meson_src_configure +} + +src_install() { + meson_src_install + + if ! use minimal ; then + newinitd "${FILESDIR}"/${PN}-r2 ${PN} + + if ! use systemd ; then + # Don't timeout when fwupd is running (#673140) + sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \ + -i "${ED}"/etc/${PN}/daemon.conf || die + fi + fi +} + +pkg_postinst() { + use minimal || udev_reload +} + +pkg_postrm() { + use minimal || udev_reload +} |