<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/14935133e7a0bc0bb6408971cc5b8431dc057cee">https://github.com/macports/macports-ports/commit/14935133e7a0bc0bb6408971cc5b8431dc057cee</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 14935133e7a stlink: compatibility fixes with libusb 1.0.25
</span>14935133e7a is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 14935133e7a0bc0bb6408971cc5b8431dc057cee
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Tue Feb 22 08:27:50 2022 -0500

<span style='display:block; white-space:pre;color:#404040;'>    stlink: compatibility fixes with libusb 1.0.25
</span>---
 cross/stlink/Portfile                              |  8 ++++
 .../patch-stlink-libusb-Security-framework.diff    | 47 ++++++++++++++++++++++
 2 files changed, 55 insertions(+)

<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 737744c7c8a..1ef4a12ab54 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,11 @@ PortSystem              1.0
</span> PortGroup               cmake 1.1
 PortGroup               github 1.0
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# stlink static-links to libusb, which needs clock_gettime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup               legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> github.setup            stlink-org stlink 1.7.0 v
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision                1
</span> 
 categories              cross devel
 license                 BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,6 +26,10 @@ checksums               rmd160  40627ba83e3a4749b0a7bbcbb8a66873df346c88 \
</span> depends_lib-append      path:lib/pkgconfig/libusb-1.0.pc:libusb \
                         port:pkgconfig
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# stlink static-links to libusb, which needs Security
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args          -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles              patch-stlink-libusb-Security-framework.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant gui description "Enable st-link GUI" {
     PortGroup           app 1.0
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cross/stlink/files/patch-stlink-libusb-Security-framework.diff b/cross/stlink/files/patch-stlink-libusb-Security-framework.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..78ae95be91a
</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-stlink-libusb-Security-framework.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,47 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 468b1d2daa853b975c33ab69876c486734f2c6a7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: nightwalker-87 <15526941+Nightwalker-87@users.noreply.github.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 4 Feb 2022 22:24:42 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] [libusb] Added Security framework for macOS
</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;'>+ CMakeLists.txt                     | 6 ++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake/packaging/cpack_config.cmake | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 5 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 52c00ea2..67f76ec0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -209,7 +209,8 @@ if (APPLE)     # ... with Apple macOS libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     find_library(ObjC objc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     find_library(CoreFoundation CoreFoundation)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     find_library(IOKit IOKit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    target_link_libraries(${STLINK_LIB_SHARED} ${LIBUSB_LIBRARY} ${SSP_LIB} ${ObjC} ${CoreFoundation} ${IOKit})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    find_library(Security Security)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    target_link_libraries(${STLINK_LIB_SHARED} ${LIBUSB_LIBRARY} ${SSP_LIB} ${ObjC} ${CoreFoundation} ${IOKit} ${Security})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif (WIN32) # ... with Windows libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     target_link_libraries(${STLINK_LIB_SHARED} ${LIBUSB_LIBRARY} ${SSP_LIB} wsock32 ws2_32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -251,7 +252,8 @@ if (APPLE)     # ... with Apple macOS libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     find_library(ObjC objc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     find_library(CoreFoundation CoreFoundation)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     find_library(IOKit IOKit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    target_link_libraries(${STLINK_LIB_STATIC} ${LIBUSB_LIBRARY} ${SSP_LIB} ${ObjC} ${CoreFoundation} ${IOKit})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    find_library(Security Security)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    target_link_libraries(${STLINK_LIB_STATIC} ${LIBUSB_LIBRARY} ${SSP_LIB} ${ObjC} ${CoreFoundation} ${IOKit} ${Security})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif (WIN32) # ... with Windows libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     target_link_libraries(${STLINK_LIB_STATIC} ${LIBUSB_LIBRARY} ${SSP_LIB} wsock32 ws2_32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/cmake/packaging/cpack_config.cmake b/cmake/packaging/cpack_config.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 587ff5fb..a4f1ae07 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cmake/packaging/cpack_config.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake/packaging/cpack_config.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,7 +17,7 @@ set(CPACK_OUTPUT_FILE_PREFIX "${CMAKE_BINARY_DIR}/dist")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (APPLE)                                                                      # macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(CPACK_GENERATOR "ZIP")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}-macosx-amd64")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}-macos-amd64")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set(CPACK_INSTALL_PREFIX "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif (WIN32 AND (NOT EXISTS "/etc/debian_version"))                           # Windows
</span></pre><pre style='margin:0'>

</pre>