[Lunar-commits] <moonbase> bluez: version bump and a few tweaks along the way.

[stumbles]

commit ce62877f9ca14480c4f5e1ce7c7097c48007c72c
Author: stumbles <stumbles at lunar-linux.org>
Date:   Tue Jul 21 22:53:22 2009 -0400

    bluez: version bump and a few tweaks along the way.
---
 bluetooth/bluez/BUILD   |   19 ++++++++++---------
 bluetooth/bluez/DEPENDS |    4 ++--
 bluetooth/bluez/DETAILS |    6 +++---
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/bluetooth/bluez/BUILD b/bluetooth/bluez/BUILD
index bb2f83d..ef4d0e4 100644
--- a/bluetooth/bluez/BUILD
+++ b/bluetooth/bluez/BUILD
@@ -2,17 +2,21 @@
 
   patch_it $SOURCE_CACHE/$SOURCE2 0 &&
 
-  OPTS+=" --enable-tools    \
+  OPTS+=" --build=$BUILD    \
+          --host=$BUILD     \
+          --enable-tools    \
           --enable-bccmd    \
           --enable-hid2hci  \
           --enable-dfutool  \
           --enable-hidd     \
           --enable-pand     \
           --enable-dund     \
+          --enable-test     \ 
           --enable-manpages       \
           --enable-configfiles    \
           --with-telephony=dummy  \
           --enable-gstreamer      \
+          --enable-udevrules      \
           $OPTS"                 &&
 
   default_build  &&
@@ -20,14 +24,11 @@
   sedit "s:#\[A:\[A:" audio/audio.conf
   sedit "s:#SBCS:SBCS:" audio/audio.conf
   sedit "s:#MPEG:MPEG:" audio/audio.conf
+  sedit "s:#AutoConnect:AutoConnect:" audio/audio.conf
 
-  cp -f audio/*.conf /etc/bluetooth/    &&
-  cp -f network/*.conf /etc/bluetooth/  &&
-  cp -f input/*.conf /etc/bluetooth/    &&
-
-  if [ ! -d /etc/default ] ; then
-    mkdir -p /etc/default &&
-    cp -f scripts/bluetooth.default /etc/default/bluetooth 
-  fi
+  cp -f audio/audio.conf /etc/bluetooth/ &&
+  cp -f network/*.conf /etc/bluetooth/   &&
+  cp -f input/*.conf /etc/bluetooth/     &&
+  cp -f audio/bluetooth.conf /etc/asound.conf
 
 ) > $C_FIFO 2>&1
diff --git a/bluetooth/bluez/DEPENDS b/bluetooth/bluez/DEPENDS
index f532c8e..4d9fad8 100644
--- a/bluetooth/bluez/DEPENDS
+++ b/bluetooth/bluez/DEPENDS
@@ -18,6 +18,6 @@ optional_depends "cups"         "--enable-cups"         \
                                 "--disable-cups"        \
                                 "to enable cups printing support"
 
-optional_depends "pcmciautils"  "--enable-pcmciarules"  \
-                                "--disable-pcmciarules" \
+optional_depends "pcmciautils"  "--enable-pcmcia --enable-serial"   \
+                                "--disable-pcmcia --disable-serial" \
                                 "to enable pcmcia support, 2.6 kernels"
diff --git a/bluetooth/bluez/DETAILS b/bluetooth/bluez/DETAILS
index d6925b0..64fb1f2 100644
--- a/bluetooth/bluez/DETAILS
+++ b/bluetooth/bluez/DETAILS
@@ -1,14 +1,14 @@
           MODULE=bluez
-         VERSION=4.42
+         VERSION=4.46
           SOURCE=$MODULE-$VERSION.tar.gz
          SOURCE2=$MODULE-4.41.dbus.access.patch
       SOURCE_URL=http://www.kernel.org/pub/linux/bluetooth/
      SOURCE2_URL=$PATCH_URL
-      SOURCE_VFY=sha1:c0923acac8995d591fa44b0047600f77d6bcb3e3
+      SOURCE_VFY=sha1:9283807b8361eca1d08fa88c53678d054647081e
      SOURCE2_VFY=sha1:1bea7d4cc74f55b8861544b42b07244b555c8550
         WEB_SITE=http://www.bluez.org
          ENTERED=20090328
-         UPDATED=20090622
+         UPDATED=20090719
            SHORT="support for core Bluetooth layers and protocols"
 
 cat << EOF