summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-12-14 17:56:53 +0000
committerJoshua Lock <josh@linux.intel.com>2010-12-14 17:56:53 +0000
commit290280b332570ec73301f76765b1c5f2de20a9fd (patch)
tree247e86885f1b7663f2ef8e720fdd2e15d5f99d70
parent9e11fbf9048b17526ca8160d82b69f386595c9a7 (diff)
downloadpoky-290280b332570ec73301f76765b1c5f2de20a9fd.tar.gz
gst-plugins: fix for make 3.82
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.19.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.29.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.23.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.15.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, 33 insertions, 5 deletions
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 \
9 9
10DEPENDS += "gst-plugins-base libmusicbrainz tremor" 10DEPENDS += "gst-plugins-base libmusicbrainz tremor"
11 11
12PR = "r2" 12PR = "r3"
13 13
14inherit gettext 14inherit gettext
15 15
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
10RDEPENDS += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \ 10RDEPENDS += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \
11 gnome-vfs-plugin-sftp" 11 gnome-vfs-plugin-sftp"
12 12
13PR = "r1" 13PR = "r2"
14 14
15inherit gettext 15inherit gettext
16 16
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 \
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 = "r0" 10PR = "r1"
11 11
12inherit gettext 12inherit gettext
13 13
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 \
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 = "r0" 10PR = "r1"
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 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"
7 7
8inherit autotools pkgconfig 8inherit autotools pkgconfig
9 9
10SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2" 10FILESPATH =. "${FILE_DIRNAME}/gst-plugins:"
11
12SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \
13 file://make-382.patch"
11 14
12EXTRA_OECONF = "--disable-valgrind --disable-debug --disable-examples " 15EXTRA_OECONF = "--disable-valgrind --disable-debug --disable-examples "
13 16
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 @@
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
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-27 04:04:36 +0000