[meta-oe][PATCH 0/4] Pull request #19

[meta-oe][PATCH 0/4] Pull request #19

[Martin Jansa]

The following changes since commit 059369b22fddb5e69536d37c29cb064c3d1372ae:

  gconf: inherit perlnative (2011-07-21 08:26:14 +0200)

are available in the git repository at:
  git://git.openembedded.org/meta-openembedded-contrib jansa/meta-oe
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/meta-oe

Martin Jansa (4):
  connman: remove if_alg.h test from configure
  tangogps: fix build with curl-7.21.8 and newer
  foxtrotgps: fix build with curl-7.21.8 and newer
  xf86-video-glamo: bump SRCREV, remove upstream applied patch

 .../recipes-connectivity/connman/connman_0.76.bb   |    4 +-
 ...efine-GLAMO_CMDQ_MAX_COUNT-instead-of-mag.patch |   66 --------------------
 .../xorg-driver/xf86-video-glamo_git.bb            |    5 +-
 .../foxtrotgps-1.0.1/remove.unused.header.patch    |   40 ++++++++++++
 .../foxtrotgps/foxtrotgps_1.0.1.bb                 |    6 +-
 .../tangogps-0.99.4/remove.unused.header.patch     |   37 +++++++++++
 .../recipes-navigation/tangogps/tangogps_0.99.4.bb |    4 +-
 7 files changed, 89 insertions(+), 73 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-drm-define-GLAMO_CMDQ_MAX_COUNT-instead-of-mag.patch
 create mode 100644 meta-oe/recipes-navigation/foxtrotgps/foxtrotgps-1.0.1/remove.unused.header.patch
 create mode 100644 meta-oe/recipes-navigation/tangogps/tangogps-0.99.4/remove.unused.header.patch

-- 
1.7.6

[meta-oe][PATCH 1/4] connman: remove if_alg.h test from configure

[Martin Jansa]

* we're not building alg-test and if_alg.h needs newer linux-libc-headers than many distributions prefer now

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-connectivity/connman/connman_0.76.bb   |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta-oe/recipes-connectivity/connman/connman_0.76.bb b/meta-oe/recipes-connectivity/connman/connman_0.76.bb
index 8257be5..cb84caa 100644
--- a/meta-oe/recipes-connectivity/connman/connman_0.76.bb
+++ b/meta-oe/recipes-connectivity/connman/connman_0.76.bb
@@ -25,7 +25,9 @@ SRC_URI  = "\
 SRC_URI[md5sum] = "59b4cfd9fa4f736f7a2d88ee0c758fe9"
 SRC_URI[sha256sum] = "bf58fa72454bb63033da8f847a4709dbdfe64c000056a93a7504240cb31c1321"
 
-# alg-test doesn't build, so disable that
+# alg-test doesn't build, so disable that and test for if_alg.h as this header is only in 2.6.39
 do_configure_prepend() {
 	sed -i 's:tools/alg-test ::g' Makefile.am
+	sed -i 's:AC_CHECK_HEADERS(linux/if_alg.h, dummy=yes,::g;
+	        s:AC_MSG_ERROR(User-space algorithm header files are required))::g' configure.ac
 }
-- 
1.7.6

[meta-oe][PATCH 2/4] tangogps: fix build with curl-7.21.8 and newer

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../tangogps-0.99.4/remove.unused.header.patch     |   37 ++++++++++++++++++++
 .../recipes-navigation/tangogps/tangogps_0.99.4.bb |    4 ++-
 2 files changed, 40 insertions(+), 1 deletions(-)
 create mode 100644 meta-oe/recipes-navigation/tangogps/tangogps-0.99.4/remove.unused.header.patch

