[PATCH 01/27] onig: Use "foreign" automake strictness

[PATCH 01/27] onig: Use "foreign" automake strictness

[Richard Purdie]

---
 meta-oe/recipes-support/onig/files/configure.patch | 13 +++++++++++++
 meta-oe/recipes-support/onig/onig_5.9.3.bb         |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-support/onig/files/configure.patch

diff --git a/meta-oe/recipes-support/onig/files/configure.patch b/meta-oe/recipes-support/onig/files/configure.patch
new file mode 100644
index 0000000..5fa700f
--- /dev/null
+++ b/meta-oe/recipes-support/onig/files/configure.patch
@@ -0,0 +1,13 @@
+Index: onig-5.9.3/configure.in
+===================================================================
+--- onig-5.9.3.orig/configure.in	2012-10-26 07:06:14.000000000 +0000
++++ onig-5.9.3/configure.in	2014-07-18 08:02:52.701574484 +0000
+@@ -3,7 +3,7 @@
+ 
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE([foreign])
+ AC_CONFIG_HEADER(config.h)
+ 
+ 
diff --git a/meta-oe/recipes-support/onig/onig_5.9.3.bb b/meta-oe/recipes-support/onig/onig_5.9.3.bb
index f67ceed..22db78a 100644
--- a/meta-oe/recipes-support/onig/onig_5.9.3.bb
+++ b/meta-oe/recipes-support/onig/onig_5.9.3.bb
@@ -6,7 +6,8 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0d4861b5bc0c392a5aa90d9d76ebd86f"
 
 SRC_URI = "http://www.geocities.jp/kosako3/oniguruma/archive/onig-${PV}.tar.gz \
-           file://do-not-use-system-headers.patch"
+           file://do-not-use-system-headers.patch \
+           file://configure.patch"
 
 SRC_URI[md5sum] = "0d4eda2066d3c92970842a6790ce897a"
 SRC_URI[sha256sum] = "c3bba66b2a84760e6582c40881db97c839d94f327870009724bb8b4d0c051f2a"
-- 
2.0.2

[PATCH 02/27] libol: Use "foreign" automake strictness

[Richard Purdie]

---
 meta-oe/recipes-support/libol/libol/configure.patch | 14 ++++++++++++++
 meta-oe/recipes-support/libol/libol_0.3.18.bb       |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-support/libol/libol/configure.patch

diff --git a/meta-oe/recipes-support/libol/libol/configure.patch b/meta-oe/recipes-support/libol/libol/configure.patch
new file mode 100644
index 0000000..87695fb
--- /dev/null
+++ b/meta-oe/recipes-support/libol/libol/configure.patch
@@ -0,0 +1,14 @@
+Index: libol-0.3.18/configure.in
+===================================================================
+--- libol-0.3.18.orig/configure.in	2006-03-27 14:44:52.000000000 +0000
++++ libol-0.3.18/configure.in	2014-07-18 07:05:56.029481372 +0000
+@@ -1,7 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+-AC_INIT(src/abstract_io.c)
++AC_INIT(libol, "0.3.18")
+ 
+-AM_INIT_AUTOMAKE(libol, "0.3.18", 1)
++AM_INIT_AUTOMAKE([foreign])
+ if test -n "$SNAPSHOT_VERSION"; then
+         VERSION=$VERSION+$SNAPSHOT_VERSION
+ fi
diff --git a/meta-oe/recipes-support/libol/libol_0.3.18.bb b/meta-oe/recipes-support/libol/libol_0.3.18.bb
index d2d7c26..c31f483 100644
--- a/meta-oe/recipes-support/libol/libol_0.3.18.bb
+++ b/meta-oe/recipes-support/libol/libol_0.3.18.bb
@@ -3,7 +3,8 @@ SECTION = "libs"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
 
-SRC_URI = "http://www.balabit.com/downloads/files/libol/0.3/${BP}.tar.gz"
+SRC_URI = "http://www.balabit.com/downloads/files/libol/0.3/${BP}.tar.gz \
+           file://configure.patch"
 SRC_URI[md5sum] = "cbadf4b7ea276dfa85acc38a1cc5ff17"
 SRC_URI[sha256sum] = "9de3bf13297ff882e02a1e6e5f6bf760a544aff92a9d8a1cf4328a32005cefe7"
 
-- 
2.0.2

[PATCH 03/27] usbpath: Use "foreign" automake strictness

[Richard Purdie]

---
 meta-oe/recipes-support/usbpath/usbpath/configure.patch | 11 +++++++++++
 meta-oe/recipes-support/usbpath/usbpath_svn.bb          |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-support/usbpath/usbpath/configure.patch

diff --git a/meta-oe/recipes-support/usbpath/usbpath/configure.patch b/meta-oe/recipes-support/usbpath/usbpath/configure.patch
new file mode 100644
index 0000000..271e6a5
--- /dev/null
+++ b/meta-oe/recipes-support/usbpath/usbpath/configure.patch
@@ -0,0 +1,11 @@
+Index: usbpath/configure.ac
+===================================================================
+--- usbpath.orig/configure.ac	2014-07-17 20:40:26.000000000 +0000
++++ usbpath/configure.ac	2014-07-18 07:01:40.933474420 +0000
+@@ -1,5 +1,5 @@
+ AC_INIT([usbpath],[0.1])
+-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
++AM_INIT_AUTOMAKE([foreign])
+ 
+ AC_PROG_CC
+ AC_PROG_RANLIB
diff --git a/meta-oe/recipes-support/usbpath/usbpath_svn.bb b/meta-oe/recipes-support/usbpath/usbpath_svn.bb
index 0ec9324..134192b 100644
--- a/meta-oe/recipes-support/usbpath/usbpath_svn.bb
+++ b/meta-oe/recipes-support/usbpath/usbpath_svn.bb
@@ -11,7 +11,8 @@ BBCLASSEXTEND = "native"
 SRCREV = "3172"
 PV = "0.0+svnr${SRCPV}"
 
-SRC_URI = "svn://svn.openmoko.org/trunk/src/host;module=usbpath;protocol=http"
+SRC_URI = "svn://svn.openmoko.org/trunk/src/host;module=usbpath;protocol=http \
+           file://configure.patch"
 
 S = "${WORKDIR}/usbpath"
 
-- 
2.0.2

[PATCH 04/27] pidgin-otr: Add missing intltool-native DEPENDS

[Richard Purdie]

---
 meta-oe/recipes-support/pidgin/pidgin-otr_4.0.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.0.bb b/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.0.bb
index 94ab363..18dbe09 100644
--- a/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.0.bb
+++ b/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.0.bb
@@ -2,7 +2,7 @@ SUMMARY = "(OTR) Messaging allows you to have private conversations over instant
 HOMEPAGE = "http://www.cypherpunks.ca/otr/"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=92fe174bad6da3763f6e9e9eaff6df24"
-DEPENDS = "libgcrypt libotr pidgin"
+DEPENDS = "libgcrypt libotr pidgin intltool-native"
 
 SRC_URI = "http://www.cypherpunks.ca/otr/${BP}.tar.gz \
            file://ignore_extra-portability_warnings.patch \
-- 
2.0.2

[PATCH 05/27] dejagnu: Use "foreign" automake strictness

[Richard Purdie]

---
 .../dejagnu/dejagnu/configure.patch                | 45 ++++++++++++++++++++++
 meta-oe/recipes-devtools/dejagnu/dejagnu_1.4.4.bb  |  3 +-
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-devtools/dejagnu/dejagnu/configure.patch

