bluez: Move from meta-extras to meta since required by syncml/openobex

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1612 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 53 insertions, 0 deletions

diff --git a/meta/packages/bluez/bluez-utils-dbus/dbus-2.24.patch b/meta/packages/bluez/bluez-utils-dbus/dbus-2.24.patch
new file mode 100644
index 0000000000..d8ec946a0b
--- /dev/null
+++ b/meta/packages/bluez/bluez-utils-dbus/dbus-2.24.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], [