* [PATCH 1/3] gst-plugins: fix for make 3.82
2010-12-20 14:46 [PATCH 0/3] Misc build fixes v2 Joshua Lock
@ 2010-12-14 17:56 ` Joshua Lock
2010-12-17 14:09 ` [PATCH 2/3] gnome-common: add native variant via BBCLASSEXTEND Joshua Lock
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Joshua Lock @ 2010-12-14 17:56 UTC (permalink / raw)
To: poky
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] gnome-common: add native variant via BBCLASSEXTEND
2010-12-20 14:46 [PATCH 0/3] Misc build fixes v2 Joshua Lock
2010-12-14 17:56 ` [PATCH 1/3] gst-plugins: fix for make 3.82 Joshua Lock
@ 2010-12-17 14:09 ` Joshua Lock
2010-12-17 14:09 ` [PATCH 3/3] gnome-doc-utils: ensure a native variant exists for document generation Joshua Lock
2010-12-21 7:27 ` [PATCH 0/3] Misc build fixes v2 Wolfgang Denk
3 siblings, 0 replies; 6+ messages in thread
From: Joshua Lock @ 2010-12-17 14:09 UTC (permalink / raw)
To: poky
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] gnome-doc-utils: ensure a native variant exists for document generation
2010-12-20 14:46 [PATCH 0/3] Misc build fixes v2 Joshua Lock
2010-12-14 17:56 ` [PATCH 1/3] gst-plugins: fix for make 3.82 Joshua Lock
2010-12-17 14:09 ` [PATCH 2/3] gnome-common: add native variant via BBCLASSEXTEND Joshua Lock
@ 2010-12-17 14:09 ` Joshua Lock
2010-12-21 7:27 ` [PATCH 0/3] Misc build fixes v2 Wolfgang Denk
3 siblings, 0 replies; 6+ messages in thread
From: Joshua Lock @ 2010-12-17 14:09 UTC (permalink / raw)
To: poky
gnome-doc-utils-native must be available to do the build time generation of
documentation however most gnome projects will do a pkgconfig check for the
host version of gnome-doc-utils.
This patch adds gnome-doc-utils-native and makes gnome-doc-utils depend on it
so that recipe writers can just add gnome-doc-utils to their DEPENDS and the
system will do the right thing.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
.../gnome/gnome-doc-utils-native_0.20.2.bb | 7 +++++++
meta/recipes-gnome/gnome/gnome-doc-utils.inc | 4 +---
2 files changed, 8 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils-native_0.20.2.bb
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils-native_0.20.2.bb b/meta/recipes-gnome/gnome/gnome-doc-utils-native_0.20.2.bb
new file mode 100644
index 0000000..30d5a5b
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils-native_0.20.2.bb
@@ -0,0 +1,7 @@
+require gnome-doc-utils_${PV}.bb
+
+inherit native
+
+DEPENDS = "libxml2-native libxslt-native"
+
+PR = "r0"
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils.inc b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
index 00a64e2..0cd8203 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils.inc
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
@@ -1,7 +1,5 @@
LICENSE = "GPL LGPL"
-DEPENDS = "libxml2 libxslt libxslt-native"
-
-PR = "r1"
+DEPENDS = "libxml2 libxslt libxslt-native gnome-doc-utils-native"
inherit gnome
--
1.7.3.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 0/3] Misc build fixes v2
@ 2010-12-20 14:46 Joshua Lock
2010-12-14 17:56 ` [PATCH 1/3] gst-plugins: fix for make 3.82 Joshua Lock
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Joshua Lock @ 2010-12-20 14:46 UTC (permalink / raw)
To: poky
This series includes a corrected fix for gst-plugins-base for make 3.82 as
well as a more correct fix to enable gthumb to build on a system without
gtk-doc installed.
We do this by providing a gtk-doc-native recipe and having gtk-doc depend on
it. That way we have a binary to run on the build system to generate the
documentation as well as a target version so that the pkgconfig test passes.
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 (3):
gst-plugins: fix for make 3.82
gnome-common: add native variant via BBCLASSEXTEND
gnome-doc-utils: ensure a native variant exists for document
generation
meta/recipes-gnome/gnome/gnome-common_2.28.0.bb | 2 +
.../gnome/gnome-doc-utils-native_0.20.2.bb | 7 +++++
meta/recipes-gnome/gnome/gnome-doc-utils.inc | 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, 40 insertions(+), 5 deletions(-)
create mode 100644 meta/recipes-gnome/gnome/gnome-doc-utils-native_0.20.2.bb
create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch
--
1.7.3.3
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/3] Misc build fixes v2
2010-12-20 14:46 [PATCH 0/3] Misc build fixes v2 Joshua Lock
` (2 preceding siblings ...)
2010-12-17 14:09 ` [PATCH 3/3] gnome-doc-utils: ensure a native variant exists for document generation Joshua Lock
@ 2010-12-21 7:27 ` Wolfgang Denk
2010-12-21 14:45 ` Richard Purdie
3 siblings, 1 reply; 6+ messages in thread
From: Wolfgang Denk @ 2010-12-21 7:27 UTC (permalink / raw)
To: Joshua Lock; +Cc: poky
Dear Joshua Lock,
In message <cover.1292856365.git.josh@linux.intel.com> you wrote:
> This series includes a corrected fix for gst-plugins-base for make 3.82 as
> well as a more correct fix to enable gthumb to build on a system without
> gtk-doc installed.
>
> We do this by providing a gtk-doc-native recipe and having gtk-doc depend on
> it. That way we have a binary to run on the build system to generate the
> documentation as well as a target version so that the pkgconfig test passes.
>
> 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
I confirm that I can build both poky-image-sdk and meta-toolchain-sdk
for "qemuppc" on Fedora 14 / x86_64 with these patches.
Tested-by: Wolfgang Denk <wd@denx.de>
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
A Freudian slip is when you say one thing but mean your mother.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/3] Misc build fixes v2
2010-12-21 7:27 ` [PATCH 0/3] Misc build fixes v2 Wolfgang Denk
@ 2010-12-21 14:45 ` Richard Purdie
0 siblings, 0 replies; 6+ messages in thread
From: Richard Purdie @ 2010-12-21 14:45 UTC (permalink / raw)
To: Wolfgang Denk; +Cc: poky, Joshua Lock
On Tue, 2010-12-21 at 08:27 +0100, Wolfgang Denk wrote:
> Dear Joshua Lock,
>
> In message <cover.1292856365.git.josh@linux.intel.com> you wrote:
> > This series includes a corrected fix for gst-plugins-base for make 3.82 as
> > well as a more correct fix to enable gthumb to build on a system without
> > gtk-doc installed.
> >
> > We do this by providing a gtk-doc-native recipe and having gtk-doc depend on
> > it. That way we have a binary to run on the build system to generate the
> > documentation as well as a target version so that the pkgconfig test passes.
> >
> > 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
>
> I confirm that I can build both poky-image-sdk and meta-toolchain-sdk
> for "qemuppc" on Fedora 14 / x86_64 with these patches.
>
> Tested-by: Wolfgang Denk <wd@denx.de>
Great, I'm pleased this is working better now. Thanks for reporting
back!
(and thanks Joshua for sorting the issues!)
Cheers,
Richard
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-12-21 14:46 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-20 14:46 [PATCH 0/3] Misc build fixes v2 Joshua Lock
2010-12-14 17:56 ` [PATCH 1/3] gst-plugins: fix for make 3.82 Joshua Lock
2010-12-17 14:09 ` [PATCH 2/3] gnome-common: add native variant via BBCLASSEXTEND Joshua Lock
2010-12-17 14:09 ` [PATCH 3/3] gnome-doc-utils: ensure a native variant exists for document generation Joshua Lock
2010-12-21 7:27 ` [PATCH 0/3] Misc build fixes v2 Wolfgang Denk
2010-12-21 14:45 ` Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.