Revert "bump libftdi to 1-1.5"

The build does not work anymore with mingw and clang. I couldn't make it work

This reverts commit 63a888f4b93715fc34ee284a0aa489e3c5f9a749.

Author: umbynos

deps/build_libs.sh

@@ -45,7 +45,7 @@ else
   make install
 fi
 
-cd /opt/lib/libftdi1-1.5
+cd /opt/lib/libftdi1-1.4
 rm -rf build && mkdir build && cd build
 
 CMAKE_EXTRA_FLAG="-DSHAREDLIBS=OFF -DBUILD_TESTS=OFF -DPYTHON_BINDINGS=OFF -DEXAMPLES=OFF -DFTDI_EEPROM=OFF"

deps/libftdi1-1.5/.gitignore renamed to deps/libftdi1-1.4/.gitignore

@@ -4,7 +4,6 @@
 *.so
 *.lo
 *.la
-*.patch
 *.pc
 .deps/
 .libs/
@@ -42,6 +41,7 @@ examples/simple
 
 # libftdi specific
 libftdi1-config
+libftdi1.spec
 
 # CMake
 CMakeCache.txt
@@ -51,6 +51,3 @@ CMakeFiles
 # Misc. binaries
 *.dylib
 opt
-
-# ctags
-tags

deps/libftdi1-1.5/AUTHORS renamed to deps/libftdi1-1.4/AUTHORS

@@ -7,8 +7,8 @@ see Changelog for full details:
 
   Adam Malinowski <[email protected]>
   Alain Abbas <[email protected]>
-  Alex Harford <[email protected]>
   Alexander Lehmann <[email protected]>
+  Alex Harford <[email protected]>
   Anders Larsen <[email protected]>
   Andrei Errapart <[email protected]>
   Andrew John Rogers <[email protected]>
@@ -17,34 +17,26 @@ see Changelog for full details:
   Benjamin Vanheuverzwijn <[email protected]>
   Chris Morgan <[email protected]>
   Chris Zeh <[email protected]>
-  Claudio Lanconelli <[email protected]>
   Clifford Wolf <[email protected]>
-  Dan Dedrick <[email protected]>
   Daniel Kirkham <[email protected]>
   David Challis <[email protected]>
   Davide Michelizza <[email protected]>
   Denis Sirotkin <[email protected]>
-  Diego Elio Pettenò <[email protected]>
   Emil <[email protected]>
-  Eneas U de Queiroz <[email protected]>
-  Eric Schott <[email protected]>
+  Eric Schott <[email protected]>
   Eugene Hutorny <[email protected]>
   Evan Nemerson <[email protected]>
   Evgeny Sinelnikov <[email protected]>
-  Fabrice Fontaine <[email protected]>
   Fahrzin Hemmati <[email protected]>
   Flynn Marquardt <[email protected]>
   Forest Crossman <[email protected]>
-  Frank Dana <[email protected]>
-  Holger Mößinger <[email protected]>
   Ian Abbott <[email protected]>
   Jared Boone <[email protected]>
   Jarkko Sonninen <[email protected]>
   Jean-Daniel Merkli <[email protected]>
   Jochen Sprickerhof <[email protected]>
   Joe Zbiciak <[email protected]>
   Jon Beniston <[email protected]>
-  Jordan Rupprecht <[email protected]>
   Juergen Beisert <[email protected]>
   Lorenz Moesenlechner <[email protected]>
   Marek Vavruša <[email protected]>
@@ -62,17 +54,13 @@ see Changelog for full details:
   Nathan Fraser <[email protected]>
   Oleg Seiljus <[email protected]>
   Paul Fertser <[email protected]>
-  Pawel Jewstafjew <[email protected]>
   Peter Holik <[email protected]>
   Raphael Assenat <[email protected]>
