From patchwork Sun Dec 9 23:06:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: openobex: new package Date: Sun, 09 Dec 2012 13:06:22 -0000 From: Samuel Martin X-Patchwork-Id: 204801 Message-Id: <1355094387-22886-2-git-send-email-s.martin49@gmail.com> To: buildroot@busybox.net Cc: armadeus-forum@lists.sourceforge.net, Julien Boibessot Cc: Julien Boibessot Cc: Eric Jarrige Signed-off-by: Samuel Martin Tested-by: Eric Jarrige --- package/Config.in | 1 + package/openobex/Config.in | 28 +++++++++++++++++ ...penobex-libusb_check_when_cross-compiling.patch | 18 +++++++++++ .../openobex-replace_deprecated_functions.patch | 30 +++++++++++++++++++ package/openobex/openobex.mk | 35 ++++++++++++++++++++++ 5 files changed, 112 insertions(+) create mode 100644 package/openobex/Config.in create mode 100644 package/openobex/openobex-libusb_check_when_cross-compiling.patch create mode 100644 package/openobex/openobex-replace_deprecated_functions.patch create mode 100644 package/openobex/openobex.mk diff --git a/package/Config.in b/package/Config.in index 74e439e..0855684 100644 --- a/package/Config.in +++ b/package/Config.in @@ -632,6 +632,7 @@ source "package/ntp/Config.in" source "package/nuttcp/Config.in" source "package/olsr/Config.in" source "package/openntpd/Config.in" +source "package/openobex/Config.in" source "package/openssh/Config.in" source "package/openswan/Config.in" source "package/openvpn/Config.in" diff --git a/package/openobex/Config.in b/package/openobex/Config.in new file mode 100644 index 0000000..06f4c7d --- /dev/null +++ b/package/openobex/Config.in @@ -0,0 +1,28 @@ +config BR2_PACKAGE_OPENOBEX + bool "openobex" + help + Free open source implementation of the Object Exchange (OBEX) + protocol. + + http://www.openobex.org + +if BR2_PACKAGE_OPENOBEX +config BR2_PACKAGE_OPENOBEX_BLUEZ + bool "enable bluez support" + select BR2_PACKAGE_BLUEZ_UTILS + +config BR2_PACKAGE_OPENOBEX_LIBUSB + bool "enable libusb support" + select BR2_PACKAGE_LIBUSB + +config BR2_PACKAGE_OPENOBEX_APPS + bool "install test applications" + help + Also install the openobex test applications on target. + +config BR2_PACKAGE_OPENOBEX_SYSLOG + bool "enable debugging to the system logger" + +config BR2_PACKAGE_OPENOBEX_DUMP + bool "enable protocol dumping for debugging" +endif diff --git a/package/openobex/openobex-libusb_check_when_cross-compiling.patch b/package/openobex/openobex-libusb_check_when_cross-compiling.patch new file mode 100644 index 0000000..7b8056a --- /dev/null +++ b/package/openobex/openobex-libusb_check_when_cross-compiling.patch @@ -0,0 +1,18 @@ +Fix libusb check when cross-compiling. + +Signed-off-by: Julien Boibessot +Signed-off-by: Samuel Martin + +Index: openobex-1.5/acinclude.m4 +=================================================================== +--- openobex-1.5.orig/acinclude.m4 2010-06-16 10:32:47.000000000 +0200 ++++ openobex-1.5/acinclude.m4 2010-06-16 10:35:33.000000000 +0200 +@@ -158,7 +158,7 @@ + ;; + *) + PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no)) +- AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb") ++ REQUIRES="libusb" + ;; + esac + AC_SUBST(USB_CFLAGS) diff --git a/package/openobex/openobex-replace_deprecated_functions.patch b/package/openobex/openobex-replace_deprecated_functions.patch new file mode 100644 index 0000000..17274d3 --- /dev/null +++ b/package/openobex/openobex-replace_deprecated_functions.patch @@ -0,0 +1,30 @@ +obex_test_cable.c: avoid to use SuSv3 LEGACY APIs + +Signed-off-by: Julien Boibessot +Signed-off-by: Samuel Martin + +Index: openobex-1.5/apps/obex_test_cable.c +=================================================================== +--- openobex-1.5.orig/apps/obex_test_cable.c 2009-02-08 19:30:22.000000000 +0100 ++++ openobex-1.5/apps/obex_test_cable.c 2010-06-16 11:11:05.000000000 +0200 +@@ -113,9 +113,9 @@ + if(total == sizeof(tmpbuf)) + return -1; + +- if( (answer = index(tmpbuf, '\n')) ) { ++ if( (answer = strchr(tmpbuf, '\n')) ) { + // Remove first line (echo) +- if( (answer_end = index(answer+1, '\n')) ) { ++ if( (answer_end = strchr(answer+1, '\n')) ) { + // Found end of answer + done = 1; + } +@@ -178,7 +178,7 @@ + } + + tcgetattr(gt->ttyfd, >->oldtio); +- bzero(>->newtio, sizeof(struct termios)); ++ memset(>->newtio, 0, sizeof(struct termios)); + gt->newtio.c_cflag = B115200 | CS8 | CREAD | CRTSCTS; + gt->newtio.c_iflag = IGNPAR; + gt->newtio.c_oflag = 0; diff --git a/package/openobex/openobex.mk b/package/openobex/openobex.mk new file mode 100644 index 0000000..beac5ff --- /dev/null +++ b/package/openobex/openobex.mk @@ -0,0 +1,35 @@ +############################################################# +# +# openobex +# +############################################################# +OPENOBEX_VERSION = 1.5 +OPENOBEX_SITE = http://ftp.osuosl.org/pub/linux/bluetooth +# Libraries seems release under LGPLv2.1, while other material are undrer GPLv2 +OPENOBEX_LICENSE = GPLv2/LGPLv2.1 +OPENOBEX_LICENSE_FILES = COPYING COPYING.LIB + +OPENOBEX_AUTORECONF = YES +OPENOBEX_INSTALL_STAGING = YES + +OPENOBEX_CONF_OPT += \ + $(if $(BR2_ENABLE_DEBUG),--enable-debug) \ + $(if $(BR2_PACKAGE_OPENOBEX_APPS),--enable-apps) \ + $(if $(BR2_PACKAGE_OPENOBEX_SYSLOG),--enable-syslog) \ + $(if $(BR2_PACKAGE_OPENOBEX_DUMP),--enable-dump) + +ifeq ($(BR2_PACKAGE_OPENOBEX_BLUEZ),y) +OPENOBEX_DEPENDENCIES += bluez_utils +OPENOBEX_CONF_OPT += --with-bluez=$(STAGING_DIR) +else +OPENOBEX_CONF_OPT += --disable-bluetooth +endif + +ifeq ($(BR2_PACKAGE_OPENOBEX_LIBUSB),y) +OPENOBEX_DEPENDENCIES += libusb +OPENOBEX_CONF_OPT += --with-usb=$(STAGING_DIR) +else +OPENOBEX_CONF_OPT += --disable-usb +endif + +$(eval $(autotools-package))