[PATCH 1/8] gstreamer: fix to comply with make 3.82's stricter parser

[PATCH 1/8] gstreamer: fix to comply with make 3.82's stricter parser

[Joshua Lock]

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 .../gstreamer/gstreamer-0.10.30/make-382.patch     |   32 ++++++++++++++++++++
 .../gstreamer/gstreamer_0.10.30.bb                 |    7 ++--
 2 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer-0.10.30/make-382.patch

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.30/make-382.patch b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.30/make-382.patch
new file mode 100644
index 0000000..1af2a81
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.30/make-382.patch
@@ -0,0 +1,32 @@
+The whitespaces instead of tabs here cause the new, stricter, parser in make
+3.82 to barf on the doc makefiles.
+
+This patch should no longer be required in more recent gstreamer version
+
+JL - 14/12/10
+
+Index: gstreamer-0.10.29/common/gtk-doc.mak
+===================================================================
+--- gstreamer-0.10.29.orig/common/gtk-doc.mak
++++ gstreamer-0.10.29/common/gtk-doc.mak
+@@ -232,6 +232,6 @@ dist-hook: dist-check-gtkdoc dist-hook-l
+ 	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ 	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ 	cd $(distdir) && rm -f $(DISTCLEANFILES)
+-        -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
++	-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+ 
+ .PHONY : dist-hook-local docs
+Index: gstreamer-0.10.29/common/gtk-doc-plugins.mak
+===================================================================
+--- gstreamer-0.10.29.orig/common/gtk-doc-plugins.mak
++++ gstreamer-0.10.29/common/gtk-doc-plugins.mak
+@@ -352,7 +352,7 @@ dist-hook: dist-check-gtkdoc dist-hook-l
+ 	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ 	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ 	cd $(distdir) && rm -f $(DISTCLEANFILES)
+-        -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
++	-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+ 
+ .PHONY : dist-hook-local docs
+ 
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.30.bb b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.30.bb
index 923365f..538884e 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.30.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.30.bb
@@ -10,11 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \
                     file://gst/gst.h;beginline=1;endline=21;md5=8e5fe5e87d33a04479fde862e238eaa4"
 DEPENDS = "glib-2.0 gettext libxml2 bison-native flex-native"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
-           file://check_fix.patch;patch=1 \
-           file://gst-inspect-check-error.patch;patch=1"
+           file://check_fix.patch \
+           file://gst-inspect-check-error.patch \
+	   file://make-382.patch"
 
 SRC_URI[md5sum] = "de01f73f71d97c5854badd363ca06509"
 SRC_URI[sha256sum] = "e8ef301be423797ff36a0bb3615930b112b4175634051d19fd655e0ed974532a"
-- 
1.7.3.3

[PATCH 7/8] gst-plugins: fix for make 3.82

[Joshua Lock]

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 .../gstreamer/gst-plugins-bad_0.10.20.bb           |    2 +-
 .../gstreamer/gst-plugins-base_0.10.30.bb          |    2 +-
 .../gstreamer/gst-plugins-good_0.10.25.bb          |    2 +-
 .../gstreamer/gst-plugins-ugly_0.10.16.bb          |    2 +-
 meta/recipes-multimedia/gstreamer/gst-plugins.inc  |    5 +++-
 .../gstreamer/gst-plugins/make-382.patch           |   25 ++++++++++++++++++++
 6 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch

diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.20.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.20.bb
index 59e127c..7e1dbc6 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.20.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.20.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
 
 DEPENDS += "gst-plugins-base libmusicbrainz tremor"
 
-PR = "r0"
+PR = "r1"
 
 inherit gettext
 
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb
index 71d211a..7f36266 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb
@@ -15,7 +15,7 @@ SRC_URI += " file://gst-plugins-base-tremor.patch"
 SRC_URI[md5sum] = "3ad90152b58563e1314af26c263f3c4c"
 SRC_URI[sha256sum] = "63938641380be9935c804ae8d55acdcfd93920ed2deb72dcf70f027a78b085d7"
 
-PR = "r1"
+PR = "r2"
 
 inherit gettext
 
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.25.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.25.bb
index 83b43b6..852995d 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.25.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.25.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
 
 DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \
 	    speex"