diff --git a/meta-oe/recipes-devtools/dejagnu/dejagnu/configure.patch b/meta-oe/recipes-devtools/dejagnu/dejagnu/configure.patch
new file mode 100644
index 0000000..2eb8af7
--- /dev/null
+++ b/meta-oe/recipes-devtools/dejagnu/dejagnu/configure.patch
@@ -0,0 +1,45 @@
+Index: dejagnu-1.4.4/configure.in
+===================================================================
+--- dejagnu-1.4.4.orig/configure.in	2014-07-18 07:05:49.997481207 +0000
++++ dejagnu-1.4.4/configure.in	2014-07-18 07:05:50.085481210 +0000
+@@ -1,10 +1,10 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_PREREQ(2.13)
+-AC_INIT(runtest.exp)
++AC_INIT(dejagnu, 1.4.4)
+ dnl AC_CONFIG_AUX_DIR(..)
+ 
+ dnl These are required by automake
+-AM_INIT_AUTOMAKE(dejagnu, 1.4.4)
++AM_INIT_AUTOMAKE([foreign])
+ AM_MAINTAINER_MODE
+ AC_PROG_MAKE_SET
+ 
+Index: dejagnu-1.4.4/example/calc/configure.in
+===================================================================
+--- dejagnu-1.4.4.orig/example/calc/configure.in	2002-04-26 03:32:40.000000000 +0000
++++ dejagnu-1.4.4/example/calc/configure.in	2014-07-18 07:11:59.085491266 +0000
+@@ -1,8 +1,8 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_PREREQ(2.5)
+-AC_INIT(calc.c)
++AC_INIT(calc, 1.1)
+ AM_CONFIG_HEADER(calc.h)
+-AM_INIT_AUTOMAKE(calc, 1.1)
++AM_INIT_AUTOMAKE([foreign])
+ 
+ AC_PROG_CC
+ AC_PROG_INSTALL
+Index: dejagnu-1.4.4/example/hello/configure.in
+===================================================================
+--- dejagnu-1.4.4.orig/example/hello/configure.in	2002-08-31 05:46:16.000000000 +0000
++++ dejagnu-1.4.4/example/hello/configure.in	2014-07-18 07:12:23.721491937 +0000
+@@ -25,7 +25,7 @@
+ # ------------------------------------------------------------------------
+ 
+ AC_INIT(helloworld, demo-version, philip.wilsey@ieee.org)
+-AM_INIT_AUTOMAKE(helloworld, demo-version)
++AM_INIT_AUTOMAKE([foreign])
+ 
+ #AC_CONFIG_SRCDIR([hello.cc])
+ #AC_CONFIG_HEADER([config.h])
diff --git a/meta-oe/recipes-devtools/dejagnu/dejagnu_1.4.4.bb b/meta-oe/recipes-devtools/dejagnu/dejagnu_1.4.4.bb
index f5fe9b9..63726b2 100644
--- a/meta-oe/recipes-devtools/dejagnu/dejagnu_1.4.4.bb
+++ b/meta-oe/recipes-devtools/dejagnu/dejagnu_1.4.4.bb
@@ -5,7 +5,8 @@ SECTION = "devel"
 
 inherit autotools
 
-SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz"
+SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
+           file://configure.patch"
 
 SRC_URI[md5sum] = "053f18fd5d00873de365413cab17a666"
 SRC_URI[sha256sum] = "d0fbedef20fb0843318d60551023631176b27ceb1e11de7468a971770d0e048d"
-- 
2.0.2

[PATCH 06/27] hplip: Use "foreign" automake strictness and autotools-brokensep

[Richard Purdie]

---
 .../recipes-extended/hplip/hplip-3.12.6/configure.patch    | 14 ++++++++++++++
 meta-oe/recipes-extended/hplip/hplip_3.12.6.bb             |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-extended/hplip/hplip-3.12.6/configure.patch

diff --git a/meta-oe/recipes-extended/hplip/hplip-3.12.6/configure.patch b/meta-oe/recipes-extended/hplip/hplip-3.12.6/configure.patch
new file mode 100644
index 0000000..31c005c
--- /dev/null
+++ b/meta-oe/recipes-extended/hplip/hplip-3.12.6/configure.patch
@@ -0,0 +1,14 @@
+Index: hplip-3.12.6/configure.in
+===================================================================
+--- hplip-3.12.6.orig/configure.in	2014-07-16 20:03:51.310044196 +0000
++++ hplip-3.12.6/configure.in	2014-07-18 07:53:31.589559192 +0000
+@@ -27,8 +27,7 @@
+ 
+ #AC_PREREQ(2.59)
+ AC_INIT([HP Linux Imaging and Printing], [3.12.6], [3.12.6], [hplip])
+-#AM_INIT_AUTOMAKE([1.9 foreign])
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE([1.9 foreign])
+ AC_DISABLE_STATIC
+ 
+ # Checks for programs.
diff --git a/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb b/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb
index 95b6cab..fc5ef18 100644
--- a/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb
+++ b/meta-oe/recipes-extended/hplip/hplip_3.12.6.bb
@@ -8,11 +8,12 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \
            file://setup-add-sleep-after-cups-reset.patch \
            file://fix-libusb-paths.patch \
            file://cups-1.6.patch \
+           file://configure.patch \
 "
 
 DEPENDS += "cups python libusb"
 
-inherit autotools python-dir pythonnative pkgconfig
+inherit autotools-brokensep python-dir pythonnative pkgconfig
 
 export BUILD_SYS
 export HOST_SYS
-- 
2.0.2

[PATCH 07/27] claws-plugin-gtkhtml2: Use "foreign" automake strictness and autotools-brokensep

[Richard Purdie]

---
 .../claws-plugin-gtkhtml2-viewer/configure.patch   | 52 ++++++++++++++++++++++
 .../claws-plugin-gtkhtml2-viewer_0.31.bb           |  3 +-
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer/configure.patch

diff --git a/meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer/configure.patch b/meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer/configure.patch
new file mode 100644
index 0000000..222a796
--- /dev/null
+++ b/meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer/configure.patch
@@ -0,0 +1,52 @@
+Index: gtkhtml2_viewer-0.31/configure.ac
+===================================================================
+--- gtkhtml2_viewer-0.31.orig/configure.ac	2011-08-27 08:08:55.000000000 +0000
++++ gtkhtml2_viewer-0.31/configure.ac	2014-07-18 07:28:42.769518618 +0000
+@@ -1,33 +1,27 @@
+ AC_PREREQ(2.60)
+-AC_INIT(src/gtkhtml2_viewer.c)
++
++dnl plugin version
++m4_define([plugin_major_version],[0])
++m4_define([plugin_minor_version],[31])
++m4_define([plugin_micro_version],[0])
++m4_define([plugin_version], [plugin_major_version.plugin_minor_version.plugin_micro_version])
++
++AC_INIT(gtkhml2_viewer, plugin_version)
++AC_CONFIG_SRCDIR(src/gtkhtml2_viewer.c)
+ AC_CONFIG_AUX_DIR(config)
+ AM_MAINTAINER_MODE
+ 
+ PACKAGE=gtkhtml2_viewer
+ 
+-dnl plugin version
+-MAJOR_VERSION=0
+-MINOR_VERSION=31
+-MICRO_VERSION=0
++MAJOR_VERSION=plugin_major_version
++MINOR_VERSION=plugin_minor_version
++MICRO_VERSION=plugin_micro_version
+ EXTRA_VERSION=0
+-
+-if test \( $EXTRA_VERSION -eq 0 \); then
+-    if test \( $MICRO_VERSION -eq 0 \); then
+-        VERSION=${MAJOR_VERSION}.${MINOR_VERSION} 
+-    else
+-		VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
+-    fi
+-else
+-    if test \( $MICRO_VERSION -eq 0 \); then
+-        VERSION=${MAJOR_VERSION}.${MINOR_VERSION}cvs${EXTRA_VERSION}
+-    else
+-		VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}cvs${EXTRA_VERSION}
+-    fi
+-fi
++VERSION=plugin_version
+ 
+ AC_CANONICAL_SYSTEM
+ 
+-AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
++AM_INIT_AUTOMAKE([foreign no-define])
+ AC_CONFIG_HEADERS(config.h)
+ AC_DEFINE_UNQUOTED(PLUGINVERSION, "$VERSION", [plugin version])
+ 
diff --git a/meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.31.bb b/meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.31.bb
index f203cc0..9adfd28 100644
--- a/meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.31.bb
+++ b/meta-oe/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.31.bb
@@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=977f04a8048c04684e521c06e2844a94"
 
 PR = "r1"
 
-SRC_URI = "http://www.claws-mail.org/downloads/plugins_obsolete/gtkhtml2_viewer-${PV}.tar.gz"
+SRC_URI = "http://www.claws-mail.org/downloads/plugins_obsolete/gtkhtml2_viewer-${PV}.tar.gz \
+           file://configure.patch"
 SRC_URI[md5sum] = "a6c9dfa6f969ccd844796a5724b52167"
 SRC_URI[sha256sum] = "4d41f6d961efaac0f51705e5052bac732bc0bdafee2ef2082a9cf9d89f183ae5"
 
-- 
2.0.2

[PATCH 08/27] claws-plugin-rssyl: Use "foreign" automake strictness and autotools-brokensep

