From 192d40a9c1149605443ac267a09b7f76afd571e2 Mon Sep 17 00:00:00 2001
From: Steffen Sledz <sledz@dresearch.de>
Date: Tue, 19 Jan 2010 09:42:04 +0100
Subject: linux-2.6.24: defconfig for hipox machine changed

- UART3 enabled
- I2C bitbash pins changed (SDA=GPIO26, SCL=GPIO25)

Signed-off-by: Steffen Sledz <sledz@dresearch.de>
---
 recipes/linux/linux-2.6.24/hipox/defconfig | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/recipes/linux/linux-2.6.24/hipox/defconfig b/recipes/linux/linux-2.6.24/hipox/defconfig
index 8778456c56..f01741d14f 100644
--- a/recipes/linux/linux-2.6.24/hipox/defconfig
+++ b/recipes/linux/linux-2.6.24/hipox/defconfig
@@ -166,7 +166,10 @@ CONFIG_ARCH_HIPOX_UART2=y
 CONFIG_ARCH_HIPOX_UART2_DEBUG=y
 CONFIG_ARCH_HIPOX_UART2_BOOTPROGRESS=y
 # CONFIG_ARCH_HIPOX_UART2_MODEM is not set
-# CONFIG_ARCH_HIPOX_UART3 is not set
+CONFIG_ARCH_HIPOX_UART3=y
+# CONFIG_ARCH_HIPOX_UART3_DEBUG is not set
+# CONFIG_ARCH_HIPOX_UART3_BOOTPROGRESS is not set
+# CONFIG_ARCH_HIPOX_UART3_MODEM is not set
 CONFIG_ARCH_HIPOX_PCI_REQGNT_0=y
 # CONFIG_ARCH_HIPOX_PCI_REQGNT_1 is not set
 # CONFIG_ARCH_HIPOX_PCI_REQGNT_2 is not set
@@ -212,8 +215,8 @@ CONFIG_TACHO_THERM_AND_FAN=m
 # CONFIG_HIPOX_USB_TEST_MODES is not set
 # CONFIG_LEDS_TRIGGER_SATA_DISK is not set
 # CONFIG_HIPOX_LED_TEST is not set
-CONFIG_HIPOX_I2C_SDA=6
-CONFIG_HIPOX_I2C_SCL=7
+CONFIG_HIPOX_I2C_SDA=26
+CONFIG_HIPOX_I2C_SCL=25
 # CONFIG_HIPOX_USB_PORTA_POWER_CONTROL is not set
 # CONFIG_HIPOX_USB_PORTB_POWER_CONTROL is not set
 # CONFIG_HIPOX_USB_PORTC_POWER_CONTROL is not set
-- 
cgit v1.2.3


From b28038e8136bab6c93fd39e199105a72149b8edb Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Date: Tue, 19 Jan 2010 16:28:28 +0100
Subject: xinput-calibrator: added 0.5.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is tool to calibrate touchscreens which works as XInput devices
(evdev, evtouch, ... but not tslib one).

So far only X11 version, GTKmm one will be provided later by Petr Štetiar.
---
 .../use-proper-compiler.patch                        | 20 ++++++++++++++++++++
 recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb | 13 +++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 recipes/xinput-calibrator/xinput-calibrator-0.5.0/use-proper-compiler.patch
 create mode 100644 recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb

diff --git a/recipes/xinput-calibrator/xinput-calibrator-0.5.0/use-proper-compiler.patch b/recipes/xinput-calibrator/xinput-calibrator-0.5.0/use-proper-compiler.patch
new file mode 100644
index 0000000000..a7912fb4c7
--- /dev/null
+++ b/recipes/xinput-calibrator/xinput-calibrator-0.5.0/use-proper-compiler.patch
@@ -0,0 +1,20 @@
+---
+ Makefile |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- git.orig/Makefile
++++ git/Makefile
+@@ -1,11 +1,11 @@
+ all: x11 gtkmm
+ 
+ x11: main_x11.cpp gui_x11.cpp
+-	g++ -Wall main_x11.cpp -lX11 -lXi -o xinput_calibrator.x11
++	$(CXX) $(CFLAGS) $(LDFLAGS) -Wall main_x11.cpp -lX11 -lXi -o xinput_calibrator.x11
+ 	cp xinput_calibrator.x11 xinput_calibrator
+ 
+ gtkmm: main_gtkmm.cpp gui_gtkmm.cpp
+-	g++ -Wall main_gtkmm.cpp `pkg-config --cflags --libs gtkmm-2.4` -o xinput_calibrator.gtkmm
++	$(CXX) $(CFLAGS) $(LDFLAGS) -Wall main_gtkmm.cpp `pkg-config --cflags --libs gtkmm-2.4` -o xinput_calibrator.gtkmm
+ 
+ clean:
+ 	rm -f xinput_calibrator xinput_calibrator.x11 xinput_calibrator.gtkmm
diff --git a/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb b/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb
new file mode 100644
index 0000000000..59a28569c9
--- /dev/null
+++ b/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb
@@ -0,0 +1,13 @@
+DEPENDS = "virtual/libx11 libxi"
+
+SRCREV  = "6af268f1b435f7bdd83335092ddc684054df2110"
+SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \
+           file://use-proper-compiler.patch;patch=1"
+
+S = "${WORKDIR}/git/"
+EXTRA_OEMAKE = "x11"
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 xinput_calibrator ${D}${bindir}
+}
-- 
cgit v1.2.3


From 487479374e52651b7bf8974a60e8a5e2624ab76b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 19 Jan 2010 12:01:38 -0800
Subject: libqpe, opie-taskbar: Fix linking errors found with 2.20 ld

* Fix PR #5376

* Dont remove ~LnkProperties when QTOPIA_INTERNAL_FSLP is not defined
  this could cause g++ to emit default destructor which will be inlined
  and as we asked inlines to have hidden visibility it could make the
  destructor hidden in the final library this happens now because ld
  can merge the visibility attributes which it did not do before.

* Note that this fix might be needed in few other places too.
  We will fix them as we encounter them.

* Remove the workaround in opie-taskbar

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../unhide_lnkproperties_destructor.patch          | 24 ++++++++++++++++++++++
 recipes/libqpe/libqpe-opie_1.2.4.bb                |  3 ++-
 recipes/opie-taskbar/opie-taskbar/launcher.patch   | 17 ---------------
 recipes/opie-taskbar/opie-taskbar_1.2.4.bb         |  3 +--
 4 files changed, 27 insertions(+), 20 deletions(-)
 create mode 100644 recipes/libqpe/libqpe-opie/unhide_lnkproperties_destructor.patch
 delete mode 100644 recipes/opie-taskbar/opie-taskbar/launcher.patch

diff --git a/recipes/libqpe/libqpe-opie/unhide_lnkproperties_destructor.patch b/recipes/libqpe/libqpe-opie/unhide_lnkproperties_destructor.patch
new file mode 100644
index 0000000000..65e790a145
--- /dev/null
+++ b/recipes/libqpe/libqpe-opie/unhide_lnkproperties_destructor.patch
@@ -0,0 +1,24 @@
+Dont hide destructor, if we do then in moc_lnkproperties.cpp its not
+seen and compiler puts in a default one and inlines it which is then
+hidden as we ask it to use -fvisibility-inlines-hidden
+
+Now linker can merge the symbol visivility  and promotes the most
+restrictive visivility in output which means that the library will have
+the destructor but it will be hidden 
+
+-Khem
+
+Index: library/lnkproperties.h
+===================================================================
+--- library.orig/lnkproperties.h	2010-01-19 10:49:36.771348810 -0800
++++ library/lnkproperties.h	2010-01-19 10:49:59.318857574 -0800
+@@ -45,8 +45,8 @@
+ //      have this class.
+ #ifdef QTOPIA_INTERNAL_FSLP
+     LnkProperties( AppLnk* lnk, QWidget* parent = 0 );
+-    ~LnkProperties();
+ #endif
++    ~LnkProperties();
+ 
+     void done(int);
+ private slots:
diff --git a/recipes/libqpe/libqpe-opie_1.2.4.bb b/recipes/libqpe/libqpe-opie_1.2.4.bb
index 5c1690ec12..bb154d013f 100644
--- a/recipes/libqpe/libqpe-opie_1.2.4.bb
+++ b/recipes/libqpe/libqpe-opie_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
@@ -8,5 +8,6 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
            file://unbreak-logging.patch;patch=1 \
            file://citytime-path-2.patch;patch=1 \
            file://no-include-pro.patch;patch=1 \
+           file://unhide_lnkproperties_destructor.patch;patch=1 \
           "
 