-PR = "r0"
+PR = "r1"
 
 inherit gettext
 
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.16.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.16.bb
index 7dda685..aa0ef9f 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.16.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.16.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                     file://gst/mpegstream/gstmpegparse.h;beginline=1;endline=18;md5=ff65467b0c53cdfa98d0684c1bc240a9"
 
 DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame"
-PR = "r0"
+PR = "r1"
 
 inherit gettext
 
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
index cd3e0a0..644a78e 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
@@ -7,7 +7,10 @@ DEPENDS = "gstreamer"
 
 inherit autotools pkgconfig
 
-SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2"
+FILESPATH =. "${FILE_DIRNAME}/gst-plugins:"
+
+SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \
+	   file://make-382.patch"
 
 EXTRA_OECONF = "--disable-valgrind --disable-debug --disable-examples "
 
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch b/meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch
new file mode 100644
index 0000000..28caf07
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch
@@ -0,0 +1,25 @@
+Index: gst-plugins-base-0.10.29/common/gtk-doc-plugins.mak
+===================================================================
+--- gst-plugins-base-0.10.29.orig/common/gtk-doc-plugins.mak
++++ gst-plugins-base-0.10.29/common/gtk-doc-plugins.mak
+@@ -352,7 +352,7 @@ dist-hook: dist-check-gtkdoc dist-hook-l
+ 	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ 	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ 	cd $(distdir) && rm -f $(DISTCLEANFILES)
+-        -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
++	-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+ 
+ .PHONY : dist-hook-local docs
+ 
+Index: gst-plugins-base-0.10.29/common/gtk-doc.mak
+===================================================================
+--- gst-plugins-base-0.10.29.orig/common/gtk-doc.mak
++++ gst-plugins-base-0.10.29/common/gtk-doc.mak
+@@ -232,6 +232,6 @@ dist-hook: dist-check-gtkdoc dist-hook-l
+ 	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ 	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ 	cd $(distdir) && rm -f $(DISTCLEANFILES)
+-        -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
++	-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+ 
+ .PHONY : dist-hook-local docs
-- 
1.7.3.3

[PATCH 2/8] libowl-av: fix for Make 3.82

[Joshua Lock]

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 .../owl-video-widget/libowl-av/make-382.patch      |   11 +++++++++++
 .../recipes-sato/owl-video-widget/libowl-av_svn.bb |    5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch

diff --git a/meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch b/meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
new file mode 100644
index 0000000..6ba37fb
--- /dev/null
+++ b/meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
@@ -0,0 +1,11 @@
+Index: libowl-av/Makefile.am
+===================================================================
+--- libowl-av.orig/Makefile.am
++++ libowl-av/Makefile.am
+@@ -14,5 +14,5 @@ EXTRA_DIST = libowl-av.pc.in libowl-av.v
+ MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp intltool-extract intltool-merge intltool-update install-sh ltmain.sh Makefile.in missing
+ 
+ snapshot:
+-        $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
++	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+ 
diff --git a/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb b/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb
index e00d3b6..4eeeed6 100644
--- a/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb
+++ b/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb
@@ -13,11 +13,12 @@ RDEPENDS = "gst-meta-base"
 RRECOMMENDS = "gst-meta-audio gst-meta-video"
 
 PV = "0.0+svnr${SRCREV}"
-PR = "r4"
+PR = "r5"
 
 S = "${WORKDIR}/${PN}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http \
-           file://gst_change_state.patch"
+           file://gst_change_state.patch \
+	   file://make-382.patch"
 
 inherit autotools pkgconfig
-- 
1.7.3.3

[PATCH 3/8] owl-video-widget: fix Makefile for super strict make 3.82

[Joshua Lock]

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 .../owl-video-widget/owl-video/make-382.patch      |   15 +++++++++++++++
 .../recipes-sato/owl-video-widget/owl-video_svn.bb |    3 ++-
 2 files changed, 17 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-sato/owl-video-widget/owl-video/make-382.patch

