Merge bk://openembedded@openembedded.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/07/16 11:57:19+02:00 uni-frankfurt.de!mickey
btscanner: catch up with newer bluez

2004/07/16 00:58:46+02:00 uni-frankfurt.de!mickey
upgrade bluetooth libraries and utilities to 2.8
kill off older versions
patch courtesy Thomas Themel - thanks.

BKrev: 40f7a6890LniHneec2Br9FW60h2ReA

10 files changed, 49 insertions, 115 deletions

diff --git a/bluez-hcidump/bluez-hcidump-1.5/configure.patch b/bluez-hcidump/bluez-hcidump-1.5/configure.patch
deleted file mode 100644
index fe40bfb3ad..0000000000
--- a/bluez-hcidump/bluez-hcidump-1.5/configure.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- bluez-hcidump-1.5/configure.in~configure
-+++ bluez-hcidump-1.5/configure.in
-@@ -24,8 +24,8 @@
- AC_ARG_WITH(bluez-libs,
- 	--with-bluez-libs=DIR  BlueZ libraries and header files,
- 	[
--	    BLUEZ_INCDIR="$withval"/include
--	    BLUEZ_LIBDIR="$withval"/src
-+	    BLUEZ_INCDIR="$withval/include $withval/include/bluetooth"
-+	    BLUEZ_LIBDIR="$withval"/lib
- 	],[
- 	    BLUEZ_INCDIR='../libs/include /usr/include/bluetooth'
- 	    BLUEZ_LIBDIR='../libs/src /usr/lib'
---- bluez-hcidump-1.5/acinclude.m4~configure
-+++ bluez-hcidump-1.5/acinclude.m4
-@@ -74,7 +74,7 @@
- 	p=`cd $p && pwd`
- 
- 	# Check for libtool library
--	if test -f $p/lib$1.la; then
-+	if test -f $p/lib$1.la -a -d $p/.libs; then
- 		path=$p/.libs
- 	else
- 		path=$p
diff --git a/bluez-hcidump/bluez-hcidump_1.5.oe b/bluez-hcidump/bluez-hcidump_1.5.oe
deleted file mode 100644
index 0556293bad..0000000000
--- a/bluez-hcidump/bluez-hcidump_1.5.oe
+++ /dev/null
@@ -1,14 +0,0 @@
-SECTION = "libs"
-PRIORITY = "optional"
-SECTION = "libs"
-DEPENDS = "virtual/libbluetooth"
-DESCRIPTION = "Analyses Bluetooth HCI packets."
-PR = "r1"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz \
-	   file://configure.patch;patch=1"
-
-EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR}/.."
-CPPFLAGS =+ "-I${STAGING_KERNEL_DIR}/include"
-
-inherit autotools 
diff --git a/bluez-libs/bluez-libs_2.4.oe b/bluez-libs/bluez-libs_2.4.oe
deleted file mode 100644
index 44a24815ce..0000000000
--- a/bluez-libs/bluez-libs_2.4.oe
+++ /dev/null
@@ -1,20 +0,0 @@
-SECTION = "libs"
-PRIORITY = "optional"
-SECTION = "libs"
-PROVIDES = "virtual/libbluetooth"
-DESCRIPTION = "Linux Bluetooth Stack Libaries."
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz"
-
-inherit autotools 
-
-do_stage () {
-	oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR}
-
-	install -d ${STAGING_INCDIR}/bluetooth
-	for X in bluetooth.h hci.h hci_lib.h hci_uart.h hci_vhci.h l2cap.h \
-	  sco.h rfcomm.h
-	do
-		install -m 0644 include/${X} ${STAGING_INCDIR}/bluetooth/${X}
-	done
-}
diff --git a/bluez-utils/bluez-utils-2.3/configure.patch b/bluez-libs/bluez-libs_2.8.oe
index e69de29bb2..e69de29bb2 100644
--- a/bluez-utils/bluez-utils-2.3/configure.patch
+++ b/bluez-libs/bluez-libs_2.8.oe
diff --git a/bluez-pan/bluez-pan_1.1.oe b/bluez-pan/bluez-pan_1.1.oe
deleted file mode 100644
index e36bffc62e..0000000000
--- a/bluez-pan/bluez-pan_1.1.oe
+++ /dev/null
@@ -1,11 +0,0 @@
-SECTION = "libs"
-PRIORITY = "optional"
-SECTION = "libs"
-DEPENDS = "virtual/libbluetooth virtual/libsdp"
-DESCRIPTION = "Personal area networking for Bluetooth devices."
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-pan-${PV}.tar.gz"
-
-EXTRA_OECONF:="--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} --with-sdp-libs=${STAGING_LIBDIR} --with-sdp-includes=${STAGING_INCDIR}"
-
-inherit autotools 
diff --git a/bluez-sdp/bluez-sdp_1.5.oe b/bluez-sdp/bluez-sdp_1.5.oe
deleted file mode 100644
index b51343d1bc..0000000000
--- a/bluez-sdp/bluez-sdp_1.5.oe
+++ /dev/null
@@ -1,24 +0,0 @@
-SECTION = "libs"
-PRIORITY = "optional"
-SECTION = "libs"
-DEPENDS = "virtual/libbluetooth"
-PROVIDES = "virtual/libsdp"
-DESCRIPTION = "BlueZ Bluetooth SDP daemon and tool."
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-sdp-${PV}.tar.gz"
-
-EXTRA_OECONF:="--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
-LDFLAGS_prepend = "-L${S}/libs "
-
-inherit autotools 
-
-do_stage () {
-	oe_libinstall -a -so -C libs libsdp ${STAGING_LIBDIR}
-
-	for X in sdp.h sdp_lib.h
-	do
-		install -m 0644 include/$X ${STAGING_INCDIR}/bluetooth/$X
-	done
-
-}
-
diff --git a/bluez-utils/bluez-utils_2.3.oe b/bluez-utils/bluez-utils_2.3.oe
deleted file mode 100644
index b592a26213..0000000000
--- a/bluez-utils/bluez-utils_2.3.oe
+++ /dev/null
@@ -1,14 +0,0 @@
-SECTION = "libs"
-PRIORITY = "optional"
-SECTION = "libs"
-DEPENDS = "virtual/libbluetooth"
-DESCRIPTION = "Utilities for controlling Bluetooth devices."
-PR = "r1"
-
-SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
-	   file://man.patch;patch=1 \
-	   file://configure.patch;patch=1"
-
-EXTRA_OECONF:="--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
-
-inherit autotools 
diff --git a/bluez-utils/bluez-utils-2.3/man.patch b/bluez-utils/bluez-utils_2.8.oe
index e69de29bb2..e69de29bb2 100644
--- a/bluez-utils/bluez-utils-2.3/man.patch
+++ b/bluez-utils/bluez-utils_2.8.oe
diff --git a/btscanner/btscanner-1.0/configure.patch b/btscanner/btscanner-1.0/configure.patch
index e69de29bb2..a69d4df9e4 100644
--- a/btscanner/btscanner-1.0/configure.patch
+++ b/btscanner/btscanner-1.0/configure.patch
@@ -0,0 +1,45 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- btscanner-1.0/configure.in~configure.patch	2003-10-14 13:01:20.000000000 +0200
++++ btscanner-1.0/configure.in	2004-07-16 11:55:24.000000000 +0200
+@@ -10,9 +10,8 @@
+ AC_PROG_CC
+ 
+ # Checks for libraries.
+-AC_HAVE_LIBRARY(curses,,[AC_MSG_ERROR([Curses not found])])
++AC_HAVE_LIBRARY(ncurses,,[AC_MSG_ERROR([Curses not found])])
+ AC_HAVE_LIBRARY(bluetooth,,[AC_MSG_ERROR([Bluetooth not found])])
+-AC_HAVE_LIBRARY(sdp,,[AC_MSG_ERROR([SDP not found])])
+ AC_HAVE_LIBRARY(pthread,,[AC_MSG_ERROR([Pthreads not found])])
+ AC_HAVE_LIBRARY(gdbm,,[AC_MSG_ERROR([GDBM not found])])
+ 
+--- btscanner-1.0/Makefile.in~configure.patch	2003-10-14 14:16:23.000000000 +0200
++++ btscanner-1.0/Makefile.in	2004-07-16 11:54:45.000000000 +0200
+@@ -6,9 +6,12 @@
+ CP		=	cp
+ MV		=	mv
+ RM		=	rm
++INSTALL		=	install
+ GZIP	=	gzip
+ MKDIR	=	mkdir
+ 
++DESTDIR = 
++
+ all:	$(EXECS)
+ 
+ btscanner.o:	btscanner.c btscanner.h
+@@ -34,7 +37,7 @@
+ 	$(CC) $(CFLAGS) -c $*.c
+ 
+ install:	all
+-	$(MKDIR) -p @prefix@/bin
+-	$(CP) $(EXECS) @prefix@/bin/
+-	$(MKDIR) -p @prefix@/etc
+-	$(CP) oui.txt @prefix@/etc/oui.txt
++	$(INSTALL) -d $(DESTDIR)/@prefix@/bin
++	$(INSTALL) -m 0755 $(EXECS) $(DESTDIR)/@prefix@/bin/
++	$(INSTALL) -d $(DESTDIR)/@prefix@/etc
++	$(INSTALL) -m 0444 oui.txt $(DESTDIR)/@prefix@/etc/oui.txt
diff --git a/btscanner/btscanner_1.0.oe b/btscanner/btscanner_1.0.oe
index b4fd18a0e6..7b2da37a85 100644
--- a/btscanner/btscanner_1.0.oe
+++ b/btscanner/btscanner_1.0.oe
@@ -1,8 +1,9 @@
-HOMEPAGE = "http://www.pentest.co.uk/cgi-bin/viewcat.cgi?cat=downloads&section=01_bluetooth"
-DESCRIPTION = "Extract information from near Bluetooth devices"
+DESCRIPTION = "Extract information from Bluetooth devices in range."
 SECTION = "libs"
 PRIORITY = "optional"
-DEPENDS = "virtual/libbluetooth virtual/libsdp gdbm ncurses"
+HOMEPAGE = "http://www.pentest.co.uk/cgi-bin/viewcat.cgi?cat=downloads&section=01_bluetooth"
+DEPENDS = "libbluetooth gdbm ncurses"
+PR = "r1"
 
 SRC_URI = "http://www.pentest.co.uk/src/btscanner-${PV}.tar.gz \
 	   file://configure.patch;patch=1"