From aee8d316d940bb85ba1a1a6fb6876c6428464cbb Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 5 Jun 2009 21:26:40 +0200
Subject: midori: bump SRCREB

---
 conf/distro/include/sane-srcrevs.inc | 2 +-
 recipes/gtk-webcore/midori_git.bb    | 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 554c49ad4b..7b5a93a8c8 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -133,7 +133,7 @@ SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-matchbox-stroke ?= "1820"
 SRCREV_pn-mickeydbus ?= "f894801916cc4d0e912e4553490dc215276c52a9"
 SRCREV_pn-mickeyterm ?= "f894801916cc4d0e912e4553490dc215276c52a9"
-SRCREV_pn-midori ?= "eaaed697bf962862b6f393c6b1aceeb04df7414b"
+SRCREV_pn-midori ?= "c41845b907b72e6c255a519c621f2382cba67b44"
 SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
 SRCREV_pn-moko-gtk-engine ?= "4734"
 SRCREV_pn-mokoko ?= "127"
diff --git a/recipes/gtk-webcore/midori_git.bb b/recipes/gtk-webcore/midori_git.bb
index d7eacd575a..9e0344e4f6 100644
--- a/recipes/gtk-webcore/midori_git.bb
+++ b/recipes/gtk-webcore/midori_git.bb
@@ -4,7 +4,7 @@ DEPENDS += "python-native python-docutils-native"
 
 # increment PR every time SRCREV is updated!
 PR = "r0"
-PV = "0.1.6+${PR}+gitr${SRCREV}"
+PV = "0.1.7+${PR}+gitr${SRCREV}"
 
 SRC_URI = "git://git.xfce.org/kalikiana/midori;protocol=git \
            file://waf"
-- 
cgit v1.2.3


From 92f3e5fb27286507b2311824001c7288407441e2 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 5 Jun 2009 23:04:00 +0200
Subject: fldigi: add 3.11.4

---
 conf/checksums.ini           |  4 ++++
 recipes/sdr/fldigi_3.11.4.bb | 12 ++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 recipes/sdr/fldigi_3.11.4.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index beb3ede376..4258191bca 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -6178,6 +6178,10 @@ sha256=c7345faf10b269b3556f2e1373c4afc35f08891f8bbd54e45d49151a8c8e4ac0
 md5=a3bb1f9a8e2b1238ffaf89193e60be02
 sha256=ec5ace49df7cfe69b7c02c8d1b6df8089f32076a390b931051feed2a9762d554
 