diff --git a/meta/recipes-sato/owl-video-widget/owl-video/make-382.patch b/meta/recipes-sato/owl-video-widget/owl-video/make-382.patch
new file mode 100644
index 0000000..7d8aff7
--- /dev/null
+++ b/meta/recipes-sato/owl-video-widget/owl-video/make-382.patch
@@ -0,0 +1,15 @@
+Make 3.82 is much stricter and demands tabs. Obey.
+
+JL - 15/12/10
+
+Index: video/Makefile.am
+===================================================================
+--- video.orig/Makefile.am
++++ video/Makefile.am
+@@ -4,5 +4,5 @@ SUBDIRS = src
+ MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp intltool-extract intltool-merge intltool-update install-sh ltmain.sh Makefile.in missing
+ 
+ snapshot:
+-        $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
++	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+ 
diff --git a/meta/recipes-sato/owl-video-widget/owl-video_svn.bb b/meta/recipes-sato/owl-video-widget/owl-video_svn.bb
index 07c52ef..5419bea 100644
--- a/meta/recipes-sato/owl-video-widget/owl-video_svn.bb
+++ b/meta/recipes-sato/owl-video-widget/owl-video_svn.bb
@@ -21,7 +21,8 @@ SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=video;proto=http \
            file://stock_volume-min.png \
            file://stock_volume-med.png \
            file://stock_volume-max.png \
-           file://owl-video-widget.desktop"
+           file://owl-video-widget.desktop \
+	   file://make-382.patch"
 
 inherit autotools pkgconfig
 
-- 
1.7.3.3

[PATCH 5/8] dates: fix for Make 3.82

[Joshua Lock]

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/recipes-sato/pimlico/dates/make-382.patch |   16 ++++++++++++++++
 meta/recipes-sato/pimlico/dates_git.bb         |    5 +++--
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-sato/pimlico/dates/make-382.patch

diff --git a/meta/recipes-sato/pimlico/dates/make-382.patch b/meta/recipes-sato/pimlico/dates/make-382.patch
new file mode 100644
index 0000000..9147361
--- /dev/null
+++ b/meta/recipes-sato/pimlico/dates/make-382.patch
@@ -0,0 +1,16 @@
+Make 3.82 is offended by the use of spaces instead of tabs. This has been fixed
+in upstream git.
+
+JL - 15/12/10
+
+Index: git/Makefile.am
+===================================================================
+--- git.orig/Makefile.am
++++ git/Makefile.am
+@@ -7,5 +7,5 @@ DISTCLEANFILES = intltool-extract intlto
+ MAINTAINERCLEANFILES = $(DISTCLEANFILES) aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing
+ 
+ snapshot:
+-        $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
++	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+ 
diff --git a/meta/recipes-sato/pimlico/dates_git.bb b/meta/recipes-sato/pimlico/dates_git.bb
index 49ca4ec..d09f4e6 100644
--- a/meta/recipes-sato/pimlico/dates_git.bb
+++ b/meta/recipes-sato/pimlico/dates_git.bb
@@ -6,8 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
                     file://src/gconf-bridge.c;endline=22;md5=ad7626c6daf4aec590474a243f4912fa"
 
 PV = "0.4.11+git${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 S = "${WORKDIR}/git"
 
-SRC_URI = "git://git.gnome.org/${PN};protocol=git"
+SRC_URI = "git://git.gnome.org/${PN};protocol=git \
+	   file://make-382.patch"
-- 
1.7.3.3

[PATCH 6/8] contacts: fix for make 3.82

[Joshua Lock]

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/recipes-sato/pimlico/contacts/make-382.patch |   14 ++++++++++++++
 meta/recipes-sato/pimlico/contacts_git.bb         |    5 +++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-sato/pimlico/contacts/make-382.patch

diff --git a/meta/recipes-sato/pimlico/contacts/make-382.patch b/meta/recipes-sato/pimlico/contacts/make-382.patch
new file mode 100644
index 0000000..f85d6b2
--- /dev/null
+++ b/meta/recipes-sato/pimlico/contacts/make-382.patch
@@ -0,0 +1,14 @@
+Fix for stricter parser in make 3.82. This fix has been pushed to upstream git.
+
+JL - 15/12/10
+
+Index: git/Makefile.am
+===================================================================
+--- git.orig/Makefile.am
++++ git/Makefile.am
+@@ -11,4 +11,4 @@ DISTCLEANFILES = $(INTLTOOL_BUILT)
+ MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp $(INTLTOOL_BUILT:=.in) install-sh ltmain.sh mkinstalldirs Makefile.in missing
+ 
+ snapshot:
+-        $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
++	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
diff --git a/meta/recipes-sato/pimlico/contacts_git.bb b/meta/recipes-sato/pimlico/contacts_git.bb
index bff4e28..c375435 100644
--- a/meta/recipes-sato/pimlico/contacts_git.bb
+++ b/meta/recipes-sato/pimlico/contacts_git.bb
@@ -6,11 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://src/contacts-gtk.c;endline=23;md5=e1ee9b9e72045f2d3aa44cf17313b46e"
 
 PV = "0.12+git${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 S = "${WORKDIR}/git"
 
