Merge pull request #1433 from peternewman/master-resync

peternewman · web-flow · commit 671e66b85a9a · 2018-06-12T12:07:01.000+01:00
Master resync
diff --git a/.travis.yml b/.travis.yml
@@ -45,38 +45,44 @@ matrix:
       env:
       - TASK='compile'
       - CPPUNIT='1.13'
+      - LIBFTDI='0'
     - os: osx
       osx_image: xcode9.3
       compiler: clang
       env:
       - TASK='compile'
       - CPPUNIT='1.14'
+      - LIBFTDI='0'
     - os: osx
       osx_image: xcode9.3
       compiler: gcc
       env:
       - TASK='compile'
       - CPPUNIT='1.13'
+      - LIBFTDI='0'
     - os: osx
       osx_image: xcode9.3
       compiler: gcc
       env:
       - TASK='compile'
       - CPPUNIT='1.14'
-    - os: osx
-      osx_image: xcode9.2
+      - LIBFTDI='0'
+    - os: osx
+      osx_image: xcode9.3
       compiler: clang
       env:
       - TASK='compile'
       - CPPUNIT='1.14'
       - PROTOBUF='3.5'
+      - LIBFTDI='1'
     - os: osx
-      osx_image: xcode9.2
+      osx_image: xcode9.3
       compiler: gcc
       env:
       - TASK='compile'
       - CPPUNIT='1.14'
       - PROTOBUF='3.5'
+      - LIBFTDI='1'
     - os: linux
       dist: trusty
       compiler: clang
@@ -289,7 +295,9 @@ before_install:
  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew reinstall -s libtool; fi
 #Fix a broken homebrew python upgrade - see https://github.com/Homebrew/homebrew-core/issues/26358
  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade python || true; fi
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache bison flex libftdi libftdi0 libusb liblo libmicrohttpd; fi # ossp-uuid, homebrew/python/numpy already present
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache bison flex liblo libmicrohttpd; fi # ossp-uuid, homebrew/python/numpy and libusb already present
+ - if [ "$TRAVIS_OS_NAME" == "osx" -a "$LIBFTDI" != "1" ]; then brew install libftdi0; fi # install libftdi0
+ - if [ "$TRAVIS_OS_NAME" == "osx" -a "$LIBFTDI" == "1" ]; then brew install libftdi; fi # install the latest libftdi
  - if [ "$TRAVIS_OS_NAME" == "osx" -a "$PROTOBUF" == "3.5" ]; then brew install protobuf@3.5; fi
  - if [ "$TRAVIS_OS_NAME" == "osx" -a "$PROTOBUF" != "3.5" ]; then brew install protobuf@3.1; fi
  - if [ "$TRAVIS_OS_NAME" == "osx" -a "$PROTOBUF" != "3.5" ]; then brew link -f protobuf@3.1; export PKG_CONFIG_PATH=/usr/local/opt/protobuf@3.1/lib/pkgconfig; brew install --build-from-source --ignore-dependencies --env=std protobuf-c; fi # When protobuf is not on the latest release
diff --git a/AUTHORS b/AUTHORS
@@ -8,6 +8,7 @@ Contributors:
   Bastien Andrès, contributed to the dmx4linux plugin
   Carsten Presser, Karate USB plugin
   Dave Olsthoorn, working on a new web-ui
+  E.S. Rosenberg, further work on ftdidmx plugin.
   Florian Edelmann, added DMXCreator 512 Basic USB and native SPI DMX support
   Hakan Lindestaf, Renard plugin
   Harry F, for the Eurolite USB Pro code
diff --git a/configure.ac b/configure.ac
@@ -612,19 +612,33 @@ AC_ARG_ENABLE(
   [ja-rule],
   [AS_HELP_STRING([--enable-ja-rule], [Build the Ja Rule test tool])])
 
-# libftdi: this requires libusb-0.1.4+ don't know if I should also
+# libftdi0: this requires libusb-0.1.4+ don't know if I should also
 # check for it, since the libusb check above is not for 0.1.4 but for libusb-1
 AC_ARG_ENABLE(
   [libftdi],
   [AS_HELP_STRING([--disable-libftdi],
-                  [Avoid using libftdi even if it exists])])
+                  [Avoid using libftdi0 or libftdi1 even if either exists])])
 
