From 290280b332570ec73301f76765b1c5f2de20a9fd 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-bad_0.10.19.bb | 2 +- .../gstreamer/gst-plugins-base_0.10.29.bb | 2 +- .../gstreamer/gst-plugins-good_0.10.23.bb | 2 +- .../gstreamer/gst-plugins-ugly_0.10.15.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.19.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.19.bb index 1a58668440..1960dd9229 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.19.bb +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.19.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ DEPENDS += "gst-plugins-base libmusicbrainz tremor" -PR = "r2" +PR = "r3" inherit gettext diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.29.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.29.bb index c1d2f1e9dd..1945da064e 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.29.bb +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.29.bb @@ -10,7 +10,7 @@ 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" -PR = "r1" +PR = "r2" inherit gettext diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.23.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.23.bb index 528dcbf540..784ba779ea 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.23.bb +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.23.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.15.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.15.bb index 7dda685002..aa0ef9fe38 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.15.bb +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.15.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 cd3e0a0a95..644a78e887 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 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