diff options
Diffstat (limited to 'multimedia/gstreamer-plugins80/files')
10 files changed, 237 insertions, 97 deletions
diff --git a/multimedia/gstreamer-plugins80/files/ia64-patch-ffmpeg::configure b/multimedia/gstreamer-plugins80/files/ia64-patch-ffmpeg::configure deleted file mode 100644 index f4c1cb8ae..000000000 --- a/multimedia/gstreamer-plugins80/files/ia64-patch-ffmpeg::configure +++ /dev/null @@ -1,10 +0,0 @@ ---- gst-libs/ext/ffmpeg/ffmpeg/configure.bak Sat Sep 27 18:39:42 2003 -+++ gst-libs/ext/ffmpeg/ffmpeg/configure Sat Sep 27 19:53:52 2003 -@@ -119,6 +119,7 @@ - v4l="no" - audio_oss="yes" - make="gmake" -+CFLAGS="$CFLAGS -fPIC -DPIC" - LDFLAGS="$LDFLAGS -export-dynamic" - ;; - BSD/OS) diff --git a/multimedia/gstreamer-plugins80/files/patch-configure b/multimedia/gstreamer-plugins80/files/patch-configure new file mode 100644 index 000000000..de19ee0c6 --- /dev/null +++ b/multimedia/gstreamer-plugins80/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Wed Feb 11 19:13:23 2004 ++++ configure Wed Feb 11 19:13:58 2004 +@@ -44295,7 +44295,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ltheora $LIBS" ++LIBS="-ltheora -logg $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + /* confdefs.h. */ diff --git a/multimedia/gstreamer-plugins80/files/patch-ext::ivorbis::vorbisenc.h b/multimedia/gstreamer-plugins80/files/patch-ext::ivorbis::vorbisenc.h new file mode 100644 index 000000000..90d39a1a2 --- /dev/null +++ b/multimedia/gstreamer-plugins80/files/patch-ext::ivorbis::vorbisenc.h @@ -0,0 +1,103 @@ +--- /dev/null Thu Feb 12 22:22:00 2004 ++++ ext/ivorbis/vorbisenc.h Thu Feb 12 22:24:08 2004 +@@ -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(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__ */ diff --git a/multimedia/gstreamer-plugins80/files/patch-ext_ffmpeg_gstffmpegcodecmap.c b/multimedia/gstreamer-plugins80/files/patch-ext_ffmpeg_gstffmpegcodecmap.c deleted file mode 100644 index 180258708..000000000 --- a/multimedia/gstreamer-plugins80/files/patch-ext_ffmpeg_gstffmpegcodecmap.c +++ /dev/null @@ -1,31 +0,0 @@ ---- ext/ffmpeg/gstffmpegcodecmap.c.orig Fri Feb 6 15:29:09 2004 -+++ ext/ffmpeg/gstffmpegcodecmap.c Fri Feb 6 15:40:14 2004 -@@ -44,13 +44,13 @@ - "width", G_TYPE_INT, context->width, \ - "height", G_TYPE_INT, context->height, \ - "framerate", G_TYPE_DOUBLE, 1. * context->frame_rate / \ -- context->frame_rate_base, \ -+ context->frame_rate_base , \ - ##props, NULL) \ - : \ - gst_caps_new_simple (mimetype, \ - "width", GST_TYPE_INT_RANGE, 16, 4096, \ - "height", GST_TYPE_INT_RANGE, 16, 4096, \ -- "framerate", GST_TYPE_DOUBLE_RANGE, 0., G_MAXDOUBLE, \ -+ "framerate", GST_TYPE_DOUBLE_RANGE, 0., G_MAXDOUBLE , \ - ##props, NULL) - - /* same for audio - now with channels/sample rate -@@ -60,10 +60,10 @@ - (context != NULL) ? \ - gst_caps_new_simple (mimetype, \ - "rate", G_TYPE_INT, context->sample_rate, \ -- "channels", G_TYPE_INT, context->channels, \ -+ "channels", G_TYPE_INT, context->channels , \ - ##props, NULL) \ - : \ -- gst_caps_new_simple (mimetype, \ -+ gst_caps_new_simple (mimetype , \ - ##props, NULL) - - /* Convert a FFMPEG codec ID and optional AVCodecContext diff --git a/multimedia/gstreamer-plugins80/files/patch-ext_flac_gstflacenc.c b/multimedia/gstreamer-plugins80/files/patch-ext_flac_gstflacenc.c deleted file mode 100644 index b42b35cb7..000000000 --- a/multimedia/gstreamer-plugins80/files/patch-ext_flac_gstflacenc.c +++ /dev/null @@ -1,20 +0,0 @@ ---- ext/flac/gstflacenc.c.orig Fri Feb 6 15:43:38 2004 -+++ ext/flac/gstflacenc.c Fri Feb 6 16:15:23 2004 -@@ -575,7 +575,7 @@ - gst_flacenc_set_metadata (flacenc); - state = FLAC__seekable_stream_encoder_init (flacenc->encoder); - if (state != FLAC__STREAM_ENCODER_OK) { -- GST_ELEMENT_ERROR (flacenc, LIBRARY, INIT, NULL, -+ GST_ELEMENT_ERROR (flacenc, LIBRARY, INIT, (NULL), - ("could not initialize encoder (wrong parameters?)")); - return; - } -@@ -610,7 +610,7 @@ - flacenc->data = NULL; - - if (!res) { -- GST_ELEMENT_ERROR (flacenc, STREAM, ENCODE, NULL, NULL); -+ GST_ELEMENT_ERROR (flacenc, STREAM, ENCODE, (NULL), (NULL)); - } - } - diff --git a/multimedia/gstreamer-plugins80/files/patch-gst-libs_ext_ffmpeg_Makefile.in b/multimedia/gstreamer-plugins80/files/patch-gst-libs_ext_ffmpeg_Makefile.in deleted file mode 100644 index 3b293cd85..000000000 --- a/multimedia/gstreamer-plugins80/files/patch-gst-libs_ext_ffmpeg_Makefile.in +++ /dev/null @@ -1,36 +0,0 @@ ---- gst-libs/ext/ffmpeg/Makefile.in.orig Sat Feb 21 18:56:31 2004 -+++ gst-libs/ext/ffmpeg/Makefile.in Sat Feb 21 19:04:32 2004 -@@ -532,15 +532,12 @@ - $(defs_powerpc) \ - -DTUNECPU=generic \ - -DHAVE_STRPTIME=1 \ -- -DHAVE_LRINTF=1 \ - -DCONFIG_ENCODERS=1 \ - -DCONFIG_DECODERS=1 \ - -DCONFIG_PP=1 \ - -DCONFIG_MPEGAUDIO_HP=1 \ - -DCONFIG_HAVE_DLOPEN=1 \ - -DCONFIG_HAVE_DLFCN=1 \ -- -DHAVE_MALLOC_H=1 \ -- -DHAVE_MEMALIGN=1 \ - -DSIMPLE_IDCT=1 \ - -DCONFIG_RISKY=1 - -@@ -904,7 +901,7 @@ - libavformat_la-file.lo libavformat_la-flvdec.lo \ - libavformat_la-flvenc.lo libavformat_la-framehook.lo \ - libavformat_la-gif.lo libavformat_la-gifdec.lo \ -- libavformat_la-grab.lo libavformat_la-idcin.lo \ -+ libavformat_la-idcin.lo \ - libavformat_la-idroq.lo libavformat_la-img.lo \ - libavformat_la-ipmovie.lo libavformat_la-jpeg.lo \ - libavformat_la-mov.lo libavformat_la-movenc.lo \ -@@ -5697,7 +5694,7 @@ - - patches: - @echo -n Patching ffmpeg if necessary ... -- @patch -p0 -N -r rejects <$(srcdir)/patch/function.patch > /dev/null || true -+# @patch -p0 -N -r rejects <$(srcdir)/patch/function.patch > /dev/null || true - @rm -f rejects || true - @echo done. - diff --git a/multimedia/gstreamer-plugins80/files/patch-gst_audioconvert_gstaudioconvert.c b/multimedia/gstreamer-plugins80/files/patch-gst_audioconvert_gstaudioconvert.c new file mode 100644 index 000000000..8689da3dd --- /dev/null +++ b/multimedia/gstreamer-plugins80/files/patch-gst_audioconvert_gstaudioconvert.c @@ -0,0 +1,11 @@ +--- gst/audioconvert/gstaudioconvert.c.orig Thu Feb 26 19:35:40 2004 ++++ gst/audioconvert/gstaudioconvert.c Thu Feb 26 19:36:33 2004 +@@ -242,7 +242,7 @@ + + if (!gst_pad_is_negotiated (this->sink)) + { +- GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, NULL, ++ GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, (NULL), + ("Sink pad not negotiated before chain function")); + return; + } diff --git a/multimedia/gstreamer-plugins80/files/patch-gst_interleave_deinterleave.c b/multimedia/gstreamer-plugins80/files/patch-gst_interleave_deinterleave.c new file mode 100644 index 000000000..7ca0cf7e8 --- /dev/null +++ b/multimedia/gstreamer-plugins80/files/patch-gst_interleave_deinterleave.c @@ -0,0 +1,11 @@ +--- gst/interleave/deinterleave.c.orig Thu Feb 26 19:41:29 2004 ++++ gst/interleave/deinterleave.c Thu Feb 26 19:41:38 2004 +@@ -379,7 +379,7 @@ + } + + if (this->channels == 0) { +- GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, NULL, ++ GST_ELEMENT_ERROR (this, CORE, NEGOTIATION, (NULL), + ("format wasn't negotiated before chain function")); + return; + } else if (this->channels == 1) { diff --git a/multimedia/gstreamer-plugins80/files/patch-gst_interleave_interleave.c b/multimedia/gstreamer-plugins80/files/patch-gst_interleave_interleave.c new file mode 100644 index 000000000..2997fd823 --- /dev/null +++ b/multimedia/gstreamer-plugins80/files/patch-gst_interleave_interleave.c @@ -0,0 +1,29 @@ +--- gst/interleave/interleave.c.orig Thu Feb 26 19:40:04 2004 ++++ gst/interleave/interleave.c Thu Feb 26 19:40:44 2004 +@@ -25,7 +25,7 @@ + #include "config.h" + #endif + +-#include <alloca.h> ++#include <stdlib.h> + #include <string.h> + #include <gst/gst.h> + #include <gst/audio/audio.h> +@@ -414,7 +414,7 @@ + data_in = alloca (this->numchannels * sizeof (gpointer)); + + if (!this->channels) { +- GST_ELEMENT_ERROR (element, CORE, PAD, NULL, ++ GST_ELEMENT_ERROR (element, CORE, PAD, (NULL), + ("interleave: at least one sink pad needs to be connected")); + return; + } +@@ -487,7 +487,7 @@ + static void + interleave_bytestream_loop (GstElement *element) + { +- GST_ELEMENT_ERROR (element, CORE, NOT_IMPLEMENTED, NULL, ++ GST_ELEMENT_ERROR (element, CORE, NOT_IMPLEMENTED, (NULL), + ("interleave: unbuffered mode is not yet implemented")); + + /* Should look the same as the buffered loop, except that getting the data is diff --git a/multimedia/gstreamer-plugins80/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h b/multimedia/gstreamer-plugins80/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h new file mode 100644 index 000000000..d6d605dea --- /dev/null +++ b/multimedia/gstreamer-plugins80/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h @@ -0,0 +1,72 @@ +--- sys/cdrom/gstcdplayer_ioctl_bsd.h.orig Mon Dec 8 21:01:50 2003 ++++ sys/cdrom/gstcdplayer_ioctl_bsd.h Mon Dec 8 23:13:54 2003 +@@ -139,6 +139,7 @@ + { + struct ioc_toc_header toc_header; + struct ioc_read_toc_entry toc_entry; ++ struct cd_toc_entry toc_entry_data; + guint i; + + cd->fd = open(device,O_RDONLY | O_NONBLOCK); +@@ -148,7 +149,7 @@ + } + + /* get the toc header information */ +- if (ioctl(cd->fd,CDIOREADTOCHDR,&toc_header) != 0) { ++ if (ioctl(cd->fd,CDIOREADTOCHEADER,&toc_header) != 0) { + close(cd->fd); + cd->fd = -1; + return FALSE; +@@ -158,6 +159,8 @@ + for (i = 1; i <= toc_header.ending_track; i++) { + toc_entry.address_format = CD_MSF_FORMAT; + toc_entry.starting_track = i; ++ toc_entry.data = &toc_entry_data; ++ toc_entry.data_len = sizeof(toc_entry_data); + + if (ioctl(cd->fd,CDIOREADTOCENTRYS,&toc_entry) != 0) { + close(cd->fd); +@@ -165,9 +168,9 @@ + return FALSE; + } + +- cd->tracks[i].minute = toc_entry.entry.addr.msf.minute; +- cd->tracks[i].second = toc_entry.entry.addr.msf.second; +- cd->tracks[i].frame = toc_entry.entry.addr.msf.frame; ++ cd->tracks[i].minute = toc_entry.data->addr.msf.minute; ++ cd->tracks[i].second = toc_entry.data->addr.msf.second; ++ cd->tracks[i].frame = toc_entry.data->addr.msf.frame; + cd->tracks[i].data_track = (toc_entry.data->control & 4) == 4; + } + +@@ -183,9 +186,9 @@ + return FALSE; + } + +- cd->tracks[LEADOUT].minute = toc_entry.entry.addr.msf.minute; +- cd->tracks[LEADOUT].second = toc_entry.entry.addr.msf.second; +- cd->tracks[LEADOUT].frame = toc_entry.entry.addr.msf.frame; ++ cd->tracks[LEADOUT].minute = toc_entry.data->addr.msf.minute; ++ cd->tracks[LEADOUT].second = toc_entry.data->addr.msf.second; ++ cd->tracks[LEADOUT].frame = toc_entry.data->addr.msf.frame; + + cd->num_tracks = toc_header.ending_track; + +@@ -221,6 +224,8 @@ + return FALSE; + } + ++ /* lets return TRUE and lets see what happes (may not be correct)*/ ++ return TRUE; + } + + gboolean cd_pause(struct cd *cd) +@@ -318,7 +323,7 @@ + return -1; + } + +- return sub_channel.data->track_number; ++ return sub_channel.data->what.track_info.track_number; + } + + gboolean cd_close(struct cd *cd) |