diff --git a/recipes/opie-taskbar/opie-taskbar/launcher.patch b/recipes/opie-taskbar/opie-taskbar/launcher.patch
deleted file mode 100644
index e7f90f9185..0000000000
--- a/recipes/opie-taskbar/opie-taskbar/launcher.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: launcher/launcher.cpp
-===================================================================
---- launcher.orig/launcher.cpp	2009-12-23 22:29:17.396221157 +0100
-+++ launcher/launcher.cpp	2009-12-23 22:31:45.849117517 +0100
-@@ -646,10 +646,10 @@
-     // Not supported: flat is simpler for the user
-     } else {
- /* ### libqtopia FIXME also moving docLnks... */
--        LnkProperties prop(appLnk,0 );
-+    /*    LnkProperties prop(appLnk,0 );
- 
-         if (QPEApplication::execDialog( &prop )==QDialog::Accepted && tabs->currentView()==tabs->docView()) {
--        }
-+        }*/
-     }
- }
- 
diff --git a/recipes/opie-taskbar/opie-taskbar_1.2.4.bb b/recipes/opie-taskbar/opie-taskbar_1.2.4.bb
index 7648747fa6..b5660451a6 100644
--- a/recipes/opie-taskbar/opie-taskbar_1.2.4.bb
+++ b/recipes/opie-taskbar/opie-taskbar_1.2.4.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
@@ -14,5 +14,4 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
 	   file://restart-from-bindir.patch;patch=1 \
            file://server-pro-1.2.4.patch;patch=1 \
 	   file://firstuse-path.patch;patch=1 \
-           file://launcher.patch;patch=1 \
           "
-- 
cgit v1.2.3


From 0788436f2de5446fd78213d8d88f612ce49f1b3d Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@mvista.com>
Date: Tue, 19 Jan 2010 13:01:41 -0700
Subject: package_dbg.bbclass: add current incarnation from MVL6

This optional bbclass implements per-subpackage debug packages.  Among other
things, this makes it much easier to automate creation of debug images (where
you have the debug files for all installed packages).

Signed-off-by: Chris Larson <clarson@mvista.com>
---
 classes/package_dbg.bbclass | 125 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 125 insertions(+)
 create mode 100644 classes/package_dbg.bbclass

diff --git a/classes/package_dbg.bbclass b/classes/package_dbg.bbclass
new file mode 100644
index 0000000000..39dceaf9b3
--- /dev/null
+++ b/classes/package_dbg.bbclass
@@ -0,0 +1,125 @@
+# package_dbg.bbclass: populate -dbg versions for each package in PACKAGES
+#
+# Copyright (c) 2009 MontaVista Software, Inc.  All rights reserved.
+#
+# Released under the MIT license (see LICENSE.MIT for the terms)
+
+
+inherit package
+
+
+PACKAGE_DBG_DIRS = "${bindir} ${sbindir} \
+                    ${libexecdir} ${libdir} \
+                    ${base_bindir} ${base_sbindir} \
+                    ${base_libdir}"
+PACKAGE_DBG_DESC = "Debugging files for %s"
+PACKAGE_DBG_EXCLUDE = "${PN}-locale* ${PN}-doc ${PN}-dev *-dbg"
+
+
+def __find(dir):
+    """ Given a directory, recurses into that directory,
+    returning all files. """
+
+    from os import walk
+    from os.path import join
+
+    for root, dirs, files in walk(dir):
+        for file in files:
+            yield join(root, file)
+
+def __package_get_files(pkg, d):
+    """ Obtains a list of files to be included in a package.
+
+    Starting from the FILES_<pkg> variable, it expands any globs in the list,
+    which removes missing files, and traverses any directories in the list.
+
+    It does *not* remove files which are also in other packages, it's left
+    to the user's discretion whether to allow overlap. """
+
+    from glob import glob
+    from os.path import join, isdir, islink
+
+    installdir = d.getVar("D", True)
+    installdirlen = len(installdir)
+
+    files = (d.getVar("FILES_%s" % pkg, True) or "").split()
+    for globbed in (glob(join(installdir, file[1:])) for file in files):
+        for path in globbed:
+            if isdir(path) and not islink(path):
+                for file in __find(path):
+                    yield file[installdirlen:]
+            else:
+                yield path[installdirlen:]
+
+def add_dbg_packages(d):
+    from fnmatch import fnmatch
+
+    packages = d.getVar("PACKAGES", True).split()
+    excludes = d.getVar("PACKAGE_DBG_EXCLUDE", True).split()
+
+    for pkg in tuple(packages):
+        if any(fnmatch(pkg, excluded) for excluded in excludes):
+            continue
+
+        dbgpkg = "%s-dbg" % pkg
+        if not dbgpkg in packages:
+            packages.insert(0, dbgpkg)
+
+    d.setVar("PACKAGES", " ".join(packages))
+
+
+# Add the -dbg packages to PACKAGES
+python () {
+    from bb.data import inherits_class as inherits
+
+    # Task handles its own -dbg versions of its packages at the moment
+    if not inherits("task", d):
+        dynpkgs = d.getVar("PACKAGES_DYNAMIC", True).split()
+        dynpkgs += ["%s-dbg" % dyn for dyn in dynpkgs]
+        d.setVar("PACKAGES_DYNAMIC", " ".join(dynpkgs))
+
+        add_dbg_packages(d)
+}
+
+python populate_packages_prepend () {
+	from bb.data import inherits_class as inherits
+
+	if not inherits("task", d):
+		bb.build.exec_func("package_do_dbg", d)
+}
+
+# Populate the -dbg subpackage metadata
+python package_do_dbg() {
+    """ Populate the -dbg subpackage metadata. """
+
+    from os.path import join, basename, dirname
+
+    def setVar(key, val):
+        if d.getVar(key, val) is None:
+            d.setVar(key, val)
+
+    add_dbg_packages(d)
+    packages = d.getVar("PACKAGES", True).split()
+    desc = d.getVar("PACKAGE_DBG_DESC", True)
+    debug_dirs = d.getVar("PACKAGE_DBG_DIRS", True).split()
+
+    done = []
+    for pkgname in tuple(packages):
+        files = tuple(__package_get_files(pkgname, d))
+        dbg = [join(dirname(file), ".debug", basename(file))
+               for file in files
+               if not file in done and
+                  any(file.startswith(dir) for dir in debug_dirs)]
+        done.extend(files)
+
+        if dbg:
+            setVar("FILES_%s-dbg" % pkgname, " ".join(dbg))
+            setVar("DESCRIPTION_%s-dbg" % pkgname, desc % pkgname)
+            setVar("RDEPENDS_%s-dbg" % pkgname, pkgname)
+        else:
+            try:
+                packages.remove("%s-dbg" % pkgname)
+            except ValueError:
+                pass
+    d.setVar("PACKAGES", " ".join(packages))
+}
-- 
cgit v1.2.3


From 73bf22892797343197a1548c287e274b0c3304a2 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@mvista.com>
Date: Tue, 19 Jan 2010 13:22:52 -0700
Subject: amend-recipes.inc: Add. Allows tweaks to be amended to a recipe via a
 .inc in its FILESPATH

Signed-off-by: Chris Larson <clarson@mvista.com>
---
 conf/amend-recipes.inc | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 conf/amend-recipes.inc

diff --git a/conf/amend-recipes.inc b/conf/amend-recipes.inc
new file mode 100644
index 0000000000..bcb93d4e75
--- /dev/null
+++ b/conf/amend-recipes.inc
@@ -0,0 +1,29 @@
+# Allows tweaks to be amended to a recipe via a .inc in its FILESPATH
+#
+# Simply drop amend.inc into an appropriate place in a recipe's FILESPATH and
+# it'll be parsed in after the recipe itself is.
+#
+# Copyright (c) 2009 MontaVista Software, Inc.  All rights reserved.
+#
+# Released under the MIT license (see LICENSE.MIT for the terms)
+
+python () {
+    import bb, os
+
+    filespath = d.getVar("FILESPATH", 1).split(":")
+    amendfiles = [os.path.join(fpath, "amend.inc")
+                  for fpath in filespath]
+
+    # Adding all amend.incs that can exist to the __depends, to ensure that
+    # creating one of them invalidates the bitbake cache.  Note that it
+    # requires a fix in bitbake.  Without the bitbake fix, the cache will be
+    # completely invalidated on every bitbake execution.
+    depends = d.getVar("__depends", 0) or []
+    d.setVar("__depends", depends + [(file, 0) for file in amendfiles if not os.path.exists(file)])
+
+    existing = (file for file in amendfiles if os.path.exists(file))
+    try:
+        bb.parse.handle(existing.next(), d, 1)
+    except StopIteration:
+        pass
+}
-- 
cgit v1.2.3


From 053e7c83402029c4fa887a05aec153e043174122 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Tue, 19 Jan 2010 21:05:24 +0000
Subject: irdadump: Migrated to glib-2.0.

---
 recipes/irda-utils/irdadump/glib2.patch | 13 +++++++++++++
 recipes/irda-utils/irdadump_0.9.16.bb   | 10 ++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 recipes/irda-utils/irdadump/glib2.patch

