summaryrefslogtreecommitdiff
path: root/multimedia/gstreamer-plugins/files
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/gstreamer-plugins/files')
-rw-r--r--multimedia/gstreamer-plugins/files/ia64-patch-ffmpeg::configure10
-rw-r--r--multimedia/gstreamer-plugins/files/patch-configure31
-rw-r--r--multimedia/gstreamer-plugins/files/patch-ext::ivorbis::vorbisenc.h103
-rw-r--r--multimedia/gstreamer-plugins/files/patch-ext_a52dec_gsta52dec.c11
-rw-r--r--multimedia/gstreamer-plugins/files/patch-ext_xvid_gstxvid.h39
-rw-r--r--multimedia/gstreamer-plugins/files/patch-ffmpeg::simple_idct_alpha.c17
-rw-r--r--multimedia/gstreamer-plugins/files/patch-gst_level_filter.func14
-rw-r--r--multimedia/gstreamer-plugins/files/patch-ltmain.sh51
-rw-r--r--multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h72
-rw-r--r--multimedia/gstreamer-plugins/files/patch-sys_oss_gstosselement.h10
-rw-r--r--multimedia/gstreamer-plugins/files/patch-sys_ximage_ximagesink.h10
-rw-r--r--multimedia/gstreamer-plugins/files/patch-sys_xvideo_gstxvimage.c21
-rw-r--r--multimedia/gstreamer-plugins/files/patch-sys_xvimage_xvimagesink.h10
13 files changed, 316 insertions, 83 deletions
diff --git a/multimedia/gstreamer-plugins/files/ia64-patch-ffmpeg::configure b/multimedia/gstreamer-plugins/files/ia64-patch-ffmpeg::configure
deleted file mode 100644
index f4c1cb8ae5f6..000000000000
--- a/multimedia/gstreamer-plugins/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-plugins/files/patch-configure b/multimedia/gstreamer-plugins/files/patch-configure
index 001d56fd6e4f..e2987f9821af 100644
--- a/multimedia/gstreamer-plugins/files/patch-configure
+++ b/multimedia/gstreamer-plugins/files/patch-configure
@@ -1,10 +1,21 @@
---- configure.orig Thu Jul 11 15:51:47 2002
-+++ configure Thu Jul 11 15:51:57 2002
-@@ -6731,6 +6731,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+--- configure.orig Tue Mar 16 20:32:36 2004
++++ configure Tue Mar 16 20:41:00 2004
+@@ -41192,7 +41192,8 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-laudio $X_LIBS $LIBS"
++#xxx fix the non x case is er niet...
++LIBS="-laudio -lm -lXt $X_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h. */
+@@ -44483,7 +44484,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-plugins/files/patch-ext::ivorbis::vorbisenc.h b/multimedia/gstreamer-plugins/files/patch-ext::ivorbis::vorbisenc.h
new file mode 100644
index 000000000000..90d39a1a29b2
--- /dev/null
+++ b/multimedia/gstreamer-plugins/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-plugins/files/patch-ext_a52dec_gsta52dec.c b/multimedia/gstreamer-plugins/files/patch-ext_a52dec_gsta52dec.c
deleted file mode 100644
index 05c0e53668b6..000000000000
--- a/multimedia/gstreamer-plugins/files/patch-ext_a52dec_gsta52dec.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ext/a52dec/gsta52dec.c.orig Sun Apr 6 18:58:19 2003
-+++ ext/a52dec/gsta52dec.c Sun Apr 20 13:16:28 2003
-@@ -25,7 +25,7 @@
-
- #include <stdlib.h>
-
--#ifdef HAVE_STDINT_H
-+#if defined(HAVE_STDINT_H) || defined(__FreeBSD__)
- #include <stdint.h>
- #else
- /* (Ronald) hacky... can't include stdint.h because it's not available
diff --git a/multimedia/gstreamer-plugins/files/patch-ext_xvid_gstxvid.h b/multimedia/gstreamer-plugins/files/patch-ext_xvid_gstxvid.h
new file mode 100644
index 000000000000..970e99fa1512
--- /dev/null
+++ b/multimedia/gstreamer-plugins/files/patch-ext_xvid_gstxvid.h
@@ -0,0 +1,39 @@
+--- /dev/null Sun Nov 16 22:55:00 2003
++++ ext/xvid/gstxvid.h Sun Nov 16 22:32:25 2003
+@@ -0,0 +1,36 @@
++/* GStreamer xvid decoder plugin
++ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
++ *
++ * 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_XVID_H__
++#define __GST_XVID_H__
++
++#include <gst/gst.h>
++
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++
++extern gchar * gst_xvid_error (int errorcode);
++extern gboolean gst_xvid_init (void);
++
++#ifdef __cplusplus
++}
++#endif /* __cplusplus */
++
++#endif /* __GST_XVID_H__ */
diff --git a/multimedia/gstreamer-plugins/files/patch-ffmpeg::simple_idct_alpha.c b/multimedia/gstreamer-plugins/files/patch-ffmpeg::simple_idct_alpha.c
deleted file mode 100644
index 8149c39817cb..000000000000
--- a/multimedia/gstreamer-plugins/files/patch-ffmpeg::simple_idct_alpha.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- gst-libs/ext/ffmpeg/ffmpeg/libavcodec/alpha/simple_idct_alpha.c.orig Fri Apr 25 22:06:13 2003
-+++ gst-libs/ext/ffmpeg/ffmpeg/libavcodec/alpha/simple_idct_alpha.c Fri Apr 25 23:19:39 2003
-@@ -24,8 +24,14 @@
- * and Falk Hueffner <falk@debian.org>
- */
-
-+#include <sys/param.h>
-+
- #include "asm.h"
- #include "../dsputil.h"
-+
-+#if defined(__FreeBSD__) && __FreeBSD_version < 500000
-+typedef __int32_t int_fast32_t;
-+#endif
-
- extern void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels,
- int line_size);
diff --git a/multimedia/gstreamer-plugins/files/patch-gst_level_filter.func b/multimedia/gstreamer-plugins/files/patch-gst_level_filter.func
deleted file mode 100644
index 3b154eb4bdc1..000000000000
--- a/multimedia/gstreamer-plugins/files/patch-gst_level_filter.func
+++ /dev/null
@@ -1,14 +0,0 @@
---- gst/level/filter.func.orig Mon Oct 13 22:32:12 2003
-+++ gst/level/filter.func Mon Oct 13 22:32:21 2003
-@@ -10,9 +10,9 @@
- register double square = 0.0; /* Square */
- register double PSS = 0.0; /* Peak Square Sample */
-
-- *CS = 0.0; /* Cumulative Square for this block */
--
- gdouble normalizer = (double) (1 << resolution);
-+
-+ *CS = 0.0; /* Cumulative Square for this block */
-
- /*
- * process data here
diff --git a/multimedia/gstreamer-plugins/files/patch-ltmain.sh b/multimedia/gstreamer-plugins/files/patch-ltmain.sh
new file mode 100644
index 000000000000..3d50310f61a4
--- /dev/null
+++ b/multimedia/gstreamer-plugins/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig Mon Oct 20 15:20:54 2003
++++ ltmain.sh Fri Nov 14 18:06:07 2003
+@@ -1278,7 +1278,7 @@
+ esac
+ elif test "X$arg" = "X-lc_r"; then
+ case $host in
+- *-*-openbsd* | *-*-freebsd*)
++ *-*-openbsd* | *-*-freebsd4*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+@@ -1288,8 +1288,16 @@
+ continue
+ ;;
+
++ -pthread)
++ compile_command="$compile_command -pthread"
++ finalize_command="$finalize_command -pthread"
++ compiler_flags="$compiler_flags -pthread"
++ continue
++ ;;
++
+ -module)
+ module=yes
++ build_old_libs=no
+ continue
+ ;;
+
+@@ -3008,6 +3016,9 @@
+ # problems, so we reset it completely
+ verstring=
+ ;;
++ *-*-freebsd*)
++ # FreeBSD doesn't need this...
++ ;;
+ *)
+ verstring="0.0"
+ ;;
+@@ -5457,10 +5468,12 @@
+ fi
+
+ # Install the pseudo-library for information purposes.
++ if /usr/bin/false; then
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ instname="$dir/$name"i
+ $show "$install_prog $instname $destdir/$name"
+ $run eval "$install_prog $instname $destdir/$name" || exit $?
++ fi
+
+ # Maybe install the static library, too.
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h b/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h
new file mode 100644
index 000000000000..daaefac5eb5d
--- /dev/null
+++ b/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h
@@ -0,0 +1,72 @@
+--- sys/cdrom/gstcdplayer_ioctl_bsd.h.orig Mon Mar 1 06:52:03 2004
++++ sys/cdrom/gstcdplayer_ioctl_bsd.h Tue Mar 9 16:05:36 2004
+@@ -142,6 +142,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);
+@@ -151,7 +152,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;
+@@ -161,6 +162,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);
+@@ -168,9 +171,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;
+ }
+
+@@ -186,9 +189,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;
+
+@@ -224,6 +227,8 @@
+ return FALSE;
+ }
+
++ /* lets return TRUE and lets see what happes (may not be correct)*/
++ return TRUE;
+ }
+
+ gboolean cd_pause(struct cd *cd)
+@@ -321,7 +326,7 @@
+ return -1;
+ }
+
+-#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__FreeBSD__)
+ return sub_channel.data->what.track_info.track_number;
+ #else
+ return sub_channel.data->track_number;
diff --git a/multimedia/gstreamer-plugins/files/patch-sys_oss_gstosselement.h b/multimedia/gstreamer-plugins/files/patch-sys_oss_gstosselement.h
new file mode 100644
index 000000000000..30258ba113c1
--- /dev/null
+++ b/multimedia/gstreamer-plugins/files/patch-sys_oss_gstosselement.h
@@ -0,0 +1,10 @@
+--- sys/oss/gstosselement.h.orig Tue Mar 9 16:46:05 2004
++++ sys/oss/gstosselement.h Tue Mar 9 16:46:14 2004
+@@ -23,6 +23,7 @@
+ #ifndef __GST_OSS_ELEMENT_H__
+ #define __GST_OSS_ELEMENT_H__
+
++#include <sys/types.h>
+ #include <gst/gst.h>
+
+ /* debugging category */
diff --git a/multimedia/gstreamer-plugins/files/patch-sys_ximage_ximagesink.h b/multimedia/gstreamer-plugins/files/patch-sys_ximage_ximagesink.h
new file mode 100644
index 000000000000..07b125bfee89
--- /dev/null
+++ b/multimedia/gstreamer-plugins/files/patch-sys_ximage_ximagesink.h
@@ -0,0 +1,10 @@
+--- sys/ximage/ximagesink.h.orig Tue Mar 16 22:51:03 2004
++++ sys/ximage/ximagesink.h Tue Mar 16 23:06:44 2004
+@@ -23,6 +23,7 @@
+ #include <gst/video/videosink.h>
+
+ #ifdef HAVE_XSHM
++#include <sys/types.h>
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
+ #endif /* HAVE_XSHM */
diff --git a/multimedia/gstreamer-plugins/files/patch-sys_xvideo_gstxvimage.c b/multimedia/gstreamer-plugins/files/patch-sys_xvideo_gstxvimage.c
deleted file mode 100644
index cb156ee6bf8d..000000000000
--- a/multimedia/gstreamer-plugins/files/patch-sys_xvideo_gstxvimage.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- sys/xvideo/gstxvimage.c.orig Sun Nov 23 20:17:00 2003
-+++ sys/xvideo/gstxvimage.c Sun Nov 23 20:25:19 2003
-@@ -20,6 +20,10 @@
- #include "config.h"
-
- #include <errno.h>
-+#include <sys/types.h>
-+#include <machine/param.h>
-+#include <sys/types.h>
-+#include <sys/ipc.h>
- #include <sys/shm.h> /* for SHM symbols */
- #include <gst/gst.h>
- /* gcc -ansi -pedantic on GNU/Linux causes warnings and errors
-@@ -34,7 +38,6 @@
-
- #include <stdio.h>
- #include <stdlib.h>
--#include <sys/types.h>
-
- #if defined (HAVE_IPC_H) && defined (HAVE_SHM_H) && defined (HAVE_XSHM_H)
- #define USE_SHM
diff --git a/multimedia/gstreamer-plugins/files/patch-sys_xvimage_xvimagesink.h b/multimedia/gstreamer-plugins/files/patch-sys_xvimage_xvimagesink.h
new file mode 100644
index 000000000000..ddb0d1f00501
--- /dev/null
+++ b/multimedia/gstreamer-plugins/files/patch-sys_xvimage_xvimagesink.h
@@ -0,0 +1,10 @@
+--- sys/xvimage/xvimagesink.h.orig Tue Mar 16 22:51:04 2004
++++ sys/xvimage/xvimagesink.h Tue Mar 16 23:07:39 2004
+@@ -23,6 +23,7 @@
+ #include <gst/video/videosink.h>
+
+ #ifdef HAVE_XSHM
++#include <sys/types.h>
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
+ #endif /* HAVE_XSHM */