From c7d8eb5fbc53e757ac999785247dd630d56b2f4c Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 14 Jan 2006 18:52:02 +0000 Subject: bluez-utils: move hciattach_devlength.patch - move the patch from bluez-utils.inc to the versioned recipes, as it is not needed anymore for bluez-utils 2.24 --- packages/bluez/bluez-utils-dbus_2.20.bb | 1 + packages/bluez/bluez-utils-dbus_2.21.bb | 1 + packages/bluez/bluez-utils-nodbus_2.20.bb | 1 + packages/bluez/bluez-utils-nodbus_2.21.bb | 1 + packages/bluez/bluez-utils.inc | 1 - 5 files changed, 4 insertions(+), 1 deletion(-) (limited to 'packages/bluez') diff --git a/packages/bluez/bluez-utils-dbus_2.20.bb b/packages/bluez/bluez-utils-dbus_2.20.bb index 3a9baf4ebc..ca3b110d48 100644 --- a/packages/bluez/bluez-utils-dbus_2.20.bb +++ b/packages/bluez/bluez-utils-dbus_2.20.bb @@ -5,6 +5,7 @@ PR = "r9" DEPENDS += "dbus" SRC_URI += "file://dbus.patch;patch=1 \ file://smash.patch;patch=1 \ + file://hciattach_devlength.patch;patch=1 \ file://hcid-alignment-fix.patch;patch=1" EXTRA_OECONF += "--with-dbus" diff --git a/packages/bluez/bluez-utils-dbus_2.21.bb b/packages/bluez/bluez-utils-dbus_2.21.bb index 7eeb0a269a..bfd3994c24 100644 --- a/packages/bluez/bluez-utils-dbus_2.21.bb +++ b/packages/bluez/bluez-utils-dbus_2.21.bb @@ -5,5 +5,6 @@ PR = "r3" DEPENDS += "dbus" SRC_URI += "file://dbus.patch;patch=1 \ file://smash.patch;patch=1 \ + file://hciattach_devlength.patch;patch=1 \ file://hcid-alignment-fix.patch;patch=1" EXTRA_OECONF += "--with-dbus" diff --git a/packages/bluez/bluez-utils-nodbus_2.20.bb b/packages/bluez/bluez-utils-nodbus_2.20.bb index 2abe49aab3..3c47a030b2 100644 --- a/packages/bluez/bluez-utils-nodbus_2.20.bb +++ b/packages/bluez/bluez-utils-nodbus_2.20.bb @@ -2,5 +2,6 @@ include bluez-utils.inc PR = "r1" +SRC_URI += "file://hciattach_devlength.patch;patch=1" EXTRA_OECONF += "--without-dbus" diff --git a/packages/bluez/bluez-utils-nodbus_2.21.bb b/packages/bluez/bluez-utils-nodbus_2.21.bb index 774549be3d..43c06a9587 100644 --- a/packages/bluez/bluez-utils-nodbus_2.21.bb +++ b/packages/bluez/bluez-utils-nodbus_2.21.bb @@ -2,4 +2,5 @@ include bluez-utils.inc PR = "r1" +SRC_URI += "file://hciattach_devlength.patch;patch=1" EXTRA_OECONF += "--without-dbus" diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc index 9fddc5f759..5babed48dc 100644 --- a/packages/bluez/bluez-utils.inc +++ b/packages/bluez/bluez-utils.inc @@ -8,7 +8,6 @@ LICENSE = "GPL" SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://base.patch;patch=1 \ file://blueboxes.patch;patch=1 \ - file://hciattach_devlength.patch;patch=1 \ file://hcid.conf \ file://bluetooth.default \ file://bluetooth.conf " -- cgit v1.2.3 From e6b9740c0ee3c08fabd2fd8b8a6807bdb75ab1c1 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 14 Jan 2006 18:59:51 +0000 Subject: bluez-libs/utils: add version 2.24 --- packages/bluez/bluez-libs_2.24.bb | 22 +++++++++ .../bluez/bluez-utils-dbus-2.24/.mtn2git_empty | 0 packages/bluez/bluez-utils-dbus-2.24/dbus.patch | 53 ++++++++++++++++++++++ packages/bluez/bluez-utils-dbus_2.24.bb | 7 +++ 4 files changed, 82 insertions(+) create mode 100644 packages/bluez/bluez-libs_2.24.bb create mode 100644 packages/bluez/bluez-utils-dbus-2.24/.mtn2git_empty create mode 100644 packages/bluez/bluez-utils-dbus-2.24/dbus.patch create mode 100644 packages/bluez/bluez-utils-dbus_2.24.bb (limited to 'packages/bluez') diff --git a/packages/bluez/bluez-libs_2.24.bb b/packages/bluez/bluez-libs_2.24.bb new file mode 100644 index 0000000000..d740bd80a9 --- /dev/null +++ b/packages/bluez/bluez-libs_2.24.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Linux Bluetooth Stack Userland Libaries." +SECTION = "libs" +PRIORITY = "optional" +HOMEPAGE = "http://www.bluez.org" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz" + +inherit autotools pkgconfig + +HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h" + +do_stage() { + oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/bluetooth/ + for f in ${HEADERS} + do + install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f + done +} diff --git a/packages/bluez/bluez-utils-dbus-2.24/.mtn2git_empty b/packages/bluez/bluez-utils-dbus-2.24/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/bluez/bluez-utils-dbus-2.24/dbus.patch b/packages/bluez/bluez-utils-dbus-2.24/dbus.patch new file mode 100644 index 0000000000..d8ec946a0b --- /dev/null +++ b/packages/bluez/bluez-utils-dbus-2.24/dbus.patch @@ -0,0 +1,53 @@ +--- bluez-utils-2.24/acinclude.m4.orig 2006-01-12 08:21:38.000000000 +0100 ++++ bluez-utils-2.24/acinclude.m4 2006-01-12 08:23:18.000000000 +0100 +@@ -131,46 +131,15 @@ + ]) + + AC_DEFUN([AC_PATH_DBUS], [ +- dbus_prefix=${prefix} +- +- AC_ARG_WITH(dbus, AC_HELP_STRING([--with-dbus=DIR], [D-BUS library is installed in DIR]), [ +- if (test "${withval}" != "yes"); then +- dbus_prefix=${withval} +- fi +- ]) +- +- ac_save_CPPFLAGS=$CPPFLAGS +- ac_save_LDFLAGS=$LDFLAGS +- +- DBUS_CFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE" +- test -d "${dbus_prefix}/include/dbus-1.0" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/include/dbus-1.0" +- if (test "${prefix}" = "${bluez_prefix}"); then +- test -d "${libdir}/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${libdir}/dbus-1.0/include" +- else +- test -d "${dbus_prefix}/lib64/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib64/dbus-1.0/include" +- test -d "${dbus_prefix}/lib/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib/dbus-1.0/include" +- fi ++ if pkg-config --exists dbus-1; then ++ dbus_found=yes ; DBUS_CFLAGS="`pkg-config --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE" ++ DBUS_LIBS="`pkg-config --libs dbus-1`" + + CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS" +- AC_CHECK_HEADER(dbus/dbus.h, dbus_found=yes, dbus_found=no) +- +- DBUS_LIBS="" +- if (test "${prefix}" = "${dbus_prefix}"); then +- test -d "${libdir}" && DBUS_LIBS="$DBUS_LIBS -L${libdir}" +- else +- test -d "${dbus_prefix}/lib64" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib64" +- test -d "${dbus_prefix}/lib" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib" +- fi +- + LDFLAGS="$LDFLAGS $DBUS_LIBS" +- AC_CHECK_LIB(dbus-1, dbus_error_init, DBUS_LIBS="$DBUS_LIBS -ldbus-1", dbus_found=no) +- AC_CHECK_LIB(dbus-1, dbus_message_iter_get_basic, dummy=yes, dbus_found=no) +- +- CPPFLAGS=$ac_save_CPPFLAGS +- LDFLAGS=$ac_save_LDFLAGS +- + AC_SUBST(DBUS_CFLAGS) + AC_SUBST(DBUS_LIBS) ++ fi + ]) + + AC_DEFUN([AC_PATH_FUSE], [ diff --git a/packages/bluez/bluez-utils-dbus_2.24.bb b/packages/bluez/bluez-utils-dbus_2.24.bb new file mode 100644 index 0000000000..c05208a024 --- /dev/null +++ b/packages/bluez/bluez-utils-dbus_2.24.bb @@ -0,0 +1,7 @@ +include bluez-utils.inc + +PR = "r0" + +DEPENDS += "dbus" +SRC_URI += "file://dbus.patch;patch=1" +EXTRA_OECONF += "--with-dbus" -- cgit v1.2.3