From 0a751b7dc273140968f7a1784382fe1f0932be62 Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Thu, 18 Nov 2010 00:48:01 +0800 Subject: 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 Signed-off-by: Saul Wold --- .../gst-plugins-base-tremor.patch | 17 +++++++++++++++++ .../gstreamer/gst-plugins-base_0.10.30.bb | 4 +++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.30/gst-plugins-base-tremor.patch (limited to 'meta/recipes-multimedia') 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 @@ +Remove -DTREMOR option since Tremor has dropped its internal +libogg2, and gst-plugins-base has dependency on that. + +Signed-off-by: Dongxiao Xu + +diff -ruN gst-plugins-base-0.10.30-orig/ext/vorbis/Makefile.am gst-plugins-base-0.10.30/ext/vorbis/Makefile.am +--- gst-plugins-base-0.10.30-orig/ext/vorbis/Makefile.am 2010-11-17 16:11:03.000000000 +0800 ++++ gst-plugins-base-0.10.30/ext/vorbis/Makefile.am 2010-11-17 16:12:41.000000000 +0800 +@@ -28,7 +28,7 @@ + libgstivorbisdec_la_SOURCES = gstivorbisdec.c \ + gstvorbisdec.c gstvorbisdeclib.c gstvorbiscommon.c + libgstivorbisdec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ +- -DTREMOR $(IVORBIS_CFLAGS) ++ $(IVORBIS_CFLAGS) + libgstivorbisdec_la_LIBADD = \ + $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \ + $(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 RDEPENDS += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \ gnome-vfs-plugin-sftp" -PR = "r0" +SRC_URI += " file://gst-plugins-base-tremor.patch" + +PR = "r1" inherit gettext -- cgit 1.2.3-korg