diff options
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/gst-plugins/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/gst-plugins/Makefile.common | 4 | ||||
| -rw-r--r-- | multimedia/gst-plugins/distinfo | 11 | ||||
| -rw-r--r-- | multimedia/gst-plugins/patches/patch-ac | 19 | ||||
| -rw-r--r-- | multimedia/gst-plugins/patches/patch-ag | 30 |
5 files changed, 26 insertions, 41 deletions
diff --git a/multimedia/gst-plugins/Makefile b/multimedia/gst-plugins/Makefile index 563916ca3a7..612a7dcacbf 100644 --- a/multimedia/gst-plugins/Makefile +++ b/multimedia/gst-plugins/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.26 2005/08/02 14:47:01 rillig Exp $ +# $NetBSD: Makefile,v 1.27 2005/08/21 11:27:54 jmmv Exp $ # .include "Makefile.common" -PKGREVISION= 1 COMMENT+= base plugins USE_TOOLS+= perl:run diff --git a/multimedia/gst-plugins/Makefile.common b/multimedia/gst-plugins/Makefile.common index 41f9bc8e0ca..da3264c7e3b 100644 --- a/multimedia/gst-plugins/Makefile.common +++ b/multimedia/gst-plugins/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.21 2005/08/10 20:56:20 jlam Exp $ +# $NetBSD: Makefile.common,v 1.22 2005/08/21 11:27:54 jmmv Exp $ # -DISTNAME= gst-plugins-0.8.9 +DISTNAME= gst-plugins-0.8.10 CATEGORIES= multimedia gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gst-plugins/0.8/} \ http://gstreamer.freedesktop.org/src/gst-plugins/ diff --git a/multimedia/gst-plugins/distinfo b/multimedia/gst-plugins/distinfo index f02c9e47629..03e29b189d2 100644 --- a/multimedia/gst-plugins/distinfo +++ b/multimedia/gst-plugins/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.24 2005/06/28 12:24:44 wiz Exp $ +$NetBSD: distinfo,v 1.25 2005/08/21 11:27:54 jmmv Exp $ -SHA1 (gst-plugins-0.8.9.tar.bz2) = f73dd3b96e1e5c7e90fdb1bf2c72de8c8d035bb1 -RMD160 (gst-plugins-0.8.9.tar.bz2) = 294b1873c8d54ac225bf94a2e5ba872f089fd605 -Size (gst-plugins-0.8.9.tar.bz2) = 2356958 bytes +SHA1 (gst-plugins-0.8.10.tar.bz2) = 99e5746d4f013fc00cd29a59f9aab773db08ab1c +RMD160 (gst-plugins-0.8.10.tar.bz2) = fb59c37aef76b9cc065530fc4a7e7fe43168e619 +Size (gst-plugins-0.8.10.tar.bz2) = 2397528 bytes SHA1 (patch-aa) = 3a33fce125bd04ad99c402b799365b31ea8347c8 SHA1 (patch-ab) = ca6dd27984a020f5a01e14d785e425e8cd219e74 -SHA1 (patch-ac) = 652e4eb7ea25efc58c6b4e34f19b03f30d30e22d SHA1 (patch-ae) = 3509dd08d3e010e9eb85c71ae6c42e28f6f9ec2d SHA1 (patch-af) = 1a2562b3bff15c3ca3324428f8c2bd3e7ec1f4ca -SHA1 (patch-ag) = 89bd7a3f615af0c9e740c17efc640fa85948cda0 +SHA1 (patch-ag) = 264ef4cb6a4fa8eb65ff55ca1c0947d3566a64b8 diff --git a/multimedia/gst-plugins/patches/patch-ac b/multimedia/gst-plugins/patches/patch-ac deleted file mode 100644 index 8ab59dcb203..00000000000 --- a/multimedia/gst-plugins/patches/patch-ac +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ac,v 1.8 2005/06/28 12:24:32 wiz Exp $ - -http://bugzilla.gnome.org/show_bug.cgi?id=309043 - ---- gst/wavparse/gstwavparse.c.orig 2005-05-20 12:51:20.000000000 +0200 -+++ gst/wavparse/gstwavparse.c -@@ -567,6 +567,12 @@ gst_wavparse_fmt (GstWavParse * wav) - wav->width = (header->blockalign * 8) / header->channels; - wav->depth = header->size; - wav->bps = header->av_bps; -+ if (wav->bps <= 0) { -+ GST_ELEMENT_ERROR (wav, STREAM, FAILED, (NULL), -+ ("Stream claims to bitrate of <= zero - invalid data")); -+ g_free (header); -+ return FALSE; -+ } - - caps = gst_riff_create_audio_caps (header->format, NULL, header, NULL); - g_free (header); diff --git a/multimedia/gst-plugins/patches/patch-ag b/multimedia/gst-plugins/patches/patch-ag index 08e3bbbfb71..bfbe21197b7 100644 --- a/multimedia/gst-plugins/patches/patch-ag +++ b/multimedia/gst-plugins/patches/patch-ag @@ -1,30 +1,36 @@ -$NetBSD: patch-ag,v 1.1 2005/06/14 07:47:17 rillig Exp $ +$NetBSD: patch-ag,v 1.2 2005/08/21 11:27:54 jmmv Exp $ Removed the #define directive from the inside of a macro expansion. Needed for gcc-2.95 and possibly others. ---- sys/glsink/glimagesink.c.orig Tue May 17 10:41:52 2005 -+++ sys/glsink/glimagesink.c Tue Jun 14 09:36:08 2005 -@@ -51,15 +51,19 @@ GST_ELEMENT_DETAILS ("Video sink", - /* Default template - initiated with class struct to allow gst-register to work - without X running */ - static GstStaticPadTemplate gst_glimagesink_sink_template_factory = -+#ifdef ENABLE_YUV +--- sys/glsink/glimagesink.c.orig 2005-06-14 18:38:03.000000000 +0200 ++++ sys/glsink/glimagesink.c +@@ -46,6 +46,12 @@ GST_ELEMENT_DETAILS ("Video sink", + "An OpenGL 1.2 based videosink", + "Gernot Ziegler <gz@lysator.liu.se>, Julien Moutte <julien@moutte.net>"); + ++#ifdef GL_YCBCR_MESA +# define YUV_FOO ";" GST_VIDEO_CAPS_YUV ("{ UYVY, YUY2 }") +#else -+# define YUV_FOO /* empty */ ++# define YUV_FOO +#endif - GST_STATIC_PAD_TEMPLATE ("sink", ++ + /* Default template - initiated with class struct to allow gst-register to work + without X running */ + static GstStaticPadTemplate gst_glimagesink_sink_template_factory = +@@ -53,12 +59,12 @@ static GstStaticPadTemplate gst_glimages GST_PAD_SINK, GST_PAD_ALWAYS, GST_STATIC_CAPS (GST_VIDEO_CAPS_RGBx ";" GST_VIDEO_CAPS_BGRx --#ifdef ENABLE_YUV +-#ifdef GL_YCBCR_MESA - ";" GST_VIDEO_CAPS_YUV ("{ UYVY, YUY2 }") -#endif + YUV_FOO ) ); -+#undef YUV_FOO ++#undef YUV_FOO ++ #if 0 enum + { |