Received: by mail.netbsd.org (Postfix, from userid 605) id 55F7184DE3; Sun, 7 Mar 2021 10:51:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9094C84D73 for ; Sun, 7 Mar 2021 10:51:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id z4uM-L_wxX-0 for ; Sun, 7 Mar 2021 10:51:06 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id A301B84CD8 for ; Sun, 7 Mar 2021 10:51:06 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 962C0FA95; Sun, 7 Mar 2021 10:51:06 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1615114266163810" MIME-Version: 1.0 Date: Sun, 7 Mar 2021 10:51:06 +0000 From: "Klaus Klein" Subject: CVS commit: pkgsrc/devel/libftdi1 To: pkgsrc-changes@NetBSD.org Reply-To: kleink@netbsd.org X-Mailer: log_accum Message-Id: <20210307105106.962C0FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1615114266163810 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: kleink Date: Sun Mar 7 10:51:06 UTC 2021 Modified Files: pkgsrc/devel/libftdi1: Makefile PLIST distinfo Added Files: pkgsrc/devel/libftdi1/patches: patch-11a50ae5b80b3e03694a19e84513345d0794e563-CMakeLists.txt patch-CMakeLists.txt patch-cdb28383402d248dbc6062f4391b038375c52385-CMakeLists.txt Log Message: 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 To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 pkgsrc/devel/libftdi1/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/libftdi1/PLIST cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/libftdi1/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/devel/libftdi1/patches/patch-11a50ae5b80b3e03694a19e84513345d0794e563-CMakeLists.txt \ pkgsrc/devel/libftdi1/patches/patch-cdb28383402d248dbc6062f4391b038375c52385-CMakeLists.txt cvs rdiff -u -r0 -r1.3 pkgsrc/devel/libftdi1/patches/patch-CMakeLists.txt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1615114266163810 Content-Disposition: inline Content-Length: 7315 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/libftdi1/Makefile diff -u pkgsrc/devel/libftdi1/Makefile:1.39 pkgsrc/devel/libftdi1/Makefile:1.40 --- pkgsrc/devel/libftdi1/Makefile:1.39 Fri Jan 1 08:24:40 2021 +++ pkgsrc/devel/libftdi1/Makefile Sun Mar 7 10:51:06 2021 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.39 2021/01/01 08:24:40 ryoon Exp $ +# $NetBSD: Makefile,v 1.40 2021/03/07 10:51:06 kleink Exp $ -DISTNAME= libftdi1-1.4 -PKGREVISION= 2 +DISTNAME= libftdi1-1.5 CATEGORIES= devel MASTER_SITES= https://www.intra2net.com/en/developer/libftdi/download/ EXTRACT_SUFX= .tar.bz2 @@ -21,6 +20,8 @@ CMAKE_ARGS+= -Wno-dev CMAKE_ARGS+= -DEXAMPLES=off CMAKE_ARGS+= -DDOCUMENTATION=off CMAKE_ARGS+= -DLIB_SUFFIX="" +CMAKE_ARGS+= -DFTDIPP=on +CMAKE_ARGS+= -DPYTHON_BINDINGS=on PKGCONFIG_OVERRIDE+= libftdi1.pc.in PKGCONFIG_OVERRIDE+= libftdipp1.pc.in Index: pkgsrc/devel/libftdi1/PLIST diff -u pkgsrc/devel/libftdi1/PLIST:1.3 pkgsrc/devel/libftdi1/PLIST:1.4 --- pkgsrc/devel/libftdi1/PLIST:1.3 Tue Mar 24 16:21:12 2020 +++ pkgsrc/devel/libftdi1/PLIST Sun Mar 7 10:51:06 2021 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2020/03/24 16:21:12 nia Exp $ +@comment $NetBSD: PLIST,v 1.4 2021/03/07 10:51:06 kleink Exp $ bin/ftdi_eeprom bin/libftdi1-config include/libftdi1/ftdi.h @@ -9,10 +9,10 @@ lib/cmake/libftdi1/UseLibFTDI1.cmake lib/libftdi1.a lib/libftdi1.so lib/libftdi1.so.2 -lib/libftdi1.so.2.4.0 +lib/libftdi1.so.2.5.0 lib/libftdipp1.a lib/libftdipp1.so -lib/libftdipp1.so.2.4.0 +lib/libftdipp1.so.2.5.0 lib/libftdipp1.so.3 lib/pkgconfig/libftdi1.pc lib/pkgconfig/libftdipp1.pc Index: pkgsrc/devel/libftdi1/distinfo diff -u pkgsrc/devel/libftdi1/distinfo:1.4 pkgsrc/devel/libftdi1/distinfo:1.5 --- pkgsrc/devel/libftdi1/distinfo:1.4 Tue Mar 24 16:21:12 2020 +++ pkgsrc/devel/libftdi1/distinfo Sun Mar 7 10:51:06 2021 @@ -1,6 +1,9 @@ -$NetBSD: distinfo,v 1.4 2020/03/24 16:21:12 nia Exp $ +$NetBSD: distinfo,v 1.5 2021/03/07 10:51:06 kleink Exp $ -SHA1 (libftdi1-1.4.tar.bz2) = 5b14cebab8168e12dd6c2b5325a29ad93ed40f3d -RMD160 (libftdi1-1.4.tar.bz2) = c7160d343c6098eb1f26f54d37b221113985e4e3 -SHA512 (libftdi1-1.4.tar.bz2) = dbab74f7bc35ca835b9c6dd5b70a64816948d65da1f73a9ece37a0f0f630bd0df1a676543acc517b02a718bc34ba4f7a30cbc48b6eed1c154c917f8ef0a358fc -Size (libftdi1-1.4.tar.bz2) = 109521 bytes +SHA1 (libftdi1-1.5.tar.bz2) = 0b4dc9763342d094d2b5e74ced7d10d574b4758d +RMD160 (libftdi1-1.5.tar.bz2) = 4b763717d47f9ac5891d7a4d762a989349b7af3c +SHA512 (libftdi1-1.5.tar.bz2) = c525b2ab6aff9ef9254971ae7d57f3549a36a36875765c48f947d52532814a2a004de1232389d4fe824a8c8ab84277b08427308573476e1da9b7db83db802f6f +Size (libftdi1-1.5.tar.bz2) = 116297 bytes +SHA1 (patch-11a50ae5b80b3e03694a19e84513345d0794e563-CMakeLists.txt) = 0350988ba545a69191f3daddc92582c87ca5787f +SHA1 (patch-CMakeLists.txt) = 8fa0ba4d490a9c0b22bef382fc25aeb8ee1911bc +SHA1 (patch-cdb28383402d248dbc6062f4391b038375c52385-CMakeLists.txt) = 375b9e113d5d86c8a014c2892f9e412a302dd8a4 Added files: Index: pkgsrc/devel/libftdi1/patches/patch-11a50ae5b80b3e03694a19e84513345d0794e563-CMakeLists.txt diff -u /dev/null pkgsrc/devel/libftdi1/patches/patch-11a50ae5b80b3e03694a19e84513345d0794e563-CMakeLists.txt:1.1 --- /dev/null Sun Mar 7 10:51:06 2021 +++ pkgsrc/devel/libftdi1/patches/patch-11a50ae5b80b3e03694a19e84513345d0794e563-CMakeLists.txt Sun Mar 7 10:51:06 2021 @@ -0,0 +1,28 @@ +$NetBSD: patch-11a50ae5b80b3e03694a19e84513345d0794e563-CMakeLists.txt,v 1.1 2021/03/07 10:51:06 kleink Exp $ + +commit 11a50ae5b80b3e03694a19e84513345d0794e563 +Author: Thomas Jarosch +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 () + Index: pkgsrc/devel/libftdi1/patches/patch-cdb28383402d248dbc6062f4391b038375c52385-CMakeLists.txt diff -u /dev/null pkgsrc/devel/libftdi1/patches/patch-cdb28383402d248dbc6062f4391b038375c52385-CMakeLists.txt:1.1 --- /dev/null Sun Mar 7 10:51:06 2021 +++ pkgsrc/devel/libftdi1/patches/patch-cdb28383402d248dbc6062f4391b038375c52385-CMakeLists.txt Sun Mar 7 10:51:06 2021 @@ -0,0 +1,39 @@ +$NetBSD: patch-cdb28383402d248dbc6062f4391b038375c52385-CMakeLists.txt,v 1.1 2021/03/07 10:51:06 kleink Exp $ + +commit cdb28383402d248dbc6062f4391b038375c52385 +Author: Fabrice Fontaine +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 + | ^~~~~~~~ + + Fixes: + - http://autobuild.buildroot.org/results/1427f44e36752c337791597fab47a1889552a2fe + + Signed-off-by: Fabrice Fontaine + +--- 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 ) Index: pkgsrc/devel/libftdi1/patches/patch-CMakeLists.txt diff -u /dev/null pkgsrc/devel/libftdi1/patches/patch-CMakeLists.txt:1.3 --- /dev/null Sun Mar 7 10:51:06 2021 +++ pkgsrc/devel/libftdi1/patches/patch-CMakeLists.txt Sun Mar 7 10:51:06 2021 @@ -0,0 +1,22 @@ +$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} ) --_----------=_1615114266163810--