-SRC_URI =+ "git://git.gnome.org/${PN};protocol=git"
+SRC_URI =+ "git://git.gnome.org/${PN};protocol=git \
+	    file://make-382.patch"
 
 S = "${WORKDIR}/git"
 
-- 
1.7.3.3

[PATCH 4/8] web-webkit: fix for make 3.82

[Joshua Lock]

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/recipes-sato/web/web-webkit/make-382.patch |   15 +++++++++++++++
 meta/recipes-sato/web/web-webkit_svn.bb         |    5 +++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-sato/web/web-webkit/make-382.patch

diff --git a/meta/recipes-sato/web/web-webkit/make-382.patch b/meta/recipes-sato/web/web-webkit/make-382.patch
new file mode 100644
index 0000000..253743d
--- /dev/null
+++ b/meta/recipes-sato/web/web-webkit/make-382.patch
@@ -0,0 +1,15 @@
+Make 3.82 does not allow 8 spaces instead of a tab
+
+JL - 15/12/10
+
+Index: webkit/Makefile.am
+===================================================================
+--- webkit.orig/Makefile.am
++++ webkit/Makefile.am
+@@ -5,5 +5,5 @@ SUBDIRS = src data
+ MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing
+ 
+ snapshot:
+-        $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
++	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+ 
diff --git a/meta/recipes-sato/web/web-webkit_svn.bb b/meta/recipes-sato/web/web-webkit_svn.bb
index 9cdf1f9..895d49b 100644
--- a/meta/recipes-sato/web/web-webkit_svn.bb
+++ b/meta/recipes-sato/web/web-webkit_svn.bb
@@ -8,10 +8,11 @@ SECTION = "x11"
 DEPENDS = "libxml2 glib-2.0 gtk+ libglade webkit-gtk curl gconf js libowl"
 
 PV = "0.0+svnr${SRCREV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "svn://svn.o-hand.com/repos/web/branches;module=webkit;proto=http \
-           file://link-with-g++.patch;patch=1"
+           file://link-with-g++.patch \
+	   file://make-382.patch"
 
 S = "${WORKDIR}/webkit"
 
-- 
1.7.3.3

[PATCH 8/8] gst-plugins-base: add avahi to DEPENDS

[Joshua Lock]

Base plugins try to link against avahi so ensure it is available

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 .../gstreamer/gst-plugins-base_0.10.30.bb          |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb
index 7f36266..88c9cb4 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
                     file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \
                     file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0"
 
-DEPENDS += "virtual/libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis libxv libtheora"
+DEPENDS += "virtual/libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis libxv libtheora avahi"
 RDEPENDS += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \
              gnome-vfs-plugin-sftp"
 
@@ -15,7 +15,7 @@ SRC_URI += " file://gst-plugins-base-tremor.patch"
 SRC_URI[md5sum] = "3ad90152b58563e1314af26c263f3c4c"
 SRC_URI[sha256sum] = "63938641380be9935c804ae8d55acdcfd93920ed2deb72dcf70f027a78b085d7"
 
-PR = "r2"
+PR = "r3"
 
 inherit gettext
 
-- 
1.7.3.3

[PATCH 0/8] WIP Make 3.82 fixes for master

[Joshua Lock]

Inspired by my recent Laverne patch set this pull request contains patches
towards making Poky master buildable with GNU Make 3.82.

There are still some issues but since I'm away from my multi-core
build machine I thought it best to share the patches, hopefully they are
useful to others and I can finish up the work tomorrow/next week.

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: josh/make-382
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=josh/make-382

Thanks,
    Joshua Lock <josh@linux.intel.com>
---


