|
 |
800851e |
From a817a1899909b9b210e0451339919253e49eeab6 Mon Sep 17 00:00:00 2001
|
|
|
800851e |
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
|
|
|
800851e |
Date: Sun, 15 Jun 2014 11:08:37 +0200
|
|
|
800851e |
Subject: [PATCH 1/3] detect version 1.x of libftdi library
|
|
|
800851e |
|
|
|
800851e |
The FDTI library changed version, module name and also soname, so add an option to detect it
|
|
|
800851e |
when the 0.x version is not found. The 1.x API is compatible enough for libsigrok to build.
|
|
|
800851e |
---
|
|
|
800851e |
configure.ac | 8 ++++++--
|
|
|
800851e |
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
800851e |
|
|
|
800851e |
diff --git a/configure.ac b/configure.ac
|
|
|
800851e |
index cb4eeaf..ff93d8f 100644
|
|
|
800851e |
--- a/configure.ac
|
|
|
800851e |
+++ b/configure.ac
|
|
|
800851e |
@@ -370,7 +370,11 @@ PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16],
|
|
|
800851e |
[LIB_CFLAGS="$LIB_CFLAGS $libftdi_CFLAGS";
|
|
|
800851e |
LIBS="$LIBS $libftdi_LIBS";
|
|
|
800851e |
SR_PKGLIBS="$SR_PKGLIBS libftdi"],
|
|
|
800851e |
- [HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA="no"; HW_IKALOGIC_SCANAPLUS="no"])
|
|
|
800851e |
+ [PKG_CHECK_MODULES([libftdi1], [libftdi1 >= 1.1],
|
|
|
800851e |
+ [LIB_CFLAGS="$LIB_CFLAGS $libftdi1_CFLAGS";
|
|
|
800851e |
+ LIBS="$LIBS $libftdi1_LIBS";
|
|
|
800851e |
+ SR_PKGLIBS="$SR_PKGLIBS libftdi1"],
|
|
|
800851e |
+ [HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA="no"; HW_IKALOGIC_SCANAPLUS="no"])])
|
|
|
800851e |
|
|
|
800851e |
# The Check unit testing framework is optional. Disable if not found.
|
|
|
800851e |
PKG_CHECK_MODULES([check], [check >= 0.9.4],
|
|
|
800851e |
@@ -599,7 +603,7 @@ echo "Detected libraries:"
|
|
|
800851e |
echo
|
|
|
800851e |
|
|
|
800851e |
# Note: This only works for libs with pkg-config integration.
|
|
|
800851e |
-for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.0" "librevisa >= 0.0.20130812" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" "check >= 0.9.4"; do
|
|
|
800851e |
+for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.0" "librevisa >= 0.0.20130812" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" "libftdi1 >= 1.1" "check >= 0.9.4"; do
|
|
|
800851e |
optional="OPTIONAL"
|
|
|
800851e |
if test "x$lib" = "xglib-2.0 >= 2.32.0"; then optional="REQUIRED"; fi
|
|
|
800851e |
if test "x$lib" = "xlibzip >= 0.10"; then optional="REQUIRED"; fi
|
|
|
800851e |
--
|
|
|
800851e |
1.9.3
|
|
|
800851e |
|
|
|
800851e |
|
|
|
800851e |
From d9f2abd86839812ac06c61b97f4009a8e0276e7b Mon Sep 17 00:00:00 2001
|
|
|
800851e |
From: Uwe Hermann <uwe@hermann-uwe.de>
|
|
|
800851e |
Date: Mon, 16 Jun 2014 13:19:34 +0200
|
|
|
800851e |
Subject: [PATCH 2/3] Lower libftdi1 requirement to 1.0 (builds fine too).
|
|
|
800851e |
|
|
|
800851e |
---
|
|
|
800851e |
configure.ac | 4 ++--
|
|
|
800851e |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
800851e |
|
|
|
800851e |
diff --git a/configure.ac b/configure.ac
|
|
|
800851e |
index ff93d8f..0212f05 100644
|
|
|
800851e |
--- a/configure.ac
|
|
|
800851e |
+++ b/configure.ac
|
|
|
800851e |
@@ -370,7 +370,7 @@ PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16],
|
|
|
800851e |
[LIB_CFLAGS="$LIB_CFLAGS $libftdi_CFLAGS";
|
|
|
800851e |
LIBS="$LIBS $libftdi_LIBS";
|
|
|
800851e |
SR_PKGLIBS="$SR_PKGLIBS libftdi"],
|
|
|
800851e |
- [PKG_CHECK_MODULES([libftdi1], [libftdi1 >= 1.1],
|
|
|
800851e |
+ [PKG_CHECK_MODULES([libftdi1], [libftdi1 >= 1.0],
|
|
|
800851e |
[LIB_CFLAGS="$LIB_CFLAGS $libftdi1_CFLAGS";
|
|
|
800851e |
LIBS="$LIBS $libftdi1_LIBS";
|
|
|
800851e |
SR_PKGLIBS="$SR_PKGLIBS libftdi1"],
|
|
|
800851e |
@@ -603,7 +603,7 @@ echo "Detected libraries:"
|
|
|
800851e |
echo
|
|
|
800851e |
|
|
|
800851e |
# Note: This only works for libs with pkg-config integration.
|
|
|
800851e |
-for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.0" "librevisa >= 0.0.20130812" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" "libftdi1 >= 1.1" "check >= 0.9.4"; do
|
|
|
800851e |
+for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.0" "librevisa >= 0.0.20130812" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" "libftdi1 >= 1.0" "check >= 0.9.4"; do
|
|
|
800851e |
optional="OPTIONAL"
|
|
|
800851e |
if test "x$lib" = "xglib-2.0 >= 2.32.0"; then optional="REQUIRED"; fi
|
|
|
800851e |
if test "x$lib" = "xlibzip >= 0.10"; then optional="REQUIRED"; fi
|
|
|
800851e |
--
|
|
|
800851e |
1.9.3
|
|
|
800851e |
|
|
|
800851e |
|
|
|
800851e |
From d82281a6136dd2cf53cc058021842084b51d962c Mon Sep 17 00:00:00 2001
|
|
|
800851e |
From: Uwe Hermann <uwe@hermann-uwe.de>
|
|
|
800851e |
Date: Mon, 16 Jun 2014 13:20:56 +0200
|
|
|
800851e |
Subject: [PATCH 3/3] README: Document that libftdi1 is also an option.
|
|
|
800851e |
|
|
|
800851e |
---
|
|
|
800851e |
README | 2 +-
|
|
|
800851e |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
800851e |
|
|
|
800851e |
diff --git a/README b/README
|
|
|
800851e |
index 556ab3f..dc795f6 100644
|
|
|
800851e |
--- a/README
|
|
|
800851e |
+++ b/README
|
|
|
800851e |
@@ -39,7 +39,7 @@ Requirements
|
|
|
800851e |
- libserialport >= 0.1.0 (optional, used by some drivers)
|
|
|
800851e |
- librevisa >= 0.0.20130812 (optional, used by some drivers)
|
|
|
800851e |
- libusb-1.0 >= 1.0.16 (optional, used by some drivers)
|
|
|
800851e |
- - libftdi >= 0.16 (optional, used by some drivers)
|
|
|
800851e |
+ - libftdi >= 0.16 or libftdi1 >= 1.0 (optional, used by some drivers)
|
|
|
800851e |
- check >= 0.9.4 (optional, only needed to run unit tests)
|
|
|
800851e |
|
|
|
800851e |
|
|
|
800851e |
--
|
|
|
800851e |
1.9.3
|
|
|
800851e |
|