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

into stealth.nexus.co.uk:/home/pb/oe/oe-packages

2004/10/19 22:40:32+01:00 nexus.co.uk!pb
add -lxf86drm to via final link


2004/10/19 22:21:51+01:00 nexus.co.uk!pb
enable initscripts

2004/10/19 22:21:14+01:00 nexus.co.uk!pb
correct icon name

BKrev: 41758b14kapIf9odK4fNTo44aTa0pQ

4 files changed, 92 insertions, 1 deletions

diff --git a/bluez-utils/bluez-utils_2.10.oe b/bluez-utils/bluez-utils_2.10.oe
index e69de29bb2..ef6bf41d14 100644
--- a/bluez-utils/bluez-utils_2.10.oe
+++ b/bluez-utils/bluez-utils_2.10.oe
@@ -0,0 +1,25 @@
+DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "bluez-libs pcmcia-cs"
+RPROVIDES = "bluez-pan bluez-sdp"
+PR = "r1"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz"
+
+EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} --enable-pcmcia --enable-initscripts"
+
+do_install_append() {
+	install -d ${D}/sbin ${D}/bin/
+	mv ${D}${sbindir}/* ${D}/sbin/
+	mv ${D}${bindir}/* ${D}/bin/
+	rmdir ${D}${bindir} ${D}${sbindir}
+	chmod u+s ${D}/sbin/hciattach ${D}/sbin/hciconfig
+    chmod 755 ${D}/etc/pcmcia/bluetooth
+}
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "bluetooth"
+INITSCRIPT_PARAMS = "defaults"
+
diff --git a/gpe-bluetooth/gpe-bluetooth-0.37/icon-resize.patch b/gpe-bluetooth/gpe-bluetooth-0.37/icon-resize.patch
index e69de29bb2..2580d9c3c8 100644
--- a/gpe-bluetooth/gpe-bluetooth-0.37/icon-resize.patch
+++ b/gpe-bluetooth/gpe-bluetooth-0.37/icon-resize.patch
@@ -0,0 +1,43 @@
+diff -u -r1.52 main.c
+--- gpe-bluetooth/main.c	7 Sep 2004 00:01:17 -0000	1.52
++++ gpe-bluetooth/main.c	19 Oct 2004 08:16:27 -0000
+@@ -503,6 +503,22 @@
+   g_timeout_add (time, (GSourceFunc) cancel_dock_message, (gpointer)id);
+ }
+ 
++gboolean 
++configure_event (GtkWidget *window, GdkEventConfigure *event, GdkBitmap *bitmap)
++{
++  GdkPixbuf *buf;
++  int xoff, yoff;
++
++  buf = gpe_find_icon ("bt-off");
++
++  xoff = (event->width - gdk_pixbuf_get_width (buf)) / 2;
++  yoff = (event->height - gdk_pixbuf_get_height (buf)) / 2;
++
++  gtk_widget_shape_combine_mask (window, bitmap, xoff, yoff);
++ 
++  return FALSE;
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -572,14 +588,14 @@
+   icon = gtk_image_new_from_pixbuf (gpe_find_icon (radio_is_on ? "bt-on" : "bt-off"));
+   gtk_widget_show (icon);
+   gdk_pixbuf_render_pixmap_and_mask (gpe_find_icon ("bt-off"), NULL, &bitmap, 255);
+-  gtk_widget_shape_combine_mask (window, bitmap, 2, 0);
+-  gdk_bitmap_unref (bitmap);
++  gtk_widget_shape_combine_mask (window, bitmap, 0, 0);
+ 
+   gpe_set_window_icon (window, "bt-on");
+ 
+   tooltips = gtk_tooltips_new ();
+   gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), window, _("This is the Bluetooth control.\nTap here to turn the radio on and off, or to see a list of Bluetooth devices."), NULL);
+ 
++  g_signal_connect (G_OBJECT (window), "configure-event", G_CALLBACK (configure_event), bitmap);
+   g_signal_connect (G_OBJECT (window), "button-press-event", G_CALLBACK (clicked), NULL);
+   gtk_widget_add_events (window, GDK_BUTTON_PRESS_MASK);
+ 
diff --git a/gpe-bluetooth/gpe-bluetooth_0.37.oe b/gpe-bluetooth/gpe-bluetooth_0.37.oe
index 240408580d..337db4553b 100644
--- a/gpe-bluetooth/gpe-bluetooth_0.37.oe
+++ b/gpe-bluetooth/gpe-bluetooth_0.37.oe
@@ -6,7 +6,7 @@ RDEPENDS = "bluez-utils blueprobe"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 PRIORITY = "optional"
-PR = "r2"
+PR = "r3"
 
 FILES_${PN} += '${datadir}/bluez-pin'
 
diff --git a/libxvmc/files/via.patch b/libxvmc/files/via.patch
index e69de29bb2..21cdfbdd6b 100644
--- a/libxvmc/files/via.patch
+++ b/libxvmc/files/via.patch
@@ -0,0 +1,23 @@
+--- XvMC/configure.ac.old	2004-09-18 13:16:31.000000000 +0100
++++ XvMC/configure.ac	2004-09-18 13:16:32.000000000 +0100
+@@ -14,4 +14,5 @@
+ AC_OUTPUT([Makefile
+            hw/Makefile
+ 	   hw/i810/Makefile
++	   hw/via/Makefile
+            xvmc.pc])
+--- /dev/null	2004-06-13 02:32:19.000000000 +0100
++++ XvMC/hw/via/Makefile.am	2004-09-18 13:16:01.000000000 +0100
+@@ -0,0 +1,7 @@
++AM_CFLAGS = $(XVMC_CFLAGS)
++libviaXvMC_la_LIBADD = $(XVMC_LIBS) -lxf86drm
++
++lib_LTLIBRARIES = libviaXvMC.la
++
++libviaXvMC_la_SOURCES = viaXvMC.c viaXvMC.h viaLowLevel.c viaLowLevel.h \
++		viaXvMCPriv.h
+--- XvMC/hw/Makefile.am.old	2004-10-17 22:34:27.000000000 +0100
++++ XvMC/hw/Makefile.am	2004-10-17 22:34:31.000000000 +0100
+@@ -1 +1 @@
+-SUBDIRS = i810
++SUBDIRS = i810 via