Sun Mar 7 10:51:06 2021 UTC ()
libftdi1: Update to 1.5.

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


(kleink)
diff -r1.39 -r1.40 pkgsrc/devel/libftdi1/Makefile
diff -r1.3 -r1.4 pkgsrc/devel/libftdi1/PLIST
diff -r1.4 -r1.5 pkgsrc/devel/libftdi1/distinfo
diff -r0 -r1.1 pkgsrc/devel/libftdi1/patches/patch-11a50ae5b80b3e03694a19e84513345d0794e563-CMakeLists.txt
diff -r0 -r1.1 pkgsrc/devel/libftdi1/patches/patch-cdb28383402d248dbc6062f4391b038375c52385-CMakeLists.txt
diff -r0 -r1.3 pkgsrc/devel/libftdi1/patches/patch-CMakeLists.txt

cvs diff -r1.39 -r1.40 pkgsrc/devel/libftdi1/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/libftdi1/Makefile 2021/01/01 08:24:40 1.39
+++ pkgsrc/devel/libftdi1/Makefile 2021/03/07 10:51:06 1.40
@@ -1,36 +1,37 @@ @@ -1,36 +1,37 @@
1# $NetBSD: Makefile,v 1.39 2021/01/01 08:24:40 ryoon Exp $ 1# $NetBSD: Makefile,v 1.40 2021/03/07 10:51:06 kleink Exp $
2 2
3DISTNAME= libftdi1-1.4 3DISTNAME= libftdi1-1.5
4PKGREVISION= 2 
5CATEGORIES= devel 4CATEGORIES= devel
6MASTER_SITES= https://www.intra2net.com/en/developer/libftdi/download/ 5MASTER_SITES= https://www.intra2net.com/en/developer/libftdi/download/
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.intra2net.com/en/developer/libftdi/ 9HOMEPAGE= https://www.intra2net.com/en/developer/libftdi/
11COMMENT= Userland driver library for FTDI USB chips 10COMMENT= Userland driver library for FTDI USB chips
12LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
13 12
14BUILD_DEPENDS+= swig3-[0-9]*:../../devel/swig3 13BUILD_DEPENDS+= swig3-[0-9]*:../../devel/swig3
15 14
16USE_CMAKE= yes 15USE_CMAKE= yes
17USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
18USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
19 18
20CMAKE_ARGS+= -Wno-dev 19CMAKE_ARGS+= -Wno-dev
21CMAKE_ARGS+= -DEXAMPLES=off 20CMAKE_ARGS+= -DEXAMPLES=off
22CMAKE_ARGS+= -DDOCUMENTATION=off 21CMAKE_ARGS+= -DDOCUMENTATION=off
23CMAKE_ARGS+= -DLIB_SUFFIX="" 22CMAKE_ARGS+= -DLIB_SUFFIX=""
 23CMAKE_ARGS+= -DFTDIPP=on
 24CMAKE_ARGS+= -DPYTHON_BINDINGS=on
24 25
25PKGCONFIG_OVERRIDE+= libftdi1.pc.in 26PKGCONFIG_OVERRIDE+= libftdi1.pc.in
26PKGCONFIG_OVERRIDE+= libftdipp1.pc.in 27PKGCONFIG_OVERRIDE+= libftdipp1.pc.in
27 28
28PLIST_SUBST+= PYSITELIB=${PYSITELIB} 29PLIST_SUBST+= PYSITELIB=${PYSITELIB}
29 30
30.include "../../devel/boost-headers/buildlink3.mk" 31.include "../../devel/boost-headers/buildlink3.mk"
31.include "../../devel/boost-libs/buildlink3.mk" 32.include "../../devel/boost-libs/buildlink3.mk"
32.include "../../devel/confuse/buildlink3.mk" 33.include "../../devel/confuse/buildlink3.mk"
33.include "../../devel/gettext-lib/buildlink3.mk" 34.include "../../devel/gettext-lib/buildlink3.mk"
34.include "../../devel/libusb1/buildlink3.mk" 35.include "../../devel/libusb1/buildlink3.mk"
35.include "../../lang/python/pyversion.mk" 36.include "../../lang/python/pyversion.mk"
36.include "../../lang/${PYPACKAGE}/buildlink3.mk" 37.include "../../lang/${PYPACKAGE}/buildlink3.mk"

