From c914a02dc7d500be46795e81ce8c2c0795cf3731 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Tue, 14 Dec 2010 17:56:53 +0000 Subject: gst-plugins: fix for make 3.82 Signed-off-by: Joshua Lock --- .../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 (limited to 'meta') 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 aac630291a..006efdfd03 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 cd3e0a0a95..4edca95611 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 0000000000..28caf076a6 --- /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 -- cgit v1.2.3-54-g00ecf