[oe-commits] org.oe.dev gst-plugins-bad 0.10.5 fix compiling (see upstream bug #454078)
mickeyl commit
openembedded-commits at lists.openembedded.org
Tue Aug 7 11:04:21 UTC 2007
gst-plugins-bad 0.10.5 fix compiling (see upstream bug #454078)
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 3bc048bb553b64eaf0567c44a7b375930a42b5af
ViewMTN: http://monotone.openembedded.org/revision.psp?id=3bc048bb553b64eaf0567c44a7b375930a42b5af
Files:
1
packages/gstreamer/gst-plugins-bad/vorbisdec.h
packages/gstreamer/gst-plugins-bad/vorbisenc.h
packages/gstreamer/gst-plugins-bad_0.10.5.bb
Diffs:
#
# mt diff -r00c60fb6c30af9fc1a827b370b5a340b7d239eb4 -r3bc048bb553b64eaf0567c44a7b375930a42b5af
#
#
#
# add_file "packages/gstreamer/gst-plugins-bad/vorbisdec.h"
# content [35a5d523350c80fd7fcbb6e24b8cd33ed8d54767]
#
# add_file "packages/gstreamer/gst-plugins-bad/vorbisenc.h"
# content [b5193a880ad4ca82fbae6b25eaa778dde0c47235]
#
# patch "packages/gstreamer/gst-plugins-bad_0.10.5.bb"
# from [153241e44fdf8f79eb8ab1dbccc2ce27e2fd6327]
# to [f7278fed1af9fcc35b052a8c231322246a53e65e]
#
============================================================
--- packages/gstreamer/gst-plugins-bad/vorbisdec.h 35a5d523350c80fd7fcbb6e24b8cd33ed8d54767
+++ packages/gstreamer/gst-plugins-bad/vorbisdec.h 35a5d523350c80fd7fcbb6e24b8cd33ed8d54767
@@ -0,0 +1,87 @@
+/* -*- c-basic-offset: 2 -*-
+ * GStreamer
+ * Copyright (C) <1999> Erik Walthinsen <omega at cse.ogi.edu>
+ *
+ * Tremor modifications <2006>:
+ * Chris Lord, OpenedHand Ltd. <chris at openedhand.com>, 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 <gst/gst.h>
+#include <tremor/ivorbiscodec.h>
+
+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__ */
============================================================
--- packages/gstreamer/gst-plugins-bad/vorbisenc.h b5193a880ad4ca82fbae6b25eaa778dde0c47235
+++ packages/gstreamer/gst-plugins-bad/vorbisenc.h b5193a880ad4ca82fbae6b25eaa778dde0c47235
@@ -0,0 +1,101 @@
+/* GStreamer
+ * Copyright (C) <1999> Erik Walthinsen <omega at cse.ogi.edu>
+ *
+ * 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 __VORBISENC_H__
+#define __VORBISENC_H__
+
+
+#include <config.h>
+#include <gst/gst.h>
+
+#include <tremor/codec.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#define GST_TYPE_VORBISENC \
+ (vorbisenc_get_type())
+#define GST_VORBISENC(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_VORBISENC,VorbisEnc))
+#define GST_VORBISENC_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_VORBISENC,VorbisEncClass))
+#define GST_IS_VORBISENC(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VORBISENC))
+#define GST_IS_VORBISENC_CLASS(obj) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VORBISENC))
+
+typedef struct _VorbisEnc VorbisEnc;
+typedef struct _VorbisEncClass VorbisEncClass;
+
+struct _VorbisEnc {
+ GstElement element;
+
+ GstPad *sinkpad,
+ *srcpad;
+
+ ogg_stream_state os; /* take physical pages, weld into a logical
+ stream of packets */
+ ogg_page og; /* one Ogg bitstream page. Vorbis packets are inside */
+ ogg_packet op; /* one raw packet of data for decode */
+
+ vorbis_info vi; /* struct that stores all the static vorbis bitstream
+ settings */
+ vorbis_comment vc; /* struct that stores all the user comments */
+
+ vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */
+ vorbis_block vb; /* local working space for packet->PCM decode */
+
+ gboolean eos;
+
+ gboolean managed;
+ gint bitrate;
+ gint min_bitrate;
+ gint max_bitrate;
+ gfloat quality;
+ gboolean quality_set;
+ gint serial;
+
+ gint channels;
+ gint frequency;
+
+ guint64 samples_in;
+ guint64 bytes_out;
+
+ GstCaps *metadata;
+
+ gboolean setup;
+ gboolean flush_header;
+ gchar *last_message;
+};
+
+struct _VorbisEncClass {
+ GstElementClass parent_class;
+};
+
+GType vorbisenc_get_type(void);
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+
+#endif /* __VORBISENC_H__ */
============================================================
--- packages/gstreamer/gst-plugins-bad_0.10.5.bb 153241e44fdf8f79eb8ab1dbccc2ce27e2fd6327
+++ packages/gstreamer/gst-plugins-bad_0.10.5.bb f7278fed1af9fcc35b052a8c231322246a53e65e
@@ -1,8 +1,11 @@ require gst-plugins.inc
require gst-plugins.inc
+SRC_URI += "file://vorbisenc.h file://vorbisdec.h"
DEPENDS += "gst-plugins-base"
-# fails compiling (doesn't find vorbisdec.h)
-DEFAULT_PREFERENCE = "-1"
+do_compile_prepend() {
+ # work around missing files in upstream tarball (upstream bug #454078)
+ install -m 0644 ${WORKDIR}/vorbis*.h ${S}/ext/ivorbis/
+}
PR = "r0"
More information about the Openembedded-commits
mailing list