From: Saul Wold <saul.wold@intel.com>
To: Joshua Lock <josh@linux.intel.com>
Cc: poky@yoctoproject.org
Subject: Re: [PATCH 7/8] gst-plugins: fix for make 3.82
Date: Thu, 16 Dec 2010 14:38:08 -0800 [thread overview]
Message-ID: <4D0A94D0.3050309@intel.com> (raw)
In-Reply-To: <0e7de81fa0e7fb3dc908c85796ca740b399959e5.1292516982.git.josh@linux.intel.com>
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
next prev parent reply other threads:[~2010-12-16 22:38 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-16 16:29 [PATCH 0/8] WIP Make 3.82 fixes for master Joshua Lock
2010-12-14 15:39 ` [PATCH 1/8] gstreamer: fix to comply with make 3.82's stricter parser Joshua Lock
2010-12-14 17:56 ` [PATCH 7/8] gst-plugins: fix for make 3.82 Joshua Lock
2010-12-16 22:38 ` Saul Wold [this message]
2010-12-17 12:01 ` Joshua Lock
2010-12-14 18:29 ` [PATCH 2/8] libowl-av: fix for Make 3.82 Joshua Lock
2010-12-15 12:27 ` [PATCH 3/8] owl-video-widget: fix Makefile for super strict make 3.82 Joshua Lock
2010-12-15 12:58 ` [PATCH 5/8] dates: fix for Make 3.82 Joshua Lock
2010-12-15 13:42 ` [PATCH 6/8] contacts: fix for make 3.82 Joshua Lock
2010-12-15 14:31 ` [PATCH 4/8] web-webkit: " Joshua Lock
2010-12-15 18:45 ` [PATCH 8/8] gst-plugins-base: add avahi to DEPENDS Joshua Lock
2010-12-16 17:36 ` [PATCH 0/8] WIP Make 3.82 fixes for master Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D0A94D0.3050309@intel.com \
--to=saul.wold@intel.com \
--cc=josh@linux.intel.com \
--cc=poky@yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.