diff options
6 files changed, 5 insertions, 33 deletions
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 7e1dbc6438..59e127c859 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 \ | |||
| 9 | 9 | ||
| 10 | DEPENDS += "gst-plugins-base libmusicbrainz tremor" | 10 | DEPENDS += "gst-plugins-base libmusicbrainz tremor" |
| 11 | 11 | ||
| 12 | PR = "r1" | 12 | PR = "r0" |
| 13 | 13 | ||
| 14 | inherit gettext | 14 | inherit gettext |
| 15 | 15 | ||
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 88c9cb4859..aac630291a 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" | |||
| 15 | SRC_URI[md5sum] = "3ad90152b58563e1314af26c263f3c4c" | 15 | SRC_URI[md5sum] = "3ad90152b58563e1314af26c263f3c4c" |
| 16 | SRC_URI[sha256sum] = "63938641380be9935c804ae8d55acdcfd93920ed2deb72dcf70f027a78b085d7" | 16 | SRC_URI[sha256sum] = "63938641380be9935c804ae8d55acdcfd93920ed2deb72dcf70f027a78b085d7" |
| 17 | 17 | ||
| 18 | PR = "r3" | 18 | PR = "r1" |
| 19 | 19 | ||
| 20 | inherit gettext | 20 | inherit gettext |
| 21 | 21 | ||
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 852995dd79..83b43b6f9e 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 \ | |||
| 7 | 7 | ||
| 8 | DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \ | 8 | DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \ |
| 9 | speex" | 9 | speex" |
| 10 | PR = "r1" | 10 | PR = "r0" |
| 11 | 11 | ||
| 12 | inherit gettext | 12 | inherit gettext |
| 13 | 13 | ||
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 aa0ef9fe38..7dda685002 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 \ | |||
| 7 | file://gst/mpegstream/gstmpegparse.h;beginline=1;endline=18;md5=ff65467b0c53cdfa98d0684c1bc240a9" | 7 | file://gst/mpegstream/gstmpegparse.h;beginline=1;endline=18;md5=ff65467b0c53cdfa98d0684c1bc240a9" |
| 8 | 8 | ||
| 9 | DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame" | 9 | DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame" |
| 10 | PR = "r1" | 10 | PR = "r0" |
| 11 | 11 | ||
| 12 | inherit gettext | 12 | inherit gettext |
| 13 | 13 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc index 644a78e887..cd3e0a0a95 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc +++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc | |||
| @@ -7,10 +7,7 @@ DEPENDS = "gstreamer" | |||
| 7 | 7 | ||
| 8 | inherit autotools pkgconfig | 8 | inherit autotools pkgconfig |
| 9 | 9 | ||
| 10 | FILESPATH =. "${FILE_DIRNAME}/gst-plugins:" | 10 | SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2" |
| 11 | |||
| 12 | SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \ | ||
| 13 | file://make-382.patch" | ||
| 14 | 11 | ||
| 15 | EXTRA_OECONF = "--disable-valgrind --disable-debug --disable-examples " | 12 | EXTRA_OECONF = "--disable-valgrind --disable-debug --disable-examples " |
| 16 | 13 | ||
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 @@ | |||
| 1 | Index: gst-plugins-base-0.10.29/common/gtk-doc-plugins.mak | ||
| 2 | =================================================================== | ||
| 3 | --- gst-plugins-base-0.10.29.orig/common/gtk-doc-plugins.mak | ||
| 4 | +++ gst-plugins-base-0.10.29/common/gtk-doc-plugins.mak | ||
| 5 | @@ -352,7 +352,7 @@ dist-hook: dist-check-gtkdoc dist-hook-l | ||
| 6 | -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ | ||
| 7 | -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ | ||
| 8 | cd $(distdir) && rm -f $(DISTCLEANFILES) | ||
| 9 | - -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html | ||
| 10 | + -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html | ||
| 11 | |||
| 12 | .PHONY : dist-hook-local docs | ||
| 13 | |||
| 14 | Index: gst-plugins-base-0.10.29/common/gtk-doc.mak | ||
| 15 | =================================================================== | ||
| 16 | --- gst-plugins-base-0.10.29.orig/common/gtk-doc.mak | ||
| 17 | +++ gst-plugins-base-0.10.29/common/gtk-doc.mak | ||
| 18 | @@ -232,6 +232,6 @@ dist-hook: dist-check-gtkdoc dist-hook-l | ||
| 19 | -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ | ||
| 20 | -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ | ||
| 21 | cd $(distdir) && rm -f $(DISTCLEANFILES) | ||
| 22 | - -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html | ||
| 23 | + -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html | ||
| 24 | |||
| 25 | .PHONY : dist-hook-local docs | ||
