From owner-dev-commits-ports-all@freebsd.org Tue Jul 13 12:28:27 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C483165C09F; Tue, 13 Jul 2021 12:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GPKfz56t4z4k2D; Tue, 13 Jul 2021 12:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 980AF22642; Tue, 13 Jul 2021 12:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16DCSRMx071344; Tue, 13 Jul 2021 12:28:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16DCSR0X071343; Tue, 13 Jul 2021 12:28:27 GMT (envelope-from git) Date: Tue, 13 Jul 2021 12:28:27 GMT Message-Id: <202107131228.16DCSR0X071343@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Lev A. Serebryakov" Subject: git: aa65e0242d1c - main - devel/stlink: Update to version 1.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lev X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa65e0242d1cb227da05fc47bb9a345b505ec3bb Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Jul 2021 12:28:27 -0000 The branch main has been updated by lev: URL: https://cgit.FreeBSD.org/ports/commit/?id=aa65e0242d1cb227da05fc47bb9a345b505ec3bb commit aa65e0242d1cb227da05fc47bb9a345b505ec3bb Author: Lev A. Serebryakov AuthorDate: 2021-07-13 12:26:21 +0000 Commit: Lev A. Serebryakov CommitDate: 2021-07-13 12:28:05 +0000 devel/stlink: Update to version 1.7.0 --- devel/stlink/Makefile | 15 ++++++++++--- devel/stlink/distinfo | 6 ++--- devel/stlink/files/extra-pacth-turn-off-gtk | 26 ++++++++-------------- devel/stlink/files/patch-CMakeLists.txt | 23 ++++--------------- .../files/patch-cmake_modules_c__flags.cmake | 10 --------- .../files/patch-cmake_pkgconfig_CMakeLists.txt | 9 -------- .../files/patch-doc_dev_pkg-config_CMakeLists.txt | 9 ++++++++ devel/stlink/files/patch-doc_man_CMakeLists.txt | 8 +++---- devel/stlink/pkg-plist | 23 ++++++++++++++++--- 9 files changed, 61 insertions(+), 68 deletions(-) diff --git a/devel/stlink/Makefile b/devel/stlink/Makefile index df213abd9104..868b83d36d58 100644 --- a/devel/stlink/Makefile +++ b/devel/stlink/Makefile @@ -1,5 +1,5 @@ PORTNAME= stlink -PORTVERSION= 1.6.1 +PORTVERSION= 1.7.0 DISTVERSIONPREFIX= v PORTREVISION= 0 CATEGORIES= devel @@ -16,7 +16,7 @@ GTK3_USES= gnome GTK3_USE= GNOME=gtk30 USE_GITHUB= yes -GH_ACCOUNT= texane +GH_ACCOUNT= stlink-org USES= cmake pkgconfig USE_CSTD= c99 @@ -24,17 +24,26 @@ USE_LDCONFIG= yes PORTDOCS= README.md ${ALLDOCS} -ALLDOCS= compiling.md developer.txt devices_boards.md \ +ALLDOCS= compiling.md dev/developer.txt devices_boards.md \ flashloaders.md release.md tutorial.md \ version_support.md + +FLASHLOADERS= cleanroom.md linker.ld Makefile stm32f0.s stm32f4.s \ + stm32f4lv.s stm32f7.s stm32f7lv.s stm32l4.s stm32lx.s \ .include post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR}/dev ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/README.md .for DOC in ${ALLDOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${DOC} ${STAGEDIR}${DOCSDIR}/${DOC} .endfor + ${MKDIR} ${STAGEDIR}${DATADIR} +.for F in ${FLASHLOADERS} + ${INSTALL_DATA} ${WRKSRC}/flashloaders/${F} ${STAGEDIR}${DATADIR}/${F} +.endfor + .include diff --git a/devel/stlink/distinfo b/devel/stlink/distinfo index 778e5eb1e9df..556583c64ced 100644 --- a/devel/stlink/distinfo +++ b/devel/stlink/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1591103161 -SHA256 (texane-stlink-v1.6.1_GH0.tar.gz) = ca9a640f84c3e2c9873bd51759594bc05c00cdf6e1f21b434ae2c0e7985433d8 -SIZE (texane-stlink-v1.6.1_GH0.tar.gz) = 295826 +TIMESTAMP = 1626176959 +SHA256 (stlink-org-stlink-v1.7.0_GH0.tar.gz) = 57ec1214905aedf59bee7f70ddff02316f64fa9ba5a9b6a3a64952edc5b65855 +SIZE (stlink-org-stlink-v1.7.0_GH0.tar.gz) = 334883 diff --git a/devel/stlink/files/extra-pacth-turn-off-gtk b/devel/stlink/files/extra-pacth-turn-off-gtk index 85b972d71e3d..58dbf302d489 100644 --- a/devel/stlink/files/extra-pacth-turn-off-gtk +++ b/devel/stlink/files/extra-pacth-turn-off-gtk @@ -1,19 +1,11 @@ ---- CMakeLists.txt.orig 2020-06-01 01:00:20.000000000 +0300 -+++ CMakeLists.txt 2020-06-02 16:07:00.308748843 +0300 -@@ -48,11 +48,11 @@ endif () - find_package(libusb REQUIRED) +--- CMakeLists.txt.orig 2021-04-25 01:24:02.000000000 +0300 ++++ CMakeLists.txt 2021-07-13 15:04:41.612208080 +0300 +@@ -295,7 +295,7 @@ + # Additional build tasks + ### - ## Package configuration (pkg-config) on unix-based systems --if (NOT WIN32 AND NOT CMAKE_CROSSCOMPILING) -- #add_subdirectory(cmake/pkgconfig) -- find_package(PkgConfig) -- pkg_check_modules(GTK3 gtk+-3.0) --endif () -+#if (NOT WIN32 AND NOT CMAKE_CROSSCOMPILING) -+# #add_subdirectory(cmake/pkgconfig) -+# find_package(PkgConfig) -+# pkg_check_modules(GTK3 gtk+-3.0) -+#endif () +-add_subdirectory(src/stlink-gui) # contains subordinate CMakeLists to build GUI ++# add_subdirectory(src/stlink-gui) # contains subordinate CMakeLists to build GUI + add_subdirectory(tests) # contains subordinate CMakeLists to build test executables + add_subdirectory(cmake/packaging) # contains subordinate CMakeLists to build packages - ## Check for system-specific additional header files and libraries - include(CheckIncludeFile) diff --git a/devel/stlink/files/patch-CMakeLists.txt b/devel/stlink/files/patch-CMakeLists.txt index e7b41f3d34d4..c17726682dc9 100644 --- a/devel/stlink/files/patch-CMakeLists.txt +++ b/devel/stlink/files/patch-CMakeLists.txt @@ -1,23 +1,8 @@ ---- CMakeLists.txt.orig 2020-05-31 22:00:20 UTC -+++ CMakeLists.txt -@@ -71,7 +71,11 @@ include(CheckLibraryExists) - - CHECK_LIBRARY_EXISTS(ssp __stack_chk_fail "" _stack_chk_fail_exists) - if (_stack_chk_fail_exists) -- set(SSP_LIB -static ssp) -+ if(WIN32) -+ set(SSP_LIB -static ssp) -+ else() -+ set(SSP_LIB ssp) -+ endif() - else () - set(SSP_LIB "") - endif () -@@ -278,6 +282,7 @@ add_subdirectory(include) # contains subordinate CMake - add_subdirectory(src/stlink-gui) # contains subordinate CMakeLists to build GUI +--- CMakeLists.txt.orig 2021-07-13 15:04:41.612208000 +0300 ++++ CMakeLists.txt 2021-07-13 15:06:16.763751332 +0300 +@@ -299,4 +299,5 @@ add_subdirectory(tests) # contains subordinate CMakeLists to build test executables add_subdirectory(cmake/packaging) # contains subordinate CMakeLists to build packages -+add_subdirectory(cmake/pkgconfig) # contains subordinate CMakeLists to build pkgconfig file ++add_subdirectory(doc/dev/pkg-config) # contains subordinate CMakeLists to build pkg-config descriptor option(STLINK_GENERATE_MANPAGES "Generate manpages with pandoc" OFF) - add_subdirectory(doc/man) # contains subordinate CMakeLists to generate manpages diff --git a/devel/stlink/files/patch-cmake_modules_c__flags.cmake b/devel/stlink/files/patch-cmake_modules_c__flags.cmake deleted file mode 100644 index 1ee38c1ebb41..000000000000 --- a/devel/stlink/files/patch-cmake_modules_c__flags.cmake +++ /dev/null @@ -1,10 +0,0 @@ ---- cmake/modules/c_flags.cmake.orig 2020-05-31 22:00:20 UTC -+++ cmake/modules/c_flags.cmake -@@ -30,6 +30,7 @@ add_cflag_if_supported("-Wmaybe-uninitialized") - add_cflag_if_supported("-Wmissing-variable-declarations") - add_cflag_if_supported("-Wshorten-64-to-32") - add_cflag_if_supported("-Wimplicit-function-declaration") -+add_cflag_if_supported("-Wno-string-plus-int") - - ## - # On OpenBSD the system headers suck so we need to disable redundant declaration check diff --git a/devel/stlink/files/patch-cmake_pkgconfig_CMakeLists.txt b/devel/stlink/files/patch-cmake_pkgconfig_CMakeLists.txt deleted file mode 100644 index 367ea4a4e3e2..000000000000 --- a/devel/stlink/files/patch-cmake_pkgconfig_CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- cmake/pkgconfig/CMakeLists.txt.orig 2020-05-31 22:00:20 UTC -+++ cmake/pkgconfig/CMakeLists.txt -@@ -11,5 +11,5 @@ configure_file( - - install( - FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc" -- DESTINATION ${STLINK_LIBRARY_PATH}/pkgconfig -+ DESTINATION libdata/pkgconfig/ - ) diff --git a/devel/stlink/files/patch-doc_dev_pkg-config_CMakeLists.txt b/devel/stlink/files/patch-doc_dev_pkg-config_CMakeLists.txt new file mode 100644 index 000000000000..42e007c084e4 --- /dev/null +++ b/devel/stlink/files/patch-doc_dev_pkg-config_CMakeLists.txt @@ -0,0 +1,9 @@ +--- doc/dev/pkg-config/CMakeLists.txt.orig 2021-04-25 01:24:02.000000000 +0300 ++++ doc/dev/pkg-config/CMakeLists.txt 2021-07-13 15:09:25.486974252 +0300 +@@ -11,5 +11,5 @@ + + install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc" +- DESTINATION ${STLINK_LIBRARY_PATH}/pkgconfig ++ DESTINATION libdata/pkgconfig/ + ) diff --git a/devel/stlink/files/patch-doc_man_CMakeLists.txt b/devel/stlink/files/patch-doc_man_CMakeLists.txt index d41b83121895..fe262daea6fd 100644 --- a/devel/stlink/files/patch-doc_man_CMakeLists.txt +++ b/devel/stlink/files/patch-doc_man_CMakeLists.txt @@ -1,10 +1,10 @@ ---- doc/man/CMakeLists.txt.orig 2020-05-31 22:00:20 UTC -+++ doc/man/CMakeLists.txt -@@ -30,7 +30,7 @@ foreach (manpage ${MANPAGES}) +--- doc/man/CMakeLists.txt.orig 2021-07-13 15:08:26.986789558 +0300 ++++ doc/man/CMakeLists.txt 2021-04-25 01:24:02.000000000 +0300 +@@ -30,7 +30,7 @@ endif () if (f AND NOT WIN32) -- install(FILES ${f} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/man/man1) +- install(FILES ${f} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/man/man1) + install(FILES ${f} DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1) unset(f) endif () diff --git a/devel/stlink/pkg-plist b/devel/stlink/pkg-plist index 2c2cd2809d1c..5517705fd5b6 100644 --- a/devel/stlink/pkg-plist +++ b/devel/stlink/pkg-plist @@ -1,21 +1,38 @@ bin/st-flash bin/st-info +bin/st-trace bin/st-util -include/stlink.h -include/stm32.h include/stlink/backend.h include/stlink/chipid.h include/stlink/commands.h include/stlink/flash_loader.h +include/stlink/helper.h +include/stlink/libusb_settings.h +include/stlink/logging.h +include/stlink/md5.h include/stlink/reg.h +include/stlink/sg.h +include/stlink/stlink.h +include/stlink/stm32.h +include/stlink/usb.h include/stlink/version.h lib/libstlink.so lib/libstlink.so.1 -lib/libstlink.so.1.6.1 +lib/libstlink.so.1.7.0 lib/libstlink.a libdata/pkgconfig/stlink.pc man/man1/st-flash.1.gz man/man1/st-info.1.gz man/man1/st-util.1.gz +%%DATADIR%%/Makefile +%%DATADIR%%/cleanroom.md +%%DATADIR%%/linker.ld +%%DATADIR%%/stm32f0.s +%%DATADIR%%/stm32f4.s +%%DATADIR%%/stm32f4lv.s +%%DATADIR%%/stm32f7.s +%%DATADIR%%/stm32f7lv.s +%%DATADIR%%/stm32l4.s +%%DATADIR%%/stm32lx.s %%GTK3%%bin/stlink-gui %%GTK3%%%%DATADIR%%/stlink-gui.ui