From 3666726414901ba626209e9efe5e5ceedd61e963 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Sun, 16 Feb 2020 07:19:00 +0000
Subject: [PATCH] flashrom: update to flashrom-1.2

---
 packages/tools/flashrom/package.mk            | 21 +++++++++----------
 ...shrom-0000-fix-1.2-build-without-usb.patch | 21 +++++++++++++++++++
 2 files changed, 31 insertions(+), 11 deletions(-)
 create mode 100644 packages/tools/flashrom/patches/flashrom-0000-fix-1.2-build-without-usb.patch

diff --git a/packages/tools/flashrom/package.mk b/packages/tools/flashrom/package.mk
index 828a281ede..aa5c962cdd 100644
--- a/packages/tools/flashrom/package.mk
+++ b/packages/tools/flashrom/package.mk
@@ -1,22 +1,21 @@
 # SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2019 Team LibreELEC (https://libreelec.tv)
+# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="flashrom"
-PKG_VERSION="1.1"
-PKG_SHA256="aeada9c70c22421217c669356180c0deddd0b60876e63d2224e3260b90c14e19"
+PKG_VERSION="1.2"
+PKG_SHA256="e1f8d95881f5a4365dfe58776ce821dfcee0f138f75d0f44f8a3cd032d9ea42b"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.flashrom.org/Flashrom"
 PKG_URL="https://download.flashrom.org/releases/${PKG_NAME}-v${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain libusb-compat"
 PKG_LONGDESC="flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips. It is designed to flash BIOS/EFI/coreboot/firmware/optionROM images on mainboards, network/graphics/storage controller cards, and various other programmer devices."
 
-PKG_MAKE_OPTS_TARGET="PREFIX=/usr \
-                      CONFIG_ENABLE_LIBPCI_PROGRAMMERS=no \
-                      CONFIG_FT2232_SPI=no \
-                      CONFIG_USBBLASTER_SPI=no \
-                      CONFIG_JLINK_SPI=no"
-PKG_MAKEINSTALL_OPTS_TARGET="${PKG_MAKE_OPTS_TARGET}"
+PKG_MESON_OPTS_TARGET="-Dpciutils=false \
+                       -Dusb=false \
+                       -Dconfig_ft2232_spi=false \
+                       -Dconfig_usbblaster_spi=false"
 
-post_makeinstall_target() {
-  rm -fr ${INSTALL}/usr/share/man
+makeinstall_target() {
+  mkdir -p ${INSTALL}/usr/sbin
+    cp flashrom ${INSTALL}/usr/sbin
 }
diff --git a/packages/tools/flashrom/patches/flashrom-0000-fix-1.2-build-without-usb.patch b/packages/tools/flashrom/patches/flashrom-0000-fix-1.2-build-without-usb.patch
new file mode 100644
index 0000000000..ac5438deda
--- /dev/null
+++ b/packages/tools/flashrom/patches/flashrom-0000-fix-1.2-build-without-usb.patch
@@ -0,0 +1,21 @@
+From 689d136c2806188d4a8bdaf9b5a7a57c2d889050 Mon Sep 17 00:00:00 2001
+From: MilhouseVH <milhouseVH.github@nmacleod.com>
+Date: Fri, 21 Feb 2020 03:02:31 +0000
+Subject: [PATCH] meson build: fails to build stlinkv3 when usb is disabled
+
+---
+ meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/meson.build b/meson.build
+index 375089c30..3c5296c5f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -91,6 +91,7 @@ else
+   config_digilent_spi = false
+   config_developerbox_spi = false
+   config_pickit2_spi = false
++  config_stlinkv3_spi = false
+ endif
+ 
+ # some programmers require libpci