diff --git a/meta-oe/recipes-navigation/tangogps/tangogps-0.99.4/remove.unused.header.patch b/meta-oe/recipes-navigation/tangogps/tangogps-0.99.4/remove.unused.header.patch
new file mode 100644
index 0000000..db8af84
--- /dev/null
+++ b/meta-oe/recipes-navigation/tangogps/tangogps-0.99.4/remove.unused.header.patch
@@ -0,0 +1,37 @@
+curl/types.h was removed in 
+https://github.com/bagder/curl/commit/2ef7a28a71f819343afefa721e5497119fb2cee0#include/curl
+and is not available in curl-7.21.8 and newer
+
+diff -uNr tangogps-0.99.4.orig//src/util.h tangogps-0.99.4/src/util.h
+--- tangogps-0.99.4.orig//src/util.h	2009-11-06 13:16:05.000000000 +0100
++++ tangogps-0.99.4/src/util.h	2011-07-21 14:36:59.208792227 +0200
+@@ -2,7 +2,6 @@
+ #include <gtk/gtk.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ int
+ sql_execute(char *db_name, char *sql, int (*cb_func)(void*,int,char**,char**));
+diff -uNr tangogps-0.99.4.orig//src/friends.c tangogps-0.99.4/src/friends.c
+--- tangogps-0.99.4.orig//src/friends.c	2010-06-25 11:40:04.000000000 +0200
++++ tangogps-0.99.4/src/friends.c	2011-07-21 14:39:14.711789408 +0200
+@@ -17,7 +17,6 @@
+ #include <gtk/gtk.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ 
+diff -uNr tangogps-0.99.4.orig//src/tile_management.c tangogps-0.99.4/src/tile_management.c
+--- tangogps-0.99.4.orig//src/tile_management.c	2010-06-25 11:40:05.000000000 +0200
++++ tangogps-0.99.4/src/tile_management.c	2011-07-21 14:38:45.030790011 +0200
+@@ -5,7 +5,6 @@
+ #include <glib/gprintf.h>
+ #include <string.h>
+ #include <curl/curl.h>
+-#include <curl/types.h> 
+ #include <curl/easy.h> 
+ #include <math.h>
+ #include "globals.h"
diff --git a/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb b/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb
index e04f0a5..3a1ea3d 100644
--- a/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb
+++ b/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb
@@ -5,8 +5,10 @@ SECTION = "x11/applications"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 DEPENDS = "curl gtk+ gconf sqlite3 libexif libsoup-2.4 bluez4"
+PR = "r1"
 
-SRC_URI = "http://www.tangogps.org/downloads/${P}.tar.gz"
+SRC_URI = "http://www.tangogps.org/downloads/${P}.tar.gz \
+           file://remove.unused.header.patch"
 SRC_URI[md5sum] = "0f07ede94a21eb84f5e017fa88a1fc3d"
 SRC_URI[sha256sum] = "660fdf89ef3c379f2fc0c2a9d0c9d3bfa5345835786b72bf9f513ba9ec2c812a"
 
-- 
1.7.6

[meta-oe][PATCH 3/4] foxtrotgps: fix build with curl-7.21.8 and newer

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../foxtrotgps-1.0.1/remove.unused.header.patch    |   40 ++++++++++++++++++++
 .../foxtrotgps/foxtrotgps_1.0.1.bb                 |    6 ++-
 2 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-navigation/foxtrotgps/foxtrotgps-1.0.1/remove.unused.header.patch