+[http://www.w1hkj.com/fldigi-distro/fldigi-3.11.4.tar.gz]
+md5=85457a57ac97210ee23299ccf25e5c60
+sha256=1614d6720994a5b794d50b05d95dfd1f1cc556fcd500352f0203daeae88be0dd
+
 [http://downloads.sourceforge.net/flex/flex-2.5.31.tar.bz2]
 md5=363dcc4afc917dc51306eb9d3de0152f
 sha256=701353279a17655d78e3b3678ad78d0375f5bf45877ad8b3507d589c42427f26
diff --git a/recipes/sdr/fldigi_3.11.4.bb b/recipes/sdr/fldigi_3.11.4.bb
new file mode 100644
index 0000000000..f301ae1481
--- /dev/null
+++ b/recipes/sdr/fldigi_3.11.4.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Digital modem program for Linux"
+LICENSE = "GPLv2"
+
+DEPENDS = "libsndfile1 portaudio-v19 hamlib jpeg fltk libsamplerate0 pulseaudio"
+
+inherit autotools_stage
+
+SRC_URI = "http://www.w1hkj.com/fldigi-distro/fldigi-${PV}.tar.gz"
+
+EXTRA_OECONF = " --enable-static --without-jpeg"
+
+
-- 
cgit v1.2.3


From 5ff3e46de7ea08446d63669f80044b369c75be5e Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Fri, 5 Jun 2009 23:46:30 +0200
Subject: zaurus-2.6.inc: [tosa] wlan-ng is now inside the kernel for tosa

---
 conf/machine/include/zaurus-2.6.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 69589a0d60..ba923f9515 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -40,9 +40,10 @@ MACHINE_EXTRA_RRECOMMENDS_akita  = "kernel-module-snd-soc-spitz kernel-module-px
 MACHINE_EXTRA_RRECOMMENDS_spitz  = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
 MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia"
 
-# For tosa only: wlan-ng Modules and OHCI suspend/resume fixup
+# For tosa: OHCI suspend/resume fixup
+# wlan-ng is now in kernel (2.6.29)
 # Fixme ? module-snd for tosa
-MACHINE_EXTRA_RRECOMMENDS_tosa = "wlan-ng-modules-usb apm-tosa-suspendfix"
+MACHINE_EXTRA_RRECOMMENDS_tosa = "apm-tosa-suspendfix"
 
 # Fixme ? module-snd for collie
 MACHINE_EXTRA_RRECOMMENDS_collie = ""
-- 
cgit v1.2.3


From d8eaa05dad4e1f331c3d01ab8706a060153f442b Mon Sep 17 00:00:00 2001
From: Lynn Lin <Lin_Lynn@emc.com>
Date: Sat, 6 Jun 2009 07:12:11 +0800
Subject: delete .swp dirty file

---
 recipes/mini-httpd/.mini-httpd_1.19.bb.swp | Bin 12288 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 recipes/mini-httpd/.mini-httpd_1.19.bb.swp

diff --git a/recipes/mini-httpd/.mini-httpd_1.19.bb.swp b/recipes/mini-httpd/.mini-httpd_1.19.bb.swp
deleted file mode 100644
index d384577124..0000000000
Binary files a/recipes/mini-httpd/.mini-httpd_1.19.bb.swp and /dev/null differ
-- 
cgit v1.2.3


From d4dae3f91c9e0e5391ea5e83751ae0d56cbaabe6 Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Sat, 6 Jun 2009 01:55:27 +0200
Subject: zaurus-2.6.inc: FIX - collie doesn't need zaurus-updater in
 EXTRA_IMAGEDEPENDS

---
 conf/machine/include/zaurus-2.6.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index ba923f9515..cdad690545 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -14,6 +14,9 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --f
 
 EXTRA_IMAGEDEPENDS += "zaurus-installer"
 
+# collie is flashed by pressing C+D on power-on
+EXTRA_IMAGEDEPENDS_collie += ""
+
 SERIAL_CONSOLE = "115200 ttyS0"
 SERIAL_CONSOLE_collie = "115200 ttySA0"
 
-- 
cgit v1.2.3


From 1c4705fe4cb9d094d52ef20317bbf229951ee79b Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sat, 6 Jun 2009 09:06:36 +0900
Subject: zaurusd: fix spelling mistake in DESCRIPTION

---
 recipes/zaurusd/zaurusd_svn.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/zaurusd/zaurusd_svn.bb b/recipes/zaurusd/zaurusd_svn.bb
index 6240492a61..574e642b23 100644
--- a/recipes/zaurusd/zaurusd_svn.bb
+++ b/recipes/zaurusd/zaurusd_svn.bb
@@ -1,10 +1,10 @@
-DESCRIPTION = "Daemon to handle device specifc features."
+DESCRIPTION = "Daemon to handle device specific features."
 SECTION = "base"
 LICENSE = "GPL"
 DEPENDS = "tslib"
 RDEPENDS = "procps"
 PV = "0.0+svn${SRCDATE}"
-PR = "r20"
+PR = "r21"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
            file://zaurus-hinge.in \
-- 
cgit v1.2.3


From 75c6eb25b4bd16c0d81ee7af405c8f090db752e1 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 6 Jun 2009 09:59:43 +0200
Subject: swig: update to 1.3.39

---
 conf/checksums.ini                 |  4 ++++
 recipes/swig/swig-native_1.3.39.bb |  7 +++++++
 recipes/swig/swig_1.3.39.bb        | 16 ++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 recipes/swig/swig-native_1.3.39.bb
 create mode 100644 recipes/swig/swig_1.3.39.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 4258191bca..c1f46f5e95 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -22426,6 +22426,10 @@ sha256=c2ad63095e34b4a474e7ff4adb6ea8b7ab238bb5738d00a739102bb8bb71d805
 md5=650c774917be49c526a4f8a3e733c898
 sha256=e7cbddc8c68b1eccba1c82edd5427595397d9a483c8fb1184abc9303afe08045
 
+[http://downloads.sourceforge.net/swig/swig-1.3.39.tar.gz]
+md5=ac201d1b87f8659584534f9540d7ad24
+sha256=bb2d5d9373cf1fe03faaadb02de47af3b058b0300e0f58ece6a7212f0a2b11dc
+
 [http://crosswire.org/ftpmirror/pub/sword/source/v1.5/sword-1.5.10.tar.gz]
 md5=4c920f2a3ee72040df8a8e105ad840df
 sha256=5fb3f030e9395e23a48c02bde6bc81ad42b1c4056a011d9ee15c4c85110eb847
diff --git a/recipes/swig/swig-native_1.3.39.bb b/recipes/swig/swig-native_1.3.39.bb
new file mode 100644
index 0000000000..8210bb9cfb
--- /dev/null
+++ b/recipes/swig/swig-native_1.3.39.bb
@@ -0,0 +1,7 @@
+require swig_${PV}.bb
+inherit native
+
+do_stage() {
+	oe_runmake install PREFIX=${STAGING_BINDIR}/..
+}
+
diff --git a/recipes/swig/swig_1.3.39.bb b/recipes/swig/swig_1.3.39.bb
new file mode 100644
index 0000000000..8a8138c21c
--- /dev/null
+++ b/recipes/swig/swig_1.3.39.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "SWIG - Simplified Wrapper and Interface Generator"
+HOMEPAGE = "http://swig.sourceforge.net/"
+LICENSE = "BSD"
+SECTION = "devel"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/swig/swig-${PV}.tar.gz"
+S = "${WORKDIR}/swig-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-python=${STAGING_BINDIR_NATIVE} --with-swiglibdir=${STAGING_DIR_NATIVE}/swig"
+
+do_configure() {
+	oe_runconf
+}
+
-- 
cgit v1.2.3


From 1237a5635ae6df9f8bb7afbc4ef73485312bca68 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 6 Jun 2009 10:38:28 +0200
Subject: opencv: upstream moved to svn, update recipes

---
 recipes/opencv/opencv-samples_cvs.bb | 34 -----------------
 recipes/opencv/opencv-samples_svn.bb | 33 +++++++++++++++++
 recipes/opencv/opencv_cvs.bb         | 63 --------------------------------
 recipes/opencv/opencv_svn.bb         | 71 ++++++++++++++++++++++++++++++++++++
 4 files changed, 104 insertions(+), 97 deletions(-)
 delete mode 100644 recipes/opencv/opencv-samples_cvs.bb
 create mode 100644 recipes/opencv/opencv-samples_svn.bb
 delete mode 100644 recipes/opencv/opencv_cvs.bb
 create mode 100644 recipes/opencv/opencv_svn.bb

diff --git a/recipes/opencv/opencv-samples_cvs.bb b/recipes/opencv/opencv-samples_cvs.bb
deleted file mode 100644
index 0490f8b015..0000000000
--- a/recipes/opencv/opencv-samples_cvs.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "Opencv : The Open Computer Vision Library"
-HOMEPAGE = "http://sourceforge.net/projects/opencvlibrary"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "GPLv2"
-
-PR = "r2"
-
-DEPENDS = "opencv"
-
-SRC_URI = "cvs://anonymous@opencvlibrary.cvs.sourceforge.net/cvsroot/opencvlibrary;module=opencv \
-"
-SRCDATE = "20081115"
-PV = "1.0.0+cvs${SRCDATE}"
-
-S = "${WORKDIR}/opencv"
-
-do_install() {
-    cd samples/c
-	install -d ${D}/${bindir}
-
-    for i in *.c; do
-        echo "compiling $i"
-        ${CXX} ${CFLAGS} ${LDFLAGS} -ggdb `pkg-config --cflags opencv` -o `basename $i .c` $i `pkg-config --libs opencv`;
-		install -m 0755 `basename $i .c` ${D}/${bindir}
-	done
-    for i in *.cpp; do
-        echo "compiling $i"
-        ${CXX} ${CFLAGS} ${LDFLAGS} -ggdb `pkg-config --cflags opencv` -o `basename $i .cpp` $i `pkg-config --libs opencv`;
-		install -m 0755 `basename $i .cpp` ${D}/${bindir}    
-	done
-}
-
-FILES_${PN} += "${bindir}"
diff --git a/recipes/opencv/opencv-samples_svn.bb b/recipes/opencv/opencv-samples_svn.bb
new file mode 100644
index 0000000000..4eeb39486f
--- /dev/null
+++ b/recipes/opencv/opencv-samples_svn.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Opencv : The Open Computer Vision Library"
+HOMEPAGE = "http://sourceforge.net/projects/opencvlibrary"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+
+DEPENDS = "opencv"
+
+SRC_URI = "svn://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/trunk;module=opencv;proto=https \
+"
+
+SRCREV = "1820"
+PV = "1.0.0+svnr${SRCREV}"
+
+S = "${WORKDIR}/opencv"
+
+do_install() {
+    cd samples/c
+	install -d ${D}/${bindir}
+
+    for i in *.c; do
+        echo "compiling $i"
+        ${CXX} ${CFLAGS} ${LDFLAGS} -ggdb `pkg-config --cflags opencv` -o `basename $i .c` $i `pkg-config --libs opencv` || true
+		install -m 0755 `basename $i .c` ${D}/${bindir} || true
+	done
+    for i in *.cpp; do
+        echo "compiling $i"
+        ${CXX} ${CFLAGS} ${LDFLAGS} -ggdb `pkg-config --cflags opencv` -o `basename $i .cpp` $i `pkg-config --libs opencv` || true
+		install -m 0755 `basename $i .cpp` ${D}/${bindir} || true
+	done
+}
+
+FILES_${PN} += "${bindir}"
diff --git a/recipes/opencv/opencv_cvs.bb b/recipes/opencv/opencv_cvs.bb
deleted file mode 100644
index ade12c10c2..0000000000
--- a/recipes/opencv/opencv_cvs.bb
+++ /dev/null
@@ -1,63 +0,0 @@
-DESCRIPTION = "Opencv : The Open Computer Vision Library"
-HOMEPAGE = "http://sourceforge.net/projects/opencvlibrary"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "GPLv2"
-
-ARM_INSTRUCTION_SET = "arm"
-
-PR = "r1"
-
-DEPENDS = "libtool swig swig-native python jpeg zlib libpng tiff glib-2.0"
-
-SRC_URI = "cvs://anonymous@opencvlibrary.cvs.sourceforge.net/cvsroot/opencvlibrary;module=opencv \
-           file://acinclude.m4"
-
-SRCDATE = "20081115"
-PV = "1.0.0+cvs${SRCDATE}"
-
-S = "${WORKDIR}/opencv"
-
-inherit distutils-base autotools pkgconfig
-
-EXTRA_OECONF = " \
-		--disable-debug \
-		--with-gtk \
-		--enable-apps \
-		--with-python az_python_cspec=${STAGING_INCDIR}/${PYTHON_DIR} \
-		"
-
-export BUILD_SYS
-export HOST_SYS
-export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}"
-
-do_configure_prepend() {
-	cp ${WORKDIR}/acinclude.m4 ${S}
-	sed -i -e /AC_CONFIG_MACRO_DIR/d -e /AZ_PYTHON_CSPEC/d ${S}/configure.in
-}
-
-PACKAGES += "${PN}-apps python-opencv"
-
-python populate_packages_prepend () {
-	cv_libdir = bb.data.expand('${libdir}', d)
-	cv_libdir_dbg = bb.data.expand('${libdir}/.debug', d)
-	do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True)
-	do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
-	do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
-	do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True)
-}
-
-FILES_${PN} = ""
-FILES_${PN}-doc += "${datadir}/opencv/"
-FILES_${PN}-apps = "${bindir}/*"
-FILES_${PN}-dbg += "${libdir}/.debug"
-FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig"
-
-DESCRIPTION_python-opencv = "Python bindings to opencv"
-FILES_python-opencv = "${libdir}/*/site-packages/*"
-RDEPENDS_python-opencv = "python-core"
-
-do_stage() {
-	autotools_stage_all
-}
-
diff --git a/recipes/opencv/opencv_svn.bb b/recipes/opencv/opencv_svn.bb
new file mode 100644
index 0000000000..3bfa33cd9d
--- /dev/null
+++ b/recipes/opencv/opencv_svn.bb
@@ -0,0 +1,71 @@
+DESCRIPTION = "Opencv : The Open Computer Vision Library"
+HOMEPAGE = "http://sourceforge.net/projects/opencvlibrary"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+
+ARM_INSTRUCTION_SET = "arm"
+
+PR = "r1"
+
+DEPENDS = "ffmpeg gtk+ libtool swig swig-native python jpeg zlib libpng tiff glib-2.0"
+
+SRC_URI = "svn://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/trunk;module=opencv;proto=https \
+           file://acinclude.m4"
+
+SRCREV = "1820"
+PV = "1.0.0+svnr${SRCREV}"
+
+S = "${WORKDIR}/opencv"
+
+inherit distutils-base autotools pkgconfig
+
+EXTRA_OECONF = " \
+		--disable-debug \
+		--with-gtk \
+		--without-quicktime \
+		--with-gthread \
+		--without-gstreamer \
+		--with-v4l \
+		--enable-apps \
+		--enable-optimization \
+		--disable-sse \
+		--without-python az_python_cspec=${STAGING_INCDIR}/${PYTHON_DIR} \
+		"
+
+export BUILD_SYS
+export HOST_SYS
+export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}"
+
+do_configure_prepend() {
+	cp ${WORKDIR}/acinclude.m4 ${S}
+	sed -i -e /AC_CONFIG_MACRO_DIR/d -e /AZ_PYTHON_CSPEC/d ${S}/configure.in
+}
+
+TARGET_CC_ARCH += "-I${S}/include "
+
+PACKAGES += "${PN}-apps python-opencv"
+
+python populate_packages_prepend () {
+	cv_libdir = bb.data.expand('${libdir}', d)
+	cv_libdir_dbg = bb.data.expand('${libdir}/.debug', d)
+	do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True)
+	do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
+	do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
+	do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True)
+}
+
+FILES_${PN} = ""
+FILES_${PN}-doc += "${datadir}/opencv/"
+FILES_${PN}-apps = "${bindir}/*"
+FILES_${PN}-dbg += "${libdir}/.debug"
+FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig"
+
+DESCRIPTION_python-opencv = "Python bindings to opencv"
+FILES_python-opencv = "${libdir}/*/site-packages/*"
+RDEPENDS_python-opencv = "python-core"
+
+do_stage() {
+	autotools_stage_all
+}
+
-- 
cgit v1.2.3


