summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.31/gst-plugins-base-tremor.patch (renamed from meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.30/gst-plugins-base-tremor.patch)0
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.31.bb (renamed from meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb)9
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch25
3 files changed, 4 insertions, 30 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.30/gst-plugins-base-tremor.patch b/meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.31/gst-plugins-base-tremor.patch
index a6494fd4a9..a6494fd4a9 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.30/gst-plugins-base-tremor.patch
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.31/gst-plugins-base-tremor.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.31.bb
index cbc13daf0a..77330b605f 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.31.bb
@@ -10,13 +10,12 @@ DEPENDS += "virtual/libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis l
RDEPENDS_${PN} += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \
gnome-vfs-plugin-sftp"
-SRC_URI += " file://gst-plugins-base-tremor.patch \
- file://make-382.patch"
+SRC_URI += " file://gst-plugins-base-tremor.patch"
-SRC_URI[md5sum] = "3ad90152b58563e1314af26c263f3c4c"
-SRC_URI[sha256sum] = "63938641380be9935c804ae8d55acdcfd93920ed2deb72dcf70f027a78b085d7"
+SRC_URI[md5sum] = "9baa0d87e81c88b2477a3554ab629c46"
+SRC_URI[sha256sum] = "abb006c78222cfb69d31e983268d1d5219e9d4e0da24c6c4cd687968af7a33bd"
-PR = "r3"
+PR = "r0"
inherit gettext
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch b/meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch
deleted file mode 100644
index 28caf076a6..0000000000
--- a/meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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