summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/libusb/libusb-compat-0.1.4/0.1.0-beta1-gcc3.4-fix.patch15
-rw-r--r--meta/recipes-support/libusb/libusb-compat-0.1.4/obsolete_automake_macros.patch15
-rw-r--r--meta/recipes-support/libusb/libusb-compat_0.1.5.bb (renamed from meta/recipes-support/libusb/libusb-compat_0.1.4.bb)10
3 files changed, 3 insertions, 37 deletions
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 @@
1Upstream-Status: Backport
2
3Index: libusb-compat-0.1.0-beta1/configure.ac
4===================================================================
5--- libusb-compat-0.1.0-beta1.orig/configure.ac 2008-07-21 13:14:42.000000000 +0200
6+++ libusb-compat-0.1.0-beta1/configure.ac 2008-07-21 13:15:03.000000000 +0200
7@@ -55,7 +55,7 @@
8 CFLAGS="$saved_cflags"
9
10 AC_DEFINE([API_EXPORTED], [__attribute__((visibility("default")))], [Default visibility])
11-AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow"
12+AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wshadow"
13 AC_SUBST(AM_CFLAGS)
14
15 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 @@
1Upstream-Status: Submitted [https://libusb.org/ticket/161]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd libusb-compat-0.1.4/configure.ac libusb-compat-0.1.4/configure.ac
5--- libusb-compat-0.1.4/configure.ac 2012-04-24 08:45:46.000000000 +0300
6+++ libusb-compat-0.1.4/configure.ac 2013-01-02 16:41:30.440115202 +0200
7@@ -1,7 +1,7 @@
8 AC_INIT([libusb-compat], [0.1.4])
9 AM_INIT_AUTOMAKE
10 AC_CONFIG_SRCDIR([libusb/core.c])
11-AM_CONFIG_HEADER([config.h])
12+AC_CONFIG_HEADERS([config.h])
13 AC_CONFIG_MACRO_DIR([m4])
14
15 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
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"
16BBCLASSEXTEND = "native nativesdk" 16BBCLASSEXTEND = "native nativesdk"
17 17
18PE = "1" 18PE = "1"
19PR = "r1"
20 19
21SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \ 20SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2"
22 file://obsolete_automake_macros.patch \
23 "
24# file://0.1.0-beta1-gcc3.4-fix.patch"
25 21
26SRC_URI[md5sum] = "2ca521fffadd0c28fdf174e6ec73865b" 22SRC_URI[md5sum] = "2780b6a758a1e2c2943bdbf7faf740e4"
27SRC_URI[sha256sum] = "ed5bdd160c7b01ef767fb931a81b454f46226d1e2cf58502ced758d3e5a9fdc4" 23SRC_URI[sha256sum] = "404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea328bc55a"
28 24
29inherit autotools pkgconfig binconfig lib_package 25inherit autotools pkgconfig binconfig lib_package
30 26