<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/62a0718a5cdbf72082b41eb8f428cf4d33126946">https://github.com/macports/macports-ports/commit/62a0718a5cdbf72082b41eb8f428cf4d33126946</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 62a0718a5cdbf72082b41eb8f428cf4d33126946
</span>Author: Xim <chenguokai17@mails.ucas.ac.cn>
AuthorDate: Tue Jun 2 07:50:12 2020 +0800

<span style='display:block; white-space:pre;color:#404040;'>    stlink: update to version 1.6.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.6.1
</span><span style='display:block; white-space:pre;color:#404040;'>    * changed github official repo
</span><span style='display:block; white-space:pre;color:#404040;'>    * added GUI utility stlink-gui
</span>---
 cross/stlink/Portfile                                   | 17 ++++++++++-------
 cross/stlink/files/patch-CMakeList.txt.diff             | 11 +++++++++++
 .../files/patch-cmake-modules-FindLibUSB.cmake.diff     | 11 -----------
 3 files changed, 21 insertions(+), 18 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 505950e9ab9..ee86ace07cb 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,7 @@ 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.6.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup            stlink-org stlink 1.6.1 v
</span> 
 categories              cross devel
 license                 BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,11 +15,14 @@ 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  49f129d9891d5d75d2f8e6d6abeffcc3c00ed064 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  96003b0bfa40b1e0dfac3e1e0fc3d19a0ad02ca22805927677f5e3abc6ceb89a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        size    203487
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums               rmd160  3fdbf5e856aadcbe92a34266481682bd013a0941 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256  3979a165612aa2ad7ef98b5f429c101e8b2a38fba1bc1bda311f5550e2d49892 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size    295987
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append      path:lib/libusb-1.0.a:libusb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:pkgconfig
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append      path:lib/libusb-1.0.dylib:libusb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles              patch-src-logging.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        patch-CMakeList.txt.diff 
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles              patch-cmake-modules-FindLibUSB.cmake.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        patch-src-logging.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/stlink/files/patch-CMakeList.txt.diff b/cross/stlink/files/patch-CMakeList.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..01ec1bd58ae
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cross/stlink/files/patch-CMakeList.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.ori     2020-06-01 10:56:01.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2020-06-01 10:56:42.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,7 +4,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake_minimum_required(VERSION 3.4.2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake_policy(SET CMP0042 NEW)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_SOURCE_DIR}/cmake/modules")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a749f9a7cc4..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/modules/FindLibUSB.cmake.orig    2019-01-26 11:30:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/modules/FindLibUSB.cmake 2019-01-26 11:30:34.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,7 +23,7 @@
</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;'>- if (APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  set(LIBUSB_NAME libusb-1.0.a)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  set(LIBUSB_NAME libusb-1.0.dylib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif(MSYS OR MINGW)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   set(LIBUSB_NAME usb-1.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif(MSVC)
</span></pre><pre style='margin:0'>

</pre>