From b63eeb5988488c15b4a633b6781999c50669613f Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Fri, 15 Oct 2021 15:54:12 +0200 Subject: sys-apps/fwupd: bump to v1.7.0 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Thomas Deutschmann --- sys-apps/fwupd/Manifest | 1 + .../files/fwupd-1.7.0-elanfp-requires-gusb.patch | 22 +++ sys-apps/fwupd/fwupd-1.7.0.ebuild | 178 +++++++++++++++++++++ sys-apps/fwupd/metadata.xml | 1 + 4 files changed, 202 insertions(+) create mode 100644 sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch create mode 100644 sys-apps/fwupd/fwupd-1.7.0.ebuild (limited to 'sys-apps') diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index f73af45bdb66..576bc66efddf 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -2,3 +2,4 @@ DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6a DIST fwupd-1.6.2.tar.gz 3885963 BLAKE2B 183abc4d620b884a276dece39ad1e57f606c2237a5fa03b76ede2e1c93bb9548d6641e35490d96e22abbbfb3c1852697a688091f62086f6b2e9d3366e796888e SHA512 a743b37c5969939cc3eb708b0af2e8f6c665848868473c29edf9db110cef5ac62da3c042cfa9617a2f10b2a9d153d0d4146a1832a18bc71fadcbf9a7b5cea1b0 DIST fwupd-1.6.3.tar.gz 3888812 BLAKE2B 08d24fde80010d50e2396f59d743a00e640c1fcc06f6ada566ebcff48d25f1dc33676a40d13e1b684e45fd9483af1d9755ef3ac00bdaa8a37236589c03bb8a4c SHA512 837bcfe57873315ade8f3ff82d290d492dcb047387db5a642e6e7fc8e9ff7c3cabe5892692e2d4b5b0c5bd69f8a253bc364c61f23013c161a350b39de7d58e67 DIST fwupd-1.6.4.tar.gz 3891113 BLAKE2B b4f3a629c0594ee69a0e2ea727c8080f63e970a6e9964b53d007e490d6b538f5441a65de20412673ded181611342c7c1c1ec16eb0d05c69c149f635fed325269 SHA512 d0c788313f8cf00c6e0e238436668ab5885133933cd74202d3eb4a3377d1b123689dd7f3827d45853c92b98196d5d896027b471117af461356e2f3c3ec82f58e +DIST fwupd-1.7.0.tar.gz 4102985 BLAKE2B 9a29621e029c526d513304863294ee69f14ff1cf069b388fe5dc6037b2f030ea24136f18d9096abcc449376295996e3184c1c969f8dda329f2786622ba1300a7 SHA512 148f161f0e8d008fa20091c747baf4a205bc2e76ddc5dbb3676e3f2a15ca5d6d1454b572ea0336f185b5ef3a8ca8bfd3ad1098649e095a58c9822d4dbffe2987 diff --git a/sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch b/sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch new file mode 100644 index 000000000000..fec6aab4a3ce --- /dev/null +++ b/sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch @@ -0,0 +1,22 @@ +commit fa403db414301c247aef1bc895795a04b06d9298 +Author: Thomas Deutschmann +AuthorDate: Fri Oct 15 15:45:55 2021 +0200 +Commit: Thomas Deutschmann +CommitDate: Fri Oct 15 15:45:55 2021 +0200 + + elanfp plugin requires gusb + +diff --git a/plugins/elanfp/meson.build b/plugins/elanfp/meson.build +index e8bb8255..2b5d7fde 100644 +--- a/plugins/elanfp/meson.build ++++ b/plugins/elanfp/meson.build +@@ -1,3 +1,4 @@ ++if get_option('gusb') + cargs = ['-DG_LOG_DOMAIN="FuPluginElanfp"'] + + install_data(['elanfp.quirk'], +@@ -27,3 +28,4 @@ shared_module('fu_plugin_elanfp', + plugin_deps, + ], + ) ++endif diff --git a/sys-apps/fwupd/fwupd-1.7.0.ebuild b/sys-apps/fwupd/fwupd-1.7.0.ebuild new file mode 100644 index 000000000000..2e580029d434 --- /dev/null +++ b/sys-apps/fwupd/fwupd-1.7.0.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit linux-info meson python-single-r1 vala 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="agent amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ^^ ( elogind minimal systemd ) + dell? ( uefi ) + minimal? ( !introspection ) + spi? ( lzma ) + synaptics? ( gnutls ) + uefi? ( gnutls ) +" +RESTRICT="!test? ( test )" + +BDEPEND="$(vala_depend) + virtual/pkgconfig + gtk-doc? ( dev-util/gtk-doc ) + introspection? ( dev-libs/gobject-introspection ) + man? ( + app-text/docbook-sgml-utils + sys-apps/help2man + ) + test? ( + thunderbolt? ( dev-util/umockdev ) + net-libs/gnutls[tools] + ) +" +COMMON_DEPEND="${PYTHON_DEPS} + >=app-arch/gcab-1.0 + dev-db/sqlite + >=dev-libs/glib-2.45.8:2 + dev-libs/json-glib + dev-libs/libgpg-error + dev-libs/libgudev:= + >=dev-libs/libjcat-0.1.0[gpg,pkcs7] + >=dev-libs/libxmlb-0.1.13:=[introspection?] + $(python_gen_cond_dep ' + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] + ') + >=net-libs/libsoup-2.51.92:2.4[introspection?] + net-misc/curl + virtual/libelf:0= + virtual/udev + archive? ( app-arch/libarchive:= ) + dell? ( >=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.103 ) + systemd? ( >=sys-apps/systemd-211 ) + tpm? ( app-crypt/tpm2-tss ) + uefi? ( + sys-apps/fwupd-efi + sys-boot/efibootmgr + sys-fs/udisks + sys-libs/efivar + ) +" +# Block sci-chemistry/chemical-mime-data for bug #701900 +RDEPEND=" + != 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 + + vala_src_prepare +} + +src_configure() { + local plugins=( + $(meson_use amt plugin_amt) + $(meson_use dell plugin_dell) + $(meson_use flashrom plugin_flashrom) + $(meson_use gusb plugin_altos) + $(meson_use logitech plugin_logitech_bulkcontroller) + $(meson_use modemmanager plugin_modem_manager) + $(meson_use nvme plugin_nvme) + $(meson_use spi plugin_intel_spi) + $(meson_use synaptics plugin_synaptics_mst) + $(meson_use synaptics plugin_synaptics_rmi) + $(meson_use thunderbolt plugin_thunderbolt) + $(meson_use tpm plugin_tpm) + $(meson_use uefi plugin_uefi_capsule) + $(meson_use uefi plugin_uefi_capsule_splash) + $(meson_use uefi plugin_uefi_pk) + ) + use ppc64 && plugins+=( -Dplugin_msr="false" ) + use riscv && plugins+=( -Dplugin_msr="false" ) + + local emesonargs=( + --localstatedir "${EPREFIX}"/var + -Dbuild="$(usex minimal standalone all)" + -Dconsolekit="false" + -Dcurl="true" + -Ddocs="$(usex gtk-doc gtkdoc none)" + -Defi_binary="false" + -Dsupported_build="true" + $(meson_use agent) + $(meson_use archive libarchive) + $(meson_use bluetooth bluez) + $(meson_use elogind) + $(meson_use gnutls) + $(meson_use gusb) + $(meson_use lzma) + $(meson_use man) + $(meson_use introspection) + $(meson_use policykit polkit) + $(meson_use 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 +} diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml index 4d30edc6fd6b..d1dfe55c1e5e 100644 --- a/sys-apps/fwupd/metadata.xml +++ b/sys-apps/fwupd/metadata.xml @@ -16,6 +16,7 @@ Enable Dell-specific support. Enable flashrom plugin via sys-apps/flashrom Enable dev-libs/libgusb support + Build and install Logitech bulk controller plugin Build and install NVMe plugin Build and install Modem Manager plugin Install Intel-SPI plugin -- cgit v1.2.3-65-gdbad