[PATCH 1/4] gst-plugins: fix for make 3.82

[PATCH 1/4] gst-plugins: fix for make 3.82

[Joshua Lock]

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

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 aac6302..006efdf 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
@@ -10,12 +10,13 @@ DEPENDS += "virtual/libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis l
 RDEPENDS += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \
              gnome-vfs-plugin-sftp"
 
-SRC_URI += " file://gst-plugins-base-tremor.patch"
+SRC_URI += " file://gst-plugins-base-tremor.patch \
+	     file://make-382.patch"
 
 SRC_URI[md5sum] = "3ad90152b58563e1314af26c263f3c4c"
 SRC_URI[sha256sum] = "63938641380be9935c804ae8d55acdcfd93920ed2deb72dcf70f027a78b085d7"
 
-PR = "r1"
+PR = "r2"
 
 inherit gettext
 
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
index cd3e0a0..4edca95 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
@@ -7,6 +7,8 @@ DEPENDS = "gstreamer"
 
 inherit autotools pkgconfig
 
+FILESPATH =. "${FILE_DIRNAME}/gst-plugins:"
+
 SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2"
 
 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/4] gnome-common: add native variant via BBCLASSEXTEND

[Joshua Lock]

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/recipes-gnome/gnome/gnome-common_2.28.0.bb |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb b/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb
index b4adfe4..c2e1c82 100644
--- a/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb
+++ b/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb
@@ -25,3 +25,5 @@ DEPENDS = ""
 
 FILES_${PN} += "${datadir}/aclocal"
 FILES_${PN}-dev = ""
+
+BBCLASSEXTEND = "native"
-- 
1.7.3.3

[PATCH 3/4] gnome-doc-utils: add native variant using BBCLASSEXTEND

[Joshua Lock]

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/recipes-gnome/gnome/gnome-doc-utils.inc |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils.inc b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
index 00a64e2..286200b 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils.inc
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
@@ -13,3 +13,5 @@ do_install_append() {
 }
 
 FILES_${PN} += "${datadir}/xml*"
+
+BBCLASSEXTEND = "native"
-- 
1.7.3.3

[PATCH 4/4] gthumb: add gnome-doc-utils-native to DEPENDS

[Joshua Lock]

Help files are generated at build time using gnome-doc-utils so we need
gnome-doc-utils native to build this package.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/recipes-gnome/gthumb/gthumb_2.12.0.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-gnome/gthumb/gthumb_2.12.0.bb b/meta/recipes-gnome/gthumb/gthumb_2.12.0.bb
index 7df9d51..e34839a 100644
--- a/meta/recipes-gnome/gthumb/gthumb_2.12.0.bb
+++ b/meta/recipes-gnome/gthumb/gthumb_2.12.0.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "gThumb is an image viewer and browser for the GNOME Desktop"
 SECTION = "x11/gnome"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-DEPENDS = "glib-2.0 gtk+ libxml2 gnome-doc-utils libunique gconf-dbus libpng gstreamer jpeg tiff"
-PR = "r1"
+DEPENDS = "glib-2.0 gtk+ libxml2 gnome-doc-utils-native libunique gconf-dbus libpng gstreamer jpeg tiff"
+PR = "r2"
 
 EXTRA_OECONF = "--disable-gnome-keyring --disable-libsoup --disable-exiv2 --disable-clutter"
 
-- 
1.7.3.3

[PATCH 0/4] Misc build fixes

[Joshua Lock]

This series includes a corrected fix for gst-plugins-base for make 3.82 as
well as fixes to enable gthumb to build on a system without gtk-doc installed

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 (4):
  gst-plugins: fix for make 3.82
  gnome-common: add native variant via BBCLASSEXTEND
  gnome-doc-utils: add native variant using BBCLASSEXTEND
  gthumb: add gnome-doc-utils-native to DEPENDS

 meta/recipes-gnome/gnome/gnome-common_2.28.0.bb    |    2 +
 meta/recipes-gnome/gnome/gnome-doc-utils.inc       |    2 +
 meta/recipes-gnome/gthumb/gthumb_2.12.0.bb         |    4 +-
 .../gstreamer/gst-plugins-base_0.10.30.bb          |    5 ++-
 meta/recipes-multimedia/gstreamer/gst-plugins.inc  |    2 +
 .../gstreamer/gst-plugins/make-382.patch           |   25 ++++++++++++++++++++
 6 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch

-- 
1.7.3.3

Re: [PATCH 0/4] Misc build fixes

[Wolfgang Denk]

Dear Joshua,

In message <cover.1292600657.git.josh@linux.intel.com> you wrote:
> This series includes a corrected fix for gst-plugins-base for make 3.82 as
> well as fixes to enable gthumb to build on a system without gtk-doc installed

Thanks.