diff --git a/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps-1.0.1/remove.unused.header.patch b/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps-1.0.1/remove.unused.header.patch
new file mode 100644
index 0000000..d80d321
--- /dev/null
+++ b/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps-1.0.1/remove.unused.header.patch
@@ -0,0 +1,40 @@
+curl/types.h was removed in
+https://github.com/bagder/curl/commit/2ef7a28a71f819343afefa721e5497119fb2cee0#include/curl
+and is not available in curl-7.21.8 and newer
+
+=== modified file 'foxtrotgps-1.0.1/src/friends.c'
+--- foxtrotgps-1.0.1.orig/src/friends.c	2011-05-01 20:51:37 +0000
++++ foxtrotgps-1.0.1/src/friends.c	2011-07-21 15:34:03 +0000
+@@ -17,7 +17,6 @@
+ #include <gtk/gtk.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ 
+
+=== modified file 'foxtrotgps-1.0.1/src/tile_management.c'
+--- foxtrotgps-1.0.1.orig/src/tile_management.c	2011-06-02 11:25:49 +0000
++++ foxtrotgps-1.0.1/src/tile_management.c	2011-07-21 15:34:06 +0000
+@@ -8,7 +8,6 @@
+ #include <glib/gprintf.h>
+ #include <string.h>
+ #include <curl/curl.h>
+-#include <curl/types.h> 
+ #include <curl/easy.h> 
+ #include <math.h>
+ #include "globals.h"
+
+=== modified file 'foxtrotgps-1.0.1/src/util.h'
+--- foxtrotgps-1.0.1.orig/src/util.h	2010-04-13 02:20:30 +0000
++++ foxtrotgps-1.0.1/src/util.h	2011-07-21 15:34:05 +0000
+@@ -2,7 +2,6 @@
+ #include <gtk/gtk.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ int
+ sql_execute(char *db_name, char *sql, int (*cb_func)(void*,int,char**,char**));
+
diff --git a/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.0.1.bb b/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.0.1.bb
index c517f08..2a8293e 100644
--- a/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.0.1.bb
+++ b/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.0.1.bb
@@ -5,11 +5,13 @@ SECTION = "x11/applications"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 DEPENDS = "curl gtk+ gconf libglade sqlite3 libexif gpsd"
+PR = "r1"
 
-SRC_URI = "http://www.foxtrotgps.org/releases/${P}.tar.gz"
+SRC_URI = "http://www.foxtrotgps.org/releases/${P}.tar.gz \
+           file://remove.unused.header.patch"
 SRC_URI[md5sum] = "982d14cdb0439cc4d6aa6cefc232124d"
 SRC_URI[sha256sum] = "059158fd8e61137e2e6d6e01685add7fb85cce8483faa99efb01187f2ba50841"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig perlnative
 
 RRECOMMENDS_${PN} = "gpsd"
-- 
1.7.6

[meta-oe][PATCH 4/4] xf86-video-glamo: bump SRCREV, remove upstream applied patch

[Martin Jansa]

* remove mese-dri from RDEPENDS as we're now using kernel without DRM patch and it can fallback to sw rendering just fine

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 ...efine-GLAMO_CMDQ_MAX_COUNT-instead-of-mag.patch |   66 --------------------
 .../xorg-driver/xf86-video-glamo_git.bb            |    5 +-
 2 files changed, 2 insertions(+), 69 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-drm-define-GLAMO_CMDQ_MAX_COUNT-instead-of-mag.patch

diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-drm-define-GLAMO_CMDQ_MAX_COUNT-instead-of-mag.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-drm-define-GLAMO_CMDQ_MAX_COUNT-instead-of-mag.patch
deleted file mode 100644
index 0c7350f..0000000
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-drm-define-GLAMO_CMDQ_MAX_COUNT-instead-of-mag.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From e2d0f9a3ba7f36b0b8ac8d736dd76da6e5e07f38 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Fri, 29 Oct 2010 11:19:08 +0200
-Subject: [PATCH] glamo-drm: define GLAMO_CMDQ_MAX_COUNT instead of magic constant 1024
-
-* fix check for full queue, because size != count here
-* make sure we have enough space in queue for 2 resp. 4 more commands in
-  GlamoDRMAddCommand resp. GlamoDRMAddCommandBO
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- src/glamo-drm.c |   16 +++++++++++-----
- 1 files changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/src/glamo-drm.c b/src/glamo-drm.c
-index aac93bb..01e8510 100644
---- a/src/glamo-drm.c
-+++ b/src/glamo-drm.c
-@@ -32,6 +32,8 @@
- 
- #include "glamo.h"
- 
-+/* How many commands can be stored before forced dispatch */
-+#define GLAMO_CMDQ_MAX_COUNT 1024
- 
- /* Submit the prepared command sequence to the kernel */
- void GlamoDRMDispatch(GlamoPtr pGlamo)
-@@ -60,7 +62,7 @@ void GlamoDRMDispatch(GlamoPtr pGlamo)
- 
- void GlamoDRMAddCommand(GlamoPtr pGlamo, uint16_t reg, uint16_t val)
- {
--	if ( pGlamo->cmdq_drm_used == pGlamo->cmdq_drm_size ) {
-+	if ( pGlamo->cmdq_drm_used >= GLAMO_CMDQ_MAX_COUNT - 2 ) {
- 		xf86DrvMsg(pGlamo->pScreen->myNum, X_INFO,
- 		           "Forced command cache flush.\n");
- 		GlamoDRMDispatch(pGlamo);
-@@ -74,7 +76,8 @@ void GlamoDRMAddCommand(GlamoPtr pGlamo, uint16_t reg, uint16_t val)
- 
- void GlamoDRMAddCommandBO(GlamoPtr pGlamo, uint16_t reg, struct glamo_bo *bo)
- {
--	if ( pGlamo->cmdq_drm_used == pGlamo->cmdq_drm_size ) {
-+	if ( pGlamo->cmdq_drm_used >= GLAMO_CMDQ_MAX_COUNT - 4 ||
-+	       pGlamo->cmdq_obj_used >= GLAMO_CMDQ_MAX_COUNT) {
- 		xf86DrvMsg(pGlamo->pScreen->myNum, X_INFO,
- 		           "Forced command cache flush.\n");
- 		GlamoDRMDispatch(pGlamo);
-@@ -98,10 +101,13 @@ void GlamoDRMAddCommandBO(GlamoPtr pGlamo, uint16_t reg, struct glamo_bo *bo)
- 
- void GlamoDRMInit(GlamoPtr pGlamo)
- {
--	pGlamo->cmdq_objs = malloc(1024);
--	pGlamo->cmdq_obj_pos = malloc(1024);
-+	pGlamo->cmdq_objs = malloc(GLAMO_CMDQ_MAX_COUNT);
-+	pGlamo->cmdq_obj_pos = malloc(GLAMO_CMDQ_MAX_COUNT);
- 	pGlamo->cmdq_obj_used = 0;
- 	pGlamo->cmdq_drm_used = 0;
--	pGlamo->cmdq_drm_size = 4 * 1024;
-+	/* we're using 2bytes per entry (uint16_t) that's why we need to allocate
-+	 * GLAMO_CMDQ_MAX_COUNT * 2 bytes
-+	 */
-+	pGlamo->cmdq_drm_size = 2 * GLAMO_CMDQ_MAX_COUNT;
- 	pGlamo->cmdq_drm = malloc(pGlamo->cmdq_drm_size);
- }
--- 
-1.7.3.2
-
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
index 82263f2..b1030d9 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
@@ -4,17 +4,16 @@ DEPENDS += "libdrm"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8"
 
-RDEPENDS_${PN} = "xserver-xorg-extension-dri xserver-xorg-extension-dri2 xserver-xorg-extension-glx mesa-dri"
+RDEPENDS_${PN} = "xserver-xorg-extension-dri xserver-xorg-extension-dri2 xserver-xorg-extension-glx"
 PE = "2"
 PV = "1.0.0+gitr${SRCPV}"
 PR = "${INC_PR}.6"
 
 SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=master \
-           file://0001-glamo-drm-define-GLAMO_CMDQ_MAX_COUNT-instead-of-mag.patch \
            file://0001-glamo-kms-driver-drop-unused-xf86_config.patch \
           "
 
 S = "${WORKDIR}/git"
-SRCREV = "16af3c00195adc68cbd508e3613be4b2349260b3"
+SRCREV = "cb9ed17035a79e49dde26a1e7e2bc5f10fd8144b"
 
 EXTRA_OECONF = " --enable-kms "
-- 
1.7.6