-  Richard Shaw <[email protected]>
-  Robby McKilliam <[email protected]>
   Robert Cox <[email protected]>
   Robin Haberkorn <[email protected]>
   Rodney Sinclair <[email protected]>
   Rogier Wolff <[email protected]>
   Rolf Fiedler <[email protected]>
-  Roman Lapin <[email protected]>
   Salvador Eduardo Tropea <[email protected]>
   Stephan Linz <[email protected]>
   Steven Turner <[email protected]>

deps/libftdi1-1.5/CMakeLists.txt renamed to deps/libftdi1-1.4/CMakeLists.txt

@@ -1,7 +1,7 @@
 # Project
-project(libftdi1 C)
+project(libftdi1)
 set(MAJOR_VERSION 1)
-set(MINOR_VERSION 5)
+set(MINOR_VERSION 4)
 set(PACKAGE libftdi1)
 set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION})
 set(VERSION ${VERSION_STRING})
@@ -16,8 +16,6 @@ cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
 
 add_definitions(-Wall)
 
-include(CMakeOptions.txt)
-
 # Debug build
 message("-- Build type: ${CMAKE_BUILD_TYPE}")
 if(${CMAKE_BUILD_TYPE} STREQUAL Debug)
@@ -28,10 +26,8 @@ endif(${CMAKE_BUILD_TYPE} STREQUAL Debug)
 find_package ( USB1 REQUIRED )
 include_directories ( ${LIBUSB_INCLUDE_DIR} )
 
-# Find Boost
-if (FTDIPP OR BUILD_TESTS)
-  find_package( Boost REQUIRED )
-endif()
+# Find Boost (optional package)
+find_package(Boost)
 
 # Set components
 set(CPACK_COMPONENTS_ALL sharedlibs staticlibs headers)
@@ -50,6 +46,9 @@ set(CPACK_COMPONENT_SHAREDLIBS_GROUP "Development")
 set(CPACK_COMPONENT_STATICLIBS_GROUP "Development")
 set(CPACK_COMPONENT_HEADERS_GROUP    "Development")
 
+option ( SHAREDLIBS "Build ㄎ libraries" ON )
+option ( STATICLIBS "Build static libraries" ON )
+
 # guess LIB_SUFFIX, don't take debian multiarch into account 
 if ( NOT DEFINED LIB_SUFFIX )
   if( CMAKE_SYSTEM_NAME MATCHES "Linux"
@@ -115,8 +114,18 @@ add_custom_target(dist
             | bzip2 > ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 
-if ( DOCUMENTATION )
-   find_package ( Doxygen REQUIRED)
+# Tests
+option ( BUILD_TESTS "Build unit tests with Boost Unit Test framework" ON )
+
+# Documentation
+option ( DOCUMENTATION "Generate API documentation with Doxygen" ON )
+
+
+find_package ( Doxygen )
+if ( DOCUMENTATION AND DOXYGEN_FOUND )
+
+   # Find doxy config
+   message(STATUS "Doxygen found.")
 
    # Copy doxy.config.in
    set(top_srcdir ${CMAKE_SOURCE_DIR})
@@ -132,26 +141,19 @@ if ( DOCUMENTATION )
    )
 
    add_custom_target(docs ALL DEPENDS ${CMAKE_BINARY_DIR}/doc/html/index.html)
-endif ()
+
+   message(STATUS "Generating API documentation with Doxygen")
+else(DOCUMENTATION AND DOXYGEN_FOUND)
+   message(STATUS "Not generating API documentation")
+endif(DOCUMENTATION AND DOXYGEN_FOUND)
 
 add_subdirectory(src)
-if ( FTDIPP )
-  project(libftdipp1 C CXX)
-  add_subdirectory(ftdipp)
-endif ()
-if ( PYTHON_BINDINGS )
+add_subdirectory(ftdipp)
 add_subdirectory(python)
-endif ()
-if ( FTDI_EEPROM )
-  add_subdirectory(ftdi_eeprom)
-endif ()
-if ( EXAMPLES )
-  add_subdirectory(examples)
-endif ()
+add_subdirectory(ftdi_eeprom)
+add_subdirectory(examples)
 add_subdirectory(packages)
-if ( BUILD_TESTS )
-  add_subdirectory(test)
-endif ()
+add_subdirectory(test)
 
 # PkgConfig
 set(prefix      ${CMAKE_INSTALL_PREFIX})
@@ -165,6 +167,7 @@ if(${WIN32})
    set(libdir      ${CMAKE_INSTALL_PREFIX}/bin)
 endif(${WIN32})
 
+configure_file(${CMAKE_SOURCE_DIR}/libftdi1.spec.in ${CMAKE_BINARY_DIR}/libftdi1.spec @ONLY)
 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
@@ -189,7 +192,7 @@ 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 )
+if (FTDI_BUILD_CPP)
   set ( LIBFTDIPP_LIBRARY ftdipp1 )
   set ( LIBFTDIPP_LIBRARIES ${LIBFTDIPP_LIBRARY} )
   list ( APPEND LIBFTDIPP_LIBRARIES ${LIBUSB_LIBRARIES} )