From 02ce57eaf0cbc7c659e78a5591cf503f9b286791 Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Sat, 6 Jun 2009 10:11:23 +0100
Subject: micro: eliminate some bloat Acked-by: Chris Larson

---
 conf/distro/micro.conf | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
index bf4e5e1a82..a6fb64e4d8 100644
--- a/conf/distro/micro.conf
+++ b/conf/distro/micro.conf
@@ -98,3 +98,12 @@ USE_NLS_gcc-cross = "no"
 # Disable binary locale generation
 ENABLE_BINARY_LOCALE_GENERATION = "0"
 
+# Don't install useless symlinks to libraries
+PACKAGE_SNAP_LIB_SYMLINKS = "1"
+
+# Collapse /usr into /
+layout_prefix = ""
+layout_exec_prefix = ""
+
+# Don't install ldconfig and associated gubbins
+USE_LDCONFIG = "0"
-- 
cgit v1.2.3


From ef47aa19f38d0a17d7c8e1e19b168097e94c2588 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sat, 6 Jun 2009 14:28:08 +0900
Subject: zaurus-installer: add collie support.  properly unbreaks collie image
 build. * this effectively reverts d4dae3f91c9e0e5391ea5e83751ae0d56cbaabe6  
 which was not the proper way to do it.  Zaurus machine config probably  
 still needs some more TLC.