[Richard Purdie]

---
 .../claws-mail/claws-plugin-rssyl/configure.patch  | 53 ++++++++++++++++++++++
 .../claws-mail/claws-plugin-rssyl_0.34.bb          |  3 +-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl/configure.patch

diff --git a/meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl/configure.patch b/meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl/configure.patch
new file mode 100644
index 0000000..a7a38f3
--- /dev/null
+++ b/meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl/configure.patch
@@ -0,0 +1,53 @@
+Index: rssyl-0.34/configure.ac
+===================================================================
+--- rssyl-0.34.orig/configure.ac	2014-07-18 07:37:28.981532959 +0000
++++ rssyl-0.34/configure.ac	2014-07-18 07:39:45.881536690 +0000
+@@ -1,5 +1,13 @@
++
++dnl plugin version
++m4_define([plugin_major_version],[0])
++m4_define([plugin_minor_version],[34])
++m4_define([plugin_micro_version],[0])
++m4_define([plugin_version], [plugin_major_version.plugin_minor_version.plugin_micro_version])
++
+ AC_PREREQ(2.60)
+-AC_INIT(src/plugin.c)
++AC_INIT(rssyl, plugin_version)
++AC_CONFIG_SRCDIR(src/plugin.c)
+ AC_CONFIG_AUX_DIR(config)
+ AM_MAINTAINER_MODE
+ AC_CONFIG_HEADERS(config.h)
+@@ -7,28 +15,15 @@
+ PACKAGE=rssyl
+ 
+ dnl plugin version
+-MAJOR_VERSION=0
+-MINOR_VERSION=34
+-MICRO_VERSION=0
++MAJOR_VERSION=plugin_major_version
++MINOR_VERSION=plugin_minor_version
++MICRO_VERSION=plugin_micro_version
+ EXTRA_VERSION=0
+-
+-if test \( $EXTRA_VERSION -eq 0 \); then
+-    if test \( $MICRO_VERSION -eq 0 \); then
+-        VERSION=${MAJOR_VERSION}.${MINOR_VERSION} 
+-    else
+-		VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
+-    fi
+-else
+-    if test \( $MICRO_VERSION -eq 0 \); then
+-        VERSION=${MAJOR_VERSION}.${MINOR_VERSION}cvs${EXTRA_VERSION}
+-    else
+-		VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}cvs${EXTRA_VERSION}
+-    fi
+-fi
++VERSION=plugin_version
+ 
+ AC_CANONICAL_SYSTEM
+ 
+-AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
++AM_INIT_AUTOMAKE([foreign no-define])
+ AC_DEFINE_UNQUOTED(PLUGINVERSION, "$VERSION", [plugin version])
+ 
+ AC_PROG_CC
diff --git a/meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl_0.34.bb b/meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl_0.34.bb
index f441c98..cdc465c 100644
--- a/meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl_0.34.bb
+++ b/meta-oe/recipes-sato/claws-mail/claws-plugin-rssyl_0.34.bb
@@ -4,7 +4,8 @@ DEPENDS = "claws-mail libxml2 curl glib-2.0 gtk+"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0c2348e0a084e573f0220f5e45d8097e"
 
-SRC_URI = "http://www.claws-mail.org/downloads/plugins_obsolete/rssyl-${PV}.tar.gz"
+SRC_URI = "http://www.claws-mail.org/downloads/plugins_obsolete/rssyl-${PV}.tar.gz \
+           file://configure.patch"
 SRC_URI[md5sum] = "49b45608e8d160b3625d3d50016ec2ca"
 SRC_URI[sha256sum] = "2e96a1cd6a1a5bb7f86cd2eb48f6e174665957fafe1f3b1e8361aac3bb967f79"
 inherit autotools pkgconfig gettext
-- 
2.0.2

[PATCH 09/27] fbgrab: use autotools-brokensep (its not really autotools)

[Richard Purdie]

---
 meta-oe/recipes-graphics/fbgrab/fbgrab_1.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-graphics/fbgrab/fbgrab_1.2.bb b/meta-oe/recipes-graphics/fbgrab/fbgrab_1.2.bb
index 725707c..2ff331c 100644
--- a/meta-oe/recipes-graphics/fbgrab/fbgrab_1.2.bb
+++ b/meta-oe/recipes-graphics/fbgrab/fbgrab_1.2.bb
@@ -6,7 +6,7 @@ SECTION = "console/utils"
 DEPENDS = "libpng zlib"
 SRC_URI = "http://fbgrab.monells.se/${BP}.tar.gz"
 
-inherit autotools
+inherit autotools-brokensep
 
 S = "${WORKDIR}/${PN}"
 
-- 
2.0.2

[PATCH 10/27] orrery: use autotools-brokensep

[Richard Purdie]

---
 meta-oe/recipes-navigation/orrery/orrery_2.7.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb b/meta-oe/recipes-navigation/orrery/orrery_2.7.bb
index 95c1b29..e6cbffc 100644
--- a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb
+++ b/meta-oe/recipes-navigation/orrery/orrery_2.7.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://orrery.c;endline=25;md5=d792bdf2b591972da175aecc38d88cfe"
 DEPENDS = "gtk+"
 
-inherit autotools pkgconfig
+inherit autotools-brokensep pkgconfig
 
 SRC_URI = "http://projects.openmoko.org/frs/download.php/923/orrery_2.7_clean.tar.gz \
            file://orrery.png \
-- 
2.0.2

[PATCH 11/27] libsdl-image: Use "foreign" automake strictness

[Richard Purdie]

---
 .../libsdl-image/libsdl-image/configure.patch      | 43 ++++++++++++++++++++++
 .../libsdl-image/libsdl-image_1.2.12.bb            |  3 +-
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-multimedia/libsdl-image/libsdl-image/configure.patch

diff --git a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image/configure.patch b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image/configure.patch
new file mode 100644
index 0000000..5299d37
--- /dev/null
+++ b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image/configure.patch
@@ -0,0 +1,43 @@
+Index: SDL_image-1.2.12/configure.in
+===================================================================
+--- SDL_image-1.2.12.orig/configure.in	2012-01-21 01:51:33.000000000 +0000
++++ SDL_image-1.2.12/configure.in	2014-07-18 06:56:56.853466678 +0000
+@@ -1,5 +1,4 @@
+ dnl Process this file with autoconf to produce a configure script.
+-AC_INIT(README)
+ 
+ dnl Set various version strings - taken gratefully from the GTk sources
+ 
+@@ -11,12 +10,19 @@
+ # if backwards compatibility has been broken,
+ # set BINARY_AGE and INTERFACE_AGE to 0.
+ 
+-MAJOR_VERSION=1
+-MINOR_VERSION=2
+-MICRO_VERSION=12
++m4_define([sdlimage_major_version],[1])
++m4_define([sdlimage_minor_version],[2])
++m4_define([sdlimage_micro_version],[12])
++m4_define([sdlimage_version], [sdlimage_major_version.sdlimage_minor_version.sdlimage_micro_version])
++
++AC_INIT([SDL_image], [sdlimage_version])
++
++MAJOR_VERSION=sdlimage_major_version
++MINOR_VERSION=sdlimage_minor_version
++MICRO_VERSION=sdlimage_micro_version
+ INTERFACE_AGE=4
+ BINARY_AGE=12
+-VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
++VERSION=sdlimage_version
+ 
+ AC_SUBST(MAJOR_VERSION)
+ AC_SUBST(MINOR_VERSION)
+@@ -42,7 +48,7 @@
+ AC_CANONICAL_HOST
+ 
+ dnl Setup for automake
+-AM_INIT_AUTOMAKE(SDL_image, $VERSION)
++AM_INIT_AUTOMAKE([foreign])
+ 
+ dnl Check for tools
+ AC_PROG_LIBTOOL
diff --git a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb
index 78f4bf5..ea8e9ea 100644
--- a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb
+++ b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb
@@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=613734b7586e1580ef944961c6d62227"
 
 DEPENDS = "tiff zlib libpng jpeg virtual/libsdl"
 
-SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz"
+SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz \
+           file://configure.patch"
 SRC_URI[md5sum] = "a0f9098ebe5400f0bdc9b62e60797ecb"
 SRC_URI[sha256sum] = "0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699"
 
-- 
2.0.2

