Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 12 Jul 2020 13:02:20 +0000 (UTC)
From:      Boris Samorodov <bsam@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r542078 - in head/devel/libftdi1: . files
Message-ID:  <202007121302.06CD2KYD045735@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bsam
Date: Sun Jul 12 13:02:20 2020
New Revision: 542078
URL: https://svnweb.freebsd.org/changeset/ports/542078

Log:
  devel/libftdi1: Update to version 1.5 and:
  
  - mark dual licensed;
  - regenerate patches;
  - pet portlint (shuffle some Makefile lines).
  
  New in 1.5 - 2020-07-07
  -----------------------
  * Implement tc[io]flush methods & deprecate broken purge_buffers methods
  
    Please check your code for ftdi_usb_purge_rx_buffer(),
    ftdi_usb_purge_tx_buffer() and ftdi_usb_purge_buffers()
    and migrate to the new ftdi_tc[io]flush() methods.
  
    Old code will continue to function, but you'll get
    a deprecation warning during compilation.
  
  * Add program to test buffer flush (purge) functionality
  * Add kernel driver auto attach/detach.
    See new AUTO_DETACH_REATACH_SIO_MODULE option
  * Add ftdi_setflowctrl_xonxoff()
  * ftdi_eeprom / eeprom handling:
    * Unify handling of all boolean eeprom flags
    * Add device release number support
    * Add channel_a_driver support for type xxR chips
    * Add support for group0 drive levels on x232H chips
    * Fix handling of high_current_drive parameter
    * Fix inverted handling of VCP driver field for TYPE_R chips
    * New --verbose option for eeprom decode operation
  * Add example code for async mode
  * Add SPDX license identifiers to the core library & ftdi_eeprom
  * Various python SWIG wrapper improvements
  * Various cmake file improvements
  * Fix small bugs in error code paths

Modified:
  head/devel/libftdi1/Makefile
  head/devel/libftdi1/distinfo
  head/devel/libftdi1/files/patch-CMakeLists.txt
  head/devel/libftdi1/files/patch-cmake__FindUSB1.cmake
  head/devel/libftdi1/files/patch-examples__CMakeLists.txt
  head/devel/libftdi1/files/patch-test_CMakeLists.txt
  head/devel/libftdi1/pkg-plist

Modified: head/devel/libftdi1/Makefile
==============================================================================
--- head/devel/libftdi1/Makefile	Sun Jul 12 12:42:59 2020	(r542077)
+++ head/devel/libftdi1/Makefile	Sun Jul 12 13:02:20 2020	(r542078)
@@ -1,31 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	libftdi1
-PORTVERSION=	1.4
-PORTREVISION=	15
+PORTVERSION=	1.5
 CATEGORIES=	devel
 MASTER_SITES=	http://www.intra2net.com/en/developer/libftdi/download/
 
 MAINTAINER=	bsam@FreeBSD.org
 COMMENT=	Library (using libusb) to talk to FTDI chips
 
-LICENSE=	GPLv2
+LICENSE=		GPLv2 LGPL21
+LICENSE_COMB=		multi
+LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING.GPL
+LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LIB
 
-BROKEN_sparc64=		Does not build: fails to link
+BROKEN_sparc64=	Does not build: fails to link
 
 LIB_DEPENDS=	libconfuse.so:devel/libconfuse
 
-OPTIONS_DEFINE=		PYTHON BOOST DOCS EXAMPLES
-OPTIONS_DEFAULT=	PYTHON BOOST
-OPTIONS_SUB=		yes
+USES=		cmake:insource compiler:c++11-lang gettext-runtime pkgconfig tar:bzip2
+USE_LDCONFIG=	yes
 
+OPTIONS_DEFINE=	PYTHON BOOST DOCS EXAMPLES
+OPTIONS_DEFAULT=PYTHON BOOST
+OPTIONS_SUB=	yes
+
 BOOST_DESC=	Build with boost
 PYTHON_DESC=	Build Python bindings
 
-USES=		cmake:insource compiler:c++11-lang gettext-runtime pkgconfig tar:bzip2
-USE_LDCONFIG=	yes
-
-PORTDOCS=	COPYING.LIB ChangeLog README
+PORTDOCS=	ChangeLog README
 
 .include <bsd.port.options.mk>
 