>   gthumb: add gnome-doc-utils-native to DEPENDS

Using your poky-contrib/josh/make-382git branch and trying to build
poky-image-sdk for qemuppc on F14 results for me in this:

...
| checking dynamic linker characteristics... (cached) GNU/Linux ld.so
| checking how to hardcode library paths into programs... immediate
| checking for glib-genmarshal... /opt/poky/build-work-qemuppc/tmp/sysroots/x86_64-linux/usr/bin/glib-genmarshal
| checking for glib-mkenums... /opt/poky/build-work-qemuppc/tmp/sysroots/x86_64-linux/usr/bin/glib-mkenums
| checking for powerpc-poky-linux-pkg-config... no
| checking for pkg-config... /opt/poky/build-work-qemuppc/tmp/sysroots/x86_64-linux/usr/bin/pkg-config
| configure: WARNING: using cross tools not prefixed with host triplet
| checking pkg-config is at least version 0.9.0... yes
| checking gnome-doc-utils >= 0.3.2... no
| configure: error: gnome-doc-utils >= 0.3.2 not found
| FATAL: oe_runconf failed
| ERROR: Task failed: ('function do_configure failed', '/opt/poky/build-work-qemuppc/tmp/work/ppc603e-poky-linux/gthumb-2.12.0-r2/temp/log.do_configure.5399')
NOTE: package gthumb-2.12.0-r2: task do_configure: Failed
ERROR: Task 1387 (/home/wd/git/poky/work/meta/recipes-gnome/gthumb/gthumb_2.12.0.bb, do_configure) failed with 1
ERROR: '/home/wd/git/poky/work/meta/recipes-gnome/gthumb/gthumb_2.12.0.bb' failed

Am I missing something?

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
"Never give in.  Never give in.  Never. Never. Never."
- Winston Churchill

Re: [PATCH 0/4] Misc build fixes

[Joshua Lock]

On Mon, 2010-12-20 at 10:29 +0100, Wolfgang Denk wrote:
> Dear Joshua,
> 
> In message <cover.1292600657.git.josh@linux.intel.com> you wrote:
> > This series includes a corrected fix for gst-plugins-base for make 3.82 as
> > well as fixes to enable gthumb to build on a system without gtk-doc installed
> 
> Thanks.
> 
> >   gthumb: add gnome-doc-utils-native to DEPENDS
> 
> Using your poky-contrib/josh/make-382git branch and trying to build
> poky-image-sdk for qemuppc on F14 results for me in this:
> 
> ...
> | checking dynamic linker characteristics... (cached) GNU/Linux ld.so
> | checking how to hardcode library paths into programs... immediate
> | checking for glib-genmarshal... /opt/poky/build-work-qemuppc/tmp/sysroots/x86_64-linux/usr/bin/glib-genmarshal
> | checking for glib-mkenums... /opt/poky/build-work-qemuppc/tmp/sysroots/x86_64-linux/usr/bin/glib-mkenums
> | checking for powerpc-poky-linux-pkg-config... no
> | checking for pkg-config... /opt/poky/build-work-qemuppc/tmp/sysroots/x86_64-linux/usr/bin/pkg-config
> | configure: WARNING: using cross tools not prefixed with host triplet
> | checking pkg-config is at least version 0.9.0... yes
> | checking gnome-doc-utils >= 0.3.2... no
> | configure: error: gnome-doc-utils >= 0.3.2 not found
> | FATAL: oe_runconf failed
> | ERROR: Task failed: ('function do_configure failed', '/opt/poky/build-work-qemuppc/tmp/work/ppc603e-poky-linux/gthumb-2.12.0-r2/temp/log.do_configure.5399')
> NOTE: package gthumb-2.12.0-r2: task do_configure: Failed
> ERROR: Task 1387 (/home/wd/git/poky/work/meta/recipes-gnome/gthumb/gthumb_2.12.0.bb, do_configure) failed with 1
> ERROR: '/home/wd/git/poky/work/meta/recipes-gnome/gthumb/gthumb_2.12.0.bb' failed
> 
> Am I missing something?

Ah, of course - we need the non-native variant of gnome-doc-utils to
pass the pkg-config check...

As you've discovered (on IRC) you can work around this by manually
building gnome-doc-utils - I will work out a patch for this today.

Thanks for reporting,

Joshua
-- 
Joshua Lock
        Intel Open Source Technology Centre

Re: [PATCH 0/4] Misc build fixes

[Joshua Lock]

On Fri, 2010-12-17 at 15:44 +0000, Joshua Lock wrote:
> This series includes a corrected fix for gst-plugins-base for make 3.82 as
> well as fixes to enable gthumb to build on a system without gtk-doc installed

Please ignore this series, I'm putting together an updated patch series
as the gthumb fix isn't right.

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