[PATCH 12/27] lcdproc: Remove floating dependency on libhid

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb
index 1f9524d..6d66af6 100644
--- a/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb
+++ b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb
@@ -7,6 +7,7 @@ SRC_URI[sha256sum] = "b136b47d7bf585a003334f432d8730a36ef5ed1cd520084b919667d825
 
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[g15] = ",,libg15 g15daemon libg15render,"
+PACKAGECONFIG[hid] = "--enable-libhid,--disable-libhid,libhid"
 
 LCD_DRIVERS_append = "${@base_contains('PACKAGECONFIG', 'g15', '', ',!g15', d)}"
 
-- 
2.0.2

[PATCH 13/27] libxfce4ui: Add missing gtk-doc inherit

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
index 52792f5..0582412 100644
--- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
+++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475"
 DEPENDS = "perl-native glib-2.0 gtk+ intltool libxfce4util xfconf xfce4-dev-tools virtual/libx11 libsm libice"
 
-inherit autotools gettext xfce xfce-git
+inherit autotools gettext xfce xfce-git gtk-doc
 
 SRC_URI = " \
     git://git.xfce.org/xfce/libxfce4ui;protocol=git \
-- 
2.0.2

[PATCH 14/27] ipsec-tools: Use "foreign" automake strictness

[Richard Purdie]

---
 .../recipes-support/ipsec-tools/ipsec-tools/configure.patch | 13 +++++++++++++
 .../recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb        |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 meta-networking/recipes-support/ipsec-tools/ipsec-tools/configure.patch

diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/configure.patch b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/configure.patch
new file mode 100644
index 0000000..8d270a6
--- /dev/null
+++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/configure.patch
@@ -0,0 +1,13 @@
+Index: ipsec-tools-0.8.1/configure.ac
+===================================================================
+--- ipsec-tools-0.8.1.orig/configure.ac	2013-01-08 12:43:29.000000000 +0000
++++ ipsec-tools-0.8.1/configure.ac	2014-07-18 07:51:30.045555880 +0000
+@@ -6,7 +6,7 @@
+ AC_CONFIG_SRCDIR([configure.ac])
+ AC_CONFIG_HEADERS(config.h)
+ 
+-AM_INIT_AUTOMAKE(dist-bzip2)
++AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ 
+ AC_ENABLE_SHARED(no)
+ 
diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb
index fcf329c..2e5c0a4 100644
--- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb
+++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb
@@ -10,6 +10,7 @@ DEPENDS = "virtual/kernel openssl readline flex-native bison-native"
 SRC_URI = "ftp://ftp.netbsd.org/pub/NetBSD/misc/ipsec-tools/0.8/ipsec-tools-${PV}.tar.bz2 \
            file://0001-Fix-warning-with-gcc-4.8.patch \
            file://0002-Don-t-link-against-libfl.patch \
+           file://configure.patch \
           "
 SRC_URI[md5sum] = "d38b39f291ba2962387c3232e7335dd8"
 SRC_URI[sha256sum] = "fa4a95bb36842f001b84c4e7a1bb727e3ee06147edbc830a881d63abe8153dd4"
-- 
2.0.2

[PATCH 15/27] memcached: Use "foreign" automake strictness

[Richard Purdie]

---
 .../recipes-support/memcached/memcached/configure.patch     | 13 +++++++++++++
 .../recipes-support/memcached/memcached_1.4.17.bb           |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 meta-networking/recipes-support/memcached/memcached/configure.patch

diff --git a/meta-networking/recipes-support/memcached/memcached/configure.patch b/meta-networking/recipes-support/memcached/memcached/configure.patch
new file mode 100644
index 0000000..7001a0e
--- /dev/null
+++ b/meta-networking/recipes-support/memcached/memcached/configure.patch
@@ -0,0 +1,13 @@
+Index: memcached-1.4.17/configure.ac
+===================================================================
+--- memcached-1.4.17.orig/configure.ac	2013-12-20 21:44:49.000000000 +0000
++++ memcached-1.4.17/configure.ac	2014-07-18 07:17:00.593499483 +0000
+@@ -4,7 +4,7 @@
+ AC_INIT(memcached, VERSION_NUMBER, memcached@googlegroups.com)
+ AC_CANONICAL_SYSTEM
+ AC_CONFIG_SRCDIR(memcached.c)
+-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
++AM_INIT_AUTOMAKE([foreign])
+ AM_CONFIG_HEADER(config.h)
+ 
+ AC_PROG_CC
diff --git a/meta-networking/recipes-support/memcached/memcached_1.4.17.bb b/meta-networking/recipes-support/memcached/memcached_1.4.17.bb
index 20e1bd4..5d37df0 100644
--- a/meta-networking/recipes-support/memcached/memcached_1.4.17.bb
+++ b/meta-networking/recipes-support/memcached/memcached_1.4.17.bb
@@ -17,7 +17,8 @@ inherit autotools
 DEPENDS += "libevent"
 RDEPENDS_${PN} += "perl perl-module-posix perl-module-autoloader perl-module-tie-hash"
 
-SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz"
+SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \
+           file://configure.patch"
 
 SRC_URI[md5sum] = "46402dfbd7faadf6182283dbbd18b1a6"
 SRC_URI[sha256sum] = "d9173ef6d99ba798c982ea4566cb4f0e64eb23859fdbf9926a89999d8cdc0458"
-- 
2.0.2

[PATCH 16/27] smbfsnet: Use "foreign" automake strictness

[Richard Purdie]

---
 .../recipes-filesystems/smbnetfs/smbnetfs/configure.patch     | 11 +++++++++++
 meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch

diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch
new file mode 100644
index 0000000..c80fed1
--- /dev/null
+++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch
@@ -0,0 +1,11 @@
+Index: git/configure.in
+===================================================================
+--- git.orig/configure.in	2014-06-18 16:06:16.040721349 +0000
++++ git/configure.in	2014-07-18 07:49:17.085552256 +0000
+@@ -1,5 +1,5 @@
+ AC_INIT([SMBNetFS],[0.5.3а])
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE([foreign])
+ AC_CONFIG_HEADERS([src/config.h])
+ AC_PROG_CC
+ 
diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb
index c25f5d6..a0eddbc 100644
--- a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb
+++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb
@@ -16,7 +16,8 @@ PKGV = "${GITPKGVTAG}"
 
 SRCREV = "ace1c519d45fe488b9b7e6cc77a2bcadb6c83464"
 
-SRC_URI = "git://smbnetfs.git.sourceforge.net/gitroot/smbnetfs/smbnetfs;branch=master"
+SRC_URI = "git://smbnetfs.git.sourceforge.net/gitroot/smbnetfs/smbnetfs;branch=master \
+           file://configure.patch"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[gnome-keyring] = "--with-gnome-keyring=yes,--with-gnome-keyring=no,libgnome-keyring"
-- 
2.0.2

[PATCH 17/27] engrave: Use autotools-brokensep to avoid build failures

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta-efl/recipes-efl/efl/engrave_svn.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-efl/recipes-efl/efl/engrave_svn.bb b/meta-efl/recipes-efl/efl/engrave_svn.bb
index 3e35c9c..92d7ca1 100644
--- a/meta-efl/recipes-efl/efl/engrave_svn.bb
+++ b/meta-efl/recipes-efl/efl/engrave_svn.bb
@@ -6,6 +6,6 @@ DEPENDS = "evas ecore"
 PV = "0.0.0+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"
 
-inherit efl
+inherit efl autotools-brokensep
 SRC_URI = "${E_SVN}/OLD;module=${SRCNAME};protocol=http;scmdata=keep"
 S = "${WORKDIR}/${SRCNAME}"
-- 
2.0.2

