summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-07-31 10:02:03 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-07-31 10:02:03 +0100
commit456d9191f10a1f23d6ea3d33cd923dcd80f2ce4b (patch)
treedeafd80b29023a06270fc9977046edad05f0dc6b /meta
parent433c2d2318dc32843fb1f92487977d2152b72818 (diff)
downloadpoky-456d9191f10a1f23d6ea3d33cd923dcd80f2ce4b.tar.gz
openobex: 1.2 -> 1.5
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/openobex/files/libusb_crosscompile_check.patch23
-rw-r--r--meta/packages/openobex/openobex_1.5.bb (renamed from meta/packages/openobex/openobex_1.2.bb)15
2 files changed, 15 insertions, 23 deletions
diff --git a/meta/packages/openobex/files/libusb_crosscompile_check.patch b/meta/packages/openobex/files/libusb_crosscompile_check.patch
index c28921b8ca..20ac70bd1e 100644
--- a/meta/packages/openobex/files/libusb_crosscompile_check.patch
+++ b/meta/packages/openobex/files/libusb_crosscompile_check.patch
@@ -1,12 +1,13 @@
1diff -Naur openobex-1.2_old/acinclude.m4 openobex-1.2/acinclude.m4 1Index: openobex-1.5/acinclude.m4
2--- openobex-1.2_old/acinclude.m4 2006-03-07 19:57:49.000000000 +0200 2===================================================================
3+++ openobex-1.2/acinclude.m4 2006-04-18 23:07:25.000000000 +0300 3--- openobex-1.5.orig/acinclude.m4 2009-02-08 18:30:22.000000000 +0000
4@@ -195,7 +195,7 @@ 4+++ openobex-1.5/acinclude.m4 2009-07-31 09:55:46.000000000 +0100
5 5@@ -158,7 +158,7 @@
6 if (test "${usb_enable}" = "yes" && test "${usb_found}" = "yes"); then 6 ;;
7 AC_DEFINE(HAVE_USB, 1, [Define if system supports USB and it's enabled]) 7 *)
8- AC_CHECK_FILE(${usb_prefix}/lib/pkgconfig/libusb.pc, REQUIRES="$REQUIRES libusb") 8 PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no))
9- AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb")
9+ REQUIRES="libusb" 10+ REQUIRES="libusb"
10 fi 11 ;;
11 12 esac
12 AM_CONDITIONAL(APPS, test "${apps_enable}" = "yes") 13 AC_SUBST(USB_CFLAGS)
diff --git a/meta/packages/openobex/openobex_1.2.bb b/meta/packages/openobex/openobex_1.5.bb
index 1824fc743e..8fc7e6dc7d 100644
--- a/meta/packages/openobex/openobex_1.2.bb
+++ b/meta/packages/openobex/openobex_1.5.bb
@@ -3,28 +3,19 @@ Object Exchange (OBEX) protocol."
3HOMEPAGE = "http://openobex.triq.net" 3HOMEPAGE = "http://openobex.triq.net"
4SECTION = "libs" 4SECTION = "libs"
5PROVIDES = "openobex-apps" 5PROVIDES = "openobex-apps"
6DEPENDS = "libusb bluez-libs" 6DEPENDS = "libusb bluez4"
7LICENSE = "GPL" 7LICENSE = "GPL"
8PR = "r4" 8PR = "r4"
9 9
10SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \ 10SRC_URI = "${KERNELORG_MIRROR}/pub/linux/bluetooth/openobex-${PV}.tar.gz \
11 file://disable-cable-test.patch;patch=1 \ 11 file://disable-cable-test.patch;patch=1 \
12 file://libusb_crosscompile_check.patch;patch=1" 12 file://libusb_crosscompile_check.patch;patch=1"
13 13
14inherit autotools binconfig pkgconfig 14inherit autotools_stage binconfig pkgconfig
15 15
16EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump \ 16EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump \
17 --with-usb=${STAGING_LIBDIR}/.. --with-bluez=${STAGING_LIBDIR}/.." 17 --with-usb=${STAGING_LIBDIR}/.. --with-bluez=${STAGING_LIBDIR}/.."
18 18
19do_stage() {
20 oe_libinstall -so -C lib libopenobex ${STAGING_LIBDIR}
21 ln -sf libopenobex.so ${STAGING_LIBDIR}/libopenobex-1.2.so
22 install -d ${STAGING_INCDIR}/openobex
23 install -m 0644 include/*.h ${STAGING_INCDIR}/openobex/
24 install -d ${STAGING_DATADIR}/aclocal
25 install -m 0644 openobex.m4 ${STAGING_DATADIR}/aclocal/
26}
27
28# how to stop shlibrename from renaming -apps? 19# how to stop shlibrename from renaming -apps?
29PACKAGES += "openobex-apps" 20PACKAGES += "openobex-apps"
30FILES_${PN} = "${libdir}/lib*.so.*" 21FILES_${PN} = "${libdir}/lib*.so.*"