Joshua Lock (8):
  gstreamer: fix to comply with make 3.82's stricter parser
  libowl-av: fix for Make 3.82
  owl-video-widget: fix Makefile for super strict make 3.82
  web-webkit: fix for make 3.82
  dates: fix for Make 3.82
  contacts: fix for make 3.82
  gst-plugins: fix for make 3.82
  gst-plugins-base: add avahi to DEPENDS

 .../gstreamer/gst-plugins-bad_0.10.20.bb           |    2 +-
 .../gstreamer/gst-plugins-base_0.10.30.bb          |    4 +-
 .../gstreamer/gst-plugins-good_0.10.25.bb          |    2 +-
 .../gstreamer/gst-plugins-ugly_0.10.16.bb          |    2 +-
 meta/recipes-multimedia/gstreamer/gst-plugins.inc  |    5 ++-
 .../gstreamer/gst-plugins/make-382.patch           |   25 +++++++++++++++
 .../gstreamer/gstreamer-0.10.30/make-382.patch     |   32 ++++++++++++++++++++
 .../gstreamer/gstreamer_0.10.30.bb                 |    7 ++--
 .../owl-video-widget/libowl-av/make-382.patch      |   11 +++++++
 .../recipes-sato/owl-video-widget/libowl-av_svn.bb |    5 ++-
 .../owl-video-widget/owl-video/make-382.patch      |   15 +++++++++
 .../recipes-sato/owl-video-widget/owl-video_svn.bb |    3 +-
 meta/recipes-sato/pimlico/contacts/make-382.patch  |   14 ++++++++
 meta/recipes-sato/pimlico/contacts_git.bb          |    5 ++-
 meta/recipes-sato/pimlico/dates/make-382.patch     |   16 ++++++++++
 meta/recipes-sato/pimlico/dates_git.bb             |    5 ++-
 meta/recipes-sato/web/web-webkit/make-382.patch    |   15 +++++++++
 meta/recipes-sato/web/web-webkit_svn.bb            |    5 ++-
 18 files changed, 155 insertions(+), 18 deletions(-)
 create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer-0.10.30/make-382.patch
 create mode 100644 meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
 create mode 100644 meta/recipes-sato/owl-video-widget/owl-video/make-382.patch
 create mode 100644 meta/recipes-sato/pimlico/contacts/make-382.patch
 create mode 100644 meta/recipes-sato/pimlico/dates/make-382.patch
 create mode 100644 meta/recipes-sato/web/web-webkit/make-382.patch

-- 
1.7.3.3

Re: [PATCH 0/8] WIP Make 3.82 fixes for master

[Richard Purdie]

On Thu, 2010-12-16 at 16:29 +0000, Joshua Lock wrote:
> Inspired by my recent Laverne patch set this pull request contains patches
> towards making Poky master buildable with GNU Make 3.82.
> 
> There are still some issues but since I'm away from my multi-core
> build machine I thought it best to share the patches, hopefully they are
> useful to others and I can finish up the work tomorrow/next week.
> 
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>   Branch: josh/make-382
>   Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=josh/make-382
> 
> Thanks,
>     Joshua Lock <josh@linux.intel.com>

Merged into master, thanks.

Richard

Re: [PATCH 7/8] gst-plugins: fix for make 3.82

[Saul Wold]

On 12/14/2010 09:56 AM, Joshua Lock wrote:
> Signed-off-by: Joshua Lock<josh@linux.intel.com>
> ---
>   .../gstreamer/gst-plugins-bad_0.10.20.bb           |    2 +-
>   .../gstreamer/gst-plugins-base_0.10.30.bb          |    2 +-
>   .../gstreamer/gst-plugins-good_0.10.25.bb          |    2 +-
>   .../gstreamer/gst-plugins-ugly_0.10.16.bb          |    2 +-
>   meta/recipes-multimedia/gstreamer/gst-plugins.inc  |    5 +++-
>   .../gstreamer/gst-plugins/make-382.patch           |   25 ++++++++++++++++++++
This patch is required for the current versions of the plugins.  Most 
have this already fixed, can you please verify your patch and build.

I just built this and got manual patching, we may want to revert this one.

Thanks
    Sau!


