-Remove an incorrect dependency that I have added in the previous committed.

-Fix the build by add two missing files. These files were took from its CVS.

PR:		ports/114136
Reported by:	Dominic Fandrey <lon_kamikaze@gmx.de>

2 files changed, 195 insertions, 1 deletions

diff --git a/multimedia/gstreamer-plugins-bad/files/patch-add_missing_files b/multimedia/gstreamer-plugins-bad/files/patch-add_missing_files
new file mode 100644
index 000000000000..89a06596412d
--- /dev/null
+++ b/multimedia/gstreamer-plugins-bad/files/patch-add_missing_files
@@ -0,0 +1,195 @@
+diff -urN /dev/null ext/ivorbis/vorbisdec.h
+--- /dev/null	Wed Dec 31 18:00:00 1969
++++ ext/ivorbis/vorbisdec.h	Thu Jul  5 14:49:17 2007
+@@ -0,0 +1,87 @@
++/* -*- c-basic-offset: 2 -*-
++ * GStreamer
++ * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
++ *
++ * Tremor modifications <2006>:
++ *   Chris Lord, OpenedHand Ltd. <chris@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__ */
+diff -urN /dev/null ext/ivorbis/vorbisenc.h
+--- /dev/null	Wed Dec 31 18:00:00 1969
++++ ext/ivorbis/vorbisenc.h	Thu Jul  5 14:49:43 2007
+@@ -0,0 +1,100 @@
++/* GStreamer
++ * Copyright (C) <1999> Erik Walthinsen <omega@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 <gst/gst.h>
++
++#include <tremor/ivorbiscodec.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(klass) \
++  (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__ */
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index 52b2fc7f0ed2..9e09184f8dbb 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -215,7 +215,6 @@ gst_gsm_LIB_DEPENDS+=	gsm.1:${PORTSDIR}/audio/gsm
 gst_gsm_DIST=	bad
 
 # ivorbis
-gst_ivorbis_USE_GSTREAMER+=	vorbis
 gst_ivorbis_LIB_DEPENDS+=	vorbisidec.1:${PORTSDIR}/audio/libtremor
 gst_ivorbis_DIST=	bad