[PATCH 18/27] efl: Use automake foreign for cpu/elmdentica/enjoy/ephoto/exalt-client/flame/forecasts/places/rain/uptime

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta-efl/recipes-efl/e17/cpu/configure.patch       | 13 ++++++++++
 meta-efl/recipes-efl/e17/cpu_svn.bb                |  2 ++
 .../recipes-efl/e17/elmdentica/configure.patch     | 13 ++++++++++
 meta-efl/recipes-efl/e17/elmdentica_svn.bb         |  2 ++
 meta-efl/recipes-efl/e17/enjoy/configure.patch     | 13 ++++++++++
 meta-efl/recipes-efl/e17/enjoy_git.bb              |  1 +
 meta-efl/recipes-efl/e17/ephoto/configure.patch    | 13 ++++++++++
 meta-efl/recipes-efl/e17/ephoto_svn.bb             |  2 ++
 .../recipes-efl/e17/exalt-client/configure.patch   | 28 ++++++++++++++++++++++
 meta-efl/recipes-efl/e17/exalt-client_svn.bb       |  2 +-
 meta-efl/recipes-efl/e17/flame/configure.patch     | 13 ++++++++++
 meta-efl/recipes-efl/e17/flame_svn.bb              |  2 ++
 meta-efl/recipes-efl/e17/forecasts/configure.patch | 13 ++++++++++
 meta-efl/recipes-efl/e17/forecasts_svn.bb          |  4 +---
 meta-efl/recipes-efl/e17/places/configure.patch    | 13 ++++++++++
 meta-efl/recipes-efl/e17/places_svn.bb             |  2 ++
 meta-efl/recipes-efl/e17/rain/configure.patch      | 13 ++++++++++
 meta-efl/recipes-efl/e17/rain_svn.bb               |  2 ++
 meta-efl/recipes-efl/e17/uptime/configure.patch    | 13 ++++++++++
 meta-efl/recipes-efl/e17/uptime_svn.bb             |  4 +---
 20 files changed, 161 insertions(+), 7 deletions(-)
 create mode 100644 meta-efl/recipes-efl/e17/cpu/configure.patch
 create mode 100644 meta-efl/recipes-efl/e17/elmdentica/configure.patch
 create mode 100644 meta-efl/recipes-efl/e17/enjoy/configure.patch
 create mode 100644 meta-efl/recipes-efl/e17/ephoto/configure.patch
 create mode 100644 meta-efl/recipes-efl/e17/exalt-client/configure.patch
 create mode 100644 meta-efl/recipes-efl/e17/flame/configure.patch
 create mode 100644 meta-efl/recipes-efl/e17/forecasts/configure.patch
 create mode 100644 meta-efl/recipes-efl/e17/places/configure.patch
 create mode 100644 meta-efl/recipes-efl/e17/rain/configure.patch
 create mode 100644 meta-efl/recipes-efl/e17/uptime/configure.patch

diff --git a/meta-efl/recipes-efl/e17/cpu/configure.patch b/meta-efl/recipes-efl/e17/cpu/configure.patch
new file mode 100644
index 0000000..87c85de
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/cpu/configure.patch
@@ -0,0 +1,13 @@
+Index: cpu/configure.ac
+===================================================================
+--- cpu.orig/configure.ac	2014-07-17 20:39:48.000000000 +0000
++++ cpu/configure.ac	2014-07-17 21:39:55.320555868 +0000
+@@ -10,7 +10,7 @@
+ AC_CANONICAL_HOST
+ AC_ISC_POSIX
+ 
+-AM_INIT_AUTOMAKE(1.6)
++AM_INIT_AUTOMAKE([foreign])
+ AM_CONFIG_HEADER(config.h)
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
diff --git a/meta-efl/recipes-efl/e17/cpu_svn.bb b/meta-efl/recipes-efl/e17/cpu_svn.bb
index c0ad6a4..14eb08f 100644
--- a/meta-efl/recipes-efl/e17/cpu_svn.bb
+++ b/meta-efl/recipes-efl/e17/cpu_svn.bb
@@ -6,3 +6,5 @@ PV = "0.0.1+svnr${SRCREV}"
 PR = "${INC_PR}.0"
 
 require e-module.inc
