sys-apps/flashrom-1.2-r3: fix raw-access dependencies

This should allow Meson to successfully build flashrom without
rayer-spi support but with any of the other drivers requiring raw access
to hardware.

Bug: https://bugs.gentoo.org/720210
Signed-off-by: Marek Szuba <marecki@gentoo.org>

1 files changed, 25 insertions, 9 deletions

diff --git a/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch b/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch
index 03612fb71adb..a60e4030fca4 100644
--- a/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch
+++ b/sys-apps/flashrom/files/flashrom-1.2_meson-fixes.patch
@@ -56,25 +56,28 @@
    config_atahpt = false
    config_atapromise = false
    config_atavia = false
-@@ -121,14 +126,17 @@
+@@ -121,14 +126,20 @@
  # set defines for configured programmers
  if config_atahpt
    srcs += 'atahpt.c'
 +  need_libpci = true
++  need_raw_access = true
    cargs += '-DCONFIG_ATAHPT=1'
  endif
  if config_atapromise
    srcs += 'atapromise.c'
 +  need_libpci = true
++  need_raw_access = true
    cargs += '-DCONFIG_ATAPROMISE=1'
  endif
  if config_atavia
    srcs += 'atavia.c'
 +  need_libpci = true
++  need_raw_access = true
    cargs += '-DCONFIG_ATAVIA=1'
  endif
  if config_buspirate_spi
-@@ -138,22 +146,27 @@
+@@ -138,22 +149,28 @@
  endif
  if config_ch341a_spi
    srcs += 'ch341a_spi.c'
@@ -99,10 +102,11 @@
  if config_drkaiser
    srcs += 'drkaiser.c'
 +  need_libpci = true
++  need_raw_access = true
    cargs += '-DCONFIG_DRKAISER=1'
  endif
  if config_dummy
-@@ -162,12 +175,13 @@
+@@ -162,12 +179,14 @@
  endif
  if config_ft2232_spi
    srcs += 'ft2232_spi.c'
@@ -114,62 +118,72 @@
  if config_gfxnvidia
    srcs += 'gfxnvidia.c'
 +  need_libpci = true
++  need_raw_access = true
    cargs += '-DCONFIG_GFXNVIDIA=1'
  endif
  if config_internal
-@@ -186,6 +200,7 @@
+@@ -186,6 +205,8 @@
      srcs += 'sb600spi.c'
      srcs += 'wbsio_spi.c'
    endif
 +  need_libpci = true
++  need_raw_access = true
    config_bitbang_spi = true
    cargs += '-DCONFIG_INTERNAL=1'
    if get_option('config_internal_dmi')
-@@ -195,6 +210,7 @@
+@@ -195,6 +216,8 @@
  endif
  if config_it8212
    srcs += 'it8212.c'
 +  need_libpci = true
++  need_raw_access = true
    cargs += '-DCONFIG_IT8212=1'
  endif
  if config_linux_mtd
-@@ -211,36 +227,44 @@
+@@ -211,36 +234,51 @@
  endif
  if config_nic3com
    srcs += 'nic3com.c'
 +  need_libpci = true
++  need_raw_access = true
    cargs += '-DCONFIG_NIC3COM=1'
  endif
  if config_nicintel
    srcs += 'nicintel.c'
 +  need_libpci = true
++  need_raw_access = true
    cargs += '-DCONFIG_NICINTEL=1'
  endif
  if config_nicintel_eeprom
    srcs += 'nicintel_eeprom.c'
 +  need_libpci = true
++  need_raw_access = true
    cargs += '-DCONFIG_NICINTEL_EEPROM=1'
  endif
  if config_nicintel_spi
    srcs += 'nicintel_spi.c'
 +  need_libpci = true
++  need_raw_access = true
    config_bitbang_spi = true
    cargs += '-DCONFIG_NICINTEL_SPI=1'
  endif
  if config_nicnatsemi
    srcs += 'nicnatsemi.c'
 +  need_libpci = true
++  need_raw_access = true
    cargs += '-DCONFIG_NICNATSEMI=1'
  endif
  if config_nicrealtek
    srcs += 'nicrealtek.c'
 +  need_libpci = true
++  need_raw_access = true
    cargs += '-DCONFIG_NICREALTEK=1'
  endif
  if config_ogp_spi
    config_bitbang_spi = true
    srcs += 'ogp_spi.c'
 +  need_libpci = true
++  need_raw_access = true
    cargs += '-DCONFIG_OGP_SPI=1'
  endif
  if config_pickit2_spi
@@ -178,7 +192,7 @@
    cargs += '-DCONFIG_PICKIT2_SPI=1'
  endif
  if config_pony_spi
-@@ -252,15 +276,18 @@
+@@ -252,15 +290,20 @@
  if config_rayer_spi
    srcs += 'rayer_spi.c'
    config_bitbang_spi = true
@@ -189,15 +203,17 @@
  if config_satamv
    srcs += 'satamv.c'
 +  need_libpci = true
++  need_raw_access = true
    cargs += '-DCONFIG_SATAMV=1'
  endif
  if config_satasii
    srcs += 'satasii.c'
 +  need_libpci = true
++  need_raw_access = true
    cargs += '-DCONFIG_SATASII=1'
  endif
  if config_serprog
-@@ -270,12 +297,19 @@
+@@ -270,12 +313,19 @@
  endif
  if config_usbblaster_spi
    srcs += 'usbblaster_spi.c'
@@ -217,7 +233,7 @@
  
  # bitbanging SPI infrastructure
  if config_bitbang_spi
-@@ -296,6 +330,25 @@
+@@ -296,6 +346,25 @@
    srcs += 'serial.c'
  endif