libusb: Add versions required for recent bluez

4 files changed, 95 insertions, 0 deletions

diff --git a/meta/packages/libusb/libusb-compat-0.0.9+0.1.0-beta2/0.1.0-beta1-gcc3.4-fix.patch b/meta/packages/libusb/libusb-compat-0.0.9+0.1.0-beta2/0.1.0-beta1-gcc3.4-fix.patch
new file mode 100644
index 0000000000..501ba3fb29
--- /dev/null
+++ b/meta/packages/libusb/libusb-compat-0.0.9+0.1.0-beta2/0.1.0-beta1-gcc3.4-fix.patch
@@ -0,0 +1,13 @@
+Index: libusb-compat-0.1.0-beta1/configure.ac
+===================================================================
+--- libusb-compat-0.1.0-beta1.orig/configure.ac	2008-07-21 13:14:42.000000000 +0200
++++ libusb-compat-0.1.0-beta1/configure.ac	2008-07-21 13:15:03.000000000 +0200
+@@ -55,7 +55,7 @@
+ CFLAGS="$saved_cflags"
+ 
+ AC_DEFINE([API_EXPORTED], [__attribute__((visibility("default")))], [Default visibility])
+-AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow"
++AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wshadow"
+ AC_SUBST(AM_CFLAGS)
+ 
+ AC_CONFIG_FILES([libusb.pc] [libusb-config] [Makefile] [libusb/Makefile] [examples/Makefile])
diff --git a/meta/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb b/meta/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb
new file mode 100644
index 0000000000..34cc1ac50d
--- /dev/null
+++ b/meta/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb
@@ -0,0 +1,39 @@
+DESCRIPTION = "libusb is a library to provide userspace \
+access to USB devices."
+HOMEPAGE = "http://libusb.sf.net"
+SECTION = "libs"
+LICENSE = "LGPL"
+
+PE = "1"
+PR = "r0"
+
+DEPENDS = "libusb1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-0.1.0-beta2.tar.bz2 \
+					file://0.1.0-beta1-gcc3.4-fix.patch;patch=1 \
+          "
+
+S = "${WORKDIR}/libusb-compat-0.1.0-beta2"
+
+inherit autotools pkgconfig binconfig lib_package
+
+PARALLEL_MAKE = ""
+EXTRA_OECONF = "--disable-build-docs"
+
+export CXXFLAGS += "-lstdc++ -I${STAGING_INCDIR}"
+
+do_stage() {
+    autotools_stage_all
+    install -m 755 ${S}/libusb-config ${STAGING_BINDIR}
+    # can we get rid of that? wouldn't a sed statement do as well?
+    sed -i 's:\-L${libdir} :-L${STAGING_LIBDIR} :' ${STAGING_BINDIR}/libusb-config
+
+    if [ "${STAGING_BINDIR}" != "${STAGING_BINDIR_CROSS}" ]; then
+            install -d ${STAGING_BINDIR_CROSS}/
+        mv ${STAGING_BINDIR}/libusb-config ${STAGING_BINDIR_CROSS}/libusb-config
+    fi
+}
+
+PACKAGES =+ "libusbpp"
+
+FILES_libusbpp = "${libdir}/libusbpp*.so.*"
diff --git a/meta/packages/libusb/libusb1-0.9.2/0.9.0-gcc3.4-compat-fix.patch b/meta/packages/libusb/libusb1-0.9.2/0.9.0-gcc3.4-compat-fix.patch
new file mode 100644
index 0000000000..1b06945d1a
--- /dev/null
+++ b/meta/packages/libusb/libusb1-0.9.2/0.9.0-gcc3.4-compat-fix.patch
@@ -0,0 +1,13 @@
+Index: libusb-0.9.0/configure.ac
+===================================================================
+--- libusb-0.9.0.orig/configure.ac	2008-07-21 08:04:03.000000000 +0200
++++ libusb-0.9.0/configure.ac	2008-07-21 08:04:16.000000000 +0200
+@@ -62,7 +62,7 @@
+ CFLAGS="$saved_cflags"
+ 
+ AC_DEFINE([API_EXPORTED], [__attribute__((visibility("default")))], [Default visibility])
+-AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow"
++AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wshadow"
+ AC_SUBST(AM_CFLAGS)
+ 
+ AC_CONFIG_FILES([libusb-1.0.pc] [Makefile] [libusb/Makefile] [examples/Makefile] [doc/Makefile])
diff --git a/meta/packages/libusb/libusb1_0.9.2.bb b/meta/packages/libusb/libusb1_0.9.2.bb
new file mode 100644
index 0000000000..2c144f053d
--- /dev/null
+++ b/meta/packages/libusb/libusb1_0.9.2.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "libusb is a library to provide userspace \
+access to USB devices."
+HOMEPAGE = "http://libusb.sf.net"
+SECTION = "libs"
+LICENSE = "LGPL"
+
+PR = "r0"
+
+SRC_URI = "\
+  ${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \
+  file://0.9.0-gcc3.4-compat-fix.patch;patch=1 \
+"
+S = "${WORKDIR}/libusb-${PV}"
+
+inherit autotools pkgconfig binconfig lib_package
+
+PARALLEL_MAKE = ""
+EXTRA_OECONF = "--disable-build-docs"
+
+export CXXFLAGS += "-lstdc++ -I${STAGING_INCDIR}"
+
+LIBTOOL = "${HOST_SYS}-libtool"
+EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
+
+do_stage() {
+	autotools_stage_all
+}
+
+PACKAGES =+ "libusbpp"
+FILES_libusbpp = "${libdir}/libusbpp*.so.*"