diff --git a/recipes/irda-utils/irdadump/glib2.patch b/recipes/irda-utils/irdadump/glib2.patch
new file mode 100644
index 0000000000..ea37ab151b
--- /dev/null
+++ b/recipes/irda-utils/irdadump/glib2.patch
@@ -0,0 +1,13 @@
+Index: irdadump/configure.in
+===================================================================
+--- irdadump.orig/configure.in
++++ irdadump/configure.in
+@@ -9,7 +9,7 @@ AC_PROG_MAKE_SET
+ 
+ dnl Checks for libraries.
+ AM_PROG_LIBTOOL
+-AM_PATH_GLIB(1.2.0)
++AM_PATH_GLIB_2_0
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
diff --git a/recipes/irda-utils/irdadump_0.9.16.bb b/recipes/irda-utils/irdadump_0.9.16.bb
index 5c64b2dd96..90fd03ecb3 100644
--- a/recipes/irda-utils/irdadump_0.9.16.bb
+++ b/recipes/irda-utils/irdadump_0.9.16.bb
@@ -1,14 +1,16 @@
 DESCRIPTION = "Utility to dump IrDA traffic."
 SECTION = "base"
 LICENSE = "GPL"
-DEPENDS = "glib-1.2"
+DEPENDS = "glib-2.0 pkgconfig"
+PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
+	   file://glib2.patch;patch=1"
 
 S="${WORKDIR}/irda-utils-${PV}/irdadump"
 
-EXTRA_CFLAGS += "-I${STAGING_INCDIR}/glib-1.2/"
-EXTRA_LDFLAGS += "-lglib"
+EXTRA_CFLAGS += "`pkg-config --cflags glib-2.0`"
+EXTRA_LDFLAGS += "`pkg-config --libs glib-2.0`"
 
 inherit autotools
 
-- 
cgit v1.2.3


From ccfe5e49bb7be79d81266bca12d07a4f1453e5a8 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Tue, 19 Jan 2010 21:06:24 +0000
Subject: glib-1.2: Fixed file list of glib-1.2-dev.

---
 recipes/glib-1.2/glib-1.2_1.2.10.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes/glib-1.2/glib-1.2_1.2.10.bb b/recipes/glib-1.2/glib-1.2_1.2.10.bb
index 77cbee2a14..de5e73eb52 100644
--- a/recipes/glib-1.2/glib-1.2_1.2.10.bb
+++ b/recipes/glib-1.2/glib-1.2_1.2.10.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "glib-1.2-native"
-PR = "r2"
+PR = "r3"
 
 LEAD_SONAME = "libglib-1.2.*"
 
@@ -42,3 +42,4 @@ do_stage () {
 	install -m 0644 ${S}/glib.m4 ${STAGING_DATADIR}/aclocal/glib-1.2.m4
 }
 
+FILES_${PN}-dev += "${libdir}/glib/include/glibconfig.h
-- 
cgit v1.2.3


From 89f3a006a15986d045cddc0f405ecac78d11bb9a Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Tue, 19 Jan 2010 21:15:44 +0000
Subject: glib-2.0: Typo fix in previous commit.

---
 recipes/glib-1.2/glib-1.2_1.2.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/glib-1.2/glib-1.2_1.2.10.bb b/recipes/glib-1.2/glib-1.2_1.2.10.bb
index de5e73eb52..72eca3a16a 100644
--- a/recipes/glib-1.2/glib-1.2_1.2.10.bb
+++ b/recipes/glib-1.2/glib-1.2_1.2.10.bb
@@ -42,4 +42,4 @@ do_stage () {
 	install -m 0644 ${S}/glib.m4 ${STAGING_DATADIR}/aclocal/glib-1.2.m4
 }
 
-FILES_${PN}-dev += "${libdir}/glib/include/glibconfig.h
+FILES_${PN}-dev += "${libdir}/glib/include/glibconfig.h"
-- 
cgit v1.2.3


From 54fd63592417d07ad480475b7743f40d09f55790 Mon Sep 17 00:00:00 2001
From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Wed, 20 Jan 2010 02:00:32 +0100
Subject: gnome-games: set libsdl-mixer as dependency and delete sdl.m4 macro
 only when exist

* bump PR
---
 recipes/gnome/gnome-games_2.24.0.bb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/recipes/gnome/gnome-games_2.24.0.bb b/recipes/gnome/gnome-games_2.24.0.bb
index 4b3fd2077b..971b83e6a7 100644
--- a/recipes/gnome/gnome-games_2.24.0.bb
+++ b/recipes/gnome/gnome-games_2.24.0.bb
@@ -1,9 +1,9 @@
 LICENSE = "GPL"
-DEPENDS = " guile libggz ggz-client-libs python-pygtk gtk+ libgnome libgnomeui librsvg gnome-vfs gconf libglade gnome-common gnome-python-desktop gnome-python gstreamer virtual/libsdl"
+DEPENDS = " guile libggz ggz-client-libs python-pygtk gtk+ libgnome libgnomeui librsvg gnome-vfs gconf libglade gnome-common gnome-python-desktop gnome-python gstreamer virtual/libsdl libsdl-mixer"
 
 inherit gnome distutils-base gconf
 
-PR = "r6"
+PR = "r7"
 
 SRC_URI += "file://ggz-unbreak-m4.patch;patch=1 \
            "
@@ -18,7 +18,9 @@ EXTRA_OECONF = "--with-libggz-includes=${STAGING_INCDIR} \
 
 # disable help dir and crappy old sdl-macro
 do_configure_prepend() {
-	rm m4/sdl.m4
+        if [ -e m4/sdl.m4 ]; then
+	   rm m4/sdl.m4
+        fi
 	for i in $(find ${S} -name "Makefile.am") ; do
 		sed -i -e s:help::g $i
 	done
-- 
cgit v1.2.3


From a41265d8838c3a1fe8e6a67873fe40ba8113c337 Mon Sep 17 00:00:00 2001
From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Wed, 20 Jan 2010 02:09:17 +0100
Subject: libsdl-x11: use newer sdl.m4 macro from svn

* the sdl.m4 macro now uses pkgconfig which unbreaks gnome-games
  build
* bump PR
---
 recipes/libsdl/libsdl-x11-1.2.14/sdl.m4 | 203 ++++++++++++++++++++++++++++++++
 recipes/libsdl/libsdl-x11_1.2.14.bb     |   6 +-
 2 files changed, 208 insertions(+), 1 deletion(-)
 create mode 100644 recipes/libsdl/libsdl-x11-1.2.14/sdl.m4

diff --git a/recipes/libsdl/libsdl-x11-1.2.14/sdl.m4 b/recipes/libsdl/libsdl-x11-1.2.14/sdl.m4
new file mode 100644
index 0000000000..6acf1b2fc3
--- /dev/null
+++ b/recipes/libsdl/libsdl-x11-1.2.14/sdl.m4
@@ -0,0 +1,203 @@
+# Configure paths for SDL
+# Sam Lantinga 9/21/99
+# stolen from Manish Singh
+# stolen back from Frank Belew
+# stolen from Manish Singh
+# Shamelessly stolen from Owen Taylor
+
+dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
+dnl
+AC_DEFUN([AM_PATH_SDL],
+[dnl 
+dnl Get the cflags and libraries from the sdl-config script
+dnl
+AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
+            sdl_prefix="$withval", sdl_prefix="")
+AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
+            sdl_exec_prefix="$withval", sdl_exec_prefix="")
+AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
+		    , enable_sdltest=yes)
+
+  min_sdl_version=ifelse([$1], ,1.2.0,$1)
+
+  if test "x$sdl_prefix$sdl_exec_prefix" = x ; then
+    PKG_CHECK_MODULES(SDL, [sdl >= $min_sdl_version],
+           [sdl_pc=yes],
+           [dnl
+             AC_MSG_RESULT(no)
+             sdl_pc=no
+           ])
+  else
+    sdl_pc=no
+    if test x$sdl_exec_prefix != x ; then
+      sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
+      if test x${SDL_CONFIG+set} != xset ; then
+        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
+      fi
+    fi
+    if test x$sdl_prefix != x ; then
+      sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
+      if test x${SDL_CONFIG+set} != xset ; then
+        SDL_CONFIG=$sdl_prefix/bin/sdl-config
+      fi
+    fi
+  fi
+
+  if test "x$sdl_pc" = xyes ; then
+    no_sdl=""
+    SDL_CONFIG="pkg-config sdl"
+  else
+    as_save_PATH="$PATH"
+    if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
+      PATH="$prefix/bin:$prefix/usr/bin:$PATH"
+    fi
+    AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
+    PATH="$as_save_PATH"
+    AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
+    no_sdl=""
+
+    if test "$SDL_CONFIG" = "no" ; then
+      no_sdl=yes
+    else
+      SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
+      SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
+
+      sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
+             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+      sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
+             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+      sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
+             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+      if test "x$enable_sdltest" = "xyes" ; then
+        ac_save_CFLAGS="$CFLAGS"
+        ac_save_CXXFLAGS="$CXXFLAGS"
+        ac_save_LIBS="$LIBS"
+        CFLAGS="$CFLAGS $SDL_CFLAGS"
+        CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+        LIBS="$LIBS $SDL_LIBS"
+dnl
+dnl Now check if the installed SDL is sufficiently new. (Also sanity
+dnl checks the results of sdl-config to some extent
+dnl
+      rm -f conf.sdltest
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "SDL.h"
+
+char*
+my_strdup (char *str)
+{
+  char *new_str;
+  
+  if (str)
+    {
+      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
+      strcpy (new_str, str);
+    }
+  else
+    new_str = NULL;
+  
+  return new_str;
+}
+
+int main (int argc, char *argv[])
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  /* This hangs on some systems (?)
+  system ("touch conf.sdltest");
+  */
+  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = my_strdup("$min_sdl_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_sdl_version");
+     exit(1);
+   }
+
+   if (($sdl_major_version > major) ||
+      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
+      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
+    {
+      return 0;
+    }
+  else
+    {
+      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
+      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
+      printf("*** best to upgrade to the required version.\n");
+      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
+      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
+      printf("*** config.cache before re-running configure\n");
+      return 1;
+    }
+}
+
+],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+        CFLAGS="$ac_save_CFLAGS"
+        CXXFLAGS="$ac_save_CXXFLAGS"
+        LIBS="$ac_save_LIBS"
+      fi
+    fi
+    if test "x$no_sdl" = x ; then
+      AC_MSG_RESULT(yes)
+    else
+      AC_MSG_RESULT(no)
+    fi
+  fi
+  if test "x$no_sdl" = x ; then
+     ifelse([$2], , :, [$2])
+  else
+     if test "$SDL_CONFIG" = "no" ; then
+       echo "*** The sdl-config script installed by SDL could not be found"
+       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the SDL_CONFIG environment variable to the"
+       echo "*** full path to sdl-config."
+     else
+       if test -f conf.sdltest ; then
+        :
+       else
+          echo "*** Could not run SDL test program, checking why..."
+          CFLAGS="$CFLAGS $SDL_CFLAGS"
+          CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+          LIBS="$LIBS $SDL_LIBS"
+          AC_TRY_LINK([
+#include <stdio.h>
+#include "SDL.h"
+
+int main(int argc, char *argv[])
+{ return 0; }
+#undef  main
+#define main K_and_R_C_main
+],      [ return 0; ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding SDL or finding the wrong"
+          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
+          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
+          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
+          CFLAGS="$ac_save_CFLAGS"
+          CXXFLAGS="$ac_save_CXXFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     SDL_CFLAGS=""
+     SDL_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(SDL_CFLAGS)
+  AC_SUBST(SDL_LIBS)
+  rm -f conf.sdltest
+])
diff --git a/recipes/libsdl/libsdl-x11_1.2.14.bb b/recipes/libsdl/libsdl-x11_1.2.14.bb
index b35cc26dfe..d606e801de 100644
--- a/recipes/libsdl/libsdl-x11_1.2.14.bb
+++ b/recipes/libsdl/libsdl-x11_1.2.14.bb
@@ -8,10 +8,11 @@ LICENSE = "LGPL"
 DEPENDS = "alsa-lib virtual/libgl virtual/libx11 libxext tslib"
 DEPENDS_avr32 = "alsa-lib virtual/libx11 libxext tslib"
 PROVIDES = "virtual/libsdl"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = " \
   http://www.libsdl.org/release/SDL-${PV}.tar.gz \
+  file://sdl.m4 \
 "
 
 S = "${WORKDIR}/SDL-${PV}"
