<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/5cac92b4d8c5019bcbc34536e749e64dcd9be661">https://github.com/macports/macports-ports/commit/5cac92b4d8c5019bcbc34536e749e64dcd9be661</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 5cac92b stlink: update to version 1.5.1
</span>5cac92b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5cac92b4d8c5019bcbc34536e749e64dcd9be661
</span>Author: Rob Gowin <robgowin@gmail.com>
AuthorDate: Sat Jan 26 11:50:32 2019 -0600
<span style='display:block; white-space:pre;color:#404040;'> stlink: update to version 1.5.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update to version 1.5.1
</span><span style='display:block; white-space:pre;color:#404040;'> * change github parameters to fetch correct source tarball
</span><span style='display:block; white-space:pre;color:#404040;'> * redo patches
</span>---
cross/stlink/Portfile | 8 +++++---
.../patch-cmake-modules-FindLibUSB.cmake.diff | 8 ++++----
cross/stlink/files/patch-src-logging.c.diff | 24 +++++++++++++---------
3 files changed, 23 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/stlink/Portfile b/cross/stlink/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b325758..681012e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cross/stlink/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/stlink/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,8 @@ PortSystem 1.0
</span> PortGroup cmake 1.1
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup texane stlink 1.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup texane stlink 1.5.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories cross devel
license BSD
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,8 +15,9 @@ description Stlink Tools Texane
</span> long_description Open source version of the STMicroelectronics Stlink Tools. \
Provides the following tools: st-flash, st-info, st-term, st-util.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1fffecc282c328e1a3b493f0ff49830f83af5afa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2c392d3005f6b3059c4e4e11a1eaf2451d41130de2c7dac9192d3a8dd61c4eb5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6f4011b750810d25facfb5444542ea530e14dccf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 470168e427325df6d0903b37cbdee6c28186c578115f843bae945396b4b38b90 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 190237
</span>
depends_lib-append path:lib/libusb-1.0.dylib:libusb
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/stlink/files/patch-cmake-modules-FindLibUSB.cmake.diff b/cross/stlink/files/patch-cmake-modules-FindLibUSB.cmake.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 927334f..a749f9a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cross/stlink/files/patch-cmake-modules-FindLibUSB.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/stlink/files/patch-cmake-modules-FindLibUSB.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/modules/FindLibUSB.cmake.orig 2017-01-28 04:55:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/modules/FindLibUSB.cmake 2017-02-05 20:44:46.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -45,7 +45,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/modules/FindLibUSB.cmake.orig 2019-01-26 11:30:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/modules/FindLibUSB.cmake 2019-01-26 11:30:34.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,7 +23,7 @@
</span> endif()
if (APPLE)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,4 +8,4 @@
</span> + set(LIBUSB_NAME libusb-1.0.dylib)
elseif(MSYS OR MINGW)
set(LIBUSB_NAME usb-1.0)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif(WIN32 OR CMAKE_VS_PLATFORM_NAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif(MSVC)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/stlink/files/patch-src-logging.c.diff b/cross/stlink/files/patch-src-logging.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8c7091e..a3c24d1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cross/stlink/files/patch-src-logging.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/stlink/files/patch-src-logging.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/logging.c.orig 2017-01-28 11:55:48.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/logging.c 2017-02-03 00:12:16.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,25 +30,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/logging.c.orig 2019-01-26 11:28:32.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/logging.c 2019-01-26 11:42:55.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,7 +18,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 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;'>++#define UNUSED(x) (void)(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ugly_log(int level, const char *tag, const char *format, ...) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ UNUSED(tag);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (level > max_level) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,19 +33,19 @@
</span> fprintf(stderr, "%d-%02d-%02dT%02d:%02d:%02d ", tt->tm_year + 1900, tt->tm_mon + 1, tt->tm_mday, tt->tm_hour, tt->tm_min, tt->tm_sec);
switch (level) {
case UDEBUG:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,13 +30,6 @@
</span> - fprintf(stderr, "ERROR %s: ", tag);
+ fprintf(stderr, "ERROR: ");
break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case UFATAL:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fprintf(stderr, "FATAL %s: ", tag);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fprintf(stderr, "FATAL: ");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vfprintf(stderr, format, args);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit(EXIT_FAILURE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // NEVER GETS HERE!!!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span> default:
- fprintf(stderr, "%d %s: ", level, tag);
+ fprintf(stderr, "%d: ", level);
</pre><pre style='margin:0'>
</pre>