From 19e05206121e585a22b09c13cad8d00771a10d54 Mon Sep 17 00:00:00 2001 From: marcus Date: Fri, 3 Sep 2004 04:16:52 +0000 Subject: Update to 0.8.4. For a list of the changes in this release, see http://gstreamer.freedesktop.org/releases/gst-plugins/0.8.4.html. Submitted by: Koop Mast Approved by: maintainer (implicit) --- multimedia/gstreamer-plugins/Makefile | 3 +- multimedia/gstreamer-plugins/distinfo | 4 +- .../files/patch-gst_interleave_interleave.c | 65 ---------------------- multimedia/gstreamer-plugins/pkg-plist | 2 + multimedia/gstreamer-plugins80/Makefile | 3 +- multimedia/gstreamer-plugins80/distinfo | 4 +- .../files/patch-gst_interleave_interleave.c | 65 ---------------------- multimedia/gstreamer-plugins80/pkg-plist | 2 + 8 files changed, 10 insertions(+), 138 deletions(-) delete mode 100644 multimedia/gstreamer-plugins/files/patch-gst_interleave_interleave.c delete mode 100644 multimedia/gstreamer-plugins80/files/patch-gst_interleave_interleave.c (limited to 'multimedia') diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index e16c897bda39..91327a4a9b14 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gstreamer -PORTVERSION= 0.8.3 -PORTREVISION= 1 +PORTVERSION= 0.8.4 CATEGORIES= multimedia audio MASTER_SITES= ${MASTER_SITE_GNOME} \ http://gstreamer.freedesktop.org/src/gst-plugins/ diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo index afb5a92766b0..9f449022adae 100644 --- a/multimedia/gstreamer-plugins/distinfo +++ b/multimedia/gstreamer-plugins/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gst-plugins-0.8.3.tar.bz2) = a46b562dbb8c51d7c3bc46a11df09220 -SIZE (gnome2/gst-plugins-0.8.3.tar.bz2) = 2001671 +MD5 (gnome2/gst-plugins-0.8.4.tar.bz2) = 203360bb6546ac45e5a76cbb34d514e0 +SIZE (gnome2/gst-plugins-0.8.4.tar.bz2) = 2005935 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 573c81e11860..000000000000 --- a/multimedia/gstreamer-plugins/files/patch-gst_interleave_interleave.c +++ /dev/null @@ -1,65 +0,0 @@ ---- gst/interleave/interleave.c.orig Thu Aug 5 14:49:14 2004 -+++ gst/interleave/interleave.c Thu Aug 5 14:50:41 2004 -@@ -60,7 +60,8 @@ - GstPad *srcpad; - GList *channels; - -- gint numchannels; /* Number of pads on the element */ -+ gint numpads; /* Number of pads on the element */ -+ gint numchannels; /* Actual number of channels */ - gint channelcount; /* counter to get safest pad name */ - gboolean is_int; - -@@ -96,7 +97,7 @@ - "signed = (boolean) { true, false };" - "audio/x-raw-float, " - "rate = (int) [ 1, MAX ], " -- "channels = (int) 1, " -+ "channels = (int) 1," - "endianness = (int) BYTE_ORDER, " - "width = (int) 32," "buffer-frames = (int) [ 0, MAX ]") - ); -@@ -203,7 +204,11 @@ - gst_pad_set_link_function (this->srcpad, interleave_link); - gst_pad_set_getcaps_function (this->srcpad, interleave_getcaps); - -- this->numchannels = 0; -+ this->numchannels = 1; /* Numchannels must start with 1, even if there are -+ no channels, as 0 channel audio is invalid -+ and it stops people linking the interleave sink -+ before the src */ -+ this->numpads = 0; - this->channelcount = 0; - this->channels = NULL; - } -@@ -232,7 +237,9 @@ - gst_pad_set_getcaps_function (channel->sinkpad, interleave_getcaps); - - this->channels = g_list_append (this->channels, channel); -- this->numchannels++; -+ if (this->numpads > 0) -+ this->numchannels++; -+ this->numpads++; - this->channelcount++; - - GST_DEBUG ("interleave added pad %s\n", name); -@@ -261,7 +268,9 @@ - - p = p->next; - this->channels = g_list_remove_link (this->channels, p_copy); -- this->numchannels--; -+ this->numpads--; -+ if (this->numpads > 0) -+ this->numchannels--; - - g_list_free (p_copy); - -@@ -476,7 +485,7 @@ - - /* if in the future int gets a buffer-frames property, we should switch here - * on the type */ -- do_float_interleave ((gfloat **) data_in, this->numchannels, -+ do_float_interleave ((gfloat **) data_in, this->numpads, - (gfloat *) data_out, to_process_bytes / sizeof (gfloat)); - - /* clean up and push */ diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist index d832c54554a2..8767fb615f55 100644 --- a/multimedia/gstreamer-plugins/pkg-plist +++ b/multimedia/gstreamer-plugins/pkg-plist @@ -77,6 +77,7 @@ lib/gstreamer-%%VERSION%%/libgstfilter.so lib/gstreamer-%%VERSION%%/libgstflxdec.so lib/gstreamer-%%VERSION%%/libgstgamma.so %%GDKPIXBUF%%lib/gstreamer-%%VERSION%%/libgstgdkpixbuf.so +lib/gstreamer-%%VERSION%%/libgstglimagesink.so %%GNOMEVFS%%lib/gstreamer-%%VERSION%%/libgstgnomevfs.so lib/gstreamer-%%VERSION%%/libgstgoom.so %%GSM%%lib/gstreamer-%%VERSION%%/libgstgsm.so @@ -198,6 +199,7 @@ share/locale/cs/LC_MESSAGES/gst-plugins-%%VERSION%%.mo share/locale/en_GB/LC_MESSAGES/gst-plugins-%%VERSION%%.mo share/locale/hu/LC_MESSAGES/gst-plugins-%%VERSION%%.mo share/locale/nl/LC_MESSAGES/gst-plugins-%%VERSION%%.mo +share/locale/sq/LC_MESSAGES/gst-plugins-%%VERSION%%.mo share/locale/sr/LC_MESSAGES/gst-plugins-%%VERSION%%.mo share/locale/sv/LC_MESSAGES/gst-plugins-%%VERSION%%.mo share/locale/uk/LC_MESSAGES/gst-plugins-%%VERSION%%.mo diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile index e16c897bda39..91327a4a9b14 100644 --- a/multimedia/gstreamer-plugins80/Makefile +++ b/multimedia/gstreamer-plugins80/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gstreamer -PORTVERSION= 0.8.3 -PORTREVISION= 1 +PORTVERSION= 0.8.4 CATEGORIES= multimedia audio MASTER_SITES= ${MASTER_SITE_GNOME} \ http://gstreamer.freedesktop.org/src/gst-plugins/ diff --git a/multimedia/gstreamer-plugins80/distinfo b/multimedia/gstreamer-plugins80/distinfo index afb5a92766b0..9f449022adae 100644 --- a/multimedia/gstreamer-plugins80/distinfo +++ b/multimedia/gstreamer-plugins80/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gst-plugins-0.8.3.tar.bz2) = a46b562dbb8c51d7c3bc46a11df09220 -SIZE (gnome2/gst-plugins-0.8.3.tar.bz2) = 2001671 +MD5 (gnome2/gst-plugins-0.8.4.tar.bz2) = 203360bb6546ac45e5a76cbb34d514e0 +SIZE (gnome2/gst-plugins-0.8.4.tar.bz2) = 2005935 diff --git a/multimedia/gstreamer-plugins80/files/patch-gst_interleave_interleave.c b/multimedia/gstreamer-plugins80/files/patch-gst_interleave_interleave.c deleted file mode 100644 index 573c81e11860..000000000000 --- a/multimedia/gstreamer-plugins80/files/patch-gst_interleave_interleave.c +++ /dev/null @@ -1,65 +0,0 @@ ---- gst/interleave/interleave.c.orig Thu Aug 5 14:49:14 2004 -+++ gst/interleave/interleave.c Thu Aug 5 14:50:41 2004 -@@ -60,7 +60,8 @@ - GstPad *srcpad; - GList *channels; - -- gint numchannels; /* Number of pads on the element */ -+ gint numpads; /* Number of pads on the element */ -+ gint numchannels; /* Actual number of channels */ - gint channelcount; /* counter to get safest pad name */ - gboolean is_int; - -@@ -96,7 +97,7 @@ - "signed = (boolean) { true, false };" - "audio/x-raw-float, " - "rate = (int) [ 1, MAX ], " -- "channels = (int) 1, " -+ "channels = (int) 1," - "endianness = (int) BYTE_ORDER, " - "width = (int) 32," "buffer-frames = (int) [ 0, MAX ]") - ); -@@ -203,7 +204,11 @@ - gst_pad_set_link_function (this->srcpad, interleave_link); - gst_pad_set_getcaps_function (this->srcpad, interleave_getcaps); - -- this->numchannels = 0; -+ this->numchannels = 1; /* Numchannels must start with 1, even if there are -+ no channels, as 0 channel audio is invalid -+ and it stops people linking the interleave sink -+ before the src */ -+ this->numpads = 0; - this->channelcount = 0; - this->channels = NULL; - } -@@ -232,7 +237,9 @@ - gst_pad_set_getcaps_function (channel->sinkpad, interleave_getcaps); - - this->channels = g_list_append (this->channels, channel); -- this->numchannels++; -+ if (this->numpads > 0) -+ this->numchannels++; -+ this->numpads++; - this->channelcount++; - - GST_DEBUG ("interleave added pad %s\n", name); -@@ -261,7 +268,9 @@ - - p = p->next; - this->channels = g_list_remove_link (this->channels, p_copy); -- this->numchannels--; -+ this->numpads--; -+ if (this->numpads > 0) -+ this->numchannels--; - - g_list_free (p_copy); - -@@ -476,7 +485,7 @@ - - /* if in the future int gets a buffer-frames property, we should switch here - * on the type */ -- do_float_interleave ((gfloat **) data_in, this->numchannels, -+ do_float_interleave ((gfloat **) data_in, this->numpads, - (gfloat *) data_out, to_process_bytes / sizeof (gfloat)); - - /* clean up and push */ diff --git a/multimedia/gstreamer-plugins80/pkg-plist b/multimedia/gstreamer-plugins80/pkg-plist index d832c54554a2..8767fb615f55 100644 --- a/multimedia/gstreamer-plugins80/pkg-plist +++ b/multimedia/gstreamer-plugins80/pkg-plist @@ -77,6 +77,7 @@ lib/gstreamer-%%VERSION%%/libgstfilter.so lib/gstreamer-%%VERSION%%/libgstflxdec.so lib/gstreamer-%%VERSION%%/libgstgamma.so %%GDKPIXBUF%%lib/gstreamer-%%VERSION%%/libgstgdkpixbuf.so +lib/gstreamer-%%VERSION%%/libgstglimagesink.so %%GNOMEVFS%%lib/gstreamer-%%VERSION%%/libgstgnomevfs.so lib/gstreamer-%%VERSION%%/libgstgoom.so %%GSM%%lib/gstreamer-%%VERSION%%/libgstgsm.so @@ -198,6 +199,7 @@ share/locale/cs/LC_MESSAGES/gst-plugins-%%VERSION%%.mo share/locale/en_GB/LC_MESSAGES/gst-plugins-%%VERSION%%.mo share/locale/hu/LC_MESSAGES/gst-plugins-%%VERSION%%.mo share/locale/nl/LC_MESSAGES/gst-plugins-%%VERSION%%.mo +share/locale/sq/LC_MESSAGES/gst-plugins-%%VERSION%%.mo share/locale/sr/LC_MESSAGES/gst-plugins-%%VERSION%%.mo share/locale/sv/LC_MESSAGES/gst-plugins-%%VERSION%%.mo share/locale/uk/LC_MESSAGES/gst-plugins-%%VERSION%%.mo -- cgit