@@ -40,6 +41,9 @@ do_configure_append () {
   # prevent libtool from linking libs against libstdc++, libgcc, ...
   cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp
   mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
+
+  # copy new sdl.m4 macrofile to the dir for installing
+  cp ${WORKDIR}/sdl.m4 ${S}/
 }
 
 do_stage() {
-- 
cgit v1.2.3


From 2bcf50bbf1ea353c8c8d3c837b2ebdb0f32260d1 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 20 Jan 2010 00:31:28 -0800
Subject: cherokee_0.99.24.bb: Add missing DEPENDS

* 0.99 version uses openssl and there is no option to have gnutls
  so we configure it to use openssl.

* Add DEPENDS which were
  missing and override the default depends coming from cherokee.inc
  as it has gnutls in depends and would build this redundantly.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 recipes/cherokee/cherokee_0.99.24.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/recipes/cherokee/cherokee_0.99.24.bb b/recipes/cherokee/cherokee_0.99.24.bb
index b5d016006f..05349033b3 100644
--- a/recipes/cherokee/cherokee_0.99.24.bb
+++ b/recipes/cherokee/cherokee_0.99.24.bb
@@ -1,6 +1,8 @@
 require cherokee.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
+
+DEPENDS = "libpcre openssl mysql"
 
 SRC_URI = "http://www.cherokee-project.com/download/0.99/${PV}/cherokee-${PV}.tar.gz \
            file://cherokee.init "
@@ -9,4 +11,4 @@ CONFFILES_${PN} = " \
 ${sysconfdir}/cherokee/cherokee.conf \
 ${sysconfdir}/init.d/cherokee \
 "
-EXTRA_OECONF += "--with-mysql=${STAGING_INCDIR}/mysql"
+EXTRA_OECONF = "--enable-tls=openssl --disable-static --disable-nls --with-mysql=${STAGING_INCDIR}/mysql"
-- 
cgit v1.2.3


From 680760be3ab2431586f52c55f4311502cab1c50d Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 19 Jan 2010 13:17:43 +0100
Subject: libbonobo: update to 2.24.2 (automake 1.11.x fixes)

---
 conf/checksums.ini                | 4 ++++
 recipes/gnome/libbonobo_2.24.1.bb | 2 --
 recipes/gnome/libbonobo_2.24.2.bb | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)
 delete mode 100644 recipes/gnome/libbonobo_2.24.1.bb
 create mode 100644 recipes/gnome/libbonobo_2.24.2.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index d78264d553..52dba4d15a 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -14646,6 +14646,10 @@ sha256=5a6d96b9b15afa5d1702eee3a1ee3e50c3cfedb65d7c3faad64036ccfb3294b4
 md5=8868b6083392964a6969547ceb8d7cd1
 sha256=42b2ac58b86b2cc93fbbc65f94a3d1fcf5e8f33f728384653b30dbe456e91274
 
+[http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.24/libbonobo-2.24.2.tar.bz2]
+md5=5c7c5ea9c2f78a3c1e9ff2f1e27ad751
+sha256=95c0230a31a657e1873fc601318bbaa16722986699219317053f1cd1aa2a28bf
+
 [http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-2.6.0.tar.bz2]
 md5=078942cb9c6a1a31f93958e993353f45
 sha256=cd579e8dff38882d685be01449db92dad7c78900885d5a9abf6160756f83a7a8
diff --git a/recipes/gnome/libbonobo_2.24.1.bb b/recipes/gnome/libbonobo_2.24.1.bb
deleted file mode 100644
index efc71d24a8..0000000000
--- a/recipes/gnome/libbonobo_2.24.1.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require libbonobo.inc
-
diff --git a/recipes/gnome/libbonobo_2.24.2.bb b/recipes/gnome/libbonobo_2.24.2.bb
new file mode 100644
index 0000000000..efc71d24a8
--- /dev/null
+++ b/recipes/gnome/libbonobo_2.24.2.bb
@@ -0,0 +1,2 @@
+require libbonobo.inc
+
-- 
cgit v1.2.3


From dfc707b84076939eb91c776c3d2d684588f0bada Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 19 Jan 2010 14:59:25 +0100
Subject: gnome-keyring 2.28: update to 2.28.2

---
 conf/checksums.ini                    |  8 ++++++++
 recipes/gnome/gnome-keyring_2.28.0.bb | 28 ----------------------------
 recipes/gnome/gnome-keyring_2.28.2.bb | 25 +++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 28 deletions(-)
 delete mode 100644 recipes/gnome/gnome-keyring_2.28.0.bb
 create mode 100644 recipes/gnome/gnome-keyring_2.28.2.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 52dba4d15a..75daba9f0d 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -9654,6 +9654,14 @@ sha256=7acda11db2eb07b2f68a1a506203fe95141954acb10c394850418fd04ed80a07
 md5=07fa253d8506c22640d74eb4fc90a092
 sha256=1b3234f1feac6a619a9a61a0b5f67ab8cd89d94aeeec9a5cc2d78b81d9d8cab4
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/2.28/gnome-keyring-2.28.2.tar.bz2]
+md5=97ea6823e88b39284187764c1ca95a59
+sha256=d2d686fb2528ee045bbcd9f18d0d452e0eb88c2265a1947f639152b61a5987f6
+
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/2.29/gnome-keyring-2.29.5.tar.bz2]
+md5=13c0da5743242313400fe86a363a5f69
+sha256=cf63c162845929a1b1f407a334afdafdc2bc3769001d51d214bc22284a9fba9f
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.26/gnome-media-2.26.0.tar.bz2]
 md5=3d519bc7d812aed8f6e4288b6d3cdf26
 sha256=39e7646d0790e05a010da1eb2d7552dcb5311abd72f001477c9c465d7146b9f7