-have_libftdi="no"
+have_libftdi0="no"
+AS_IF([test "x$enable_libftdi" != xno],
+      [PKG_CHECK_MODULES([libftdi0], [libftdi >= 0.18], [have_libftdi0="yes"],
+                         [true])])
+AM_CONDITIONAL([HAVE_LIBFTDI0], [test "x$have_libftdi0" = xyes])
+AS_IF([test "x$have_libftdi0" = xyes],
+      [AC_DEFINE([HAVE_LIBFTDI0], [1], [define if libftdi0 is installed])])
+have_libftdi1="no"
 AS_IF([test "x$enable_libftdi" != xno],
-      [PKG_CHECK_MODULES([libftdi], [libftdi >= 0.18], [have_libftdi="yes"],
+      [PKG_CHECK_MODULES([libftdi1], [libftdi1 >= 1.0], [have_libftdi1="yes"],
                          [true])])
+AM_CONDITIONAL([HAVE_LIBFTDI1], [test "x$have_libftdi1" = xyes])
+AS_IF([test "x$have_libftdi1" = xyes],
+      [AC_DEFINE([HAVE_LIBFTDI1], [1], [define if libftdi1 is installed])])
+have_libftdi="no"
+if test "x$have_libftdi0" = xyes || test "x$have_libftdi1" = xyes; then
+  have_libftdi="yes"
+fi
 AS_IF([test "x$have_libftdi" = xyes],
-      [AC_DEFINE([HAVE_LIBFTDI], [1], [define if libftdi is installed])])
+      [AC_DEFINE([HAVE_LIBFTDI], [1], [define if libftdi0 or libftdi1 is installed])])
 
 # libusb
 AC_ARG_ENABLE(
diff --git a/debian/control b/debian/control
@@ -2,17 +2,17 @@ Source: ola
 Priority: optional
 Maintainer: Wouter Verhelst <wouter@debian.org>
 Uploaders: RenZO <renzo@imaginux.com>
-Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, bash-completion, libcppunit-dev, bison, flex, pkg-config, uuid-dev, python, python-protobuf, python-numpy, libprotobuf-dev, protobuf-compiler, libprotoc-dev, libusb-1.0-0-dev, libftdi-dev, liblo-dev, libmicrohttpd-dev, libncurses5-dev
-Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, bash-completion, libcppunit-dev, bison, flex, pkg-config, uuid-dev, python, python-protobuf, libprotobuf-dev, protobuf-compiler, libprotoc-dev, libusb-1.0-0-dev, libftdi-dev, liblo-dev, libmicrohttpd-dev, libncurses5-dev, python-numpy
+Standards-Version: 3.9.8
 Section: libs
 Vcs-Git: https://github.com/OpenLightingProject/ola.git
 Vcs-browser: https://github.com/OpenLightingProject/ola
 Homepage: https://www.openlighting.org/
-Testsuite: autopkgtest
 
 Package: libola-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ola (= ${binary:Version}), ${misc:Depends}
 Description: Open Lighting Architecture - development libraries
  The DMX512 standard for Digital MultipleX is used for digital
@@ -42,7 +42,7 @@ Description: Open Lighting Architecture - Python Classes
 Package: ola-rdm-tests
 Section: libs
 Architecture: all
-Depends: ola (>= ${source:Version}), ola (<< ${source:Version}.~), ola-python (= ${binary:Version}), ${python:Depends}, ${misc:Depends}, python-numpy, libjs-jquery, libjs-jquery-ui
+Depends: ola (>= ${source:Version}), ola (<< ${source:Version}.~), ola-python (= ${binary:Version}), ${python:Depends}, ${misc:Depends}, python-numpy, libjs-jquery, libjs-jquery-ui, lsb-base
 Suggests: bash-completion
 Description: Open Lighting Architecture - RDM Responder Tests
  The DMX512 standard for Digital MultipleX is used for digital
@@ -62,7 +62,7 @@ Description: Open Lighting Architecture - RDM Responder Tests
 Package: ola
 Section: electronics
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lsb-base
 Suggests: bash-completion
 Description: Open Lighting Architecture
  The DMX512 standard for Digital MultipleX is used for digital
@@ -78,6 +78,7 @@ Description: Open Lighting Architecture
 Package: libola1
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Description: Open Lighting Architecture - shared libraries
diff --git a/debian/ola.udev b/debian/ola.udev
@@ -1,41 +1,41 @@
 # Remember to update debian/org.openlighting.ola.ola.metainfo.xml when adding new devices
 
 # udev rules for ftdi devices
-SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6001", GROUP="plugdev"
+SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6001", GROUP="plugdev", TAG+="uaccess"
 
 # udev rules for the anyma dmx device
-SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="05dc", GROUP="plugdev"
+SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="05dc", GROUP="plugdev", TAG+="uaccess"
 
 # udev rules for the avldiy dmx device
 SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="8888", GROUP="plugdev"
 
 # udev rules for the usbdmx2 dmx device
-SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="0962", GROUP="plugdev"
+SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="0962", GROUP="plugdev", TAG+="uaccess"
 
 # udev rules for the velleman dmx device
-SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="10cf", ATTRS{idProduct}=="8062", GROUP="plugdev"
+SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="10cf", ATTRS{idProduct}=="8062", GROUP="plugdev", TAG+="uaccess"
 
 # udev rules for the ShowJockey-DMX-U1 device
 SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="57fe", GROUP="plugdev"
 
 # udev rules for the DMXControl Projects e.V. Nodle U1
-SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="16d0", ATTRS{idProduct}=="0830", GROUP="plugdev"
+SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="16d0", ATTRS{idProduct}=="0830", GROUP="plugdev", TAG+="uaccess"
 
 # udev rules for the DMXCreator 512 Basic device
 SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="0a30", ATTRS{idProduct}=="0002", GROUP="plugdev"
 
 # udev rules for the Eurolite
-SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="fa63", GROUP="plugdev", MODE="660"
+SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="fa63", GROUP="plugdev", MODE="660", TAG+="uaccess"
 
 # udev rules file for the karate-device
 KERNEL=="ttyACM?", ATTRS{product}=="DMX2USB simple", SYMLINK+="kldmx0"
 
 # udev rules file for the Scanlime Fadecandy device
-SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="607a", GROUP="plugdev"
+SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="607a", GROUP="plugdev", TAG+="uaccess"
 
 # udev rules for Ja Rule
-SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="aced", GROUP="plugdev", MODE="660"
-SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="acee", GROUP="plugdev", MODE="660"
+SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="aced", GROUP="plugdev", MODE="660", TAG+="uaccess"
+SUBSYSTEM=="usb|usb_device", ACTION=="add", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="acee", GROUP="plugdev", MODE="660", TAG+="uaccess"
 
 # udev rules for SPI
 SUBSYSTEM=="spidev", MODE="0666"
diff --git a/include/ola/rdm/DimmerSubDevice.h b/include/ola/rdm/DimmerSubDevice.h
@@ -21,7 +21,7 @@
  * @addtogroup rdm_resp
  * @{
  * @file DimmerSubDevice.h
- * @brief A soft responder that impements a SubDevice in DimmerResponder
+ * @brief A soft responder that implements a SubDevice in DimmerResponder
  * @}
  */
 
diff --git a/olad/Makefile.mk b/olad/Makefile.mk
@@ -72,10 +72,6 @@ olad_olad_LDADD = olad/libolaserver.la \
                   common/libolacommon.la \
                   ola/libola.la
 
-if USE_FTDI
-olad_olad_LDADD += -lftdi -lusb
-endif
-
 # TESTS
 ##################################################
 test_programs += \
diff --git a/plugins/ftdidmx/FtdiWidget.cpp b/plugins/ftdidmx/FtdiWidget.cpp
@@ -32,9 +32,18 @@
  * by E.S. Rosenberg a.k.a. Keeper of the Keys 5774/2014
  */
 
-#include <strings.h>
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif  // HAVE_CONFIG_H
+
+#ifdef HAVE_LIBFTDI1
+#include <libftdi1/ftdi.h>
+#else
 #include <ftdi.h>
+#endif  // HAVE_LIBFTDI1
+
 #include <assert.h>
+#include <strings.h>
 
 #include <string>
 #include <algorithm>
@@ -127,7 +136,11 @@ void FtdiWidget::Widgets(vector<FtdiWidgetInfo> *widgets) {
       ftdi_device_list* current_device = list;
 
       while (current_device != NULL) {
+#if HAVE_LIBFTDI1
+        struct libusb_device *dev = current_device->dev;
+#else
         struct usb_device *dev = current_device->dev;
+#endif  // HAVE_LIBFTDI1
         current_device = current_device->next;
         i++;
 
diff --git a/plugins/ftdidmx/FtdiWidget.h b/plugins/ftdidmx/FtdiWidget.h
@@ -35,7 +35,16 @@
 #ifndef PLUGINS_FTDIDMX_FTDIWIDGET_H_
 #define PLUGINS_FTDIDMX_FTDIWIDGET_H_
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif  // HAVE_CONFIG_H
+
+#ifdef HAVE_LIBFTDI1
+#include <libftdi1/ftdi.h>
+#else
 #include <ftdi.h>
+#endif  // HAVE_LIBFTDI1
+
 #include <stdint.h>
 #include <string.h>
 
diff --git a/plugins/ftdidmx/Makefile.mk b/plugins/ftdidmx/Makefile.mk
@@ -21,9 +21,14 @@ plugins_ftdidmx_libolaftdidmx_la_SOURCES = \
     plugins/ftdidmx/FtdiWidget.cpp \
     plugins/ftdidmx/FtdiWidget.h
 plugins_ftdidmx_libolaftdidmx_la_LIBADD = \
-    $(libftdi_LIBS) \
     common/libolacommon.la \
     olad/plugin_api/libolaserverplugininterface.la
+if HAVE_LIBFTDI1
+plugins_ftdidmx_libolaftdidmx_la_LIBADD += $(libftdi1_LIBS)
+else
+plugins_ftdidmx_libolaftdidmx_la_LIBADD += $(libftdi0_LIBS)
+endif
+
 endif
 
 EXTRA_DIST += plugins/ftdidmx/README.md