Modified: head/devel/libftdi1/distinfo
==============================================================================
--- head/devel/libftdi1/distinfo	Sun Jul 12 12:42:59 2020	(r542077)
+++ head/devel/libftdi1/distinfo	Sun Jul 12 13:02:20 2020	(r542078)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503139208
-SHA256 (libftdi1-1.4.tar.bz2) = ec36fb49080f834690c24008328a5ef42d3cf584ef4060f3a35aa4681cb31b74
-SIZE (libftdi1-1.4.tar.bz2) = 109521
+TIMESTAMP = 1594555669
+SHA256 (libftdi1-1.5.tar.bz2) = 7c7091e9c86196148bd41177b4590dccb1510bfe6cea5bf7407ff194482eb049
+SIZE (libftdi1-1.5.tar.bz2) = 116297

Modified: head/devel/libftdi1/files/patch-CMakeLists.txt
==============================================================================
--- head/devel/libftdi1/files/patch-CMakeLists.txt	Sun Jul 12 12:42:59 2020	(r542077)
+++ head/devel/libftdi1/files/patch-CMakeLists.txt	Sun Jul 12 13:02:20 2020	(r542078)
@@ -1,11 +1,11 @@
---- CMakeLists.txt.orig	2014-08-02 12:32:47.000000000 +0200
-+++ CMakeLists.txt	2014-08-02 12:34:30.000000000 +0200
-@@ -168,7 +168,7 @@
+--- CMakeLists.txt.orig	2020-07-07 19:32:55 UTC
++++ CMakeLists.txt
+@@ -168,7 +168,7 @@ endif(${WIN32})
  configure_file(${CMAKE_SOURCE_DIR}/libftdi1.pc.in ${CMAKE_BINARY_DIR}/libftdi1.pc @ONLY)
  configure_file(${CMAKE_SOURCE_DIR}/libftdipp1.pc.in ${CMAKE_BINARY_DIR}/libftdipp1.pc @ONLY)
  install(FILES ${CMAKE_BINARY_DIR}/libftdi1.pc ${CMAKE_BINARY_DIR}/libftdipp1.pc
 -        DESTINATION lib${LIB_SUFFIX}/pkgconfig)
 +        DESTINATION libdata${LIB_SUFFIX}/pkgconfig)
-
+ 
  if (UNIX OR MINGW)
    configure_file ( libftdi1-config.in ${CMAKE_CURRENT_BINARY_DIR}/libftdi1-config @ONLY )

Modified: head/devel/libftdi1/files/patch-cmake__FindUSB1.cmake
==============================================================================
--- head/devel/libftdi1/files/patch-cmake__FindUSB1.cmake	Sun Jul 12 12:42:59 2020	(r542077)
+++ head/devel/libftdi1/files/patch-cmake__FindUSB1.cmake	Sun Jul 12 13:02:20 2020	(r542078)
@@ -1,11 +1,11 @@
---- cmake/FindUSB1.cmake.orig	2014-08-02 12:05:59.000000000 +0200
-+++ cmake/FindUSB1.cmake	2014-08-02 12:06:34.000000000 +0200
-@@ -26,7 +26,7 @@
+--- cmake/FindUSB1.cmake.orig	2020-07-07 19:32:55 UTC
++++ cmake/FindUSB1.cmake
+@@ -26,7 +26,7 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
      PATH_SUFFIXES libusb-1.0
      PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS})
-
+ 
 -  FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb-1.0
 +  FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb-1.0 usb
      PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS})
-
+ 
    include(FindPackageHandleStandardArgs)

