Revert "gst-plugins: fix for make 3.82"

This reverts commit 06570b84e498e8643aa29d9864f377bd55df1f23.
These versions of gst-plugins-* already have been fixed upstream
for the make 3.82 problems, so this patch detects already applied
and bails

Signed-off-by: Saul Wold <sgw@linux.intel.com>

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 7e1dbc643814f58beba588c98b02dcbac029bbdc..59e127c8592be4e1171a4faf9530d6e50a09d175 100644 (file)
--- 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 = "r1"
+PR = "r0"
 
 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 88c9cb485982425ffd1323ee819c0f90ae508d4f..aac630291a97d86a101cb9a5cd1d3fc8d09e5afa 100644 (file)
--- 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 = "r3"
+PR = "r1"
 
 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 852995dd79d502de4a1e15c1937ed91f01d0511e..83b43b6f9e5ef862991c9f964516ea2cd825cfb9 100644 (file)
--- 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 = "r1"
+PR = "r0"
 
 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 aa0ef9fe387f6a075e21db99a1a07c5180a207c3..7dda6850029d3dce39a306c08cf3a41a518492a2 100644 (file)
--- 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 = "r1"
+PR = "r0"
 
 inherit gettext
 

diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
index 644a78e887047120815dafbb17dab5326afbf3c1..cd3e0a0a9598e36f47fb40c1a37d679f57924663 100644 (file)
--- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
@@ -7,10 +7,7 @@ DEPENDS = "gstreamer"
 
 inherit autotools pkgconfig
 
-FILESPATH =. "${FILE_DIRNAME}/gst-plugins:"
-
-SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \
-          file://make-382.patch"
+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
deleted file mode 100644 (file)
index 28caf07..0000000
--- 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