diff --git a/recipes/gnome/gnome-keyring_2.28.0.bb b/recipes/gnome/gnome-keyring_2.28.0.bb
deleted file mode 100644
index 46d2de0fd0..0000000000
--- a/recipes/gnome/gnome-keyring_2.28.0.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "GNOME security credential management"
-LICENSE = "GPL"
-SECTION = "x11/gnome"
-DEPENDS = " libpam gconf gtk+ libtasn1 libtasn1-native libgcrypt"
-
-inherit autotools gnome pkgconfig
-
-EXTRA_OECONF = "--disable-gtk-doc --enable-pam --with-pam-dir=${libdir}/security/"
-
-SRC_URI += "file://tasn.m4 file://org.gnome.keyring.service"
-
-do_configure_prepend() {
-	cp ${WORKDIR}/tasn.m4 acinclude.m4
-}
-
-do_install_append () {
-	install -d ${D}${datadir}/dbus-1/services
-	install -m 0644 ${WORKDIR}/org.gnome.keyring.service ${D}${datadir}/dbus-1/services
-}
-
-FILES_${PN} += "${datadir}/dbus-1/services ${datadir}/gcr"
-PACKAGES =+ "gnome-keyring-pam-plugin"
-FILES_gnome-keyring-pam-plugin = "${libdir}/security/*.so"
-FILES_${PN}-dbg += "${libdir}/gnome-keyring/*/.debug ${libdir}/security/.debug"
-
-do_stage() {
-        autotools_stage_all
-}
diff --git a/recipes/gnome/gnome-keyring_2.28.2.bb b/recipes/gnome/gnome-keyring_2.28.2.bb
new file mode 100644
index 0000000000..70a7349a3b
--- /dev/null
+++ b/recipes/gnome/gnome-keyring_2.28.2.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "GNOME security credential management"
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+DEPENDS = " libpam gconf gtk+ libtasn1 libtasn1-native libgcrypt"
+
+inherit gnome pkgconfig
+
+EXTRA_OECONF = "--disable-gtk-doc --enable-pam --with-pam-dir=${libdir}/security/"
+
+SRC_URI += "file://tasn.m4 file://org.gnome.keyring.service"
+
+do_configure_prepend() {
+	cp ${WORKDIR}/tasn.m4 acinclude.m4
+}
+
+do_install_append () {
+	install -d ${D}${datadir}/dbus-1/services
+	install -m 0644 ${WORKDIR}/org.gnome.keyring.service ${D}${datadir}/dbus-1/services
+}
+
+FILES_${PN} += "${datadir}/dbus-1/services ${datadir}/gcr"
+PACKAGES =+ "gnome-keyring-pam-plugin"
+FILES_gnome-keyring-pam-plugin = "${libdir}/security/*.so"
+FILES_${PN}-dbg += "${libdir}/gnome-keyring/*/.debug ${libdir}/security/.debug"
+
-- 
cgit v1.2.3


From a353f4ee7229c686bfc61417cab979ffa1735d55 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Wed, 20 Jan 2010 10:07:35 +0100
Subject: rygel: add hack to get rid of automake 1.11.x dependency

---
 recipes/rygel/rygel_0.4.8.bb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/recipes/rygel/rygel_0.4.8.bb b/recipes/rygel/rygel_0.4.8.bb
index 6d7dd6a930..2e305bbdb1 100644
--- a/recipes/rygel/rygel_0.4.8.bb
+++ b/recipes/rygel/rygel_0.4.8.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Collection of DLNA[1] (UPnP[2] AV) devices, implemented through a plug-in mechanism."
 SECTION = "network/multimedia"
-DEPENDS = "glib-2.0 gupnp gupnp-av gstreamer sqlite3 libsoup-2.4 automake-native-1.11.1"
+DEPENDS = "glib-2.0 gupnp gupnp-av gstreamer sqlite3 libsoup-2.4 "
 HOMEPAGE = "http://live.gnome.org/Rygel"
 
 SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/rygel/0.4/rygel-${PV}.tar.bz2 \
@@ -8,6 +8,11 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/rygel/0.4/rygel-${PV}.tar.bz2
 
 inherit autotools
 
+# Needs automake 1.11.x, which isn't safe to use yet in OE
+do_configure() {
+	oe_runconf
+}
+
 EXTRA_OECONF = "--enable-vala=no"
 
 FILES_${PN} += "${libdir}/rygel-1.0/librygel*.so ${datadir}/dbus-1/"
-- 
cgit v1.2.3


From f6c05a045df03c86b1a58af3cc164a2ad6005101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz>
Date: Tue, 19 Jan 2010 22:04:33 +0100
Subject: xinput_calibrator: switch to autotools
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Petr Štetiar <ynezz@true.cz>
Acked-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
---
 ...01-switch-to-autotools-based-build-system.patch | 162 +++++++++++++++++++++
 .../use-proper-compiler.patch                      |  20 ---
 .../xinput-calibrator/xinput-calibrator_0.5.0.bb   |   7 +-
 3 files changed, 166 insertions(+), 23 deletions(-)
 create mode 100644 recipes/xinput-calibrator/xinput-calibrator-0.5.0/0001-switch-to-autotools-based-build-system.patch
 delete mode 100644 recipes/xinput-calibrator/xinput-calibrator-0.5.0/use-proper-compiler.patch

