openobex: 1.2 -> 1.5
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
parent
433c2d2318
commit
456d9191f1
|
@ -1,12 +1,13 @@
|
|||
diff -Naur openobex-1.2_old/acinclude.m4 openobex-1.2/acinclude.m4
|
||||
--- openobex-1.2_old/acinclude.m4 2006-03-07 19:57:49.000000000 +0200
|
||||
+++ openobex-1.2/acinclude.m4 2006-04-18 23:07:25.000000000 +0300
|
||||
@@ -195,7 +195,7 @@
|
||||
|
||||
if (test "${usb_enable}" = "yes" && test "${usb_found}" = "yes"); then
|
||||
AC_DEFINE(HAVE_USB, 1, [Define if system supports USB and it's enabled])
|
||||
- AC_CHECK_FILE(${usb_prefix}/lib/pkgconfig/libusb.pc, REQUIRES="$REQUIRES libusb")
|
||||
Index: openobex-1.5/acinclude.m4
|
||||
===================================================================
|
||||
--- openobex-1.5.orig/acinclude.m4 2009-02-08 18:30:22.000000000 +0000
|
||||
+++ openobex-1.5/acinclude.m4 2009-07-31 09:55:46.000000000 +0100
|
||||
@@ -158,7 +158,7 @@
|
||||
;;
|
||||
*)
|
||||
PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no))
|
||||
- AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb")
|
||||
+ REQUIRES="libusb"
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(APPS, test "${apps_enable}" = "yes")
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(USB_CFLAGS)
|
||||
|
|
|
@ -3,28 +3,19 @@ Object Exchange (OBEX) protocol."
|
|||
HOMEPAGE = "http://openobex.triq.net"
|
||||
SECTION = "libs"
|
||||
PROVIDES = "openobex-apps"
|
||||
DEPENDS = "libusb bluez-libs"
|
||||
DEPENDS = "libusb bluez4"
|
||||
LICENSE = "GPL"
|
||||
PR = "r4"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \
|
||||
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/bluetooth/openobex-${PV}.tar.gz \
|
||||
file://disable-cable-test.patch;patch=1 \
|
||||
file://libusb_crosscompile_check.patch;patch=1"
|
||||
|
||||
inherit autotools binconfig pkgconfig
|
||||
inherit autotools_stage binconfig pkgconfig
|
||||
|
||||
EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump \
|
||||
--with-usb=${STAGING_LIBDIR}/.. --with-bluez=${STAGING_LIBDIR}/.."
|
||||
|
||||
do_stage() {
|
||||
oe_libinstall -so -C lib libopenobex ${STAGING_LIBDIR}
|
||||
ln -sf libopenobex.so ${STAGING_LIBDIR}/libopenobex-1.2.so
|
||||
install -d ${STAGING_INCDIR}/openobex
|
||||
install -m 0644 include/*.h ${STAGING_INCDIR}/openobex/
|
||||
install -d ${STAGING_DATADIR}/aclocal
|
||||
install -m 0644 openobex.m4 ${STAGING_DATADIR}/aclocal/
|
||||
}
|
||||
|
||||
# how to stop shlibrename from renaming -apps?
|
||||
PACKAGES += "openobex-apps"
|
||||
FILES_${PN} = "${libdir}/lib*.so.*"
|
Loading…
Reference in New Issue