Date: Sat, 4 Apr 2020 15:32:39 +0000 (UTC) From: "Lev A. Serebryakov" <lev@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r530683 - in head/devel/msp430-debug-stack: . files Message-ID: <202004041532.034FWdYE052567@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lev Date: Sat Apr 4 15:32:39 2020 New Revision: 530683 URL: https://svnweb.freebsd.org/changeset/ports/530683 Log: Update to latest version. Deleted: head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_FetControl.cpp head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_DLL430_OldApiV3.cpp head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_TI_DLL430_ConfigManager.cpp head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_TI_DLL430_UpdateManagerFet.cpp head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_TI_DLL430_UpdateManagerMSP_FET430.cpp head/devel/msp430-debug-stack/files/patch-DLL430_v3_src_TI_DLL430_UsbCdcIoChannel.h head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430_DLL_BSL430_DLL_Connections_MSPBSL_Connection5xxUSB.cpp head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430_DLL_BSL430_DLL_MSPBSL_Factory.cpp head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430_DLL_BSL430_DLL_Physical_Interfaces_MSPBSL_PhysicalInterfaceSerialUART.cpp head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430_DLL_BSL430_DLL_Physical_Interfaces_MSPBSL_PhysicalInterfaceSerialUART.h head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430__DLL_BSL430__DLL_Physical__Interfaces_MSPBSL__PhysicalInterfaceUSB.cpp Modified: head/devel/msp430-debug-stack/Makefile head/devel/msp430-debug-stack/distinfo head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.cpp head/devel/msp430-debug-stack/files/patch-Makefile head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430__DLL_Makefile head/devel/msp430-debug-stack/pkg-plist Modified: head/devel/msp430-debug-stack/Makefile ============================================================================== --- head/devel/msp430-debug-stack/Makefile Sat Apr 4 15:20:23 2020 (r530682) +++ head/devel/msp430-debug-stack/Makefile Sat Apr 4 15:32:39 2020 (r530683) @@ -1,17 +1,16 @@ # $FreeBSD$ PORTNAME= msp430-debug-stack -PORTVERSION= 3.12.000.004 -PORTREVISION= 12 +PORTVERSION= 3.15.0.1 +#PORTREVISION= 0 CATEGORIES= devel -MASTER_SITES= http://www.ti.com/lit/sw/slac460x/ \ - http://www.ti.com/lit/ug/slau320ac/:doc1 \ +MASTER_SITES= http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPDS/3_15_0_000/export/ \ + http://www.ti.com/lit/ug/slau320ai/:doc1 \ http://www.ti.com/lit/ug/slau656b/:doc2 -DISTFILES= slac460x.zip \ - slau320ac.pdf:doc1 \ +DISTFILES= MSPDebugStack_OS_Package_${PORTVERSION:S/./_/g}.zip \ + slau320ai.pdf:doc1 \ slau656b.pdf:doc2 -DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} -EXTRACT_ONLY= slac460x.zip +EXTRACT_ONLY= MSPDebugStack_OS_Package_${PORTVERSION:S/./_/g}.zip MAINTAINER= lev@FreeBSD.org COMMENT= TI MSP430 debugging interface library @@ -49,7 +48,7 @@ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/libmsp430 ${INSTALL_DATA} ${WRKSRC}/DLL430_v3/include/* ${STAGEDIR}${PREFIX}/include/libmsp430/ ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/slau320ac.pdf ${STAGEDIR}${DOCSDIR}/ + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/slau320ai.pdf ${STAGEDIR}${DOCSDIR}/ ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/slau656b.pdf ${STAGEDIR}${DOCSDIR}/ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/devd ${INSTALL_DATA} ${FILESDIR}/mspfet.conf ${STAGEDIR}${PREFIX}/etc/devd Modified: head/devel/msp430-debug-stack/distinfo ============================================================================== --- head/devel/msp430-debug-stack/distinfo Sat Apr 4 15:20:23 2020 (r530682) +++ head/devel/msp430-debug-stack/distinfo Sat Apr 4 15:32:39 2020 (r530683) @@ -1,7 +1,7 @@ -TIMESTAMP = 1521731563 -SHA256 (msp430-debug-stack-3.12.000.004/slac460x.zip) = c6bf24338b50f6ce8f6f0127ec2673e10add251e0a89e894fd30897eaa4e0cbc -SIZE (msp430-debug-stack-3.12.000.004/slac460x.zip) = 2253925 -SHA256 (msp430-debug-stack-3.12.000.004/slau320ac.pdf) = 01c24c306e11cfa129a3fcdd4ee116b439f809db52456f43e564f550940d6ea4 -SIZE (msp430-debug-stack-3.12.000.004/slau320ac.pdf) = 817214 -SHA256 (msp430-debug-stack-3.12.000.004/slau656b.pdf) = a27303bf1060a598bab53481cdee05642dbb3cde7804786c5ab31cb1e911df0c -SIZE (msp430-debug-stack-3.12.000.004/slau656b.pdf) = 487655 +TIMESTAMP = 1585852124 +SHA256 (MSPDebugStack_OS_Package_3_15_0_1.zip) = 31f8f66ce9f9156bcb550adf3937ebf44ad7995bef2517f2b09e408be947c4c5 +SIZE (MSPDebugStack_OS_Package_3_15_0_1.zip) = 2183498 +SHA256 (slau320ai.pdf) = f8444827b5536939872842a6ad11a0e92caaf02620d5ca59efefc68e1bf6c3ae +SIZE (slau320ai.pdf) = 753510 +SHA256 (slau656b.pdf) = a27303bf1060a598bab53481cdee05642dbb3cde7804786c5ab31cb1e911df0c +SIZE (slau656b.pdf) = 487655 Modified: head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.cpp ============================================================================== --- head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.cpp Sat Apr 4 15:20:23 2020 (r530682) +++ head/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_UsbCdcIoChannel.cpp Sat Apr 4 15:32:39 2020 (r530683) @@ -1,6 +1,6 @@ ---- DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.cpp.orig 2017-12-05 19:25:19.220234000 +0300 -+++ DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.cpp 2017-12-05 19:31:57.808647000 +0300 -@@ -309,6 +309,22 @@ +--- DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.cpp.orig 2020-02-14 09:38:32 UTC ++++ DLL430_v3/src/TI/DLL430/UsbCdcIoChannel.cpp +@@ -310,6 +310,22 @@ void UsbCdcIoChannel::createCdcPortList(const uint16_t } #else stringstream cdcIdStream; @@ -23,7 +23,7 @@ cdcIdStream << hex << setfill('0') << "usb:v" << setw(4) << vendorId << "p" << setw(4) << productId; path p("/sys/class/tty/"); -@@ -330,6 +346,7 @@ +@@ -331,6 +347,7 @@ void UsbCdcIoChannel::createCdcPortList(const uint16_t ifNumStream >> interfaceNumber; if (modalias.find(cdcIdStream.str()) == 0 && interfaceNumber == 0) { @@ -31,33 +31,3 @@ const string filename = it->path().filename().string(); const string portPath = string("/dev/") + filename; -@@ -375,7 +392,11 @@ - - bool UsbCdcIoChannel::openPort() - { -+#if BOOST_VERSION < 106600 - ioService = new boost::asio::io_service; -+#else -+ ioService = new boost::asio::io_context; -+#endif - port = new boost::asio::serial_port(*ioService); - timer = new boost::asio::deadline_timer(*ioService); - -@@ -384,7 +405,7 @@ - int retry = 5; - while (ec && --retry ) - { -- this_thread::sleep_for(chrono::milliseconds(5)); -+ this_thread::sleep_for(std::chrono::milliseconds(5)); - ec = port->open(portInfo.path, ec); - } - -@@ -409,7 +430,7 @@ - { - openPort(); - //Seeing issues on some platforms (eg. Ubuntu) when port is immediately closed again -- this_thread::sleep_for(chrono::milliseconds(100)); -+ this_thread::sleep_for(std::chrono::milliseconds(100)); - close(); - } - } Modified: head/devel/msp430-debug-stack/files/patch-Makefile ============================================================================== --- head/devel/msp430-debug-stack/files/patch-Makefile Sat Apr 4 15:20:23 2020 (r530682) +++ head/devel/msp430-debug-stack/files/patch-Makefile Sat Apr 4 15:32:39 2020 (r530683) @@ -1,15 +1,15 @@ ---- Makefile.orig 2017-06-22 12:44:14.000000000 +0300 -+++ Makefile 2017-12-05 18:35:24.639422000 +0300 +--- Makefile.orig 2020-02-24 09:36:30 UTC ++++ Makefile @@ -16,6 +16,7 @@ MAKE_PCH += -x c++-header USE_PCH += -include $(PCH_HEADER) export BOOST_DIR +export HIDAPI_DIR - export BIT32 export STATIC export DEBUG -@@ -76,15 +77,15 @@ ifeq ($(PLATFORM),Linux) +@@ -68,15 +69,15 @@ ifeq ($(PLATFORM),Linux) + HIDOBJ := $(LIBTHIRD)/hid-libusb.o else - CXX:= clang++ @@ -29,7 +29,7 @@ endif ifdef BOOST_DIR -@@ -92,9 +93,14 @@ else +@@ -84,9 +85,14 @@ else LIBDIRS += -L$(BOOST_DIR)/lib endif Modified: head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430__DLL_Makefile ============================================================================== --- head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430__DLL_Makefile Sat Apr 4 15:20:23 2020 (r530682) +++ head/devel/msp430-debug-stack/files/patch-ThirdParty_BSL430__DLL_Makefile Sat Apr 4 15:32:39 2020 (r530683) @@ -1,6 +1,6 @@ ---- ThirdParty/BSL430_DLL/Makefile.orig 2016-02-29 15:26:38.000000000 +0300 -+++ ThirdParty/BSL430_DLL/Makefile 2017-12-05 18:35:24.642830000 +0300 -@@ -47,11 +47,15 @@ ifeq ($(PLATFORM),Linux) +--- ThirdParty/BSL430_DLL/Makefile.orig 2019-11-18 10:16:00 UTC ++++ ThirdParty/BSL430_DLL/Makefile +@@ -47,10 +47,14 @@ ifeq ($(PLATFORM),Linux) INCLUDES += -I$(BOOST_DIR) endif else @@ -9,11 +9,10 @@ ifdef BOOST_DIR INCLUDES += -I$(BOOST_DIR)/include - endif ++ endif + ifdef HIDAPI_DIR + INCLUDES += -I$(HIDAPI_DIR)/include/hidapi + LIBDIRS += -L$(HIDAPI_DIR)/lib -+ endif + endif endif - all: $(OBJS) Modified: head/devel/msp430-debug-stack/pkg-plist ============================================================================== --- head/devel/msp430-debug-stack/pkg-plist Sat Apr 4 15:20:23 2020 (r530682) +++ head/devel/msp430-debug-stack/pkg-plist Sat Apr 4 15:32:39 2020 (r530683) @@ -7,6 +7,6 @@ include/libmsp430/MSP430_FET.h include/libmsp430/MSP430_HIL.h lib/libmsp430.so lib/libmsp430.a -%%PORTDOCS%%%%DOCSDIR%%/slau320ac.pdf +%%PORTDOCS%%%%DOCSDIR%%/slau320ai.pdf %%PORTDOCS%%%%DOCSDIR%%/slau656b.pdf etc/devd/mspfet.conf
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004041532.034FWdYE052567>