@@ -236,15 +239,7 @@ install ( FILES
           DESTINATION ${LIBFTDI_CMAKE_CONFIG_DIR}
         )
 
-include(CPack)
 
-message (STATUS "Summary of build options:
 
-  Build static libs: ${STATICLIBS}
-  Build C++ bindings: ${FTDIPP}
-  Build Python bindings: ${PYTHON_BINDINGS}
-  Build ftdi_eeprom: ${FTDI_EEPROM}
-  Build examples: ${EXAMPLES}
-  Build tests: ${BUILD_TESTS}
-  Build API documentation: ${DOCUMENTATION}
-")
+
+include(CPack)

deps/libftdi1-1.5/COPYING-CMAKE-SCRIPTS renamed to deps/libftdi1-1.4/COPYING-CMAKE-SCRIPTS

@@ -1,32 +1,3 @@
-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
-
 New in 1.4 - 2017-08-07
 -----------------------
 * New ftdi_usb_open_bus_addr() open function

deps/libftdi1-1.5/COPYING.GPL renamed to deps/libftdi1-1.4/COPYING.GPL

@@ -0,0 +1,52 @@
+--------------------------------------------------------------------
+libftdi version 1.4
+--------------------------------------------------------------------
+
+libftdi - A library (using libusb) to talk to FTDI's UART/FIFO chips
+including the popular bitbang mode.
+
+The following chips are supported:
+* FT230X
+- FT4232H / FT2232H
+- FT232R  / FT245R
+- FT2232L / FT2232D / FT2232C
+- FT232BM / FT245BM (and the BL/BQ variants)
+- FT8U232AM / FT8U245AM
+
+libftdi requires libusb 1.x.
+
+The AUTHORS file contains a list of all the people
+that made libftdi possible what it is today.
+
+Changes
+-------
+* New ftdi_usb_open_bus_addr() open function
+* Use BM/R series baud rate computation for FT230X
+* ftdi_get_error_string() now returns const char*
+* C++ API: Ability to open devices with empty descriptor strings
+* C++ API: Fix enumerations for buffer purge and modem controls
+* small build fixes and improvements in the python examples
+* ftdi_eeprom / eeprom handling:
+  * New API function: ftdi_eeprom_get_strings()
+  * Fix USE_SERIAL handling for 230X type chips
+  * Make ftdi_read_eeprom_location() endianness independent
+  * Fix flashing of FT245R
+
+You'll find the newest version of libftdi at:
+https://www.intra2net.com/en/developer/libftdi
+
+
+Quick start
+-----------
+mkdir build
+cd build
+
+cmake -DCMAKE_INSTALL_PREFIX="/usr" ../
+make
+make install
+
+More verbose build instructions are in "README.build"
+
+--------------------------------------------------------------------
+www.intra2net.com                             2003-2017 Intra2net AG
+--------------------------------------------------------------------