diff --git a/recipes/xinput-calibrator/xinput-calibrator-0.5.0/0001-switch-to-autotools-based-build-system.patch b/recipes/xinput-calibrator/xinput-calibrator-0.5.0/0001-switch-to-autotools-based-build-system.patch
new file mode 100644
index 0000000000..adec403147
--- /dev/null
+++ b/recipes/xinput-calibrator/xinput-calibrator-0.5.0/0001-switch-to-autotools-based-build-system.patch
@@ -0,0 +1,162 @@
+From 1a85be450fba4585c64b3178316603a5ad7dd4e6 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz>
+Date: Tue, 19 Jan 2010 18:59:52 +0100
+Subject: [PATCH] switch to autotools based build system
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+This patch autotoolize xinput_calibrator for easier (cross)compiling.
+
+Signed-off-by: Petr Štetiar <ynezz@true.cz>
+---
+ Makefile     |   11 -----------
+ Makefile.am  |   41 +++++++++++++++++++++++++++++++++++++++++
+ autogen.sh   |   12 ++++++++++++
+ configure.ac |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 102 insertions(+), 11 deletions(-)
+ delete mode 100644 Makefile
+ create mode 100644 Makefile.am
+ create mode 100755 autogen.sh
+ create mode 100644 configure.ac
+
+diff --git a/Makefile b/Makefile
+deleted file mode 100644
+index c6eabed..0000000
+--- a/Makefile
++++ /dev/null
+@@ -1,11 +0,0 @@
+-all: x11 gtkmm
+-
+-x11: main_x11.cpp gui_x11.cpp
+-	g++ -Wall main_x11.cpp -lX11 -lXi -o xinput_calibrator.x11
+-	cp xinput_calibrator.x11 xinput_calibrator
+-
+-gtkmm: main_gtkmm.cpp gui_gtkmm.cpp
+-	g++ -Wall main_gtkmm.cpp `pkg-config --cflags --libs gtkmm-2.4` -o xinput_calibrator.gtkmm
+-
+-clean:
+-	rm -f xinput_calibrator xinput_calibrator.x11 xinput_calibrator.gtkmm
+diff --git a/Makefile.am b/Makefile.am
+new file mode 100644
+index 0000000..ef8f531
+--- /dev/null
++++ b/Makefile.am
+@@ -0,0 +1,41 @@
++#
++# Copyright (c) 2010 Petr Stetiar <ynezz@true.cz>
++#
++# Permission is hereby granted, free of charge, to any person
++# obtaining a copy of this software and associated documentation
++# files (the "Software"), to deal in the Software without
++# restriction, including without limitation the rights to use,
++# copy, modify, merge, publish, distribute, sublicense, and/or sell
++# copies of the Software, and to permit persons to whom the
++# Software is furnished to do so, subject to the following
++# conditions:
++# 
++# The above copyright notice and this permission notice shall be
++# included in all copies or substantial portions of the Software.
++# 
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++# OTHER DEALINGS IN THE SOFTWARE.
++#
++
++#AM_CFLAGS = -Wall -ansi -pedantic -W -Wmissing-prototypes -Wmissing-declarations -Werror -std=gnu99
++
++if BUILD_GTKMM
++bin_PROGRAMS = xinput_calibrator_x11 xinput_calibrator_gtkmm
++xinput_calibrator_gtkmm_SOURCES = main_gtkmm.cpp
++xinput_calibrator_gtkmm_CXXFLAGS = $(GTKMM_CFLAGS)
++xinput_calibrator_gtkmm_LDADD = $(GTKMM_LIBS)
++else
++bin_PROGRAMS = xinput_calibrator_x11
++endif
++
++xinput_calibrator_x11_LDADD = $(XORG_LIBS)
++xinput_calibrator_x11_CFLAGS = $(XORG_CFLAGS)
++xinput_calibrator_x11_SOURCES = main_x11.cpp
++
++EXTRA_DIST = autogen.sh
+diff --git a/autogen.sh b/autogen.sh
+new file mode 100755
+index 0000000..904cd67
+--- /dev/null
++++ b/autogen.sh
+@@ -0,0 +1,12 @@
++#! /bin/sh
++
++srcdir=`dirname $0`
++test -z "$srcdir" && srcdir=.
++
++ORIGDIR=`pwd`
++cd $srcdir
++
++autoreconf -v --install || exit 1
++cd $ORIGDIR || exit $?
++
++$srcdir/configure --enable-maintainer-mode "$@"
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 0000000..13257b4
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,49 @@
++#
++# Copyright (c) 2010 Petr Stetiar <ynezz@true.cz>
++#
++# Permission is hereby granted, free of charge, to any person
++# obtaining a copy of this software and associated documentation
++# files (the "Software"), to deal in the Software without
++# restriction, including without limitation the rights to use,
++# copy, modify, merge, publish, distribute, sublicense, and/or sell
++# copies of the Software, and to permit persons to whom the
++# Software is furnished to do so, subject to the following
++# conditions:
++# 
++# The above copyright notice and this permission notice shall be
++# included in all copies or substantial portions of the Software.
++# 
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++# OTHER DEALINGS IN THE SOFTWARE.
++#
++
++AC_PREREQ([2.57])
++AC_INIT(xinput_calibrator,[0.5.0], [http://github.com/tias/xinput_calibrator])
++AM_INIT_AUTOMAKE([foreign dist-bzip2])
++AM_MAINTAINER_MODE
++
++AC_PROG_CC
++AC_PROG_CXX
++AC_PROG_INSTALL
++
++AC_ARG_ENABLE([gtkmm], AS_HELP_STRING([--enable-gtkmm], [Enable GTKMM GUI]))
++AS_IF([test "x$enable_gtkmm" = "xyes"], [
++	PKG_CHECK_MODULES(GTKMM, [gtkmm-2.4])
++	AC_SUBST(GTKMM_CFLAGS)
++	AC_SUBST(GTKMM_LIBS)
++])
++
++AM_CONDITIONAL([BUILD_GTKMM], [test "x$enable_gtkmm" = "xyes"])
++
++PKG_CHECK_MODULES(XORG, [x11 xi])
++AC_SUBST(XORG_CFLAGS)
++AC_SUBST(XORG_LIBS)
++
++AC_CONFIG_FILES(Makefile)
++AC_OUTPUT
+-- 
+1.6.0.4
+
diff --git a/recipes/xinput-calibrator/xinput-calibrator-0.5.0/use-proper-compiler.patch b/recipes/xinput-calibrator/xinput-calibrator-0.5.0/use-proper-compiler.patch
deleted file mode 100644
index a7912fb4c7..0000000000
--- a/recipes/xinput-calibrator/xinput-calibrator-0.5.0/use-proper-compiler.patch
+++ /dev/null
@@ -1,20 +0,0 @@
----
- Makefile |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- git.orig/Makefile
-+++ git/Makefile
-@@ -1,11 +1,11 @@
- all: x11 gtkmm
- 
- x11: main_x11.cpp gui_x11.cpp
--	g++ -Wall main_x11.cpp -lX11 -lXi -o xinput_calibrator.x11
-+	$(CXX) $(CFLAGS) $(LDFLAGS) -Wall main_x11.cpp -lX11 -lXi -o xinput_calibrator.x11
- 	cp xinput_calibrator.x11 xinput_calibrator
- 
- gtkmm: main_gtkmm.cpp gui_gtkmm.cpp
--	g++ -Wall main_gtkmm.cpp `pkg-config --cflags --libs gtkmm-2.4` -o xinput_calibrator.gtkmm
-+	$(CXX) $(CFLAGS) $(LDFLAGS) -Wall main_gtkmm.cpp `pkg-config --cflags --libs gtkmm-2.4` -o xinput_calibrator.gtkmm
- 
- clean:
- 	rm -f xinput_calibrator xinput_calibrator.x11 xinput_calibrator.gtkmm
diff --git a/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb b/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb
index 59a28569c9..2d6924711d 100644
--- a/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb
+++ b/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb
@@ -2,12 +2,13 @@ DEPENDS = "virtual/libx11 libxi"
 
 SRCREV  = "6af268f1b435f7bdd83335092ddc684054df2110"
 SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \
-           file://use-proper-compiler.patch;patch=1"
+           file://0001-switch-to-autotools-based-build-system.patch;patch=1"
 
+PR = "r1"
+inherit autotools
 S = "${WORKDIR}/git/"
-EXTRA_OEMAKE = "x11"
 
 do_install() {
 	install -d ${D}${bindir}
-	install -m 0755 xinput_calibrator ${D}${bindir}
+	install -m 0755 xinput_calibrator_x11 ${D}${bindir}/xinput_calibrator
 }
-- 
cgit v1.2.3


From c4408fc35e6ce5fa3f08a5f8635471a6bb346dd3 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin@buglabs.net>
Date: Fri, 15 Jan 2010 18:14:38 +0100
Subject: qt3e.bbclass: fix paths for staging

Without that patch uicmoc3-native fails to build.
---
 classes/qt3e.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/qt3e.bbclass b/classes/qt3e.bbclass
index 35958b34ab..d3d4a14e8a 100644
--- a/classes/qt3e.bbclass
+++ b/classes/qt3e.bbclass
@@ -6,6 +6,6 @@ export QTEDIR="${STAGING_DIR_HOST}/qte3"
 export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic3"
 export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc3"
 export OE_QMAKE_CXXFLAGS="${CXXFLAGS} "
-export OE_QMAKE_INCDIR_QT="${QTEDIR}/include"
-export OE_QMAKE_LIBDIR_QT="${QTEDIR}/lib"
+export OE_QMAKE_INCDIR_QT="${STAGING_INCDIR}/qte3/include"
+export OE_QMAKE_LIBDIR_QT="${STAGING_LIBDIR}/qte3/lib"
 export OE_QMAKE_LIBS_QT="qte"
-- 
cgit v1.2.3


From 1b426b8382d2a7864b63051b0707e577f2c0ce69 Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin.jansa@gmail.com>
Date: Fri, 15 Jan 2010 18:10:29 +0100
Subject: sanity.bbclass: handle lack of permission to read
 /proc/sys/vm/mmap_min_addr

* With 2.6.33-rc2-00252-ge9e5521 on my host I noticed that
  "cat /proc/sys/vm/mmap_min_addr" returns now
  "cat: /proc/sys/vm/mmap_min_addr: Operation not permitted"
  Its probably becuse of
  http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0e1a6ef2dea88101b056b6d9984f3325c5efced3
  But I'm not sure if checking CAP_SYS_RAWIO even for reading this value
  is intentional or just bug which should be fixed in kernel.

This patch makes bitbake ignore reading error. Possible QEmu failure is not
handled yet.

Acked-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
---
 classes/sanity.bbclass | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index f65df61c1d..f57d8e47d0 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -96,11 +96,14 @@ def check_sanity(e):
 			if not check_app_exists("qemu-arm", e.data):
 				messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries (qemu-arm) can't be found in PATH"
 
-		if os.path.exists("/proc/sys/vm/mmap_min_addr"):
-			f = file("/proc/sys/vm/mmap_min_addr", "r")
-			if (f.read().strip() != "0"):
-				messages = messages + "/proc/sys/vm/mmap_min_addr is not 0. This will cause problems with qemu so please fix the value (as root).\n\nTo fix this in later reboots, set vm.mmap_min_addr = 0 in /etc/sysctl.conf.\n"
-			f.close()
+		try:
+			if os.path.exists("/proc/sys/vm/mmap_min_addr"):
+				f = file("/proc/sys/vm/mmap_min_addr", "r")
+				if (f.read().strip() != "0"):
+					messages = messages + "/proc/sys/vm/mmap_min_addr is not 0. This will cause problems with qemu so please fix the value (as root).\n\nTo fix this in later reboots, set vm.mmap_min_addr = 0 in /etc/sysctl.conf.\n"
+				f.close()
+		except:
+			pass
 
 	for util in required_utilities.split():
 		if not check_app_exists( util, e.data ):
-- 
cgit v1.2.3


From 33d74d678b593815f4ac005c026ed3c4c9e0d945 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Tue, 19 Jan 2010 11:13:34 +0100
Subject: linux-openmoko-2.6.32: bump SRCREV for suspend/resume fix, enable
 MMC_UNSAFE_RESUME

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 conf/distro/include/sane-srcrevs.inc                   | 2 +-
 recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 207c320a66..677134650d 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -148,7 +148,7 @@ SRCREV_pn-linux-ixp4xx ?= "1089"
 SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
 SRCREV_pn-linux-openmoko-2.6.28 ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5"
 SRCREV_pn-linux-openmoko-2.6.31 ?= "dd32737aa524e09c1d141a0e735dd58674552244"
-SRCREV_pn-linux-openmoko-2.6.32 ?= "5827b20d022fb47ce9c9731d0fb894d361e16ffe"
+SRCREV_pn-linux-openmoko-2.6.32 ?= "058cbf4220fd2f1cd970bf553c044cb178e3804e"
 SRCREV_pn-linux-openmoko-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88"
 SRCREV_pn-linux-openmoko-shr-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88"
 SRCREV_pn-linux-openmoko-shr-drm-devel ?= "e62a4ae1c6783f41b41a9ac3d258786586b65a40"
diff --git a/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig b/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig
index c7a32421bb..e63bbd73dc 100644
--- a/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig
+++ b/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig
@@ -1332,7 +1332,7 @@ CONFIG_USB_ETH_RNDIS=y
 # CONFIG_NOP_USB_XCEIV is not set
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
+CONFIG_MMC_UNSAFE_RESUME=y
 
 #
 # MMC/SD/SDIO Card Drivers
-- 
cgit v1.2.3


From 4750e2e563904042a2375100213f0f5cfadde176 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 20 Jan 2010 12:55:58 +0100
Subject: checksums.ini: add checksums for upcomming xorg upgrades

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 conf/checksums.ini | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 75daba9f0d..8c81ddd264 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -5814,6 +5814,10 @@ sha256=1954a7e96d7fe70611c483836ed143e84a069eed6d3dab22c05a531bfb6da9e4
 md5=5cb7987d29db068153bdc8f23c767c43
 sha256=2b33f7c7658fb8f004c3aaf2717711262baeb5d77cf3fd24e9b6cc263895122d
 
+[http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.2.tar.bz2]
+md5=3ca8ddb42cd4ee31b8690031303221af
+sha256=f352950ffee4437d9da3e216d9a348ba0c7cf80c8c0fb30385c77ce3b780b2a1
+
 [http://www.ex-parrot.com/~chris/driftnet/driftnet-0.1.6.tar.gz]
 md5=8e11d77770452f97bb3c23f510489815
 sha256=dbdf7ead3ae14b109f88c86dedeb7524be8c257aa773a781891216f013373d6d
@@ -9314,6 +9318,10 @@ sha256=9d9ef356cc4478499442573556787125dc76c8acd1e55e5001fb11f1e224d27f
 md5=c9f8cebfba72bfab674bc0170551fb8d
 sha256=7fb83a28ae24d4f56eca88bc48f0fe414faee1afb2574bfb6257b52e8c716fcf
 
+[http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.11.tar.bz2]
+md5=78e7c4dc7dcb74b1869fee7897e00f59
+sha256=fe481d89d74f01db4f3a671ef1f29df29da74dff5b678517ee659a6f9d819451
+
 [http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.8.tar.bz2]
 md5=3dfbd17203c0c88b94b6f579f24c11cc
 sha256=2f5d84413853b688b7bb46c66fee108a499190e1f7810afffb775910778f053c
@@ -13930,6 +13938,10 @@ sha256=e4863cdf5d471763806e9bcae25ea47606a56cd91a5546a34c093aa3de181051
 md5=001d780829f936e34851ef7cd37b4dfd
 sha256=4def4d5c9fce85d690f1f29d675154594acdea3d3fe792d0cb513732c7b4bcb2
 
+[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.3.3.tar.bz2]
+md5=5d74971360f194ce33d2bd2e4d9b066c
+sha256=8c7f867918a3739dc7cabe955179539d4a7ecc52cb42becfd261e5dfbff511ac
+
 [http://xorg.freedesktop.org/releases/individual/lib/libX11-1.3.tar.bz2]
 md5=0545089013213e90aac19b8f8045d32e
 sha256=34656d022ff2f94430b534612821428fe15ade028d86a42907958167f2e497ac
@@ -14922,6 +14934,10 @@ sha256=ddfd398383729707846e1f1689e9acb3bc672e4f255a632c8f0d0c55ddf8718c
 md5=e0e66fae165d0b665b61e9516bf33ade
 sha256=5e07ec4b644f50160900d4281a74dd1cbf1535cfe4ab24e0c28ae5b038836a8c
 
+[http://dri.freedesktop.org/libdrm/libdrm-2.4.17.tar.bz2]
+md5=667d81f993f7fd8a1b1b1b830a28a748
+sha256=b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a
+
 [http://www.metzlerbros.org/dvb/libdvb-0.5.5.1.tar.gz]
 md5=47612d2f8a4d4dee746a166d8b7f6f77
 sha256=941e8020129111377652bd7253ea85e6c133fd1c23c66bd9fc0ca9eabab1385a
@@ -22034,6 +22050,10 @@ sha256=3438437c131c9847b34106225a728c11e522776ac454bb8740a9bc7aea409f22
 md5=02bd3669f53c404c19980d5efb6f86fb
 sha256=05f78c2fd3a5f054c0d716e8ba1b67a0c04a7a7e642d6946828ec383b389d185
 
+[http://cairographics.org/releases/pixman-0.17.4.tar.gz]
+md5=734f70667d0a6454a1b1e332f8d50083
+sha256=dd2f4a7c9c9373d20720d78718c0e9603741a83d66da3316a020b097b1c918a9
+
 [http://xorg.freedesktop.org/releases/individual/lib/pixman-0.9.4.tar.bz2]
 md5=c354ab5b0da10227226d3ef604254875
 sha256=261d239e9e3070a0a81e5b3eab92e6236c6295979bdae0a1ded05cbef93f67aa
@@ -27370,6 +27390,10 @@ sha256=57d2629849796b4dc919261eadd1eea3ee6e634d58979797287f7e09408cde67
 md5=8ac38951e753f250aaefbd4ba0afda94
 sha256=d49ab68cad724ae51f6cb69f7f5cfff7629cbb066f4c5c8bda81d62675a21986
 
+[http://xorg.freedesktop.org/releases/individual/util/util-macros-1.5.0.tar.gz]
+md5=ffef78135535c60c2b68d0a2a4ecae9b
+sha256=d47116ce5df198859a6082af7a72505575d1685b8c82bb4ef6fbedfa3316617e
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/util/util-macros-X11R7.0-1.0.1.tar.bz2]
 md5=bc6be634532d4936eb753de54e1663d3
 sha256=e95a45db65b33be472a3134492e348c4cd6edc200d02a85654ffe62bc2e6fdcd
@@ -29674,6 +29698,10 @@ sha256=738463dbf1980b9d0f95936a2d951dc51bd776c7949215c2456580948660669e
 md5=4d76953e97ee760efb7627e7ac721dbf
 sha256=ea2b875a8bb8ab9d987192dbcb4fb595e511b382d06260baf23a936f7e61fa14
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.10.0.tar.bz2]
+md5=78309d4f04dd8ae6585d120377042741
+sha256=e46dd691dc93db7cd6f5f22b84fea7e9f4bfd34f28026cfd680993b3ccfc48ab
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.2.1.tar.bz2]
 md5=3334dc5142871b78fc609fd1b3dac3f2
 sha256=d976c5f5e9c84f3817aba6ad22855446f1c2b9bfa0d53bd11c37c62cfdefa60a
@@ -30234,6 +30262,10 @@ sha256=8b3e077d2534722033d7b1c647aa7f31fc7fbb5014da096b7a53170005e80226
 md5=61a1dc9a22991bd04d0ff98f800775c1
 sha256=a3657971232e9c7db3e7517a8aedd86d3ef4d159f7099ec974cdd03aafa41080
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.3.0.tar.bz2]
+md5=07fa32958aff9b463dd3af5481ef6626
+sha256=8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-vesa-X11R7.0-1.0.1.3.tar.bz2]
 md5=049ada4df1abb5aa2b6633ba90353e78
 sha256=c6601cd278ebc30a0d20b49b6284bc21b4910f8ef5d24d1c62daa1591a251452
@@ -30286,6 +30318,10 @@ sha256=3e4e9abfd806b36076083ef6cacc93b713bfa4ddefe7005edfc15c64f5174366
 md5=25287a202c986b33bd79fbe379c96a16
 sha256=956443948d94f7459b0056d8cb8ff2cd9fba4621d8b61f0257cb84469ea7da07
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-10.16.9.tar.bz2]
+md5=3b3d38abfa1f8be4b1e26dcd236bc94f
+sha256=835a5e45b54837cbbd963a48bd09db709717e097e931dd76e68e397a167e8bc1
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-vmware-X11R7.0-10.11.1.3.tar.bz2]
 md5=4df79349e26add4c23f6be8bec347ad4
 sha256=79b0bf59d866d3760fa8a55b4a19d56ae7fa6a962d629a9de5c188cec5c98c9a
@@ -31342,6 +31378,10 @@ sha256=f4fb49209a6f3cb1c5b039b1f43870774e2eac1540b4d3235a2f13bc441da159
 md5=4c63b22cad9ed8ae8b86561f0f92c327
 sha256=4b644113cd030fc77615c03c7b6529e063dc1d471ec6a990e6f62eb45a9c2db4
 
+[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.7.4.tar.bz2]
+md5=75d27c3a1c12293f620a2d6518fcbdfa
+sha256=b8ec11b3f2c6f84c21e8cd9804672ba6e27fda3e913d58dd947205ea253e33f8
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-X11R7.0-1.0.1.tar.bz2]
 md5=0e7527480fb845a3c2e333bd0f47ff50
 sha256=0419124e1bab473f8f9e2d7de1dba8bae2ed1375b72d55cdfb9471dac357ed47
@@ -31894,6 +31934,10 @@ sha256=487bf07b2f9ead6a59682d091081e47cfe4ca5777de32e6cec5bef55fa51c82f
 md5=e0744594f4e5969b20df28d897781318
 sha256=6d0feb42c2f1d6011d97c776b9d580fd589cdf3cfe246cd99437c406a2740d36
 
+[http://xorg.freedesktop.org/releases/individual/app/xvidtune-1.0.2.tar.bz2]
+md5=e40eeb4454f2a7cdde3a14f5dfd3aadd
+sha256=73ca41bd5e73560663bea0d98149b099cfef5743a2282ca67547e97732618a53
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xvidtune-X11R7.0-1.0.1.tar.bz2]
 md5=a12e27fb732cb115b6adc4c724c44c5d
 sha256=f7b3925d7e9981d146d3e5774de0521e6d48e2ed99841f538f267e8bc58bf5cd
-- 
cgit v1.2.3


From c0002bd2f71a05d8bb125ba40f1c489a29436a9e Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 20 Jan 2010 12:55:45 +0100
Subject: stopwatch: new recipe for QT4 based stopwatch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Author: Christof Musik
* can be used as stop watch
* has countdown capability (e.g. for next holiday)
* survives suspend/resume

Signed-off-by: Christian Rüb <christian.rueb@gmx.net>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 conf/distro/include/sane-srcrevs.inc |  1 +
 recipes/stopwatch/stopwatch_git.bb   | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 recipes/stopwatch/stopwatch_git.bb

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 677134650d..f4d79268a2 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -312,6 +312,7 @@ SRCREV_pn-socketcan-modules ?= "917"
 SRCREV_pn-socketcan-utils-test ?= "917"
 SRCREV_pn-sphyrna-python ?= "45"
 SRCREV_pn-starling ?= "9574"
+SRCREV_pn-stopwatch ?= "89644b91e02151fc72989755f20c1ffb144ef5e2"
 SRCREV_pn-table ?= "2191"
 SRCREV_pn-tichy ?= "ab68d849502009cf3214df48ffa8075a10cc2177"
 SRCREV_pn-tmut ?= "60"
diff --git a/recipes/stopwatch/stopwatch_git.bb b/recipes/stopwatch/stopwatch_git.bb
new file mode 100644
index 0000000000..f0d40da54b
--- /dev/null
+++ b/recipes/stopwatch/stopwatch_git.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Simple Qt based stop watch"
+AUTHOR = "Christof Musik"
+SECTION = "x11/applications"
+PRIORITY = "optional"
+HOMEPAGE = "http://git.senfdax.de"
+LICENSE = "GPL QPL"
+DEPENDS = "qt4-x11-free"
+PV = "1.3.1+gitr${SRCREV}"
+PR = "r0"
+
+inherit qt4x11
+
+SRC_URI = "git://git.senfdax.de/git/stopwatch;protocol=http;tag=master;branch=master"
+S = "${WORKDIR}/git/"
+
+do_configure() {
+    ${OE_QMAKE_QMAKE}
+}
+
+do_compile() {
+    oe_runmake
+}
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 0755 ${S}stopwatch ${D}${bindir}
+    install -d ${D}${datadir}/applications
+    install ${S}desktop/stopwatch.desktop ${D}${datadir}/applications/
+    install -d ${D}${datadir}/pixmaps
+    install ${S}desktop/stopwatch.png ${D}${datadir}/pixmaps/
+    install -d ${D}${datadir}/${PN}
+    install ${S}desktop/om.style ${D}${datadir}/${PN}/
+}
-- 
cgit v1.2.3


