[libftdi1] update to 1.5 (#15917) (#15918)

* [libftdi1] update to 1.5 (#15917)

* [libftdi1] fixed outdated version file (#15917)

* [libftdi1] Switched to using option instead of patch to disable ftdi_eeprom (#15917)

* [libftdi1] updated version file (#15917)

* [libftdi1] Change version scheme

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

9 files changed, 56 insertions, 27 deletions

diff --git a/ports/libftdi1/CONTROL b/ports/libftdi1/CONTROL
deleted file mode 100644
index daab99f17..000000000
--- a/ports/libftdi1/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: libftdi1

-Version: 1.4-1

-Build-Depends: libusb

-Description: FTDI USB driver with bitbang mode (v1.4)

diff --git a/ports/libftdi1/exports.def b/ports/libftdi1/exports.def
index f5179c59d..8fbbd3818 100644
--- a/ports/libftdi1/exports.def
+++ b/ports/libftdi1/exports.def
@@ -42,7 +42,11 @@ EXPORTS
 	ftdi_setdtr

 	ftdi_setdtr_rts

 	ftdi_setflowctrl

+	ftdi_setflowctrl_xonxoff

 	ftdi_setrts

+	ftdi_tciflush

+	ftdi_tcioflush

+	ftdi_tcoflush

 	ftdi_transfer_data_cancel

 	ftdi_transfer_data_done

 	ftdi_usb_close

diff --git a/ports/libftdi1/libconfuse-fix.patch b/ports/libftdi1/libconfuse-fix.patch
new file mode 100644
index 000000000..b50bb0a3c
--- /dev/null
+++ b/ports/libftdi1/libconfuse-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/FindConfuse.cmake b/cmake/FindConfuse.cmake
+index f6af7d5..e24d72f 100755
+--- a/cmake/FindConfuse.cmake
++++ b/cmake/FindConfuse.cmake	
+@@ -46,7 +46,7 @@ find_path ( CONFUSE_INCLUDE_DIR
+ set ( CONFUSE_INCLUDE_DIRS ${CONFUSE_INCLUDE_DIR} )
+ 
+ find_library ( CONFUSE_LIBRARY
+-  NAMES confuse
++  NAMES libconfuse
+ )
+ 
+ set ( CONFUSE_LIBRARIES ${CONFUSE_LIBRARY} )
diff --git a/ports/libftdi1/cmake-fix.patch b/ports/libftdi1/libusb-fix.patch
index ea541f719..98dae3dea 100644
--- a/ports/libftdi1/cmake-fix.patch
+++ b/ports/libftdi1/libusb-fix.patch
@@ -1,13 +1,13 @@
-diff --git a/cmake/FindUSB1.cmake b/cmake/FindUSB1.cmake

-index b90e297..6cc97a0 100644

---- a/cmake/FindUSB1.cmake

-+++ b/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 libusb-1.0

-     PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS})

- 

-   include(FindPackageHandleStandardArgs)

+diff --git a/cmake/FindUSB1.cmake b/cmake/FindUSB1.cmake
+index b90e297..6cc97a0 100755
+--- a/cmake/FindUSB1.cmake
++++ b/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 libusb-1.0
+     PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS})
+ 
+   include(FindPackageHandleStandardArgs)
diff --git a/ports/libftdi1/portfile.cmake b/ports/libftdi1/portfile.cmake
index e05ccca20..3b3fdaefe 100644
--- a/ports/libftdi1/portfile.cmake
+++ b/ports/libftdi1/portfile.cmake
@@ -1,15 +1,16 @@
 vcpkg_download_distfile(ARCHIVE

-    URLS "https://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.4.tar.bz2"

-    FILENAME "libftdi1-1.4.tar.bz2"

-    SHA512 dbab74f7bc35ca835b9c6dd5b70a64816948d65da1f73a9ece37a0f0f630bd0df1a676543acc517b02a718bc34ba4f7a30cbc48b6eed1c154c917f8ef0a358fc

+    URLS "https://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.5.tar.bz2"

+    FILENAME "libftdi1-1.5.tar.bz2"

+    SHA512 c525b2ab6aff9ef9254971ae7d57f3549a36a36875765c48f947d52532814a2a004de1232389d4fe824a8c8ab84277b08427308573476e1da9b7db83db802f6f

 )

 

 vcpkg_extract_source_archive_ex(

     OUT_SOURCE_PATH SOURCE_PATH

     ARCHIVE ${ARCHIVE}

-    REF 1.4

+    REF 1.5

     PATCHES

-        cmake-fix.patch

+        libusb-fix.patch

+        libconfuse-fix.patch

         win32.patch

 )

 

@@ -26,10 +27,10 @@ vcpkg_configure_cmake(
         -DLINK_PYTHON_LIBRARY=OFF

         -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON

         -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON

-        -DCMAKE_DISABLE_FIND_PACKAGE_Confuse=ON

         -DCMAKE_DISABLE_FIND_PACKAGE_Libintl=ON

         -DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON

         -DCMAKE_DISABLE_FIND_PACKAGE_PythonInterp=ON

+        -DFTDI_EEPROM=OFF

 )

 

 vcpkg_install_cmake()

diff --git a/ports/libftdi1/vcpkg.json b/ports/libftdi1/vcpkg.json
new file mode 100644
index 000000000..aeedcd1bd
--- /dev/null
+++ b/ports/libftdi1/vcpkg.json
@@ -0,0 +1,10 @@
+{
+  "name": "libftdi1",
+  "version": "1.5",
+  "port-version": 1,
+  "description": "FTDI USB driver with bitbang mode",
+  "dependencies": [
+    "libconfuse",
+    "libusb"
+  ]
+}
diff --git a/ports/libftdi1/win32.patch b/ports/libftdi1/win32.patch
index 8cf35c920..7cea44d4f 100644
--- a/ports/libftdi1/win32.patch
+++ b/ports/libftdi1/win32.patch
@@ -1,5 +1,5 @@
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt

-index 9fd86a6..e1e848c 100644

+index 17b3617..f9a8e59 100755

 --- a/src/CMakeLists.txt

 +++ b/src/CMakeLists.txt

 @@ -18,9 +18,14 @@ message(STATUS "Detected git snapshot version: ${SNAPSHOT_VERSION}")

@@ -16,7 +16,7 @@ index 9fd86a6..e1e848c 100644
 +if(BUILD_SHARED_LIBS)

  add_library(ftdi1 SHARED ${c_sources})

  

- math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1")    # Compatiblity with previous releases

+ math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1")    # Compatibility with previous releases

 @@ -38,7 +43,7 @@ install ( TARGETS ftdi1

            ARCHIVE DESTINATION lib${LIB_SUFFIX}

          )

diff --git a/versions/baseline.json b/versions/baseline.json
index 20bdbbacb..40e6a3b0a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2997,8 +2997,8 @@
       "port-version": 0
     },
     "libftdi1": {
-      "baseline": "1.4-1",
-      "port-version": 0
+      "baseline": "1.5",
+      "port-version": 1
     },
     "libgcrypt": {
       "baseline": "1.8.7",
diff --git a/versions/l-/libftdi1.json b/versions/l-/libftdi1.json
index bd936c8b3..49bf2665d 100644
--- a/versions/l-/libftdi1.json
+++ b/versions/l-/libftdi1.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "5e6c7ec4555f72017a8e1982492aa8fc3cabcd83",
+      "version": "1.5",
+      "port-version": 1
+    },
+    {
       "git-tree": "9d83012d7f5b6d0c838ce11124d77303933b4008",
       "version-string": "1.4-1",
       "port-version": 0