summaryrefslogtreecommitdiffstats
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/patch-gst_audioconvert_gstaudioconvert.c11
-rw-r--r--multimedia/gstreamer-plugins/files/patch-gst_interleave_deinterleave.c11
-rw-r--r--multimedia/gstreamer-plugins/files/patch-gst_interleave_interleave.c29
-rw-r--r--multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h28
-rw-r--r--multimedia/gstreamer-plugins/files/patch-sys_xvideo_gstxvimage.c10
5 files changed, 14 insertions, 75 deletions
diff --git a/multimedia/gstreamer-plugins/files/patch-gst_audioconvert_gstaudioconvert.c b/multimedia/gstreamer-plugins/files/patch-gst_audioconvert_gstaudioconvert.c
deleted file mode 100644
index 8689da3dd..000000000
--- a/multimedia/gstreamer-plugins/files/patch-gst_audioconvert_gstaudioconvert.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-plugins/files/patch-gst_interleave_deinterleave.c b/multimedia/gstreamer-plugins/files/patch-gst_interleave_deinterleave.c
deleted file mode 100644
index 7ca0cf7e8..000000000
--- a/multimedia/gstreamer-plugins/files/patch-gst_interleave_deinterleave.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-plugins/files/patch-gst_interleave_interleave.c b/multimedia/gstreamer-plugins/files/patch-gst_interleave_interleave.c
deleted file mode 100644
index 2997fd823..000000000
--- a/multimedia/gstreamer-plugins/files/patch-gst_interleave_interleave.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h b/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h
index d6d605dea..daaefac5e 100644
--- a/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h
+++ b/multimedia/gstreamer-plugins/files/patch-sys_cdrom_gstcdplayer-ioctl-bsd.h
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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;
@@ -8,7 +8,7 @@
guint i;
cd->fd = open(device,O_RDONLY | O_NONBLOCK);
-@@ -148,7 +149,7 @@
+@@ -151,7 +152,7 @@
}
/* get the toc header information */
@@ -17,7 +17,7 @@
close(cd->fd);
cd->fd = -1;
return FALSE;
-@@ -158,6 +159,8 @@
+@@ -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;
@@ -26,7 +26,7 @@
if (ioctl(cd->fd,CDIOREADTOCENTRYS,&toc_entry) != 0) {
close(cd->fd);
-@@ -165,9 +168,9 @@
+@@ -168,9 +171,9 @@
return FALSE;
}
@@ -39,7 +39,7 @@
cd->tracks[i].data_track = (toc_entry.data->control & 4) == 4;
}
-@@ -183,9 +186,9 @@
+@@ -186,9 +189,9 @@
return FALSE;
}
@@ -52,7 +52,7 @@
cd->num_tracks = toc_header.ending_track;
-@@ -221,6 +224,8 @@
+@@ -224,6 +227,8 @@
return FALSE;
}
@@ -61,12 +61,12 @@
}
gboolean cd_pause(struct cd *cd)
-@@ -318,7 +323,7 @@
+@@ -321,7 +326,7 @@
return -1;
}
-- return sub_channel.data->track_number;
-+ return sub_channel.data->what.track_info.track_number;
- }
-
- gboolean cd_close(struct cd *cd)
+-#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_xvideo_gstxvimage.c b/multimedia/gstreamer-plugins/files/patch-sys_xvideo_gstxvimage.c
deleted file mode 100644
index 8f6af77b8..000000000
--- a/multimedia/gstreamer-plugins/files/patch-sys_xvideo_gstxvimage.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- sys/xvideo/gstxvimage.c.orig Fri Jul 25 15:29:21 2003
-+++ sys/xvideo/gstxvimage.c Fri Nov 14 16:27:24 2003
-@@ -42,6 +42,7 @@
-
- #include <stdio.h>
- #include <stdlib.h>
-+#include <machine/param.h>
- #include <sys/types.h>
-
- #if defined (HAVE_IPC_H) && defined (HAVE_SHM_H) && defined (HAVE_XSHM_H)