cvs diff -r1.3 -r1.4 pkgsrc/devel/libftdi1/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/libftdi1/PLIST 2020/03/24 16:21:12 1.3
+++ pkgsrc/devel/libftdi1/PLIST 2021/03/07 10:51:06 1.4
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1@comment $NetBSD: PLIST,v 1.3 2020/03/24 16:21:12 nia Exp $ 1@comment $NetBSD: PLIST,v 1.4 2021/03/07 10:51:06 kleink Exp $
2bin/ftdi_eeprom 2bin/ftdi_eeprom
3bin/libftdi1-config 3bin/libftdi1-config
4include/libftdi1/ftdi.h 4include/libftdi1/ftdi.h
5include/libftdi1/ftdi.hpp 5include/libftdi1/ftdi.hpp
6lib/cmake/libftdi1/LibFTDI1Config.cmake 6lib/cmake/libftdi1/LibFTDI1Config.cmake
7lib/cmake/libftdi1/LibFTDI1ConfigVersion.cmake 7lib/cmake/libftdi1/LibFTDI1ConfigVersion.cmake
8lib/cmake/libftdi1/UseLibFTDI1.cmake 8lib/cmake/libftdi1/UseLibFTDI1.cmake
9lib/libftdi1.a 9lib/libftdi1.a
10lib/libftdi1.so 10lib/libftdi1.so
11lib/libftdi1.so.2 11lib/libftdi1.so.2
12lib/libftdi1.so.2.4.0 12lib/libftdi1.so.2.5.0
13lib/libftdipp1.a 13lib/libftdipp1.a
14lib/libftdipp1.so 14lib/libftdipp1.so
15lib/libftdipp1.so.2.4.0 15lib/libftdipp1.so.2.5.0
16lib/libftdipp1.so.3 16lib/libftdipp1.so.3
17lib/pkgconfig/libftdi1.pc 17lib/pkgconfig/libftdi1.pc
18lib/pkgconfig/libftdipp1.pc 18lib/pkgconfig/libftdipp1.pc
19${PYSITELIB}/_ftdi1.so 19${PYSITELIB}/_ftdi1.so
20${PYSITELIB}/ftdi1.py 20${PYSITELIB}/ftdi1.py
21share/doc/libftdi1/example.conf 21share/doc/libftdi1/example.conf
22share/libftdi/examples/cbus.py 22share/libftdi/examples/cbus.py
23share/libftdi/examples/complete.py 23share/libftdi/examples/complete.py
24share/libftdi/examples/simple.py 24share/libftdi/examples/simple.py

cvs diff -r1.4 -r1.5 pkgsrc/devel/libftdi1/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libftdi1/distinfo 2020/03/24 16:21:12 1.4
+++ pkgsrc/devel/libftdi1/distinfo 2021/03/07 10:51:06 1.5
@@ -1,6 +1,9 @@ @@ -1,6 +1,9 @@
1$NetBSD: distinfo,v 1.4 2020/03/24 16:21:12 nia Exp $ 1$NetBSD: distinfo,v 1.5 2021/03/07 10:51:06 kleink Exp $
2 2
3SHA1 (libftdi1-1.4.tar.bz2) = 5b14cebab8168e12dd6c2b5325a29ad93ed40f3d 3SHA1 (libftdi1-1.5.tar.bz2) = 0b4dc9763342d094d2b5e74ced7d10d574b4758d
4RMD160 (libftdi1-1.4.tar.bz2) = c7160d343c6098eb1f26f54d37b221113985e4e3 4RMD160 (libftdi1-1.5.tar.bz2) = 4b763717d47f9ac5891d7a4d762a989349b7af3c
5SHA512 (libftdi1-1.4.tar.bz2) = dbab74f7bc35ca835b9c6dd5b70a64816948d65da1f73a9ece37a0f0f630bd0df1a676543acc517b02a718bc34ba4f7a30cbc48b6eed1c154c917f8ef0a358fc 5SHA512 (libftdi1-1.5.tar.bz2) = c525b2ab6aff9ef9254971ae7d57f3549a36a36875765c48f947d52532814a2a004de1232389d4fe824a8c8ab84277b08427308573476e1da9b7db83db802f6f
6Size (libftdi1-1.4.tar.bz2) = 109521 bytes 6Size (libftdi1-1.5.tar.bz2) = 116297 bytes
 7SHA1 (patch-11a50ae5b80b3e03694a19e84513345d0794e563-CMakeLists.txt) = 0350988ba545a69191f3daddc92582c87ca5787f
 8SHA1 (patch-CMakeLists.txt) = 8fa0ba4d490a9c0b22bef382fc25aeb8ee1911bc
 9SHA1 (patch-cdb28383402d248dbc6062f4391b038375c52385-CMakeLists.txt) = 375b9e113d5d86c8a014c2892f9e412a302dd8a4

