<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/683b194ed43801403cfe2e7698455b21e1d3584c">https://github.com/macports/macports-ports/commit/683b194ed43801403cfe2e7698455b21e1d3584c</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 683b194ed43 mspdebug: add driver dependency
</span>683b194ed43 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 683b194ed43801403cfe2e7698455b21e1d3584c
</span>Author: Edil Medeiros <jose.edil@gmail.com>
AuthorDate: Sun Jun 9 01:36:44 2024 -0300
<span style='display:block; white-space:pre;color:#404040;'> mspdebug: add driver dependency
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> mspdebug requires the tilib driver to work properly with recent Texas
</span><span style='display:block; white-space:pre;color:#404040;'> Instrument's MSP430 Launchpad family ov development boards. This driver is
</span><span style='display:block; white-space:pre;color:#404040;'> missing in the current port. The tilib driver is provided by TI under the
</span><span style='display:block; white-space:pre;color:#404040;'> package MSP430 Debug Stack. #24397 introduces a port that provides the tilib
</span><span style='display:block; white-space:pre;color:#404040;'> driver. This enhancement:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> 1. add libmsp430 as a dependency (#24397)
</span><span style='display:block; white-space:pre;color:#404040;'> 2. provide patches so that mspdebug can find the shared library in the right
</span><span style='display:block; white-space:pre;color:#404040;'> place when installed through macports.
</span>---
devel/mspdebug/Portfile | 18 ++++++---
devel/mspdebug/files/fix-dynlib-load.diff | 47 ++++++++++++++++++++++
.../mspdebug/files/patch-Makefile-define_flag.diff | 11 +++++
3 files changed, 70 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mspdebug/Portfile b/devel/mspdebug/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0988a8d98d6..d83a4c52dc8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mspdebug/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mspdebug/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,10 @@ PortSystem 1.0
</span> PortGroup github 1.0
github.setup dlbeer mspdebug 0.25 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@edilmedeiros gmail.com:jose.edil+macports} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories devel cross
description MSPDebug is a free debugger for use with MSP430 MCUs.
long_description MSPDebug is a free debugger for use with MSP430 MCUs. \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,22 +21,26 @@ license GPL-2+
</span>
homepage https://dlbeer.co.nz/mspdebug/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 18cfcf737205ab78119a12ebad27ec051487ac5f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 18cfcf737205ab78119a12ebad27ec051487ac5f \
</span> sha256 a1a3620de6a86128ad03938ef2eda6d57e7b320b2361cd35aec10ad5d3080215 \
size 333977
depends_build port:pkgconfig
depends_lib port:hidapi \
port:libusb-compat \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:readline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:readline \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libmsp430
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Makefile-define_flag.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fix-dynlib-load.diff
</span>
use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append CC="${configure.cc} [get_canonical_archflags]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append CC="${configure.cc} [get_canonical_archflags]" PREFIX=${prefix}
</span>
destroot.env-append PREFIX=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mspdebug/files/fix-dynlib-load.diff b/devel/mspdebug/files/fix-dynlib-load.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5fd05509acb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mspdebug/files/fix-dynlib-load.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;'>+--- drivers/tilib_api.c.orig 2024-06-09 00:24:35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ drivers/tilib_api.c 2024-06-09 00:43:06
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,8 +16,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
</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;'>++#include <limits.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stddef.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "util/output.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "tilib_api.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "dynload.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,6 +30,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__Windows__) || defined(__CYGWIN__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const char tilib_filename[] = "MSP430.DLL";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define TIDLL __stdcall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const char tilib_filename[] = "libmsp430.dylib";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define TIDLL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const char tilib_filename[] = "libmsp430.so";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define TIDLL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -757,12 +762,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__MACPORTS__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char libpath[PATH_MAX];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ snprintf(libpath, sizeof(libpath), "%s/%s", MACPORTS_LIB_DIR, tilib_filename);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lib_handle = dynload_open(libpath);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!lib_handle) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printc_err("tilib_api: can't find %s: %s\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tilib_filename, dynload_error());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib_handle = dynload_open(tilib_filename);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!lib_handle) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printc_err("tilib_api: can't find %s: %s\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tilib_filename, dynload_error());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dynload_sym(lib_handle, "MSP430_HIL_MEMAP")) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printc_dbg("Using new (SLAC460L+) API\n");
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mspdebug/files/patch-Makefile-define_flag.diff b/devel/mspdebug/files/patch-Makefile-define_flag.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0c2e0d2d2ea
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mspdebug/files/patch-Makefile-define_flag.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;'>+--- Makefile.orig 2024-06-09 00:24:35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2024-06-09 00:44:20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -90,7 +90,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDES = -I. -Isimio -Iformats -Itransport -Idrivers -Iutil -Iui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_CFLAGS = -O1 -Wall -Wno-char-subscripts -ggdb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CONFIG_CFLAGS = -DLIB_DIR=\"$(LIBDIR)\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CONFIG_CFLAGS = -DLIB_DIR=\"$(LIBDIR)\" -D__APPLE__ -D__MACPORTS__ -DMACPORTS_LIB_DIR=\"$(PREFIX)/lib\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MSPDEBUG_LDFLAGS = $(LDFLAGS) $(PORTS_LDFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MSPDEBUG_LIBS = -L. -lusb $(READLINE_LIBS) $(OS_LIBS)
</span></pre><pre style='margin:0'>
</pre>