Small fixes

index 8a1c524..4569dca 100644
@@ -1,25 +1,27 @@
-From d140e69c1d76ed61d1feb53b79820951707ee5a6 Mon Sep 17 00:00:00 2001
+From a0f53e1dbb3851bb0f0efcfdbd565b05e4be9cac Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
-Date: Sun, 19 Aug 2012 15:15:45 +0200
+Date: Thu, 23 Aug 2012 18:10:57 +0200
 Subject: [PATCH 1/2] ARM: qemu related workarounds in cpu features detection
  code
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
-This was ported from meta-oe's patch [1]
+This was ported from meta-oe's patch [1]. The original pixman patch is found
+at [2].
 
 [1] http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch
+[2] http://lists.freedesktop.org/archives/pixman/2011-January/000906.html
 
 Upstream-Status: Inappropriate [other] qemu fix
 
 Signed-off-by: Andreas Müller <[email protected]>
 ---
- pixman/pixman-arm.c |   74 +++++++++++++++++++++++++++++++++++++++++++++++---
- 1 files changed, 69 insertions(+), 5 deletions(-)
+ pixman/pixman-arm.c |   82 ++++++++++++++++++++++++++++++++++++++++----------
+ 1 files changed, 65 insertions(+), 17 deletions(-)
 
 diff --git a/pixman/pixman-arm.c b/pixman/pixman-arm.c
-index 23374e4..d0771fd 100644
+index 23374e4..d98bda6 100644
 --- a/pixman/pixman-arm.c
 +++ b/pixman/pixman-arm.c
 @@ -129,16 +129,35 @@ detect_cpu_features (void)

@@ -58,40 +60,34 @@ index 23374e4..d0771fd 100644
  
      fd = open ("/proc/self/auxv", O_RDONLY);
      if (fd >= 0)
-@@ -147,22 +166,23 @@ detect_cpu_features (void)
+@@ -147,32 +166,61 @@ detect_cpu_features (void)
  	{
  	    if (aux.a_type == AT_HWCAP)
  	    {
 -		uint32_t hwcap = aux.a_un.a_val;
-+		hwcap = aux.a_un.a_val;
- 
- 		/* hardcode these values to avoid depending on specific
- 		 * versions of the hwcap header, e.g. HWCAP_NEON
- 		 */
+-
+-		/* hardcode these values to avoid depending on specific
+-		 * versions of the hwcap header, e.g. HWCAP_NEON
+-		 */
 -		if ((hwcap & 64) != 0)
-+		if ((hwcap & ARM_HWCAP_VFP) != 0)
- 		    features |= ARM_VFP;
+-		    features |= ARM_VFP;
 -		if ((hwcap & 512) != 0)
-+		if ((hwcap & ARM_HWCAP_IWMMXT) != 0)
- 		    features |= ARM_IWMMXT;
- 		/* this flag is only present on kernel 2.6.29 */
+-		    features |= ARM_IWMMXT;
+-		/* this flag is only present on kernel 2.6.29 */
 -		if ((hwcap & 4096) != 0)
-+		if ((hwcap & ARM_HWCAP_NEON) != 0)
- 		    features |= ARM_NEON;
+-		    features |= ARM_NEON;
++		hwcap = aux.a_un.a_val;
  	    }
  	    else if (aux.a_type == AT_PLATFORM)
  	    {
 -		const char *plat = (const char*) aux.a_un.a_val;
+-
+-		if (strncmp (plat, "v7l", 3) == 0)
 +		plat = (const char*) aux.a_un.a_val;
 +		plat_cnt++;
- 
- 		if (strncmp (plat, "v7l", 3) == 0)
- 		    features |= (ARM_V7 | ARM_V6);
-@@ -171,8 +191,52 @@ detect_cpu_features (void)
- 	    }
- 	}
- 	close (fd);
-+
++	    }
++	}
++	close (fd);
 +	if (plat == NULL || plat_cnt != 1 || *plat != 'v')
 +	{
 +	    /*

@@ -106,17 +102,19 @@ index 23374e4..d0771fd 100644
 +	    {
 +		if (strcmp (u.machine, "armv7l") == 0)
 +		{
-+		    features |= (ARM_V7 | ARM_V6);
+ 		    features |= (ARM_V7 | ARM_V6);
+-		else if (strncmp (plat, "v6l", 3) == 0)
 +		    hwcap |= ARM_HWCAP_VFP;  /* qemu is supposed to emulate vfp */
 +		    hwcap |= ARM_HWCAP_NEON; /* qemu is supposed to emulate neon */
 +		}
 +		else if (strcmp (u.machine, "armv6l") == 0)
 +		{
-+		    features |= ARM_V6;
+ 		    features |= ARM_V6;
 +		    hwcap |= ARM_HWCAP_VFP;  /* qemu is supposed to emulate vfp */
 +		}
