libFTDI major version update 1. This version can coexists beside the 0.x version (libftdi.so, libftdi1.so).
PATCH 1/1 libFTDI major version update 1. This version can coexists beside the 0.x version (libftdi.so, libftdi1.so).
--- package/Config.in | 1 + package/libftdi1/Config.in | 24 ++++++++++++++++++++++++ package/libftdi1/libftdi1.mk | 22 ++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 package/libftdi1/Config.in create mode 100644 package/libftdi1/libftdi1.mk
package/Config.in +1 -0
@@ -670,6 +670,7 @@ menu "Hardware handling" source "package/libcec/Config.in" source "package/libfreefare/Config.in" source "package/libftdi/Config.in" + source "package/libftdi1/Config.in" source "package/libhid/Config.in" source "package/libinput/Config.in" source "package/libiqrf/Config.in"
package/libftdi1/Config.in new file +24 -0
@@ -0,0 +1,24 @@ +config BR2_PACKAGE_LIBFTDI1 + bool "libftdi1" + depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + select BR2_PACKAGE_LIBUSB + select BR2_PACKAGE_LIBUSB_COMPAT + select BR2_PACKAGE_LIBCONFUSE + help + Userspace access to FTDI USB interface chips (version 1.x) + + http://www.intra2net.com/en/developer/libftdi/index.php + +if BR2_PACKAGE_LIBFTDI1 + +config BR2_PACKAGE_LIBTFDI1_CPP + depends on BR2_INSTALL_LIBSTDCPP + bool "C++ bindings" + help + C++ bindings for libftdi + +endif # BR2_PACKAGE_LIBFTDI1 + +comment "libftdi1 needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS +
package/libftdi1/libftdi1.mk new file +22 -0
@@ -0,0 +1,22 @@ +################################################################################ +# +# libftdi1 +# +################################################################################ + +LIBFTDI1_VERSION = 1.1 +LIBFTDI1_SOURCE = libftdi1-$(LIBFTDI1_VERSION).tar.bz2 +LIBFTDI1_SITE = http://www.intra2net.com/en/developer/libftdi/download/ +LIBFTDI1_INSTALL_STAGING = YES +LIBFDTI1_CONF_OPT = --without-examples +LIBFTDI1_DEPENDENCIES = libusb-compat libusb libconfuse + +# configure detect it automaticaly so we need to force it +ifeq ($(BR2_PACKAGE_LIBTFDI1_CPP),y) +LIBFDTI_CONF_OPT += --enable-libftdipp +else +LIBFDTI_CONF_OPT += --disable-libftdipp +endif + +$(eval $(cmake-package)) +
Signature · 1 line
1.9.1
PATCH 1/1 libFTDI major version update 1. This version can coexists beside the 0.x version (libftdi.so, libftdi1.so).
Dear Daniel Sangue,
Thanks for getting back with a proper patch for libftdi1. Definitely looking much better!
One first nit: the way your commit log is formatted. See
http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html.
Your commit log should look like:
"""
libftdi1: new package
This commit adds libftdi1 as a new package. This version should (and can) co-exist besides the 0.x version already packaged as libftdi, because they use different library names and a different API.
Signed-off-by: ...
"""
The most important thing is that the first line should be short, and be an overall summary of what the patch is doing. Then one blank line, and one or several paragraphs of additional details, then one blank line, and the Signed-off-by line.
Quoted 14 lines · Daniel Sangue
package/libftdi1/Config.in new file +8
-0@@ -0,0 +1,24 @@ +config BR2_PACKAGE_LIBFTDI1 + bool "libftdi1" + depends on BR2_TOOLCHAIN_HAS_THREADS # libusb + select BR2_PACKAGE_LIBUSB + select BR2_PACKAGE_LIBUSB_COMPAT + select BR2_PACKAGE_LIBCONFUSE + help + Userspace access to FTDI USB interface chips (version 1.x)
package/libftdi1/Config.in line 18
Quoted 10 lines
package/libftdi1/Config.in new file +10
-0+ + http://www.intra2net.com/en/developer/libftdi/index.php + +if BR2_PACKAGE_LIBFTDI1 + +config BR2_PACKAGE_LIBTFDI1_CPP + depends on BR2_INSTALL_LIBSTDCPP + bool "C++ bindings" + help + C++ bindings for libftdi
According to your libftdi1.mk file comments, it looks like C++ support can be autodetected. So maybe it's not really worth the effort having an option for that: we could just enable C++ support when available, and that's it.
Quoted 12 lines
package/libftdi1/Config.in new file +6
-0+ +endif # BR2_PACKAGE_LIBFTDI1 + +comment "libftdi1 needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS +package/libftdi1/libftdi1.mk new file +0
-0
package/libftdi1/libftdi1.mk line 9
Quoted 9 lines
package/libftdi1/libftdi1.mk new file +9
-0@@ -0,0 +1,22 @@ +################################################################################ +# +# libftdi1 +# +################################################################################ + +LIBFTDI1_VERSION = 1.1 +LIBFTDI1_SOURCE = libftdi1-$(LIBFTDI1_VERSION).tar.bz2 +LIBFTDI1_SITE = http://www.intra2net.com/en/developer/libftdi/download/
Please add LIBFTDI1_LICENSE and LIBFTDI1_LICENSE_FILES.
package/libftdi1/libftdi1.mk line 15
Quoted 6 lines
package/libftdi1/libftdi1.mk new file +6
-0+LIBFTDI1_INSTALL_STAGING = YES +LIBFDTI1_CONF_OPT = --without-examples +LIBFTDI1_DEPENDENCIES = libusb-compat libusb libconfuse + +# configure detect it automaticaly so we need to force it +ifeq ($(BR2_PACKAGE_LIBTFDI1_CPP),y)
If you remove the option for C++ support, you could use:
ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
here. It will make sure C++ bindings are automatically built when the toolchain has C++ support.
package/libftdi1/libftdi1.mk line 21
Quoted 6 lines
package/libftdi1/libftdi1.mk new file +6
-0+LIBFDTI_CONF_OPT += --enable-libftdipp +else +LIBFDTI_CONF_OPT += --disable-libftdipp +endif + +$(eval $(cmake-package))
Are you sure --{enable,disable}-libftdipp options are working for CMake? It doesn't look like the usual way of passing CMake configuration options, but maybe I'm missing something here.
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com