Date: Wed, 3 Jun 2020 15:16:52 +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: r537617 - in head/devel/stlink: . files Message-ID: <202006031516.053FGq9h042086@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lev Date: Wed Jun 3 15:16:51 2020 New Revision: 537617 URL: https://svnweb.freebsd.org/changeset/ports/537617 Log: Update to latest version 1.6.1 Added: head/devel/stlink/files/patch-CMakeLists.txt (contents, props changed) head/devel/stlink/files/patch-cmake_modules_c__flags.cmake (contents, props changed) head/devel/stlink/files/patch-cmake_pkgconfig_CMakeLists.txt (contents, props changed) Deleted: head/devel/stlink/files/patch-cmake_CFlags.cmake head/devel/stlink/files/patch-usr_lib_pkgconfig_CMakeLists.txt Modified: head/devel/stlink/Makefile head/devel/stlink/distinfo head/devel/stlink/files/extra-pacth-turn-off-gtk head/devel/stlink/files/patch-doc_man_CMakeLists.txt head/devel/stlink/pkg-plist Modified: head/devel/stlink/Makefile ============================================================================== --- head/devel/stlink/Makefile Wed Jun 3 14:44:25 2020 (r537616) +++ head/devel/stlink/Makefile Wed Jun 3 15:16:51 2020 (r537617) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= stlink -PORTVERSION= 1.5.0 -PORTREVISION= 2 +PORTVERSION= 1.6.1 +#PORTREVISION= 0 CATEGORIES= devel MAINTAINER= lev@FreeBSD.org @@ -18,12 +18,17 @@ GTK3_USE= GNOME=gtk30 USE_GITHUB= yes GH_ACCOUNT= texane +GH_TAGNAME= v${PORTVERSION} USES= cmake pkgconfig USE_LDCONFIG= yes -PORTDOCS= README.md tested-boards.md tutorial.md +PORTDOCS= README.md ${ALLDOCS} +ALLDOCS= compiling.md developer.txt devices_boards.md \ + flashloaders.md release.md tutorial.md \ + version_support.md + .include <bsd.port.pre.mk> .if ! ${ARCH:M*64*} @@ -33,7 +38,8 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-pacth-32bit post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/README.md - ${INSTALL_DATA} ${WRKSRC}/doc/tested-boards.md ${STAGEDIR}${DOCSDIR}/tested-boards.md - ${INSTALL_DATA} ${WRKSRC}/doc/tutorial.md ${STAGEDIR}${DOCSDIR}/tutorial.md +.for DOC in ${ALLDOCS} + ${INSTALL_DATA} ${WRKSRC}/doc/${DOC} ${STAGEDIR}${DOCSDIR}/${DOC} +.endfor .include <bsd.port.post.mk> Modified: head/devel/stlink/distinfo ============================================================================== --- head/devel/stlink/distinfo Wed Jun 3 14:44:25 2020 (r537616) +++ head/devel/stlink/distinfo Wed Jun 3 15:16:51 2020 (r537617) @@ -1,3 +1,3 @@ -TIMESTAMP = 1519129443 -SHA256 (texane-stlink-1.5.0_GH0.tar.gz) = 4f0301edf9e904688ba31cf181653102f367c747e23ad356de1c430d1a654e2e -SIZE (texane-stlink-1.5.0_GH0.tar.gz) = 140484 +TIMESTAMP = 1591103161 +SHA256 (texane-stlink-1.6.1-v1.6.1_GH0.tar.gz) = ca9a640f84c3e2c9873bd51759594bc05c00cdf6e1f21b434ae2c0e7985433d8 +SIZE (texane-stlink-1.6.1-v1.6.1_GH0.tar.gz) = 295826 Modified: head/devel/stlink/files/extra-pacth-turn-off-gtk ============================================================================== --- head/devel/stlink/files/extra-pacth-turn-off-gtk Wed Jun 3 14:44:25 2020 (r537616) +++ head/devel/stlink/files/extra-pacth-turn-off-gtk Wed Jun 3 15:16:51 2020 (r537617) @@ -1,17 +1,19 @@ ---- CMakeLists.txt.orig 2017-07-01 17:41:54.000000000 +0300 -+++ CMakeLists.txt 2017-08-21 18:28:07.992623000 +0300 -@@ -21,10 +21,10 @@ include(cmake/CFlags.cmake) - # Dependencies - ### - find_package(LibUSB REQUIRED) --if (NOT APPLE AND NOT WIN32 AND NOT CMAKE_CROSSCOMPILING) -- find_package(PkgConfig) -- pkg_check_modules(gtk gtk+-3.0) +--- 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) + + ## 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 APPLE AND NOT WIN32 AND NOT CMAKE_CROSSCOMPILING) -+# find_package(PkgConfig) -+# pkg_check_modules(gtk gtk+-3.0) ++#if (NOT WIN32 AND NOT CMAKE_CROSSCOMPILING) ++# #add_subdirectory(cmake/pkgconfig) ++# find_package(PkgConfig) ++# pkg_check_modules(GTK3 gtk+-3.0) +#endif () + ## Check for system-specific additional header files and libraries include(CheckIncludeFile) - CHECK_INCLUDE_FILE(sys/mman.h STLINK_HAVE_SYS_MMAN_H) Added: head/devel/stlink/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/stlink/files/patch-CMakeLists.txt Wed Jun 3 15:16:51 2020 (r537617) @@ -0,0 +1,23 @@ +--- 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 + 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 + + option(STLINK_GENERATE_MANPAGES "Generate manpages with pandoc" OFF) + add_subdirectory(doc/man) # contains subordinate CMakeLists to generate manpages Added: head/devel/stlink/files/patch-cmake_modules_c__flags.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/stlink/files/patch-cmake_modules_c__flags.cmake Wed Jun 3 15:16:51 2020 (r537617) @@ -0,0 +1,10 @@ +--- 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 Added: head/devel/stlink/files/patch-cmake_pkgconfig_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/stlink/files/patch-cmake_pkgconfig_CMakeLists.txt Wed Jun 3 15:16:51 2020 (r537617) @@ -0,0 +1,9 @@ +--- 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/ + ) Modified: head/devel/stlink/files/patch-doc_man_CMakeLists.txt ============================================================================== --- head/devel/stlink/files/patch-doc_man_CMakeLists.txt Wed Jun 3 14:44:25 2020 (r537616) +++ head/devel/stlink/files/patch-doc_man_CMakeLists.txt Wed Jun 3 15:16:51 2020 (r537617) @@ -1,11 +1,11 @@ ---- doc/man/CMakeLists.txt.orig 2017-07-01 17:41:54.000000000 +0300 -+++ doc/man/CMakeLists.txt 2017-08-21 18:28:07.995838000 +0300 -@@ -31,7 +31,7 @@ foreach(manpage ${MANPAGES}) - endif() +--- doc/man/CMakeLists.txt.orig 2020-05-31 22:00:20 UTC ++++ doc/man/CMakeLists.txt +@@ -30,7 +30,7 @@ foreach (manpage ${MANPAGES}) + endif () - if (f AND NOT WIN32) -- install(FILES ${f} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1) -+ install(FILES ${f} DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1) - unset(f) - endif() - endforeach() + if (f AND NOT WIN32) +- install(FILES ${f} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/man/man1) ++ install(FILES ${f} DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1) + unset(f) + endif () + endforeach () Modified: head/devel/stlink/pkg-plist ============================================================================== --- head/devel/stlink/pkg-plist Wed Jun 3 14:44:25 2020 (r537616) +++ head/devel/stlink/pkg-plist Wed Jun 3 15:16:51 2020 (r537617) @@ -2,19 +2,16 @@ bin/st-flash bin/st-info 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/logging.h -include/stlink/mmap.h include/stlink/reg.h -include/stlink/sg.h -include/stlink/usb.h include/stlink/version.h -lib/libstlink-shared.so -lib/libstlink-shared.so.1 -lib/libstlink-shared.so.1.5.0 +lib/libstlink.so +lib/libstlink.so.1 +lib/libstlink.so.1.6.1 lib/libstlink.a libdata/pkgconfig/stlink.pc man/man1/st-flash.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006031516.053FGq9h042086>