From 941e31317e406dcf50953b53d7d2d386dfebd024 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 11 Jun 2013 23:00:49 -0700 Subject: [PATCH] libusb: Update tp 0.1.5 Removed obsoleted patches (From OE-Core rev: ed72e1867d517b99e60be66cb9f2318919c36056) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../0.1.0-beta1-gcc3.4-fix.patch | 15 --------------- .../obsolete_automake_macros.patch | 15 --------------- ...usb-compat_0.1.4.bb => libusb-compat_0.1.5.bb} | 10 +++------- 3 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 meta/recipes-support/libusb/libusb-compat-0.1.4/0.1.0-beta1-gcc3.4-fix.patch delete mode 100644 meta/recipes-support/libusb/libusb-compat-0.1.4/obsolete_automake_macros.patch rename meta/recipes-support/libusb/{libusb-compat_0.1.4.bb => libusb-compat_0.1.5.bb} (78%) diff --git a/meta/recipes-support/libusb/libusb-compat-0.1.4/0.1.0-beta1-gcc3.4-fix.patch b/meta/recipes-support/libusb/libusb-compat-0.1.4/0.1.0-beta1-gcc3.4-fix.patch deleted file mode 100644 index b255457eb1..0000000000 --- a/meta/recipes-support/libusb/libusb-compat-0.1.4/0.1.0-beta1-gcc3.4-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Backport - -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/recipes-support/libusb/libusb-compat-0.1.4/obsolete_automake_macros.patch b/meta/recipes-support/libusb/libusb-compat-0.1.4/obsolete_automake_macros.patch deleted file mode 100644 index 18375e1f75..0000000000 --- a/meta/recipes-support/libusb/libusb-compat-0.1.4/obsolete_automake_macros.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Submitted [https://libusb.org/ticket/161] - -Signed-off-by: Marko Lindqvist -diff -Nurd libusb-compat-0.1.4/configure.ac libusb-compat-0.1.4/configure.ac ---- libusb-compat-0.1.4/configure.ac 2012-04-24 08:45:46.000000000 +0300 -+++ libusb-compat-0.1.4/configure.ac 2013-01-02 16:41:30.440115202 +0200 -@@ -1,7 +1,7 @@ - AC_INIT([libusb-compat], [0.1.4]) - AM_INIT_AUTOMAKE - AC_CONFIG_SRCDIR([libusb/core.c]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_MACRO_DIR([m4]) - - AC_PREREQ([2.50]) diff --git a/meta/recipes-support/libusb/libusb-compat_0.1.4.bb b/meta/recipes-support/libusb/libusb-compat_0.1.5.bb similarity index 78% rename from meta/recipes-support/libusb/libusb-compat_0.1.4.bb rename to meta/recipes-support/libusb/libusb-compat_0.1.5.bb index d74307262b..de93a36073 100644 --- a/meta/recipes-support/libusb/libusb-compat_0.1.4.bb +++ b/meta/recipes-support/libusb/libusb-compat_0.1.5.bb @@ -16,15 +16,11 @@ PROVIDES = "libusb virtual/libusb0" BBCLASSEXTEND = "native nativesdk" PE = "1" -PR = "r1" -SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \ - file://obsolete_automake_macros.patch \ - " -# file://0.1.0-beta1-gcc3.4-fix.patch" +SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2" -SRC_URI[md5sum] = "2ca521fffadd0c28fdf174e6ec73865b" -SRC_URI[sha256sum] = "ed5bdd160c7b01ef767fb931a81b454f46226d1e2cf58502ced758d3e5a9fdc4" +SRC_URI[md5sum] = "2780b6a758a1e2c2943bdbf7faf740e4" +SRC_URI[sha256sum] = "404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea328bc55a" inherit autotools pkgconfig binconfig lib_package