-+	    }
-+	}
+ 	    }
+ 	}
+-	close (fd);
 +	else if (strncmp (plat, "v7l", 3) == 0)
 +	{
 +	    features |= (ARM_V7 | ARM_V6);

@@ -134,6 +132,7 @@ index 23374e4..d0771fd 100644
 +        features |= ARM_VFP;
 +    if ((hwcap & ARM_HWCAP_IWMMXT) != 0)
 +        features |= ARM_IWMMXT;
++    /* this flag is only present on kernel 2.6.29 */
 +    if ((hwcap & ARM_HWCAP_NEON) != 0)
 +        features |= ARM_NEON;
 +

@@ -141,5 +140,5 @@ index 23374e4..d0771fd 100644
  }
  
 -- 
-1.7.4.4
+1.7.6.5
 

index a04a549..c677167 100644
@@ -1,5 +1,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
 
+PRINC := "${@int(PRINC) + 1}"
+
 SRC_URI += " \
   file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \
   file://0002-Generic-C-implementation-of-pixman_blt-with-overlapp.patch \

index 550f8cf..dcacb32 100644
@@ -28,4 +28,5 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
   mplayer-common \
   task-x11-server \
   fbset-modes \
+  gpsd-machine-conf \
 "

index e8f4cad..eff0dcb 100644
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
 DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-native"
 PROVIDES = "virtual/gpsd"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
   file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \

@@ -94,7 +94,7 @@ FILES_gpsd-dev += "${libdir}/pkgconfdir/libgpsd.pc ${libdir}/pkgconfdir/libgps.p
 FILES_python-pygps-dbg += " ${libdir}/python*/site-packages/gps/.debug"
 
 RDEPENDS_${PN} = "gpsd-gpsctl"
-RRECOMMENDS_${PN} = "gpsd-conf gpsd-udev"
+RRECOMMENDS_${PN} = "gpsd-conf gpsd-udev gpsd-machine-conf"
 
 DESCRIPTION_gpsd-udev = "udev relevant files to use gpsd hotplugging"
 FILES_gpsd-udev = "${base_libdir}/udev ${sysconfdir}/udev/*"

new file mode 100644
index 0000000..2042383
@@ -0,0 +1,7 @@
+DESCRIPTION = "Machine specific gpsd config"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD;md5=3775480a712fc46a69647678acb234cb"
+
+# empty by default
+# BSP layers can add stuff like meta-openmoko example:
+# 

index 25ddbda..5940584 100644
@@ -3,7 +3,7 @@ DESCRIPTION = "Wrapper to enable of systemd services"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
-PR = "r5"
+PR = "r6"
 
 inherit native
 

index 5c21e7f..d71c7ed 100755
@@ -81,7 +81,7 @@ for service in $services; do
 	wanted_by=$(grep WantedBy $ROOT/$service_file \
 		        | sed 's,WantedBy=,,g' \
 		        | tr ',' '\n' \
-		        | grep '\.target$')
+		        | grep '\(\.target$\)\|\(\.service$\)')
 
 	for r in $wanted_by; do
 		echo "WantedBy=$r found in $service"

index 266d44b..9562956 100644
@@ -5,7 +5,7 @@ PR = "r2"
 
 inherit gnome
 
-DEPENDS = "libglade libart-lgpl virtual/gail"
+DEPENDS = "gtk+ libglade libart-lgpl"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 

index 936872f..79e9e8a 100644
@@ -5,7 +5,7 @@ SECTION = "x11/gnome/libs"
 
 inherit gnome
 
-DEPENDS = "libglade libart-lgpl virtual/gail xineramaproto"
+DEPENDS = "gtk+ libglade libart-lgpl xineramaproto"
 
 EXTRA_OECONF = "--disable-gtk-doc"