Pull request #7

similarity index 100%
rename from meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.901/hack-assume-pixman-supports-overlapped-blt.patch
rename to meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.902/hack-assume-pixman-supports-overlapped-blt.patch

similarity index 100%
rename from meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.901/hack-fbdev-ignore-return-mode.patch
rename to meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.0.902/hack-fbdev-ignore-return-mode.patch

similarity index 82%
rename from meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.0.901.bb
rename to meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.0.902.bb
index c1d9566..47fd3f8 100644
@@ -2,6 +2,7 @@
 DISTRO_XORG_CONFIG_MANAGER_angstrom = "udev"
 
 require xorg-xserver-common.inc
+LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
 
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native"

@@ -12,8 +13,8 @@ SRC_URI += " \
             file://hack-fbdev-ignore-return-mode.patch \
             file://hack-assume-pixman-supports-overlapped-blt.patch \
            "
-SRC_URI[md5sum] = "d750cf5f6342b548b7ac2be56e9d1841"
-SRC_URI[sha256sum] = "de18f52c35fc3d3f18c7e905296f9de5ac42dc71e4e01da9ae8e154a78c7771c"
+SRC_URI[md5sum] = "65e5db9e614cd75e97840247c3754521"
+SRC_URI[sha256sum] = "994ab87bb0cc9b56203e01e3294fddd502a96d074139496ea4ffc03c95b41b42"
 
 do_install_prepend() {
         mkdir -p ${D}/${libdir}/X11/fonts

index be441a3..d18bdd7 100644
@@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
 
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native"
-PV = "1.10.0.901"
+PV = "1.10.0.902"
 PR = "${INC_PR}.0"
 PR_append = "+gitr${SRCPV}"
 PE = "2"
 
-#DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE = "-1"
 
-SRCREV = "1f51fe4f748b2997e466863d8387bd6791b32931"
+SRCREV = "ec6e1e45627de2bb851f135df0507a360d0d99e6"
 SRC_URI = " \
   git://anongit.freedesktop.org/xorg/xserver;protocol=git;branch=server-1.10-branch \
   file://hack-fbdev-ignore-return-mode.patch \

similarity index 100%
rename from meta-efl/classes/vala.bbclass
rename to meta-oe/classes/vala.bbclass

deleted file mode 100644
index 747ae77..0000000
@@ -1,71 +0,0 @@
-DESCRIPTION = "Linux Bluetooth Stack Userland V4"
-HOMEPAGE = "http://www.bluez.org"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "GPLv2/LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
-                    file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
-"
-DEPENDS = "gst-plugins-base alsa-lib virtual/libusb0 dbus-glib"
-INC_PR = "r8"
-
-# temporary solution until bug 5176 is properly fixed
-PROVIDES += "bluez-utils bluez-libs bluez-utils-dbus"
-RPROVIDES_bluez4 += "bluez-utils bluez-libs bluez-utils-dbus"
-RPROVIDES_bluez4-dev = "bluez-libs-dev"
-
-SRC_URI = "\
-  http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
-  file://fix-dfutool-usb-declaration-mismatch.patch \
-  file://bluetooth.conf \
-"
-S = "${WORKDIR}/bluez-${PV}"
-
-inherit autotools update-rc.d
-
-EXTRA_OECONF = "\
-  --enable-gstreamer \
-  --enable-alsa \
-  --enable-usb \
-  --enable-netlink \
-  --enable-tools \
-  --enable-bccmd \
-  --enable-hid2hci \
-  --enable-dfutool \
-  --enable-hidd \
-  --enable-pand \
-  --enable-dund \
-  --disable-cups \
-  --enable-test \
-  --enable-manpages \
-  --enable-configfiles \
-  --enable-initscripts \
-  --disable-pcmciarules \
-"
-
-do_install_append() {
-        install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
-        install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
-        install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/
-        # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
-        install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
-}
-
-INITSCRIPT_NAME = "bluetooth"
-INITSCRIPT_PARAMS = "defaults 23 19"
-
-PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
-
-FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
-FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa/bluetooth.conf"
-FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev"
-FILES_${PN}-dev += "\
-  ${libdir}/bluetooth/plugins/*.la \
-  ${libdir}/alsa-lib/*.la \
-  ${libdir}/gstreamer-0.10/*.la \
-"
-
-FILES_${PN}-dbg += "\
-  ${libdir}/bluetooth/plugins/.debug \
-  ${libdir}/*/.debug \
-"

deleted file mode 100644
index ca5e9e4..0000000
@@ -1,16 +0,0 @@
-<!-- This configuration file specifies the required security policies
-     for Bluetooth core daemon to work. -->
-
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
-  <!-- ../system.conf have denied everything, so we just punch some holes -->
-
-  <policy context="default">
-    <allow own="org.bluez"/>
-    <allow send_destination="org.bluez"/>
-    <allow send_interface="org.bluez.Agent"/>
-  </policy>
-
-</busconfig>

deleted file mode 100644
index b1ee510..0000000
@@ -1,13 +0,0 @@
-Index: bluez-4.27/tools/dfutool.c
-===================================================================
---- bluez-4.27.orig/tools/dfutool.c
-+++ bluez-4.27/tools/dfutool.c
-@@ -59,7 +59,7 @@
- #endif
- 
- #ifdef NEED_USB_GET_BUSSES
--static inline struct usb_bus *usb_get_busses(void)
-+inline struct usb_bus *usb_get_busses(void)
- {
- 	return usb_busses;
- }

deleted file mode 100644
index ed15fd5..0000000
@@ -1,33 +0,0 @@
-# Signed-off-by: Khem Raj <[email protected]>
-#
-# Use the new usb1 API for usb_init() and check for fails from 
-# usb_init (). Currently we see a crash on a system which does
-# not have USB because usb_init() fails and it cleans up all initialized
-# data (e.g. ctx) which is used in subsequent calls to libusb
-# We return immediately if usb_init() fails for some reason.
-
-Index: bluez-4.24/tools/hid2hci.c
-===================================================================
---- bluez-4.24.orig/tools/hid2hci.c	2008-10-25 23:40:34.000000000 -0700
-+++ bluez-4.24/tools/hid2hci.c	2008-12-29 22:06:04.000000000 -0800
-@@ -337,7 +337,7 @@
- int main(int argc, char *argv[])
- {
- 	struct device_info dev[16];
--	int i, opt, num, quiet = 0, mode = HCI;
-+	int i, ret, opt, num, quiet = 0, mode = HCI;
- 
- 	while ((opt = getopt_long(argc, argv, "+01qh", main_options, NULL)) != -1) {
- 		switch (opt) {
-@@ -361,8 +361,9 @@
- 	argc -= optind;
- 	argv += optind;
- 	optind = 0;
--
--	usb_init();
-+	ret = libusb_init();
-+	if (ret < 0)
-+		return ret;
- 
- 	num = find_devices(mode, dev, sizeof(dev) / sizeof(dev[0]));
- 	if (num <= 0) {

deleted file mode 100644
index 3505426..0000000
@@ -1,11 +0,0 @@
---- bluez/sbc/sbc_math.h~	2008-03-05 20:18:03.000000000 +0000
-+++ bluez/sbc/sbc_math.h	2008-10-27 13:39:27.000000000 +0000
-@@ -59,7 +59,7 @@
- 
- #define SBC_FIXED_0(val) { val = 0; }
- #define MUL(a, b)        ((a) * (b))
--#ifdef __arm__
-+#if defined(__arm__) && !defined(__thumb__)
- #define MULA(a, b, res) ({				\
- 		int tmp = res;			\
- 		__asm__(				\

78 lines not on this page · raw message

new file mode 100644
index 0000000..9943265
@@ -0,0 +1,42 @@
+Upstream-Status: Accepted, already in git, expected to be included in next version after 2.0
+From 95ea4ff5c9c7dbda2f3faaef4e5cd46d542a48c8 Mon Sep 17 00:00:00 2001
+From: Anderson Lizardo <[email protected]>
+Date: Fri, 18 Mar 2011 15:10:19 -0400
+Subject: [PATCH] Fix compilation against latest BlueZ
+
+BlueZ now has ntoh64()/hton64() functions in bluetooth.h, therefore the
+hcidump local copy is not necessary.
+---
+ src/hcidump.c |   16 ----------------
+ 1 files changed, 0 insertions(+), 16 deletions(-)
+
+diff --git a/src/hcidump.c b/src/hcidump.c
+index af086c7..2023130 100644
+--- a/src/hcidump.c
++++ b/src/hcidump.c
+@@ -50,22 +50,6 @@
+ #include "parser/parser.h"
+ #include "parser/sdp.h"
+ 
+-#if __BYTE_ORDER == __LITTLE_ENDIAN
+-static inline uint64_t ntoh64(uint64_t n)
+-{
+-	uint64_t h;
+-	uint64_t tmp = ntohl(n & 0x00000000ffffffff);
+-	h = ntohl(n >> 32);
+-	h |= tmp << 32;
+-	return h;
+-}
+-#elif __BYTE_ORDER == __BIG_ENDIAN
+-#define ntoh64(x) (x)
+-#else
+-#error "Unknown byte order"
+-#endif
+-#define hton64(x) ntoh64(x)
+-
+ #define SNAP_LEN 	HCI_MAX_FRAME_SIZE
+ #define DEFAULT_PORT	"10839";
+ 
+-- 
+1.7.4.4
+

new file mode 100644
index 0000000..7ad8eef
@@ -0,0 +1,21 @@
+SUMMARY = "Linux Bluetooth Stack HCI Debugger Tool."
+DESCRIPTION = "The hcidump tool reads raw HCI data coming from and going to a Bluetooth device \
+and displays the commands, events and data in a human-readable form."
+
+SECTION = "console"
+PRIORITY = "optional"
+DEPENDS = "bluez4"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
+                    file://src/hcidump.c;beginline=1;endline=23;md5=3bee3a162dff43a5be7470710b99fbcf"
+PR = "r0"
+
+SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/${P}.tar.gz \
+           file://remove.ntoh64.definition.patch"
+
+SRC_URI[md5sum] = "5c2e3ef0a68b2845047867ba51ff8ac9"
+SRC_URI[sha256sum] = "b3b64fd0b18301df07d3aaf34c037c1e4808b4aaf702294822d62b5424f617fd"
+
+EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
+
+inherit autotools