---
 conf/machine/include/zaurus-2.6.inc        |  3 ---
 recipes/zaurus-updater/zaurus-installer.bb | 10 ++++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index cdad690545..ba923f9515 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -14,9 +14,6 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --f
 
 EXTRA_IMAGEDEPENDS += "zaurus-installer"
 
-# collie is flashed by pressing C+D on power-on
-EXTRA_IMAGEDEPENDS_collie += ""
-
 SERIAL_CONSOLE = "115200 ttyS0"
 SERIAL_CONSOLE_collie = "115200 ttySA0"
 
diff --git a/recipes/zaurus-updater/zaurus-installer.bb b/recipes/zaurus-updater/zaurus-installer.bb
index 098110b969..70dca30031 100644
--- a/recipes/zaurus-updater/zaurus-installer.bb
+++ b/recipes/zaurus-updater/zaurus-installer.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "Installkit for kexecboot-kernel"
-DEPENDS = "zaurus-updater linux-kexecboot"
-PR = "r0"
+DEPENDS = "${@base_conditional('MACHINE', 'collie', 'linux-kexecboot', 'zaurus-updater linux-kexecboot', d)}"
+PR = "r1"
 
 PACKAGES = ""
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = '(poodle|c7x0|spitz|akita|tosa)'
+COMPATIBLE_MACHINE = '(collie|poodle|c7x0|spitz|akita|tosa)'
 
 S = "${WORKDIR}"
 