File Added: pkgsrc/devel/libftdi1/patches/patch-11a50ae5b80b3e03694a19e84513345d0794e563-CMakeLists.txt
$NetBSD: patch-11a50ae5b80b3e03694a19e84513345d0794e563-CMakeLists.txt,v 1.1 2021/03/07 10:51:06 kleink Exp $

commit 11a50ae5b80b3e03694a19e84513345d0794e563
Author: Thomas Jarosch <thomas.jarosch@intra2net.com>
Date:   Mon Aug 24 19:27:22 2020 +0200

    Fix building unit tests without FTDIPP
    
    Needed to run the baudrate unit tests.
    
    Probably another fallout from:
    
    ****************************
    commit 0209a3633dc877a577af07d883eb5059e22f6a91
    
    cmake: do not check for g++ when FTDIPP is disabled
    ****************************

--- CMakeLists.txt.orig	2020-07-07 19:32:55.000000000 +0000
+++ CMakeLists.txt
@@ -150,6 +150,7 @@ if ( EXAMPLES )
 endif ()
 add_subdirectory(packages)
 if ( BUILD_TESTS )
+  project(libftdi1 C CXX)
   add_subdirectory(test)
 endif ()
 

File Added: pkgsrc/devel/libftdi1/patches/patch-cdb28383402d248dbc6062f4391b038375c52385-CMakeLists.txt
$NetBSD: patch-cdb28383402d248dbc6062f4391b038375c52385-CMakeLists.txt,v 1.1 2021/03/07 10:51:06 kleink Exp $

commit cdb28383402d248dbc6062f4391b038375c52385
Author: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date:   Fri Jul 17 21:25:03 2020 +0200

    CMakeLists.txt: fix paths when FTDIPP is set
    
    Use the same project name (i.e. libftdi1 and not libftdipp1) when FTDIPP
    is enabled as suggested by Aurelien Jarno in
    http://developer.intra2net.com/mailarchive/html/libftdi/2020/msg00044.html
    
    Without this change, the libftdi1.pc config file defines the include
    path as /usr/local/include/libftdipp1 while the ftdi.h file is actually
    installed in /usr/local/include/libftdi1
    
    This is an issue for example for libsigrok which will fail on:
    
    In file included from src/hardware/asix-sigma/protocol.c:27:
    src/hardware/asix-sigma/protocol.h:28:10: fatal error: ftdi.h: No such file or directory
       28 | #include <ftdi.h>
          |          ^~~~~~~~
    
    Fixes:
     - http://autobuild.buildroot.org/results/1427f44e36752c337791597fab47a1889552a2fe
    
    Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

--- CMakeLists.txt.orig	2020-07-07 19:32:55.000000000 +0000
+++ CMakeLists.txt
@@ -136,7 +136,7 @@ endif ()
 
 add_subdirectory(src)
 if ( FTDIPP )
-  project(libftdipp1 C CXX)
+  project(libftdi1 C CXX)
   add_subdirectory(ftdipp)
 endif ()
 if ( PYTHON_BINDINGS )

File Added: pkgsrc/devel/libftdi1/patches/patch-CMakeLists.txt
$NetBSD: patch-CMakeLists.txt,v 1.3 2021/03/07 10:51:06 kleink Exp $

Don't append libusb to the CMake package: It picks up the one from
DESTDIR, and the dynamic linker does the right thing already.

--- CMakeLists.txt.orig	2020-07-07 19:32:55.000000000 +0000
+++ CMakeLists.txt
@@ -185,14 +185,11 @@ set ( LIBFTDI_INCLUDE_DIR ${includedir} 
 set ( LIBFTDI_INCLUDE_DIRS ${LIBFTDI_INCLUDE_DIR} )
 set ( LIBFTDI_LIBRARY ftdi1 )
 set ( LIBFTDI_LIBRARIES ${LIBFTDI_LIBRARY} )
-list ( APPEND LIBFTDI_LIBRARIES ${LIBUSB_LIBRARIES} )
 set ( LIBFTDI_STATIC_LIBRARY ftdi1.a )
 set ( LIBFTDI_STATIC_LIBRARIES ${LIBFTDI_STATIC_LIBRARY} )
-list ( APPEND LIBFTDI_STATIC_LIBRARIES ${LIBUSB_LIBRARIES} )
 if ( FTDIPP )
   set ( LIBFTDIPP_LIBRARY ftdipp1 )
   set ( LIBFTDIPP_LIBRARIES ${LIBFTDIPP_LIBRARY} )
-  list ( APPEND LIBFTDIPP_LIBRARIES ${LIBUSB_LIBRARIES} )
 endif ()
 set ( LIBFTDI_LIBRARY_DIRS ${libdir} )
 set ( LIBFTDI_ROOT_DIR ${prefix} )