From 0eaeda31b9f8d286a8a58d787637b4c4d0516b2d Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan.hovold@lundinova.se>
Date: Thu, 17 Dec 2009 05:18:14 +0000
Subject: wxwidgets: add 2.9.0 and clean up recipes

- Add wxwidget-2.9.0 include with derived rather than hardcoded lib and
   config script names (depends on debug and charset configure flags)
 - Use regular expression for LEAD_SONAME rather than hardcoded name.
 - Fix autoconf issue where configure could not find staging root.
 - Use INC_PR.

 - Add wxwidgets-2.9.0 (unicode)
 - Add wxwidgets-ansi-2.9.0 (non-unicode)
 - Add wxwidgets-opengl-2.9.0 (unicode, opengl)

Signed-off-by: Johan Hovold <johan.hovold@lundinova.se>
Signed-off-by: Marco Cavallini <m.cavallini@koansoftware.com>
---
 conf/checksums.ini                                 |  4 ++
 recipes/wxwidgets/wxwidgets-2.9.0.inc              | 44 ++++++++++++++++++++++
 .../wxwidgets-2.9.0/configure-cross_root.patch     | 30 +++++++++++++++
 recipes/wxwidgets/wxwidgets-ansi_2.9.0.bb          |  5 +++
 recipes/wxwidgets/wxwidgets-opengl_2.9.0.bb        |  7 ++++
 recipes/wxwidgets/wxwidgets_2.9.0.bb               |  3 ++
 6 files changed, 93 insertions(+)
 create mode 100644 recipes/wxwidgets/wxwidgets-2.9.0.inc
 create mode 100644 recipes/wxwidgets/wxwidgets-2.9.0/configure-cross_root.patch
 create mode 100644 recipes/wxwidgets/wxwidgets-ansi_2.9.0.bb
 create mode 100644 recipes/wxwidgets/wxwidgets-opengl_2.9.0.bb
 create mode 100644 recipes/wxwidgets/wxwidgets_2.9.0.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 8c81ddd264..924bfccc33 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -28230,6 +28230,10 @@ sha256=9b4096bb1e273914adf101182c27d457f46fcc44d1b3ea027bae3d34ace8c6f7
 md5=3ad40ea2b1728eefa94f60beb9951ff7
 sha256=9b4096bb1e273914adf101182c27d457f46fcc44d1b3ea027bae3d34ace8c6f7
 