Modified: head/devel/libftdi1/files/patch-examples__CMakeLists.txt
==============================================================================
--- head/devel/libftdi1/files/patch-examples__CMakeLists.txt	Sun Jul 12 12:42:59 2020	(r542077)
+++ head/devel/libftdi1/files/patch-examples__CMakeLists.txt	Sun Jul 12 13:02:20 2020	(r542078)
@@ -1,13 +1,13 @@
---- examples/CMakeLists.txt.orig	2014-08-03 23:07:13.000000000 +0200
-+++ examples/CMakeLists.txt	2014-08-03 23:08:06.000000000 +0200
-@@ -36,8 +36,8 @@
-     if(FTDI_BUILD_CPP)
-         if(Boost_FOUND)
-             message(STATUS "Building libftdi++ examples.")
--            include_directories(BEFORE ${CMAKE_SOURCE_DIR}/ftdipp
--                                ${Boost_INCLUDE_DIRS})
-+            include_directories(BEFORE ${CMAKE_SOURCE_DIR}/ftdipp)
-+            include_directories(AFTER ${Boost_INCLUDE_DIRS})
+--- examples/CMakeLists.txt.orig	2020-07-07 19:32:55 UTC
++++ examples/CMakeLists.txt
+@@ -33,8 +33,8 @@ target_link_libraries(purge_test ftdi1)
  
-             # Target
-             add_executable(find_all_pp find_all_pp.cpp)
+ # libftdi++ examples
+ if( FTDIPP )
+-	include_directories(BEFORE ${CMAKE_SOURCE_DIR}/ftdipp
+-			${Boost_INCLUDE_DIRS})
++	include_directories(BEFORE ${CMAKE_SOURCE_DIR}/ftdipp)
++	include_directories(AFTER ${Boost_INCLUDE_DIRS})
+ 
+ 	# Target
+ 	add_executable(find_all_pp find_all_pp.cpp)

Modified: head/devel/libftdi1/files/patch-test_CMakeLists.txt
==============================================================================
--- head/devel/libftdi1/files/patch-test_CMakeLists.txt	Sun Jul 12 12:42:59 2020	(r542077)
+++ head/devel/libftdi1/files/patch-test_CMakeLists.txt	Sun Jul 12 13:02:20 2020	(r542078)
@@ -1,11 +1,11 @@
---- test/CMakeLists.txt.orig	2017-08-07 14:52:39 UTC
+--- test/CMakeLists.txt.orig	2020-07-07 19:32:55 UTC
 +++ test/CMakeLists.txt
-@@ -10,7 +10,7 @@ if(BUILD_TESTS)
+@@ -2,7 +2,7 @@ find_package(Boost COMPONENTS unit_test_framework REQU
  
-         enable_testing()
+ enable_testing()
  
--        INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/src ${Boost_INCLUDE_DIRS})
-+        INCLUDE_DIRECTORIES(BEFORE ${Boost_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/src)
+-INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/src ${Boost_INCLUDE_DIRS})
++INCLUDE_DIRECTORIES(BEFORE ${Boost_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/src)
  
-         set(cpp_tests
-             basic.cpp
+ set(cpp_tests basic.cpp baudrate.cpp)
+ 

Modified: head/devel/libftdi1/pkg-plist
==============================================================================
--- head/devel/libftdi1/pkg-plist	Sun Jul 12 12:42:59 2020	(r542077)
+++ head/devel/libftdi1/pkg-plist	Sun Jul 12 13:02:20 2020	(r542078)
@@ -17,16 +17,16 @@ lib/cmake/libftdi1/LibFTDI1Config.cmake
 lib/cmake/libftdi1/LibFTDI1ConfigVersion.cmake
 lib/cmake/libftdi1/UseLibFTDI1.cmake
 include/libftdi1/ftdi.h
-%%BOOST%%include/libftdi1/ftdi.hpp
+%%BOOST%%include/libftdipp1/ftdi.hpp
 lib/libftdi1.a
 lib/libftdi1.so
 lib/libftdi1.so.2
-lib/libftdi1.so.2.4.0
+lib/libftdi1.so.2.5.0
 %%BOOST%%lib/libftdipp1.a
 %%BOOST%%lib/libftdipp1.so
 %%BOOST%%lib/libftdipp1.so.3
-%%BOOST%%lib/libftdipp1.so.2.4.0
-%%PORTDOCS%%%%DOCSDIR%%/example.conf
+%%BOOST%%lib/libftdipp1.so.2.5.0
+share/doc/libftdipp1/example.conf
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_ftdi1.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/ftdi1.py
 %%PYTHON%%share/libftdi/examples/cbus.py



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007121302.06CD2KYD045735>