+
+SRC_URI += "file://configure.patch"
diff --git a/meta-efl/recipes-efl/e17/elmdentica/configure.patch b/meta-efl/recipes-efl/e17/elmdentica/configure.patch
new file mode 100644
index 0000000..79a981b
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/elmdentica/configure.patch
@@ -0,0 +1,13 @@
+Index: elmdentica/configure.ac
+===================================================================
+--- elmdentica.orig/configure.ac	2014-07-17 21:46:14.712566207 +0000
++++ elmdentica/configure.ac	2014-07-17 21:51:34.960574935 +0000
+@@ -3,7 +3,7 @@
+ AM_CONFIG_HEADER(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE([foreign])
+ 
+ AC_PROG_CC
+ AC_GNU_SOURCE
diff --git a/meta-efl/recipes-efl/e17/elmdentica_svn.bb b/meta-efl/recipes-efl/e17/elmdentica_svn.bb
index e7b61a5..20a4849 100644
--- a/meta-efl/recipes-efl/e17/elmdentica_svn.bb
+++ b/meta-efl/recipes-efl/e17/elmdentica_svn.bb
@@ -17,3 +17,5 @@ PV = "0.9.9+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"
 
 RDEPENDS_${PN} = "${PN}-themes"
+
+SRC_URI += "file://configure.patch"
diff --git a/meta-efl/recipes-efl/e17/enjoy/configure.patch b/meta-efl/recipes-efl/e17/enjoy/configure.patch
new file mode 100644
index 0000000..6e0ed74
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/enjoy/configure.patch
@@ -0,0 +1,13 @@
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac	2014-07-17 21:48:51.284570474 +0000
++++ git/configure.ac	2014-07-17 21:53:39.104578318 +0000
+@@ -26,7 +26,7 @@
+ AC_CANONICAL_HOST
+ AC_ISC_POSIX
+ 
+-AM_INIT_AUTOMAKE(1.6 dist-bzip2)
++AM_INIT_AUTOMAKE([dist-bzip2 foreign])
+ AC_CONFIG_HEADERS(config.h)
+ _XTERM_COLORS
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/meta-efl/recipes-efl/e17/enjoy_git.bb b/meta-efl/recipes-efl/e17/enjoy_git.bb
index bc3168e..297cbd5 100644
--- a/meta-efl/recipes-efl/e17/enjoy_git.bb
+++ b/meta-efl/recipes-efl/e17/enjoy_git.bb
@@ -22,6 +22,7 @@ inherit e gettext
 SRC_URI = " \
     git://git.enlightenment.org/apps/enjoy.git \
     file://0001-always-use-position-as-percent-and-define-a-1-second.patch \
+    file://configure.patch \
 "
 S = "${WORKDIR}/git"
 
diff --git a/meta-efl/recipes-efl/e17/ephoto/configure.patch b/meta-efl/recipes-efl/e17/ephoto/configure.patch
new file mode 100644
index 0000000..59466f8
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/ephoto/configure.patch
@@ -0,0 +1,13 @@
+Index: ephoto/configure.ac
+===================================================================
+--- ephoto.orig/configure.ac	2014-07-17 21:48:51.028570467 +0000
++++ ephoto/configure.ac	2014-07-17 21:52:56.120577146 +0000
+@@ -27,7 +27,7 @@
+ AC_CANONICAL_HOST
+ AC_ISC_POSIX
+ 
+-AM_INIT_AUTOMAKE(1.6 dist-bzip2)
++AM_INIT_AUTOMAKE([dist-bzip2 foreign])
+ AM_CONFIG_HEADER(src/bin/config.h)
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
diff --git a/meta-efl/recipes-efl/e17/ephoto_svn.bb b/meta-efl/recipes-efl/e17/ephoto_svn.bb
index cea6f39..3255ab8 100644
--- a/meta-efl/recipes-efl/e17/ephoto_svn.bb
+++ b/meta-efl/recipes-efl/e17/ephoto_svn.bb
@@ -15,3 +15,5 @@ SRCNAME = "${PN}"
 
 # autotools-brokensep
 B = "${S}"
+
+SRC_URI += "file://configure.patch"
diff --git a/meta-efl/recipes-efl/e17/exalt-client/configure.patch b/meta-efl/recipes-efl/e17/exalt-client/configure.patch
new file mode 100644
index 0000000..d4ff801
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/exalt-client/configure.patch
@@ -0,0 +1,28 @@
+Index: exalt-client/configure.ac
+===================================================================
+--- exalt-client.orig/configure.ac	2014-07-17 21:46:14.712566207 +0000
++++ exalt-client/configure.ac	2014-07-17 21:47:56.880568991 +0000
+@@ -10,7 +10,7 @@
+ AC_CANONICAL_HOST
+ AC_ISC_POSIX
+ 
+-AM_INIT_AUTOMAKE(1.8)
++AM_INIT_AUTOMAKE([foreign])
+ AM_CONFIG_HEADER(config.h)
+ 
+ AC_PROG_CC
+@@ -29,7 +29,6 @@
+ 
+ m4_ifdef([AM_GNU_GETTEXT], [
+ AM_GNU_GETTEXT([external])
+-po_makefile_in=po/Makefile.in
+ AM_CONDITIONAL([HAVE_PO], [true])
+ ],[
+ AM_CONDITIONAL([HAVE_PO], [false])
+@@ -101,6 +100,5 @@
+ src/Makefile
+ module.desktop
+ e_modules-exalt-client.spec
+-$po_makefile_in
+ ], [
+ ])
diff --git a/meta-efl/recipes-efl/e17/exalt-client_svn.bb b/meta-efl/recipes-efl/e17/exalt-client_svn.bb
index 2c7e530..f708601 100644
--- a/meta-efl/recipes-efl/e17/exalt-client_svn.bb
+++ b/meta-efl/recipes-efl/e17/exalt-client_svn.bb
@@ -22,4 +22,4 @@ FILES_${PN}-staticdev += "${libdir}/enlightenment/modules/*/*/*.a"
 FILES_${PN}-dev += "${libdir}/enlightenment/modules/*/*/*.la"
 FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug"
  
-
+SRC_URI += "file://configure.patch"
\ No newline at end of file
diff --git a/meta-efl/recipes-efl/e17/flame/configure.patch b/meta-efl/recipes-efl/e17/flame/configure.patch
new file mode 100644
index 0000000..87c85de
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/flame/configure.patch
@@ -0,0 +1,13 @@
+Index: cpu/configure.ac
+===================================================================
+--- cpu.orig/configure.ac	2014-07-17 20:39:48.000000000 +0000
++++ cpu/configure.ac	2014-07-17 21:39:55.320555868 +0000
+@@ -10,7 +10,7 @@
+ AC_CANONICAL_HOST
+ AC_ISC_POSIX
+ 
+-AM_INIT_AUTOMAKE(1.6)
++AM_INIT_AUTOMAKE([foreign])
+ AM_CONFIG_HEADER(config.h)
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
diff --git a/meta-efl/recipes-efl/e17/flame_svn.bb b/meta-efl/recipes-efl/e17/flame_svn.bb
index b674a5d..58c79a8 100644
--- a/meta-efl/recipes-efl/e17/flame_svn.bb
+++ b/meta-efl/recipes-efl/e17/flame_svn.bb
@@ -11,3 +11,5 @@ do_configure_prepend() {
     sed -i -e /po/d ${S}/configure.ac
     sed -i -e s:\ po::g ${S}/Makefile.am
 }
+
+SRC_URI += "file://configure.patch"
diff --git a/meta-efl/recipes-efl/e17/forecasts/configure.patch b/meta-efl/recipes-efl/e17/forecasts/configure.patch
new file mode 100644
index 0000000..87c85de
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/forecasts/configure.patch
@@ -0,0 +1,13 @@
+Index: cpu/configure.ac
+===================================================================
+--- cpu.orig/configure.ac	2014-07-17 20:39:48.000000000 +0000
++++ cpu/configure.ac	2014-07-17 21:39:55.320555868 +0000
+@@ -10,7 +10,7 @@
+ AC_CANONICAL_HOST
+ AC_ISC_POSIX
+ 
+-AM_INIT_AUTOMAKE(1.6)
++AM_INIT_AUTOMAKE([foreign])
+ AM_CONFIG_HEADER(config.h)
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
diff --git a/meta-efl/recipes-efl/e17/forecasts_svn.bb b/meta-efl/recipes-efl/e17/forecasts_svn.bb
index a030952..473bdb9 100644
--- a/meta-efl/recipes-efl/e17/forecasts_svn.bb
+++ b/meta-efl/recipes-efl/e17/forecasts_svn.bb
@@ -7,6 +7,4 @@ PR = "${INC_PR}.0"
 
 require e-module.inc
 
-
-
-
+SRC_URI += "file://configure.patch"
diff --git a/meta-efl/recipes-efl/e17/places/configure.patch b/meta-efl/recipes-efl/e17/places/configure.patch
new file mode 100644
index 0000000..f8f4834
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/places/configure.patch
@@ -0,0 +1,13 @@
+Index: places/configure.ac
+===================================================================
+--- places.orig/configure.ac	2014-07-17 21:51:01.276574017 +0000
++++ places/configure.ac	2014-07-17 21:52:07.096575810 +0000
+@@ -10,7 +10,7 @@
+ AC_CANONICAL_HOST
+ AC_ISC_POSIX
+ 
+-AM_INIT_AUTOMAKE(1.8)
++AM_INIT_AUTOMAKE([foreign])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ AM_CONFIG_HEADER(config.h)
+ 
diff --git a/meta-efl/recipes-efl/e17/places_svn.bb b/meta-efl/recipes-efl/e17/places_svn.bb
index 6a6184b..54f0e01 100644
--- a/meta-efl/recipes-efl/e17/places_svn.bb
+++ b/meta-efl/recipes-efl/e17/places_svn.bb
@@ -12,3 +12,5 @@ do_configure_prepend() {
 
 # Calls /usr/bin/eject for media
 RRECOMMENDS_${PN} += "eject"
+
+SRC_URI += "file://configure.patch"
diff --git a/meta-efl/recipes-efl/e17/rain/configure.patch b/meta-efl/recipes-efl/e17/rain/configure.patch
new file mode 100644
index 0000000..87c85de
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/rain/configure.patch
@@ -0,0 +1,13 @@
+Index: cpu/configure.ac
+===================================================================
+--- cpu.orig/configure.ac	2014-07-17 20:39:48.000000000 +0000
++++ cpu/configure.ac	2014-07-17 21:39:55.320555868 +0000
+@@ -10,7 +10,7 @@
+ AC_CANONICAL_HOST
+ AC_ISC_POSIX
+ 
+-AM_INIT_AUTOMAKE(1.6)
++AM_INIT_AUTOMAKE([foreign])
+ AM_CONFIG_HEADER(config.h)
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
diff --git a/meta-efl/recipes-efl/e17/rain_svn.bb b/meta-efl/recipes-efl/e17/rain_svn.bb
index 0e990d5..cf67a4c 100644
--- a/meta-efl/recipes-efl/e17/rain_svn.bb
+++ b/meta-efl/recipes-efl/e17/rain_svn.bb
@@ -12,3 +12,5 @@ do_configure_prepend() {
     sed -i -e /po/d ${S}/configure.ac 
     sed -i -e s:\ po::g ${S}/Makefile.am
 }
+
+SRC_URI += "file://configure.patch"
diff --git a/meta-efl/recipes-efl/e17/uptime/configure.patch b/meta-efl/recipes-efl/e17/uptime/configure.patch
new file mode 100644
index 0000000..87c85de
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/uptime/configure.patch
@@ -0,0 +1,13 @@
+Index: cpu/configure.ac
+===================================================================
+--- cpu.orig/configure.ac	2014-07-17 20:39:48.000000000 +0000
++++ cpu/configure.ac	2014-07-17 21:39:55.320555868 +0000
+@@ -10,7 +10,7 @@
+ AC_CANONICAL_HOST
+ AC_ISC_POSIX
+ 
+-AM_INIT_AUTOMAKE(1.6)
++AM_INIT_AUTOMAKE([foreign])
+ AM_CONFIG_HEADER(config.h)
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
diff --git a/meta-efl/recipes-efl/e17/uptime_svn.bb b/meta-efl/recipes-efl/e17/uptime_svn.bb
index a296a5e..5c9bfa9 100644
--- a/meta-efl/recipes-efl/e17/uptime_svn.bb
+++ b/meta-efl/recipes-efl/e17/uptime_svn.bb
@@ -7,6 +7,4 @@ PR = "${INC_PR}.0"
 
 require e-module.inc
 
-
-
-
+SRC_URI += "file://configure.patch"
-- 
2.0.2

[PATCH 19/27] subsurface: Fix libxml and libm build failures

[Richard Purdie]

Use pkg-config to find libxml2 and also link against libm to avoid
build failures.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta-oe/recipes-extended/subsurface/subsurface_git.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-extended/subsurface/subsurface_git.bb b/meta-oe/recipes-extended/subsurface/subsurface_git.bb
index eb4536a..0632f21 100644
--- a/meta-oe/recipes-extended/subsurface/subsurface_git.bb
+++ b/meta-oe/recipes-extended/subsurface/subsurface_git.bb
@@ -11,7 +11,9 @@ PKGV = "${GITPKGVTAG}"
 PV = "1.1"
 
 SRCREV = "bd275d73ac06823619230915a3aa29deddc996fb"
-SRC_URI = "git://subsurface.hohndel.org/subsurface.git"
+SRC_URI = "git://subsurface.hohndel.org/subsurface.git \
+           file://pkgconfig.patch \
+           file://libm.patch"
 S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "CC='${CC}' \
-- 
2.0.2

[PATCH 20/27] subsurface: Fix libxml and libm build failures

[Richard Purdie]

Use pkg-config to find libxml2 and also link against libm to avoid
build failures.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../subsurface/subsurface/libm.patch               | 17 +++++++++++++++++
 .../subsurface/subsurface/pkgconfig.patch          | 22 ++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 meta-oe/recipes-extended/subsurface/subsurface/libm.patch
 create mode 100644 meta-oe/recipes-extended/subsurface/subsurface/pkgconfig.patch

diff --git a/meta-oe/recipes-extended/subsurface/subsurface/libm.patch b/meta-oe/recipes-extended/subsurface/subsurface/libm.patch
new file mode 100644
index 0000000..7995608
--- /dev/null
+++ b/meta-oe/recipes-extended/subsurface/subsurface/libm.patch
@@ -0,0 +1,17 @@
+| /media/build1/poky/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.9.0/ld: divelist.o: undefined reference to symbol 'pow@@GLIBC_2.0'
+| /media/build1/poky/build1/tmp/sysroots/qemux86/lib/libm.so.6: error adding symbols: DSO missing from command line
+| collect2: error: ld returned 1 exit status
+
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile	2014-07-17 20:59:03.152489041 +0000
++++ git/Makefile	2014-07-17 20:59:19.020489473 +0000
+@@ -50,7 +50,7 @@
+ LIBDIVECOMPUTERCFLAGS = -I$(LIBDIVECOMPUTERINCLUDES)
+ LIBDIVECOMPUTER = $(LIBDIVECOMPUTERARCHIVE) $(LIBUSB)
+ 
+-LIBS = $(LIBXML2) $(LIBGTK) $(LIBDIVECOMPUTER) -lpthread
++LIBS = $(LIBXML2) $(LIBGTK) $(LIBDIVECOMPUTER) -lpthread -lm
+ 
+ OBJS =	main.o dive.o profile.o info.o equipment.o divelist.o \
+ 	parse-xml.o save-xml.o libdivecomputer.o print.o uemis.o \
diff --git a/meta-oe/recipes-extended/subsurface/subsurface/pkgconfig.patch b/meta-oe/recipes-extended/subsurface/subsurface/pkgconfig.patch
new file mode 100644
index 0000000..1f294fc
--- /dev/null
+++ b/meta-oe/recipes-extended/subsurface/subsurface/pkgconfig.patch
@@ -0,0 +1,22 @@
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile	2014-07-17 20:53:23.620479788 +0000
++++ git/Makefile	2014-07-17 20:56:07.992484267 +0000
+@@ -45,7 +45,7 @@
+ # about it if it doesn't.
+ LIBUSB = $(shell pkg-config --libs libusb-1.0 2> /dev/null)
+ 
+-LIBXML2 = $(shell xml2-config --libs)
++LIBXML2 = $(shell pkg-config --libs libxml-2.0)
+ LIBGTK = $(shell pkg-config --libs gtk+-2.0 glib-2.0 gconf-2.0)
+ LIBDIVECOMPUTERCFLAGS = -I$(LIBDIVECOMPUTERINCLUDES)
+ LIBDIVECOMPUTER = $(LIBDIVECOMPUTERARCHIVE) $(LIBUSB)
+@@ -71,7 +71,7 @@
+ 	$(INSTALL) $(MANFILES) $(MANDIR)
+ 
+ parse-xml.o: parse-xml.c dive.h
+-	$(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c `xml2-config --cflags`  parse-xml.c
++	$(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c `pkg-config --cflags libxml-2.0`  parse-xml.c
+ 
+ save-xml.o: save-xml.c dive.h
+ 	$(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c save-xml.c
-- 
2.0.2

[PATCH 21/27] rp-pppoe: Use "foreign" automake strictness

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../recipes-protocols/rp-pppoe/rp-pppoe-3.8/configure.patch   | 11 +++++++++++
 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.8.bb    |  1 +
 2 files changed, 12 insertions(+)
 create mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.8/configure.patch

diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.8/configure.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.8/configure.patch
new file mode 100644
index 0000000..1380ba4
--- /dev/null
+++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.8/configure.patch
@@ -0,0 +1,11 @@
+Index: rp-pppoe-3.8/configure.in
+===================================================================
+--- rp-pppoe-3.8.orig/configure.in	2014-07-16 19:31:33.549991388 +0000
++++ rp-pppoe-3.8/configure.in	2014-07-17 22:01:18.116590827 +0000
+@@ -1,4 +1,4 @@
+-AC_INIT(src/pppoe.c)
+-AM_INIT_AUTOMAKE([rp-pppoe], [3.8])
++AC_INIT([rp-pppoe], [3.8])
++AM_INIT_AUTOMAKE([foreign])
+ AC_CONFIG_SUBDIRS(src)
+ AC_OUTPUT(Makefile)
diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.8.bb b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.8.bb
index b3e60fe..d1b0481 100644
--- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.8.bb
+++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.8.bb
@@ -14,6 +14,7 @@ SRC_URI = "http://www.roaringpenguin.com/files/download/${BP}.tar.gz \
            file://dont-swallow-errors.patch \
            file://discard-use-of-dnl-in-Makefile.am.patch \
            file://use-ldflags.patch \
+           file://configure.patch \
            file://pppoe-server.default \
            file://pppoe-server.init"
 
-- 
2.0.2

[PATCH 22/27] mtr: Use "foreign" automake strictness

[Richard Purdie]

---
 meta-networking/recipes-support/mtr/files/configure.patch | 12 ++++++++++++
 meta-networking/recipes-support/mtr/mtr_0.82.bb           |  1 +
 2 files changed, 13 insertions(+)
 create mode 100644 meta-networking/recipes-support/mtr/files/configure.patch

diff --git a/meta-networking/recipes-support/mtr/files/configure.patch b/meta-networking/recipes-support/mtr/files/configure.patch
new file mode 100644
index 0000000..c978b87
--- /dev/null
+++ b/meta-networking/recipes-support/mtr/files/configure.patch
@@ -0,0 +1,12 @@
+Index: mtr-0.82/configure.in
+===================================================================
+--- mtr-0.82.orig/configure.in	2014-07-16 19:52:56.306026346 +0000
++++ mtr-0.82/configure.in	2014-07-17 21:59:03.208587150 +0000
+@@ -1,5 +1,5 @@
+-AC_INIT(mtr.c)
+-AM_INIT_AUTOMAKE(mtr, 0.82)
++AC_INIT(mtr.c, 0.82)
++AM_INIT_AUTOMAKE([foreign])
+ 
+ 
+ AC_SUBST(GTK_OBJ)
diff --git a/meta-networking/recipes-support/mtr/mtr_0.82.bb b/meta-networking/recipes-support/mtr/mtr_0.82.bb
index 3a93948..b9a1ea2 100644
--- a/meta-networking/recipes-support/mtr/mtr_0.82.bb
+++ b/meta-networking/recipes-support/mtr/mtr_0.82.bb
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
                     file://mtr.c;beginline=5;endline=16;md5=56e390ced194aff352eefab404883057"
 
 SRC_URI = "ftp://ftp.bitwizard.nl/mtr/mtr-${PV}.tar.gz \
+           file://configure.patch \
            file://no-gtk.patch"
 
 SRC_URI[md5sum] = "10601ea543fda3e51545c4bce195b64c"
-- 
2.0.2

[PATCH 23/27] gegl: Use pkg-config for SDL

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch | 21 +++++++++++++++++++++
 meta-oe/recipes-graphics/gegl/gegl_0.2.0.bb        |  3 ++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch

diff --git a/meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch b/meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch
new file mode 100644
index 0000000..d145b62
--- /dev/null
+++ b/meta-oe/recipes-graphics/gegl/gegl/pkgconfig.patch
@@ -0,0 +1,21 @@
+Index: gegl-0.2.0/configure.ac
+===================================================================
+--- gegl-0.2.0.orig/configure.ac	2012-04-02 21:56:49.000000000 +0000
++++ gegl-0.2.0/configure.ac	2014-07-17 21:34:15.312546602 +0000
+@@ -765,15 +765,7 @@
+ 
+ have_sdl="no"
+ if test "x$with_sdl" != "xno"; then
+-  AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
+-  if test "$SDL_CONFIG" = "no"; then
+-    have_sdl="no  (SDL library not found)"
+-    AC_MSG_RESULT([*** Check for SDL library failed.])
+-  else
+-    have_sdl="yes"
+-    SDL_CFLAGS=`$SDL_CONFIG --cflags`
+-    SDL_LIBS=`$SDL_CONFIG --libs`
+-  fi
++  PKG_CHECK_MODULES([SDL], [sdl], [have_sdl="yes"], [have_sdl="no  (SDL library not found)"])
+ fi
+ 
+ AM_CONDITIONAL(HAVE_SDL, test "$have_sdl" = "yes")
diff --git a/meta-oe/recipes-graphics/gegl/gegl_0.2.0.bb b/meta-oe/recipes-graphics/gegl/gegl_0.2.0.bb
index 849fe9f..58103f6 100644
--- a/meta-oe/recipes-graphics/gegl/gegl_0.2.0.bb
+++ b/meta-oe/recipes-graphics/gegl/gegl_0.2.0.bb
@@ -11,7 +11,8 @@ PACKAGECONFIG ??= ""
 PACKAGECONFIG[jasper] = "--with-jasper,--without-jasper,jasper"
 PACKAGECONFIG[avformat] = "--with-libavformat,--without-libavformat,libav"
 
-SRC_URI = "http://ftp.gimp.org/pub/${BPN}/0.2/${BP}.tar.bz2"
+SRC_URI = "http://ftp.gimp.org/pub/${BPN}/0.2/${BP}.tar.bz2 \
+           file://pkgconfig.patch "
 SRC_URI[md5sum] = "32b00002f1f1e316115c4ed922e1dec8"
 SRC_URI[sha256sum] = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426"
 
-- 
2.0.2

[PATCH 24/27] ode: Use "foreign" automake strictness

[Richard Purdie]

---
 meta-oe/recipes-support/ode/ode/configure.patch | 13 +++++++++++++
 meta-oe/recipes-support/ode/ode_0.13.bb         |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-support/ode/ode/configure.patch

diff --git a/meta-oe/recipes-support/ode/ode/configure.patch b/meta-oe/recipes-support/ode/ode/configure.patch
new file mode 100644
index 0000000..246b2e2
--- /dev/null
+++ b/meta-oe/recipes-support/ode/ode/configure.patch
@@ -0,0 +1,13 @@
+Index: ode-0.13/libccd/configure.ac
+===================================================================
+--- ode-0.13.orig/libccd/configure.ac	2013-08-19 17:48:03.000000000 +0000
++++ ode-0.13/libccd/configure.ac	2014-07-17 22:04:16.580595690 +0000
+@@ -5,7 +5,7 @@
+ AC_INIT([libccd], [1.0], [danfis@danfis.cz])
+ AC_CONFIG_SRCDIR([src/ccd.c])
+ AC_CONFIG_HEADERS([src/config.h])
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE([foreign])
+ 
+ # Checks for programs.
+ AC_PROG_CXX
diff --git a/meta-oe/recipes-support/ode/ode_0.13.bb b/meta-oe/recipes-support/ode/ode_0.13.bb
index 8e9eb15..2dc82a8 100644
--- a/meta-oe/recipes-support/ode/ode_0.13.bb
+++ b/meta-oe/recipes-support/ode/ode_0.13.bb
@@ -11,7 +11,8 @@ LIC_FILES_CHKSUM = " \
 # file://LICENSE-BSD.TXT;md5=c74e6304a772117e059458fb9763a928
 
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/opende/ode-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/opende/ode-${PV}.tar.bz2 \
+           file://configure.patch"
 SRC_URI[md5sum] = "04b32c9645c147e18caff7a597a19f84"
 SRC_URI[sha256sum] = "34ce3e236e313bf109a0cb5546d2fca462aed99f29a42e62bc1463b803c31ef9"
 
-- 
2.0.2

[PATCH 25/27] flite: Use autotools-brokensep

[Richard Purdie]

---
 meta-oe/recipes-support/flite/flite.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/flite/flite.inc b/meta-oe/recipes-support/flite/flite.inc
index b9d5e5a..0ef82c0 100644
--- a/meta-oe/recipes-support/flite/flite.inc
+++ b/meta-oe/recipes-support/flite/flite.inc
@@ -11,7 +11,7 @@ S = "${WORKDIR}/flite-${PV}-release"
 
 CFLAGS += " -lasound "
 
-inherit autotools
+inherit autotools-brokensep
 
 PACKAGES += "lib${PN} lib${PN}-vox8 lib${PN}-vox16"
 
-- 
2.0.2

[PATCH 26/27] wvstreams: Add missing dbus/readline DEPENDS and use autotools-brokensep

[Richard Purdie]

---
 meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
index bb4d72c..8a77b5b 100644
--- a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
+++ b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb
@@ -4,7 +4,7 @@ SUMMARY = "WvStreams is a network programming library in C++"
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=55ca817ccb7d5b5b66355690e9abc605"
 
-DEPENDS = "zlib openssl (>= 0.9.8)"
+DEPENDS = "zlib openssl (>= 0.9.8) dbus readline"
 
 SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz \
            file://04_signed_request.diff \
@@ -16,7 +16,7 @@ SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz \
 SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c"
 SRC_URI[sha256sum] = "8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633"
 
-inherit autotools pkgconfig
+inherit autotools-brokensep pkgconfig
 
 PARALLEL_MAKE = ""
 
-- 
2.0.2

[PATCH 27/27] libotr: Fix B!=S build failures

[Richard Purdie]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta-oe/recipes-support/pidgin/libotr/sepbuild.patch | 16 ++++++++++++++++
 meta-oe/recipes-support/pidgin/libotr_4.0.0.bb       |  1 +
 2 files changed, 17 insertions(+)
 create mode 100644 meta-oe/recipes-support/pidgin/libotr/sepbuild.patch

diff --git a/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch b/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch
new file mode 100644
index 0000000..f66e528
--- /dev/null
+++ b/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch
@@ -0,0 +1,16 @@
+Fix builds with ${B} != ${S}
+
+Upstream-Status: Pending
+
+RP 2014/7/17
+
+Index: libotr-4.0.0/toolkit/Makefile.am
+===================================================================
+--- libotr-4.0.0.orig/toolkit/Makefile.am	2014-07-16 18:09:59.777858022 +0000
++++ libotr-4.0.0/toolkit/Makefile.am	2014-07-17 06:28:51.359066155 +0000
+@@ -1,4 +1,4 @@
+-INCLUDES = -I../src @LIBGCRYPT_CFLAGS@
++INCLUDES = -I$(top_srcdir)/src @LIBGCRYPT_CFLAGS@
+ 
+ noinst_HEADERS = aes.h ctrmode.h parse.h sesskeys.h readotr.h sha1hmac.h
+ 
diff --git a/meta-oe/recipes-support/pidgin/libotr_4.0.0.bb b/meta-oe/recipes-support/pidgin/libotr_4.0.0.bb
index a312841..dd9eeab 100644
--- a/meta-oe/recipes-support/pidgin/libotr_4.0.0.bb
+++ b/meta-oe/recipes-support/pidgin/libotr_4.0.0.bb
@@ -6,6 +6,7 @@ DEPENDS = "libgcrypt libgpg-error"
 
 SRC_URI = "http://www.cypherpunks.ca/otr/${BP}.tar.gz \
            file://fix_qa-issue_include.patch \
+           file://sepbuild.patch \
 "
 
 SRC_URI[md5sum] = "00979dca82d70383fcd1b01f3974363c"
-- 
2.0.2

Re: [PATCH 01/27] onig: Use "foreign" automake strictness

[Richard Purdie]

On Fri, 2014-07-18 at 09:42 +0100, Richard Purdie wrote:
> ---
>  meta-oe/recipes-support/onig/files/configure.patch | 13 +++++++++++++
>  meta-oe/recipes-support/onig/onig_5.9.3.bb         |  3 ++-
>  2 files changed, 15 insertions(+), 1 deletion(-)
>  create mode 100644 meta-oe/recipes-support/onig/files/configure.patch

Somehow the SoB lines got lost. I'll not spam the list again unless
someone wants me to, the commits are on:

http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=rpurdie/metaoe

complete with SoB lines.

Cheers,

Richard