+[http://downloads.sourceforge.net/wxwindows/wxWidgets-2.9.0.tar.bz2]
+md5=09058928eeb72853142c062bdec056ce
+sha256=8cf5c1dcf6357b2d27efd0c737b95baf1d2d1e88b5bf24560824b5eb6f2dc782
+
 [http://xorg.freedesktop.org/releases/individual/app/x11perf-1.4.1.tar.bz2]
 md5=fd06c8b8e3572a0e14af65a49e0dd7d1
 sha256=c81819618ec596fda55b950ef80f2ee02e5ce149ea99f1f741cedb459b4d3064
diff --git a/recipes/wxwidgets/wxwidgets-2.9.0.inc b/recipes/wxwidgets/wxwidgets-2.9.0.inc
new file mode 100644
index 0000000000..cb6a971e7a
--- /dev/null
+++ b/recipes/wxwidgets/wxwidgets-2.9.0.inc
@@ -0,0 +1,44 @@
+require wxwidgets.inc
+
+INC_PR = "r0"
+
+PROVIDES += "wxwidgets"
+
+TOOLKIT ?= "gtk2"
+UNICODE ?= "${@base_contains('EXTRA_OECONF', '--disable-unicode', 'ansi', 'unicode', d)}"
+DEBUG ?= "${@base_contains('EXTRA_OECONF', '--enable-debug', 'debug', 'release', d)}"
+RELEASE ?= "${@bb.data.getVar('PV',d,1).rsplit('.', 1)[0]}"
+
+WXCONFIG ?= "${TOOLKIT}-${UNICODE}-${DEBUG}-${RELEASE}"
+
+LEAD_SONAME = "libwx_.*_core-.*\.so"
+
+# Patch and regenerate configure script so that it finds staging root.
+FILESDIR = "${FILE_DIRNAME}/wxwidgets-${PV}"
+SRC_URI += "file://configure-cross_root.patch;patch=1"
+
+do_configure_prepend() {
+	./autogen.sh
+}
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/wx-${RELEASE}/wx
+	cp -pR include/wx ${STAGING_INCDIR}/wx-${RELEASE}
+	cp -pR lib/libwx* ${STAGING_LIBDIR}
+	cp -pR lib/wx     ${STAGING_LIBDIR}
+	cp -pR build/bakefiles/wxpresets/presets ${STAGING_DATADIR}/bakefile
+	cp -p wxwin.m4                          ${STAGING_DATADIR}/aclocal
+	ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}${WXCONFIG} \
+		${STAGING_BINDIR_CROSS}/wx-config
+	sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
+		-e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
+		-e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
+		-e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \
+		-i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}${WXCONFIG}
+}
+
+do_install() {
+	oe_runmake 'DESTDIR=${D}' install
+	ln -sf  ${libdir}/wx/config/${TARGET_PREFIX}${WXCONFIG} \
+		${D}${bindir}/wx-config
+}
diff --git a/recipes/wxwidgets/wxwidgets-2.9.0/configure-cross_root.patch b/recipes/wxwidgets/wxwidgets-2.9.0/configure-cross_root.patch
new file mode 100644
index 0000000000..e91a95cfbb
--- /dev/null
+++ b/recipes/wxwidgets/wxwidgets-2.9.0/configure-cross_root.patch
@@ -0,0 +1,30 @@
+diff -pu a/configure.in b/configure.in
+--- a/configure.in	2009-12-04 11:02:26.000000000 +0100
++++ b/configure.in	2009-12-03 22:08:05.000000000 +0100
+@@ -2117,14 +2117,21 @@ if test "$build" != "$host" -a "$GCC" = 
+     dnl the linker. Stripping off the trailing '/bin/ld' gives us a candiate
+     dnl for a 'root' below which libraries and headers for the target system
+     dnl might be installed.
+-    if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then
++    m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
++    i