From 62bccaa7979213555fced945b1b09e92683d4213 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Thu, 15 May 2014 06:57:24 -0700 Subject: libusb1: Update to 1.0.18 Signed-off-by: Saul Wold --- .../libusb1-1.0.9/obsolete_automake_macros.patch | 15 ---------- .../libusb/libusb1/obsolete_automake_macros.patch | 15 ++++++++++ meta/recipes-support/libusb/libusb1_1.0.18.bb | 32 ++++++++++++++++++++ meta/recipes-support/libusb/libusb1_1.0.9.bb | 35 ---------------------- 4 files changed, 47 insertions(+), 50 deletions(-) delete mode 100644 meta/recipes-support/libusb/libusb1-1.0.9/obsolete_automake_macros.patch create mode 100644 meta/recipes-support/libusb/libusb1/obsolete_automake_macros.patch create mode 100644 meta/recipes-support/libusb/libusb1_1.0.18.bb delete mode 100644 meta/recipes-support/libusb/libusb1_1.0.9.bb diff --git a/meta/recipes-support/libusb/libusb1-1.0.9/obsolete_automake_macros.patch b/meta/recipes-support/libusb/libusb1-1.0.9/obsolete_automake_macros.patch deleted file mode 100644 index b1dd66c969..0000000000 --- a/meta/recipes-support/libusb/libusb1-1.0.9/obsolete_automake_macros.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Submitted [https://libusb.org/ticket/159] - -Signed-off-by: Marko Lindqvist -diff -Nurd libusb-1.0.9/configure.ac libusb-1.0.9/configure.ac ---- libusb-1.0.9/configure.ac 2012-04-20 09:44:27.000000000 +0300 -+++ libusb-1.0.9/configure.ac 2013-01-02 16:36:44.152121483 +0200 -@@ -31,7 +31,7 @@ - - AC_CONFIG_SRCDIR([libusb/core.c]) - AC_CONFIG_MACRO_DIR([m4]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) - - AC_PREREQ([2.50]) diff --git a/meta/recipes-support/libusb/libusb1/obsolete_automake_macros.patch b/meta/recipes-support/libusb/libusb1/obsolete_automake_macros.patch new file mode 100644 index 0000000000..b1dd66c969 --- /dev/null +++ b/meta/recipes-support/libusb/libusb1/obsolete_automake_macros.patch @@ -0,0 +1,15 @@ +Upstream-Status: Submitted [https://libusb.org/ticket/159] + +Signed-off-by: Marko Lindqvist +diff -Nurd libusb-1.0.9/configure.ac libusb-1.0.9/configure.ac +--- libusb-1.0.9/configure.ac 2012-04-20 09:44:27.000000000 +0300 ++++ libusb-1.0.9/configure.ac 2013-01-02 16:36:44.152121483 +0200 +@@ -31,7 +31,7 @@ + + AC_CONFIG_SRCDIR([libusb/core.c]) + AC_CONFIG_MACRO_DIR([m4]) +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + + AC_PREREQ([2.50]) diff --git a/meta/recipes-support/libusb/libusb1_1.0.18.bb b/meta/recipes-support/libusb/libusb1_1.0.18.bb new file mode 100644 index 0000000000..c64f1dba21 --- /dev/null +++ b/meta/recipes-support/libusb/libusb1_1.0.18.bb @@ -0,0 +1,32 @@ +SUMMARY = "Userspace library to access USB (version 1.0)" +HOMEPAGE = "http://libusb.sf.net" +BUGTRACKER = "http://www.libusb.org/report" +SECTION = "libs" + +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ + " + +SRC_URI[md5sum] = "4a6d049923efc6496f1d383054dac1a6" +SRC_URI[sha256sum] = "c73f5cec45a5de94418da4e151b7232958571926984acfb9bce02b9424e83720" + +S = "${WORKDIR}/libusb-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--libdir=${base_libdir}" + +do_install_append() { + install -d ${D}${libdir} + if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then + mv ${D}${base_libdir}/pkgconfig ${D}${libdir} + fi +} + +FILES_${PN} += "${base_libdir}/*.so.*" + +FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la" diff --git a/meta/recipes-support/libusb/libusb1_1.0.9.bb b/meta/recipes-support/libusb/libusb1_1.0.9.bb deleted file mode 100644 index d57425b3c5..0000000000 --- a/meta/recipes-support/libusb/libusb1_1.0.9.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Userspace library to access USB (version 1.0)" -HOMEPAGE = "http://libusb.sf.net" -BUGTRACKER = "http://www.libusb.org/report" -SECTION = "libs" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" - -BBCLASSEXTEND = "native nativesdk" - -PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ - file://obsolete_automake_macros.patch \ - " - -SRC_URI[md5sum] = "7f5a02375ad960d4e33a6dae7d63cfcb" -SRC_URI[sha256sum] = "e920eedc2d06b09606611c99ec7304413c6784cba6e33928e78243d323195f9b" - -S = "${WORKDIR}/libusb-${PV}" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--libdir=${base_libdir}" - -do_install_append() { - install -d ${D}${libdir} - if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then - mv ${D}${base_libdir}/pkgconfig ${D}${libdir} - fi -} - -FILES_${PN} += "${base_libdir}/*.so.*" - -FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la" -- cgit 1.2.3-korg