<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c42a697a39f03b7563352798127827392fc39d3d">https://github.com/macports/macports-ports/commit/c42a697a39f03b7563352798127827392fc39d3d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c42a697 flashrom: update version to 1.1
</span>c42a697 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c42a697a39f03b7563352798127827392fc39d3d
</span>Author: Davide Gerhard <rainbow@irh.it>
AuthorDate: Mon Sep 16 22:44:33 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> flashrom: update version to 1.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - bump version to 1.1
</span><span style='display:block; white-space:pre;color:#404040;'> - fix distname with new value
</span><span style='display:block; white-space:pre;color:#404040;'> - revert patch to fix build error
</span><span style='display:block; white-space:pre;color:#404040;'> :info:build ich_descriptors_tool.c:153:34: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
</span><span style='display:block; white-space:pre;color:#404040;'> :info:build struct ich_descriptors desc = { 0 };
</span><span style='display:block; white-space:pre;color:#404040;'> - disable libpci usage (not available on macports)
</span><span style='display:block; white-space:pre;color:#404040;'> - fix destroot environment
</span><span style='display:block; white-space:pre;color:#404040;'> - add livecheck regex
</span>---
sysutils/flashrom/Portfile | 22 +++++++++-----
.../files/patch-ich_descriptors_tool.c.patch | 32 ++++++++++++++++++++
.../files/patch-libusb_set_debug-deprecated.diff | 35 ----------------------
3 files changed, 46 insertions(+), 43 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/flashrom/Portfile b/sysutils/flashrom/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c502c44..6336974 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/flashrom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/flashrom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name flashrom
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.1
</span> categories sysutils
platforms darwin
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,14 +15,15 @@ long_description utility for identifying, reading, writing, verifying and era
</span> programmer devices.
homepage https://www.flashrom.org/Flashrom
master_sites https://download.flashrom.org/releases/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}-v${version}
</span> use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b2e0c62d8a0ae592a6d84b69c5f5ea3283dcfefe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3702fa215ba5fb5af8e54c852d239899cfa1389194c1e51cb2a170c4dc9dee64 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 321693
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0047dd7e247b1794bec46fbe49cb2a3139ec955f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 aeada9c70c22421217c669356180c0deddd0b60876e63d2224e3260b90c14e19 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 348458
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# needed until next version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-libusb_set_debug-deprecated.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# revert the upstream patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-ich_descriptors_tool.c.patch
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +35,8 @@ build.args-append CC=${configure.cc} \
</span> CXX=${configure.cxx} \
CPP=${configure.cpp}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CONFIG_GFXNVIDIA=0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CONFIG_ENABLE_LIBPCI_PROGRAMMERS=0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CONFIG_GFXNVIDIA=0 \
</span> CONFIG_NIC3COM=0 \
CONFIG_NICREALTEK=0 \
CONFIG_NICNATSEMI=0 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +52,7 @@ build.env CONFIG_GFXNVIDIA=0 \
</span> CONFIG_IT8212=0 \
CONFIG_ATAHPT=0 \
CONFIG_ATAVIA=0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env [option build.env]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env {*}${build.env}
</span>
pre-build {
reinplace "s|sbin|bin|g" ${worksrcpath}/Makefile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,3 +61,7 @@ pre-build {
</span>
test.run yes
test.cmd ./flashrom --version
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url ${master_sites}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex ${name}-v(\\d+\\.\\d+(\\.\\d+)*)${extract.suffix}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/flashrom/files/patch-ich_descriptors_tool.c.patch b/sysutils/flashrom/files/patch-ich_descriptors_tool.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..cd842b8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/flashrom/files/patch-ich_descriptors_tool.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From df4905822754ac1f303f7939f5b77b35e5ac4a67 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Richard Hughes <richard@hughsie.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 19 Dec 2018 11:57:15 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: Fix several -Wno-missing-field-initializers warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change-Id: Ib4487d4c1a38fa8471fa1f9034604412e9d14cf7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Richard Hughes <richard@hughsie.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-on: https://review.coreboot.org/c/30405
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Nico Huber <nico.h@gmx.de>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ util/ich_descriptors_tool/ich_descriptors_tool.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(limited to 'util/ich_descriptors_tool/ich_descriptors_tool.c')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/util/ich_descriptors_tool/ich_descriptors_tool.c b/util/ich_descriptors_tool/ich_descriptors_tool.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index aec97d0f..aa857c88 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- util/ich_descriptors_tool/ich_descriptors_tool.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ util/ich_descriptors_tool/ich_descriptors_tool.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -150,7 +150,7 @@ int main(int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *fn = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *csn = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enum ich_chipset cs = CHIPSET_ICH_UNKNOWN;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct ich_descriptors desc = { 0 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct ich_descriptors desc = {{ 0 }};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while ((opt = getopt(argc, argv, "df:c:")) != -1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (opt) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cgit v1.2.1
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/flashrom/files/patch-libusb_set_debug-deprecated.diff b/sysutils/flashrom/files/patch-libusb_set_debug-deprecated.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 34e9e72..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/flashrom/files/patch-libusb_set_debug-deprecated.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,35 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 291764a70e6d8b212680e311bfb0825abf2b9a2f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Alex James <theracermaster@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 14 Apr 2018 22:59:57 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] ch341a_spi: Avoid deprecated libusb functions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libusb 1.0.22 marked libusb_set_debug as deprecated. For such versions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-of libusb, use libusb_set_option instead.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Change-Id: Ib71ebe812316eaf49136979a942a946ef9e4d487
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Alex James <theracermaster@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-on: https://review.coreboot.org/25681
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Tested-by: Nico Huber <nico.h@gmx.de>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: David Hendricks <david.hendricks@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ch341a_spi.c | 7 ++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 6 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/ch341a_spi.c b/ch341a_spi.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 95e9c9577..ee18624ea 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ch341a_spi.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ch341a_spi.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -441,7 +441,12 @@ int ch341a_spi_init(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- libusb_set_debug(NULL, 3); // Enable information, warning and error messages (only).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Enable information, warning, and error messages (only). */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if LIBUSB_API_VERSION < 0x01000106
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ libusb_set_debug(NULL, 3);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ libusb_set_option(NULL, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_INFO);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint16_t vid = devs_ch341a_spi[0].vendor_id;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint16_t pid = devs_ch341a_spi[0].device_id;
</span></pre><pre style='margin:0'>
</pre>