summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2010-11-18 00:48:01 +0800
committerSaul Wold <Saul.Wold@intel.com>2010-11-18 13:30:28 -0800
commit0a751b7dc273140968f7a1784382fe1f0932be62 (patch)
treee2f2ec1b01ccb2e1475b734b4dd93e55c05b1e4b /meta/recipes-multimedia/gstreamer
parentaef25de421576d9471ca57f9dcf7f33439202f18 (diff)
downloadpoky-0a751b7dc273140968f7a1784382fe1f0932be62.tar.gz
gst-plugins-base: Fix build error
The latest tremor has dropped its internal libogg2, which gst-plugins-base is depend on. Remove the "-DTREMOR" in gst-plugins-base Makefile.am to fix the build issue. Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer')
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.30/gst-plugins-base-tremor.patch17
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb4
2 files changed, 20 insertions, 1 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.30/gst-plugins-base-tremor.patch
new file mode 100644
index 0000000000..a6494fd4a9
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.30/gst-plugins-base-tremor.patch
@@ -0,0 +1,17 @@
1Remove -DTREMOR option since Tremor has dropped its internal
2libogg2, and gst-plugins-base has dependency on that.
3
4Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
5
6diff -ruN gst-plugins-base-0.10.30-orig/ext/vorbis/Makefile.am gst-plugins-base-0.10.30/ext/vorbis/Makefile.am
7--- gst-plugins-base-0.10.30-orig/ext/vorbis/Makefile.am 2010-11-17 16:11:03.000000000 +0800
8+++ gst-plugins-base-0.10.30/ext/vorbis/Makefile.am 2010-11-17 16:12:41.000000000 +0800
9@@ -28,7 +28,7 @@
10 libgstivorbisdec_la_SOURCES = gstivorbisdec.c \
11 gstvorbisdec.c gstvorbisdeclib.c gstvorbiscommon.c
12 libgstivorbisdec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
13- -DTREMOR $(IVORBIS_CFLAGS)
14+ $(IVORBIS_CFLAGS)
15 libgstivorbisdec_la_LIBADD = \
16 $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \
17 $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \
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 2a2731f2b0..7e0370adc9 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
@@ -10,7 +10,9 @@ 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 = "r0" 13SRC_URI += " file://gst-plugins-base-tremor.patch"
14
15PR = "r1"
14 16
15inherit gettext 17inherit gettext
16 18