From 450c47d017976ba2b0a38d6454c11b7751d337be Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Sun, 3 Aug 2008 13:47:50 +0000 Subject: gst-plugins-bad: upgrade to 0.10.8 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5014 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../gst-plugins-bad-0.10.5/ivorbisdec.patch | 91 ---------------------- meta/packages/gstreamer/gst-plugins-bad_0.10.5.bb | 15 ---- meta/packages/gstreamer/gst-plugins-bad_0.10.8.bb | 12 +++ 3 files changed, 12 insertions(+), 106 deletions(-) delete mode 100644 meta/packages/gstreamer/gst-plugins-bad-0.10.5/ivorbisdec.patch delete mode 100644 meta/packages/gstreamer/gst-plugins-bad_0.10.5.bb create mode 100644 meta/packages/gstreamer/gst-plugins-bad_0.10.8.bb (limited to 'meta/packages') diff --git a/meta/packages/gstreamer/gst-plugins-bad-0.10.5/ivorbisdec.patch b/meta/packages/gstreamer/gst-plugins-bad-0.10.5/ivorbisdec.patch deleted file mode 100644 index 047c1864c7..0000000000 --- a/meta/packages/gstreamer/gst-plugins-bad-0.10.5/ivorbisdec.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff -urNd ../gst-plugins-bad0.10-0.10.3+cvs20060918/ext/ivorbis/vorbisdec.h ext/ivorbis/vorbisdec.h ---- ../gst-plugins-bad0.10-0.10.3+cvs20060918/ext/ivorbis/vorbisdec.h 1970-01-01 01:00:00.000000000 +0100 -+++ ext/ivorbis/vorbisdec.h 2006-09-20 17:26:46.000000000 +0100 -@@ -0,0 +1,87 @@ -+/* -*- c-basic-offset: 2 -*- -+ * GStreamer -+ * Copyright (C) <1999> Erik Walthinsen -+ * -+ * Tremor modifications <2006>: -+ * Chris Lord, OpenedHand Ltd. , http://www.o-hand.com/ -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ */ -+ -+ -+#ifndef __GST_IVORBIS_DEC_H__ -+#define __GST_IVORBIS_DEC_H__ -+ -+ -+#include -+#include -+ -+G_BEGIN_DECLS -+ -+#define GST_TYPE_IVORBIS_DEC \ -+ (gst_ivorbis_dec_get_type()) -+#define GST_IVORBIS_DEC(obj) \ -+ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_IVORBIS_DEC,GstIVorbisDec)) -+#define GST_IVORBIS_DEC_CLASS(klass) \ -+ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_IVORBIS_DEC,GstIVorbisDecClass)) -+#define GST_IS_IVORBIS_DEC(obj) \ -+ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_IVORBIS_DEC)) -+#define GST_IS_IVORBIS_DEC_CLASS(klass) \ -+ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_IVORBIS_DEC)) -+ -+typedef struct _GstIVorbisDec GstIVorbisDec; -+typedef struct _GstIVorbisDecClass GstIVorbisDecClass; -+ -+/** -+ * GstIVorbisDec: -+ * -+ * Opaque data structure. -+ */ -+struct _GstIVorbisDec { -+ GstElement element; -+ -+ GstPad * sinkpad; -+ GstPad * srcpad; -+ -+ vorbis_dsp_state vd; -+ vorbis_info vi; -+ vorbis_comment vc; -+ vorbis_block vb; -+ guint64 granulepos; -+ -+ gboolean initialized; -+ -+ GList *queued; -+ -+ GstSegment segment; -+ gboolean discont; -+ -+ GstClockTime cur_timestamp; /* only used with non-ogg container formats */ -+ GstClockTime prev_timestamp; /* only used with non-ogg container formats */ -+ -+ GList *pendingevents; -+ GstTagList *taglist; -+}; -+ -+struct _GstIVorbisDecClass { -+ GstElementClass parent_class; -+}; -+ -+GType gst_ivorbis_dec_get_type(void); -+ -+G_END_DECLS -+ -+#endif /* __GST_IVORBIS_DEC_H__ */ diff --git a/meta/packages/gstreamer/gst-plugins-bad_0.10.5.bb b/meta/packages/gstreamer/gst-plugins-bad_0.10.5.bb deleted file mode 100644 index d6023aae18..0000000000 --- a/meta/packages/gstreamer/gst-plugins-bad_0.10.5.bb +++ /dev/null @@ -1,15 +0,0 @@ -require gst-plugins.inc -DEPENDS += "gst-plugins-base libmusicbrainz tremor" -PR = "r6" - -EXTRA_OECONF += "--disable-examples --disable-experimental --disable-sdl --disable-cdaudio \ - --with-plugins=musicbrainz,wavpack,ivorbis" - -SRC_URI += " file://ivorbisdec.patch;patch=1;pnum=0" - -ARM_INSTRUCTION_SET = "arm" - -do_configure_prepend() { - # This m4 file contains nastiness which conflicts with libtool 2.2.2 - rm ${S}/m4/lib-link.m4 || true -} diff --git a/meta/packages/gstreamer/gst-plugins-bad_0.10.8.bb b/meta/packages/gstreamer/gst-plugins-bad_0.10.8.bb new file mode 100644 index 0000000000..78192dfa0b --- /dev/null +++ b/meta/packages/gstreamer/gst-plugins-bad_0.10.8.bb @@ -0,0 +1,12 @@ +require gst-plugins.inc +DEPENDS += "gst-plugins-base libmusicbrainz tremor" + +EXTRA_OECONF += "--disable-examples --disable-experimental --disable-sdl --disable-cdaudio \ + --with-plugins=musicbrainz,wavpack,ivorbis" + +ARM_INSTRUCTION_SET = "arm" + +do_configure_prepend() { + # This m4 file contains nastiness which conflicts with libtool 2.2.2 + rm ${S}/m4/lib-link.m4 || true +} -- cgit v1.2.3