diff options
author | Qing He <qing.he@intel.com> | 2010-07-16 12:48:08 +0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-23 23:53:29 +0100 |
commit | 63d56523555b000a4b52027b68d0e7f33bf6a2ec (patch) | |
tree | a3857b1b8e402a640ca5fb4ffa6e5d37d61e3f64 | |
parent | 74388f763a9213d826652f647a46b8a6be45496f (diff) | |
download | poky-63d56523555b000a4b52027b68d0e7f33bf6a2ec.tar.gz |
libusb-compat: upgrade to version 0.1.3
from 0.0.9, also remove libusb recipe (see below)
changes:
- remove some unnecessary logics derived from libusb-0.1
- now PROVIDES libusb
- bluez4 depends on libusb instead of libusb-compat
libusb-0.1 vs. libusb-compat
libusb-compat is intended to be a drop-in replacement of libusb-0.1,
building on top of libusb-1.0 (which has different API from -0.1).
Few known packages don't work with libusb-compat, notable example
is libmtp. Since most packages work very well with libusb-compat,
and libusb-compat doesn't suffer from power consumption issue of
libusb-0.1 (which is often very important for embedded systems),
drop libusb-0.1 and move to libusb-compat completely. If we see
any problems in the future, either the package should be fixed
or we can add back libusb-0.1 as needed.
Signed-off-by: Qing He <qing.he@intel.com>
-rw-r--r-- | meta/packages/bluez/bluez4_4.66.bb | 2 | ||||
-rw-r--r-- | meta/packages/libusb/libusb-compat-0.1.3/0.1.0-beta1-gcc3.4-fix.patch (renamed from meta/packages/libusb/libusb-compat-0.0.9+0.1.0-beta2/0.1.0-beta1-gcc3.4-fix.patch) | 0 | ||||
-rw-r--r-- | meta/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb | 28 | ||||
-rw-r--r-- | meta/packages/libusb/libusb-compat_0.1.3.bb | 23 | ||||
-rw-r--r-- | meta/packages/libusb/libusb/configure_fix.patch | 17 | ||||
-rw-r--r-- | meta/packages/libusb/libusb_0.1.12.bb | 29 |
6 files changed, 24 insertions, 75 deletions
diff --git a/meta/packages/bluez/bluez4_4.66.bb b/meta/packages/bluez/bluez4_4.66.bb index 6443938693..7abf0faa65 100644 --- a/meta/packages/bluez/bluez4_4.66.bb +++ b/meta/packages/bluez/bluez4_4.66.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ | |||
7 | file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ | 7 | file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ |
8 | file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \ | 8 | file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \ |
9 | file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191" | 9 | file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191" |
10 | DEPENDS = "gst-plugins-base alsa-lib libusb-compat dbus-glib libnl" | 10 | DEPENDS = "gst-plugins-base alsa-lib libusb dbus-glib libnl" |
11 | 11 | ||
12 | # For angstrom we want this to replace at least bluez-libs | 12 | # For angstrom we want this to replace at least bluez-libs |
13 | PROVIDES_append_angstrom = " bluez-utils bluez-libs" | 13 | PROVIDES_append_angstrom = " bluez-utils bluez-libs" |
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.1.3/0.1.0-beta1-gcc3.4-fix.patch index 501ba3fb29..501ba3fb29 100644 --- 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.1.3/0.1.0-beta1-gcc3.4-fix.patch | |||
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 deleted file mode 100644 index 087fe3ada5..0000000000 --- a/meta/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | DESCRIPTION = "libusb is a library to provide userspace \ | ||
2 | access to USB devices." | ||
3 | HOMEPAGE = "http://www.libusb.org/" | ||
4 | BUGTRACKER = "http://www.libusb.org/report" | ||
5 | SECTION = "libs" | ||
6 | LICENSE = "LGPLv2.1+" | ||
7 | DEPENDS = "libusb1" | ||
8 | |||
9 | PE = "1" | ||
10 | PR = "r0" | ||
11 | |||
12 | |||
13 | SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-0.1.0-beta2.tar.bz2 \ | ||
14 | file://0.1.0-beta1-gcc3.4-fix.patch;patch=1 \ | ||
15 | " | ||
16 | |||
17 | S = "${WORKDIR}/libusb-compat-0.1.0-beta2" | ||
18 | |||
19 | inherit autotools pkgconfig binconfig lib_package | ||
20 | |||
21 | PARALLEL_MAKE = "" | ||
22 | EXTRA_OECONF = "--disable-build-docs" | ||
23 | |||
24 | export CXXFLAGS += "-lstdc++ -I${STAGING_INCDIR}" | ||
25 | |||
26 | PACKAGES =+ "libusbpp" | ||
27 | |||
28 | FILES_libusbpp = "${libdir}/libusbpp*.so.*" | ||
diff --git a/meta/packages/libusb/libusb-compat_0.1.3.bb b/meta/packages/libusb/libusb-compat_0.1.3.bb new file mode 100644 index 0000000000..e8d6338e57 --- /dev/null +++ b/meta/packages/libusb/libusb-compat_0.1.3.bb | |||
@@ -0,0 +1,23 @@ | |||
1 | DESCRIPTION = "libusb-0.1 compatible layer for libusb1, a drop-in replacement \ | ||
2 | that aims to look, feel and behave exactly like libusb-0.1" | ||
3 | HOMEPAGE = "http://www.libusb.org/" | ||
4 | BUGTRACKER = "http://www.libusb.org/report" | ||
5 | SECTION = "libs" | ||
6 | |||
7 | LICENSE = "LGPLv2.1+" | ||
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f2ac5f3ac4835e8f91324a26a590a423" | ||
9 | DEPENDS = "libusb1" | ||
10 | |||
11 | # Few packages are known not to work with libusb-compat (e.g. libmtp-1.0.0), | ||
12 | # so here libusb-0.1 is removed completely instead of adding virtual/libusb0. | ||
13 | # Besides, libusb-0.1 uses a per 1ms polling that hurts a lot to power | ||
14 | # consumption. | ||
15 | PROVIDES = "libusb" | ||
16 | |||
17 | PE = "1" | ||
18 | PR = "r0" | ||
19 | |||
20 | SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \ | ||
21 | file://0.1.0-beta1-gcc3.4-fix.patch" | ||
22 | |||
23 | inherit autotools pkgconfig binconfig | ||
diff --git a/meta/packages/libusb/libusb/configure_fix.patch b/meta/packages/libusb/libusb/configure_fix.patch deleted file mode 100644 index f01f0143f5..0000000000 --- a/meta/packages/libusb/libusb/configure_fix.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | For some reason libtool 2.2.2 can't cope with this, LT_LANG(C++) works though. | ||
2 | |||
3 | RP - 14/4/08 | ||
4 | |||
5 | Index: libusb-0.1.12/configure.in | ||
6 | =================================================================== | ||
7 | --- libusb-0.1.12.orig/configure.in 2008-04-14 22:08:26.000000000 +0100 | ||
8 | +++ libusb-0.1.12/configure.in 2008-04-14 22:09:43.000000000 +0100 | ||
9 | @@ -149,7 +149,7 @@ | ||
10 | fi | ||
11 | |||
12 | # Checks for programs. | ||
13 | -AC_LANG_CPLUSPLUS | ||
14 | +AC_PROG_CXX | ||
15 | AC_PROG_CC | ||
16 | AM_PROG_CC_C_O | ||
17 | AC_PROG_INSTALL | ||
diff --git a/meta/packages/libusb/libusb_0.1.12.bb b/meta/packages/libusb/libusb_0.1.12.bb deleted file mode 100644 index f40d32fe94..0000000000 --- a/meta/packages/libusb/libusb_0.1.12.bb +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | DESCRIPTION = "libusb is a library to provide userspace \ | ||
2 | access to USB devices. This is 0.1 legacy version" | ||
3 | HOMEPAGE = "http://www.libusb.org" | ||
4 | SECTION = "libs" | ||
5 | |||
6 | # usb.h.in and usb.h.in are under dual license of LGPL|BSD | ||
7 | # COPYING is presented as LGPLv2.1+ but not used | ||
8 | |||
9 | LICENSE = "LGPLv2+ & ( LGPLv2+ | BSD )" | ||
10 | LICENSE_libusb = "LGPLv2+" | ||
11 | LICENSE_libusb-dev = "LGPLv2+ | BSD" | ||
12 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f2ac5f3ac4835e8f91324a26a590a423" | ||
13 | PR = "r5" | ||
14 | |||
15 | SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz \ | ||
16 | file://configure_fix.patch;apply=yes" | ||
17 | |||
18 | inherit autotools pkgconfig binconfig lib_package | ||
19 | |||
20 | PARALLEL_MAKE = "" | ||
21 | EXTRA_OECONF = "--disable-build-docs" | ||
22 | |||
23 | export CXXFLAGS += "-lstdc++" | ||
24 | |||
25 | PACKAGES =+ "libusbpp" | ||
26 | |||
27 | FILES_libusbpp = "${libdir}/libusbpp*.so.*" | ||
28 | |||
29 | BBCLASSEXTEND = "native" | ||