summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2010-12-16 17:48:11 -0800
committerSaul Wold <sgw@linux.intel.com>2010-12-16 17:48:11 -0800
commit3a569bb2d88b360cb39a75a97b15638e6e03a51e (patch)
tree77526dd829dd46cdd2d29ce00da30ab2acef378d /meta/recipes-multimedia
parentac4364698618a541624d1a00f27b638815e5a3f5 (diff)
downloadpoky-3a569bb2d88b360cb39a75a97b15638e6e03a51e.tar.gz
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>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.20.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.25.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.16.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins.inc5
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch25
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
10DEPENDS += "gst-plugins-base libmusicbrainz tremor" 10DEPENDS += "gst-plugins-base libmusicbrainz tremor"
11 11
12PR = "r1" 12PR = "r0"
13 13
14inherit gettext 14inherit 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"
15SRC_URI[md5sum] = "3ad90152b58563e1314af26c263f3c4c" 15SRC_URI[md5sum] = "3ad90152b58563e1314af26c263f3c4c"
16SRC_URI[sha256sum] = "63938641380be9935c804ae8d55acdcfd93920ed2deb72dcf70f027a78b085d7" 16SRC_URI[sha256sum] = "63938641380be9935c804ae8d55acdcfd93920ed2deb72dcf70f027a78b085d7"
17 17
18PR = "r3" 18PR = "r1"
19 19
20inherit gettext 20inherit 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
8DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \ 8DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \
9 speex" 9 speex"
10PR = "r1" 10PR = "r0"
11 11
12inherit gettext 12inherit 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
9DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame" 9DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame"
10PR = "r1" 10PR = "r0"
11 11
12inherit gettext 12inherit 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
8inherit autotools pkgconfig 8inherit autotools pkgconfig
9 9
10FILESPATH =. "${FILE_DIRNAME}/gst-plugins:" 10SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2"
11
12SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \
13 file://make-382.patch"
14 11
15EXTRA_OECONF = "--disable-valgrind --disable-debug --disable-examples " 12EXTRA_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 @@
1Index: 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
14Index: 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