From 838bceaa1571fa85f7a33d9d8213521939514d3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 13 Oct 2020 19:37:52 -0300
Subject: [PATCH] fwupd: update to 1.5.1, add more conf files.

added by @q66: remove the useless build options + fix ppc builds

Closes https://github.com/void-linux/void-packages/pull/25982
---
 srcpkgs/fwupd/template | 49 ++++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index b7f0cc5ea11..84c95ee7e47 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,7 +1,7 @@
 # Template file for 'fwupd'
 pkgname=fwupd
-version=1.4.6
-revision=2
+version=1.5.1
+revision=1
 build_style=meson
 build_helper="gir"
 # tests require unpackaged umockdev
@@ -9,42 +9,47 @@ configure_args="-Dconsolekit=false -Dgtkdoc=true -Dintrospection=true
  -Dsystemd=false -Dplugin_altos=false -Dtests=false
  -Dpkcs7=false -Db_lto=false -Defi-includedir=${XBPS_CROSS_BASE}/usr/include/efi
  -Defi-ldsdir=${XBPS_CROSS_BASE}/usr/lib -Defi-ld=${XBPS_CROSS_BASE}/usr/bin/ld
- -Defi-libdir=${XBPS_CROSS_BASE}/usr/lib -Delogind=true
- $(vopt_bool uefi plugin_uefi) $(vopt_bool uefi plugin_redfish)
- $(vopt_bool dell plugin_dell)"
+ -Defi-objcopy=${XBPS_CROSS_BASE}/usr/bin/objcopy
+ -Defi-libdir=${XBPS_CROSS_BASE}/usr/lib -Delogind=true"
 hostmakedepends="dejavu-fonts-ttf gnutls-tools help2man pkg-config gcab
- vala glib-devel polkit gettext gtk-doc $(vopt_if uefi efivar)"
+ vala glib-devel polkit gettext gtk-doc"
 makedepends="libxmlb-devel cairo-devel colord-devel libarchive-devel
  gnutls-devel gpgme-devel json-glib-devel libgusb-devel polkit-devel
  sqlite-devel libsoup-devel gcab-devel pango-devel python3-gobject
- python3-Pillow elogind-devel tpm2-tss-devel libjcat-devel
- $(vopt_if uefi 'libefivar-devel gnu-efi-libs') $(vopt_if dell libsmbios-devel)"
+ python3-Pillow elogind-devel tpm2-tss-devel libjcat-devel"
 depends="udisks2"
 conf_files="
- /etc/fwupd/daemon.conf
+ /etc/fwupd/*.conf
  /etc/fwupd/remotes.d/*.conf"
 short_desc="Daemon to allow session software to update firmware"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/fwupd"
 distfiles="https://github.com/hughsie/fwupd/archive/${version}.tar.gz"
-checksum=2e70a4221e6ca09dae768af25f19fddcdbdafb9f7d7984d19e8686846fa4420a
+checksum=16e59ea1ce6e109246f86a2932cc84d2e06ed836d62dde1412493a5d26109477
 replaces="fwupdate>=0"
 
-build_options="uefi dell"
-desc_option_uefi="Enable support for UEFI firmware update"
-desc_option_dell="Enable support for Dell specific firmware update"
-
-# no efi on non-efi platforms
 case "$XBPS_TARGET_MACHINE" in
-	x86_64*|i686*)
-		build_options_default="uefi dell"
-		;;
-	aarch64*|arm*)
-		build_options_default="uefi"
-		;;
+	x86_64*|i686*|arm*|aarch64*) _have_uefi=yes;;
 esac
 
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*) ;;
+	*) configure_args+=" -Dplugin_msr=false";;
+esac
+
+if [ -n "$_have_uefi" ]; then
+	hostmakedepends+=" efivar"
+	makedepends+=" libefivar-devel gnu-efi-libs"
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*|i686*) makedepends+=" libsmbios-devel";;
+		*) configure_args+=" -Dplugin_dell=false";;
+	esac
+else
+	configure_args+=" -Dplugin_uefi=false -Dplugin_redfish=false"
+	configure_args+=" -Dplugin_dell=false"
+fi
+
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"
 
@@ -58,8 +63,6 @@ fi
 pre_configure() {
 	# Replace the values from our patch into the system itself
 	vsed -i -e "s|@XBPS_CROSS_BASE@|${XBPS_CROSS_BASE}|g" meson.build
-	# Replace host objcopy with the cross one
-	vsed -i -e "s|command -v objcopy|command -v ${XBPS_CROSS_BASE}/usr/bin/objcopy|" plugins/uefi/efi/generate_binary.sh
 }
 
 post_install() {