>   6 files changed, 33 insertions(+), 5 deletions(-)
>   create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch
>
> diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.20.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.20.bb
> index 59e127c..7e1dbc6 100644
> --- a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.20.bb
> +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.20.bb
> @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
>
>   DEPENDS += "gst-plugins-base libmusicbrainz tremor"
>
> -PR = "r0"
> +PR = "r1"
>
>   inherit gettext
>
> diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb
> index 71d211a..7f36266 100644
> --- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb
> +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb
> @@ -15,7 +15,7 @@ SRC_URI += " file://gst-plugins-base-tremor.patch"
>   SRC_URI[md5sum] = "3ad90152b58563e1314af26c263f3c4c"
>   SRC_URI[sha256sum] = "63938641380be9935c804ae8d55acdcfd93920ed2deb72dcf70f027a78b085d7"
>
> -PR = "r1"
> +PR = "r2"
>
>   inherit gettext
>
> diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.25.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.25.bb
> index 83b43b6..852995d 100644
> --- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.25.bb
> +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.25.bb
> @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
>
>   DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \
>   	    speex"
> -PR = "r0"
> +PR = "r1"
>
>   inherit gettext
>
> diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.16.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.16.bb
> index 7dda685..aa0ef9f 100644
> --- a/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.16.bb
> +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.16.bb
> @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
>                       file://gst/mpegstream/gstmpegparse.h;beginline=1;endline=18;md5=ff65467b0c53cdfa98d0684c1bc240a9"
>
>   DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame"
> -PR = "r0"
> +PR = "r1"
>
>   inherit gettext
>
> diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
> index cd3e0a0..644a78e 100644
> --- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc
> +++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
> @@ -7,7 +7,10 @@ DEPENDS = "gstreamer"
>
>   inherit autotools pkgconfig
>
> -SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2"
> +FILESPATH =. "${FILE_DIRNAME}/gst-plugins:"
> +
> +SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \
> +	   file://make-382.patch"
>
I am not sure if you build against the -19 version and then uprev'ed to 
-20, but this patch does not work against the latest 
gst-plugins-bad-0.10.20.


>   EXTRA_OECONF = "--disable-valgrind --disable-debug --disable-examples "
>
> diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch b/meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch
> new file mode 100644
> index 0000000..28caf07
> --- /dev/null
> +++ b/meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch
> @@ -0,0 +1,25 @@
> +Index: gst-plugins-base-0.10.29/common/gtk-doc-plugins.mak
> +===================================================================
> +--- gst-plugins-base-0.10.29.orig/common/gtk-doc-plugins.mak
> ++++ gst-plugins-base-0.10.29/common/gtk-doc-plugins.mak
> +@@ -352,7 +352,7 @@ dist-hook: dist-check-gtkdoc dist-hook-l
> + 	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
> + 	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
> + 	cd $(distdir)&&  rm -f $(DISTCLEANFILES)
> +-        -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
> ++	-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
> +
> + .PHONY : dist-hook-local docs
> +
> +Index: gst-plugins-base-0.10.29/common/gtk-doc.mak
> +===================================================================
> +--- gst-plugins-base-0.10.29.orig/common/gtk-doc.mak
> ++++ gst-plugins-base-0.10.29/common/gtk-doc.mak
> +@@ -232,6 +232,6 @@ dist-hook: dist-check-gtkdoc dist-hook-l
> + 	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
> + 	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
> + 	cd $(distdir)&&  rm -f $(DISTCLEANFILES)
> +-        -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
> ++	-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
> +
> + .PHONY : dist-hook-local docs

Re: [PATCH 7/8] gst-plugins: fix for make 3.82

[Joshua Lock]

On Thu, 2010-12-16 at 14:38 -0800, Saul Wold wrote:
> On 12/14/2010 09:56 AM, Joshua Lock wrote:
> > Signed-off-by: Joshua Lock<josh@linux.intel.com>
> > ---
> >   .../gstreamer/gst-plugins-bad_0.10.20.bb           |    2 +-
> >   .../gstreamer/gst-plugins-base_0.10.30.bb          |    2 +-
> >   .../gstreamer/gst-plugins-good_0.10.25.bb          |    2 +-
> >   .../gstreamer/gst-plugins-ugly_0.10.16.bb          |    2 +-
> >   meta/recipes-multimedia/gstreamer/gst-plugins.inc  |    5 +++-
> >   .../gstreamer/gst-plugins/make-382.patch           |   25 ++++++++++++++++++++
> This patch is required for the current versions of the plugins.  Most 
> have this already fixed, can you please verify your patch and build.
> 
> I just built this and got manual patching, we may want to revert this one.

Whoops, my bad - I saw gst-plugins-base fail with a similar error to
what I was seeing on my laverne branch so just cherry-picked this patch
from said branch.

I have a patch that fixes this.

Cheers,
Joshua
-- 
Joshua Lock
        Intel Open Source Technology Centre