@@ -22,7 +22,9 @@ do_deploy() {
 
 	[ -f "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin" ] && cp ${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin installkit-${MACHINE}/${KERNEL_IMAGETYPE}
 
-	cp updater.sh.${MACHINE} installkit-${MACHINE}/updater.sh
+	if [ ! "${MACHINE}" = "collie" ]; then
+		cp updater.sh.${MACHINE} installkit-${MACHINE}/updater.sh
+	fi
  
 	tar czf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz installkit-${MACHINE}/
 	md5sum ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz > ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz.md5
-- 
cgit v1.2.3


From 9ff15b96b31106c4a315106801fe6534905b5948 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sat, 6 Jun 2009 20:04:01 +0900
Subject: util-linux-ng: add e2fsprogs-libs to DEPENDS.

---
 recipes/util-linux-ng/util-linux-ng.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index 39100b0a75..7e949d1615 100644
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Util-linux-ng is a suite of essential utilities for any Linux system."
 SECTION = "base"
 LICENSE = "GPL"
-DEPENDS = "udev zlib ncurses virtual/libintl"
+DEPENDS = "udev zlib ncurses virtual/libintl e2fsprogs-libs"
 
 inherit autotools_stage
 AUTOTOOLS_STAGE_PKGCONFIG = "1"
-- 
cgit v1.2.3


From 025baf77e4417030b789b800f15b4ed23eb547a2 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 6 Jun 2009 15:17:30 +0200
Subject: task-beagleboard-demo: include gnome-bluetooth

---
 recipes/tasks/task-beagleboard-demo.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes/tasks/task-beagleboard-demo.bb b/recipes/tasks/task-beagleboard-demo.bb
index 091832fc2c..1d5f3f8305 100644
--- a/recipes/tasks/task-beagleboard-demo.bb
+++ b/recipes/tasks/task-beagleboard-demo.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task for Beagleboard-demo-image"
 
-PR = "r8"
+PR = "r9"
 
 inherit task 
 
@@ -36,6 +36,7 @@ RDEPENDS_${PN} = "\
 	openssh-scp openssh-ssh \
 	picodlp-control \
 	connman-gnome \
+	gnome-bluetooth \
 "
 
 # Install all kernel modules
-- 
cgit v1.2.3


From dda533d5b43b5d3a0ecda284c73a55c654dc28ba Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 6 Jun 2009 15:18:14 +0200
Subject: angstrom feed builder: add fldigi and xf86-video-sisusb

---
 contrib/angstrom/build-feeds.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index a3fe9b9e6b..49091b7bfd 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -122,6 +122,7 @@ do
                       findutils \
                       firefox \
                       fish \
+                      fldigi \
                       flex \
                       flite \
                       frameworkd \
@@ -326,6 +327,7 @@ do
                       xf86-input-tslib \
                       xf86-video-ati \
                       xf86-video-fbdev \
+                      xf86-video-sisusb \
                       xf86-video-vesa \
                       xfce-mcs-manager
                       xfce-mcs-manager \
-- 
cgit v1.2.3


From 4e9f655e60a5190cce98981328b725965ba57ede Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 6 Jun 2009 15:29:59 +0200
Subject: angstrom 2009.X: prefer a newer usbutils

---
 conf/distro/include/angstrom-2008-preferred-versions.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 2703e50c8d..28de7667d5 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -34,6 +34,7 @@ PREFERRED_VERSION_tiff 		= "3.8.2+4.0.0beta2"
 PREFERRED_VERSION_udev 		= "141"
 UDEV_GE_141 = "1"
 
+PREFERRED_VERSION_usbutils = "0.82"
 PREFERRED_VERSION_util-macros-native = "1.2.1"
 PREFERRED_VERSION_util-macros = "1.2.1"
 PREFERRED_VERSION_wpa-supplicant = "0.6.7"
-- 
cgit v1.2.3


From 3d0356a80bd04d073e212412fe4f54b487714879 Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan@datenfreihafen.org>
Date: Fri, 5 Jun 2009 23:46:47 +0200
Subject: libefso: Sync package version

---
 recipes/efl1/libefso_svn.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/recipes/efl1/libefso_svn.bb b/recipes/efl1/libefso_svn.bb
index 20d520cba5..276cd100ef 100644
--- a/recipes/efl1/libefso_svn.bb
+++ b/recipes/efl1/libefso_svn.bb
@@ -2,8 +2,7 @@ DESCRIPTION = "EFL FSO wrapper library"
 SECTION = "e/libs"
 LICENSE = "GPLv2"
 DEPENDS = "ecore edbus"
-PV = "0.0.0+svnr${SRCREV}"
-PR = "r2"
+PV = "0.0.1+svnr${SRCREV}"
 
 SRC_URI = "svn://svn.om.vptt.ch/trunk/;proto=http;module=libefso"
 S = "${WORKDIR}/libefso"
-- 
cgit v1.2.3


From 9828546472d9dd95cea089e481a765c7e9a353d2 Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan@datenfreihafen.org>
Date: Fri, 5 Jun 2009 23:47:07 +0200
Subject: essential-dialer: Sync package version

---
 recipes/e17/essential-dialer_svn.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/recipes/e17/essential-dialer_svn.bb b/recipes/e17/essential-dialer_svn.bb
index e0c81293e9..bd16282b41 100644
--- a/recipes/e17/essential-dialer_svn.bb
+++ b/recipes/e17/essential-dialer_svn.bb
@@ -2,8 +2,7 @@ DESCRIPTION = "Simple Dialer based on Elementary and FSO"
 SECTION = "x11"
 LICENSE = "GPLv2"
 DEPENDS = "ecore edbus elementary libefso"
-PV = "0.0.0+svnr${SRCREV}"
-PR = "r2"
+PV = "0.1.0.0+svnr${SRCREV}"
 
 SRC_URI = "svn://svn.om.vptt.ch/trunk/;proto=http;module=essential-dialer"
 S = "${WORKDIR}/essential-dialer"
-- 
cgit v1.2.3


From d920917b6ab36583c634160a5faee057abd87a6a Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan@datenfreihafen.org>
Date: Sat, 6 Jun 2009 23:50:16 +0200
Subject: sane-srcrevs: Update and add more swisscom revisions

---
 conf/distro/include/sane-srcrevs.inc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 7b5a93a8c8..08d33869e6 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -19,6 +19,7 @@ SRCREV_pn-assassin ?= "268"
 SRCREV_pn-assassin-thumbnail ?= "4690"
 SRCREV_pn-bfin-uclibc ?= "1857"
 SRCREV_pn-bootchart-lite ?= "4"
+SRCREV_pn-bubble-keyboard ?= "194"
 SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
 SRCREV_pn-clutter-box2d ?= "3197"
 SRCREV_pn-clutter-cairo ?= "3210"
@@ -42,7 +43,7 @@ SRCREV_pn-eds-dbus ?= "736"
 SRCREV_pn-eglibc ?= "8139"
 SRCREV_pn-eglibc-initial ?= "8139"
 SRCREV_pn-enlazar ?= "37"
-SRCREV_pn-essential-dialer ?= "111"
+SRCREV_pn-essential-dialer ?= "194"
 SRCREV_pn-exalt ?= "79"
 SRCREV_pn-exalt-daemon ?= "78"
 SRCREV_pn-exalt-module ?= "78"
@@ -81,17 +82,19 @@ SRCREV_pn-gpe-contacts ?= "9312"
 SRCREV_pn-gpe-gallery ?= "9376"
 SRCREV_pn-gpe-mini-browser2 ?= "9900"
 SRCREV_pn-gpe-sketchbook ?= "9547"
+SRCREV_pn-gridpad ?= "194"
 SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
 SRCREV_pn-illume-theme-asu ?= "4881"
 SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181bc5"
+SRCREV_pn-intuition ?= "194"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
 SRCREV_pn-libeflvala ?= "676c901eb57f653231fb4c9eeabc2ed3d1b0c072"
-SRCREV_pn-libefso ?= "111"
+SRCREV_pn-libefso ?= "194"
 SRCREV_pn-libexalt ?= "78"
 SRCREV_pn-libexalt-dbus ?= "76"
 SRCREV_pn-libfakekey ?= "1455"
-- 
cgit v1.2.3


From 5519930151de423b3474dc4418bd350d91cc0f49 Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan@datenfreihafen.org>
Date: Fri, 5 Jun 2009 23:49:39 +0200
Subject: bubble-keyboard: Add swisscoms bubble-keyboard prototyp

---
 recipes/e17/bubble-keyboard_svn.bb | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 recipes/e17/bubble-keyboard_svn.bb

diff --git a/recipes/e17/bubble-keyboard_svn.bb b/recipes/e17/bubble-keyboard_svn.bb
new file mode 100644
index 0000000000..c47c8fb12d
--- /dev/null
+++ b/recipes/e17/bubble-keyboard_svn.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Simple dialpad keyboard"
+SECTION = "x11"
+LICENSE = "GPLv2"
+DEPENDS = "ecore evas edje libfakekey"
+PV = "0.1.4+svnr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "svn://svn.om.vptt.ch/trunk/;proto=http;module=bubble-keyboard"
+S = "${WORKDIR}/bubble-keyboard"
+
+inherit autotools pkgconfig
-- 
cgit v1.2.3


From a12c43de7e2f67c46110449e33596d5eacf2ea89 Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan@datenfreihafen.org>
Date: Fri, 5 Jun 2009 23:49:57 +0200
Subject: gridpad: Add swisscoms gridpad.

---
 recipes/e17/gridpad_svn.bb | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 recipes/e17/gridpad_svn.bb

diff --git a/recipes/e17/gridpad_svn.bb b/recipes/e17/gridpad_svn.bb
new file mode 100644
index 0000000000..40dfa11da5
--- /dev/null
+++ b/recipes/e17/gridpad_svn.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Gridpad handstroke recognition"
+SECTION = "x11"
+LICENSE = "GPLv2"
+DEPENDS = "ecore evas edje libfakekey"
+PV = "2.0+svnr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "svn://svn.om.vptt.ch/trunk/;proto=http;module=GridPad"
+S = "${WORKDIR}/GridPad"
+
+inherit autotools pkgconfig
-- 
cgit v1.2.3


From e31843297cc4301e3d3ca01d7ae7d389f8be4560 Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan@datenfreihafen.org>
Date: Fri, 5 Jun 2009 23:50:15 +0200
Subject: intuition: Add swisscoms intuition prototype.

---
 recipes/e17/intuition_svn.bb | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 recipes/e17/intuition_svn.bb

diff --git a/recipes/e17/intuition_svn.bb b/recipes/e17/intuition_svn.bb
new file mode 100644
index 0000000000..d40dae9f43
--- /dev/null
+++ b/recipes/e17/intuition_svn.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Intuition a prototype context dependent mobile search engine"
+SECTION = "x11"
+LICENSE = "GPLv2"
+DEPENDS = "elementary sqlite"
+PV = "0.2.0+svnr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "svn://svn.om.vptt.ch/trunk/;proto=http;module=intuition"
+S = "${WORKDIR}/intuition"
+
+inherit autotools pkgconfig
-- 
cgit v1.2.3


From f999f6777d4dcbd5a65a96e7cd04a72dff5d2ef1 Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Sun, 7 Jun 2009 00:27:40 +0200
Subject: xserver-kdrive_1.4.0.90: fix AC_SUBST in configure.ac  - AC_SUBST is
 documented to only take one variable  - was breaking with autotools_2.63  -
 bump PR

---
 .../xserver-kdrive-1.4.0.90/split_multiple_AC_SUBST.patch | 15 +++++++++++++++
 recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb           |  3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 recipes/xorg-xserver/xserver-kdrive-1.4.0.90/split_multiple_AC_SUBST.patch

diff --git a/recipes/xorg-xserver/xserver-kdrive-1.4.0.90/split_multiple_AC_SUBST.patch b/recipes/xorg-xserver/xserver-kdrive-1.4.0.90/split_multiple_AC_SUBST.patch
new file mode 100644
index 0000000000..110a2a5df1
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive-1.4.0.90/split_multiple_AC_SUBST.patch
@@ -0,0 +1,15 @@
+Index: xorg-server-1.4.0.90/configure.ac
+===================================================================
+--- xorg-server-1.4.0.90.orig/configure.ac	2007-12-12 20:57:37.000000000 +0100
++++ xorg-server-1.4.0.90/configure.ac	2009-06-06 23:47:54.000000000 +0200
+@@ -1962,7 +1962,9 @@
+ 
+ AC_SUBST([DIX_CFLAGS])
+ 
+-AC_SUBST([libdir exec_prefix prefix])
++AC_SUBST([libdir])
++AC_SUBST([exec_prefix])
++AC_SUBST([prefix])
+ 
+ # Man page sections - used in config utils & generating man pages
+ XORG_MANPAGE_SECTIONS
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb
index fe0335d2cd..0b347aad7b 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb
@@ -4,7 +4,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman"
 RDEPENDS += "hal"
 
 PE = "1"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
@@ -26,6 +26,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	file://pkgconfig_fix.patch;patch=1 \
         file://no_xkb.patch;patch=1;pnum=0 \
 	file://xorg-1.4-kdrive-rotation.patch;patch=1 \
+	file://split_multiple_AC_SUBST.patch;patch=1 \
         "
 
 S = "${WORKDIR}/xorg-server-${PV}"
-- 
cgit v1.2.3


From 595a0174db40089ad992bb054c6e694957f35042 Mon Sep 17 00:00:00 2001
From: Andrea Adami <andrea.adami@gmail.com>
Date: Sun, 7 Jun 2009 00:37:02 +0200
Subject: xserver-kdrive-imageon_1.2.0: fix AC_SUBST in configure.ac  -
 AC_SUBST is documented to only take one variable  - was breaking with
 autotools_2.63  - bump PR

---
 .../xserver-kdrive-1.2.0/split_multiple_AC_SUBST.patch    | 15 +++++++++++++++
 recipes/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb      |  5 +++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 recipes/xorg-xserver/xserver-kdrive-1.2.0/split_multiple_AC_SUBST.patch

diff --git a/recipes/xorg-xserver/xserver-kdrive-1.2.0/split_multiple_AC_SUBST.patch b/recipes/xorg-xserver/xserver-kdrive-1.2.0/split_multiple_AC_SUBST.patch
new file mode 100644
index 0000000000..dfbe730613
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive-1.2.0/split_multiple_AC_SUBST.patch
@@ -0,0 +1,15 @@
+Index: xorg-server-1.2.0/configure.ac
+===================================================================
+--- xorg-server-1.2.0.orig/configure.ac	2007-12-12 20:57:37.000000000 +0100
++++ xorg-server-1.2.0/configure.ac	2009-06-06 23:47:54.000000000 +0200
+@@ -1667,7 +1667,9 @@
+ DIX_CFLAGS="-DHAVE_DIX_CONFIG_H"
+ AC_SUBST([DIX_CFLAGS])
+ 
+-AC_SUBST([libdir exec_prefix prefix])
++AC_SUBST([libdir])
++AC_SUBST([exec_prefix])
++AC_SUBST([prefix])
+ 
+ # Man page sections - used in config utils & generating man pages
+ XORG_MANPAGE_SECTIONS
diff --git a/recipes/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb b/recipes/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
index 3a042db0d1..18b85fdcb0 100644
--- a/recipes/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
+++ b/recipes/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
@@ -7,7 +7,7 @@ DEPENDS += "libxkbfile libxcalibrate"
 PROVIDES = "virtual/xserver"
 
 PE = "1"
-PR = "r6"
+PR = "r7"
 
 FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-${PV}:${FILE_DIRNAME}/xserver-kdrive:${FILE_DIRNAME}/files"
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
@@ -22,7 +22,8 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
         file://xcalibrate_coords.patch;patch=1 \
         file://enable-builtin-fonts.patch;patch=1 \
 	file://fix-picturestr-include-order.patch;patch=1 \
-        "
+	file://split_multiple_AC_SUBST.patch;patch=1 \
+	"
        
 S = "${WORKDIR}/xorg-server-${PV}"
 
-- 
cgit v1.2.3


From ead01d1ba1b934b89179a9c95a7613e48207429f Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sun, 7 Jun 2009 10:43:33 +0900
Subject: xorg-xserver: push a couple of patches upstream.

---
 recipes/xorg-xserver/files/xorg-avr32-support.diff           | 2 ++
 recipes/xorg-xserver/xserver-kdrive-1.5.3/drmfix.patch       | 2 ++
 recipes/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch       | 2 ++
 recipes/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch     | 2 ++
 recipes/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch         | 2 ++
 recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch           | 2 ++
 recipes/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch         | 2 ++
 recipes/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch         | 2 ++
 recipes/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch         | 2 ++
 recipes/xorg-xserver/xserver-xorg/dri.patch                  | 2 ++
 recipes/xorg-xserver/xserver-xorg/drmfix.patch               | 2 ++
 recipes/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch | 2 ++
 recipes/xorg-xserver/xserver-xorg/no-screen-blanking.patch   | 2 ++
 13 files changed, 26 insertions(+)

diff --git a/recipes/xorg-xserver/files/xorg-avr32-support.diff b/recipes/xorg-xserver/files/xorg-avr32-support.diff
index dd7d379010..68320482b9 100644
--- a/recipes/xorg-xserver/files/xorg-avr32-support.diff
+++ b/recipes/xorg-xserver/files/xorg-avr32-support.diff
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22129
+
 --- /tmp/servermd.h	2007-09-30 17:27:22.310911628 +0200
 +++ xorg-server-1.4/include/servermd.h	2007-09-30 17:28:25.297799199 +0200
 @@ -130,6 +130,16 @@
diff --git a/recipes/xorg-xserver/xserver-kdrive-1.5.3/drmfix.patch b/recipes/xorg-xserver/xserver-kdrive-1.5.3/drmfix.patch
index e0f633bc24..3a010dd4a9 100644
--- a/recipes/xorg-xserver/xserver-kdrive-1.5.3/drmfix.patch
+++ b/recipes/xorg-xserver/xserver-kdrive-1.5.3/drmfix.patch
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+
 Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
 ===================================================================
 --- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am	2008-09-23 19:24:59.000000000 +0100
diff --git a/recipes/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch
index 96924484af..6fb92e255f 100644
--- a/recipes/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch
+++ b/recipes/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+
 --- xorg-server-1.3.0.0.orig/hw/xfree86/os-support/linux/Makefile.am
 +++ xorg-server-1.3.0.0/hw/xfree86/os-support/linux/Makefile.am
 @@ -38,7 +38,7 @@
diff --git a/recipes/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch b/recipes/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch
index 6955727405..ba7d26f7cd 100644
--- a/recipes/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch
+++ b/recipes/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22133
+
 --- xorg-server-1.3.0.0/render/glyphstr.h~	2006-09-18 03:04:18.000000000 -0300
 +++ xorg-server-1.3.0.0/render/glyphstr.h	2008-02-03 22:14:23.187159732 -0200
 @@ -25,6 +25,7 @@
diff --git a/recipes/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch
index a62a767f23..5dc896e98f 100644
--- a/recipes/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch
+++ b/recipes/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+
 Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am
 ===================================================================
 --- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am	2007-08-23 21:04:53.000000000 +0200
diff --git a/recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch
index a62a767f23..5dc896e98f 100644
--- a/recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch
+++ b/recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+
 Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am
 ===================================================================
 --- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am	2007-08-23 21:04:53.000000000 +0200
diff --git a/recipes/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch
index e0f633bc24..3a010dd4a9 100644
--- a/recipes/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch
+++ b/recipes/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+
 Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
 ===================================================================
 --- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am	2008-09-23 19:24:59.000000000 +0100
diff --git a/recipes/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch
index e0f633bc24..3a010dd4a9 100644
--- a/recipes/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch
+++ b/recipes/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+
 Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
 ===================================================================
 --- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am	2008-09-23 19:24:59.000000000 +0100
diff --git a/recipes/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch
index e0f633bc24..3a010dd4a9 100644
--- a/recipes/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch
+++ b/recipes/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+
 Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am
 ===================================================================
 --- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am	2008-09-23 19:24:59.000000000 +0100
diff --git a/recipes/xorg-xserver/xserver-xorg/dri.patch b/recipes/xorg-xserver/xserver-xorg/dri.patch
index 37d0407fe4..337a1ddfbf 100644
--- a/recipes/xorg-xserver/xserver-xorg/dri.patch
+++ b/recipes/xorg-xserver/xserver-xorg/dri.patch
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22130
+
 --- xc/extras/drm/shared/drm.h.old	2004-09-14 21:42:45.000000000 +0100
 +++ xc/extras/drm/shared/drm.h	2004-09-14 21:42:47.000000000 +0100
 @@ -38,7 +38,6 @@
diff --git a/recipes/xorg-xserver/xserver-xorg/drmfix.patch b/recipes/xorg-xserver/xserver-xorg/drmfix.patch
index 04b0c1ae4f..a64778fb3a 100644
--- a/recipes/xorg-xserver/xserver-xorg/drmfix.patch
+++ b/recipes/xorg-xserver/xserver-xorg/drmfix.patch
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22131
+
 Index: xorg-server-X11R7.0-1.0.1/hw/xfree86/os-support/linux/Makefile.am
 ===================================================================
 --- xorg-server-X11R7.0-1.0.1.orig/hw/xfree86/os-support/linux/Makefile.am
diff --git a/recipes/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch b/recipes/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch
index fbade4319a..7cd5f78073 100644
--- a/recipes/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch
+++ b/recipes/xorg-xserver/xserver-xorg/miext_layer_shadow_h.patch
@@ -1,3 +1,5 @@
+upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22132
+
 --- temp/xorg-server-X11R7.0-1.0.1/miext/layer/Makefile.am	2005-12-01 23:02:44.000000000 -0700
 +++ xorg-server-X11R7.0-1.0.1/miext/layer/Makefile.am	2006-04-18 23:16:04.315823560 -0600
 @@ -2,7 +2,7 @@
diff --git a/recipes/xorg-xserver/xserver-xorg/no-screen-blanking.patch b/recipes/xorg-xserver/xserver-xorg/no-screen-blanking.patch
index 021ba6cded..cd7cbe371c 100644
--- a/recipes/xorg-xserver/xserver-xorg/no-screen-blanking.patch
+++ b/recipes/xorg-xserver/xserver-xorg/no-screen-blanking.patch
@@ -1,3 +1,5 @@
+upstream: not applicable to upstream
+
 --- xserver/include/site.h-orig	2006-11-02 10:37:14.000000000 +0000
 +++ xserver/include/site.h	2006-11-02 10:37:14.000000000 +0000
 @@ -117,8 +117,8 @@
-- 
cgit v1.2.3


From 0ce059dec3906b8a7bb973bcc42f54ce33d56484 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sun, 7 Jun 2009 10:44:07 +0200
Subject: x11vnc: add 0.9.7

---
 conf/checksums.ini          |  4 ++++
 recipes/vnc/x11vnc_0.9.7.bb | 10 ++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 recipes/vnc/x11vnc_0.9.7.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index c1f46f5e95..754b80c086 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -24538,6 +24538,10 @@ sha256=e3f8a224af7a8df4defc2c0b3567e1a697486443a2e073fa56122c4a4e439d65
 md5=0683a56108ca6d0c4329c7b9a5b7fbde
 sha256=e3f8a224af7a8df4defc2c0b3567e1a697486443a2e073fa56122c4a4e439d65
 
+[http://downloads.sourceforge.net/libvncserver/x11vnc-0.9.7.tar.gz]
+md5=30a167577f657909b3355421e14e2ddb
+sha256=fd21224ec09ca5294ba0627433e4d2cb726d389c7818d162f152374e6d693342
+
 [http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20090127-2245.tar.bz2]
 md5=25fcaa86a53333d416d5e837fb47ba7d
 sha256=18b38aff8e019f35bfee810831535685e69dcf91283e50bc62efa82e3a8dbc21
diff --git a/recipes/vnc/x11vnc_0.9.7.bb b/recipes/vnc/x11vnc_0.9.7.bb
new file mode 100644
index 0000000000..f3d706be5b
--- /dev/null
+++ b/recipes/vnc/x11vnc_0.9.7.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Export your X session on-the-fly via VNC"
+HOMEPAGE = "http://www.karlrunge.com/x11vnc/"
+AUTHOR = "Karl Runge"
+SECTION = "x11/utils"
+LICENSE = "GPL"
+DEPENDS = "openssl virtual/libx11 libxtst libxext avahi jpeg zlib"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz"
+
+inherit autotools
-- 
cgit v1.2.3