summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--multimedia/gst-plugins/Makefile4
-rw-r--r--multimedia/gst-plugins/Makefile.common9
-rw-r--r--multimedia/gst-plugins/PLIST9
-rw-r--r--multimedia/gst-plugins/distinfo12
-rw-r--r--multimedia/gst-plugins/patches/patch-ab22
-rw-r--r--multimedia/gst-plugins/patches/patch-ac105
-rw-r--r--multimedia/gst-plugins/patches/patch-ae10
7 files changed, 25 insertions, 146 deletions
diff --git a/multimedia/gst-plugins/Makefile b/multimedia/gst-plugins/Makefile
index 42ca3752a1e..71448b37675 100644
--- a/multimedia/gst-plugins/Makefile
+++ b/multimedia/gst-plugins/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2005/03/12 09:09:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2005/03/22 16:16:33 jmmv Exp $
#
.include "Makefile.common"
-PKGREVISION= 2
-
COMMENT+= base plugins
USE_PERL5= run
diff --git a/multimedia/gst-plugins/Makefile.common b/multimedia/gst-plugins/Makefile.common
index 5a4e945874a..08e1c8d892f 100644
--- a/multimedia/gst-plugins/Makefile.common
+++ b/multimedia/gst-plugins/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.15 2005/01/26 13:09:19 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.16 2005/03/22 16:16:33 jmmv Exp $
#
-DISTNAME= gst-plugins-0.8.7
+DISTNAME= gst-plugins-0.8.8
CATEGORIES= multimedia gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gst-plugins/0.8/} \
http://gstreamer.freedesktop.org/src/gst-plugins/
@@ -39,6 +39,7 @@ CONFIGURE_ENV+= have_func=no
aalib \
aalibtest \
alsa \
+ amrnb \
arts \
artsc \
artstest \
@@ -155,10 +156,12 @@ SUBST_STAGE.libs= pre-configure
SUBST_FILES.libs= ${GST_PLUGINS_DIR}/Makefile.in
SUBST_SED.libs= -e 's|$$(top_builddir)/gst-libs/gst/libgst|${BUILDLINK_PREFIX.gst-plugins}/lib/libgst|g'
-BUILDLINK_DEPENDS.gst-plugins+= gst-plugins>=0.8.7
+BUILDLINK_DEPENDS.gst-plugins+= gst-plugins>=0.8.8
.include "../../multimedia/gst-plugins/buildlink3.mk"
.endif
+BUILDLINK_DEPENDS.gstreamer+= gstreamer>=0.8.9
+
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
diff --git a/multimedia/gst-plugins/PLIST b/multimedia/gst-plugins/PLIST
index 22e89106256..3fc37a6787a 100644
--- a/multimedia/gst-plugins/PLIST
+++ b/multimedia/gst-plugins/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2005/01/13 12:56:31 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.13 2005/03/22 16:16:33 jmmv Exp $
bin/gst-launch-ext-0.8
bin/gst-visualise-0.8
include/gstreamer-0.8/gst/audio/audio.h
@@ -47,6 +47,7 @@ lib/gstreamer-0.8/libgstaudiofilter.la
lib/gstreamer-0.8/libgstaudiorate.la
lib/gstreamer-0.8/libgstaudioscale.la
lib/gstreamer-0.8/libgstauparse.la
+lib/gstreamer-0.8/libgstautodetect.la
lib/gstreamer-0.8/libgstavi.la
lib/gstreamer-0.8/libgstcdxaparse.la
lib/gstreamer-0.8/libgstchart.la
@@ -55,6 +56,7 @@ lib/gstreamer-0.8/libgstcutter.la
lib/gstreamer-0.8/libgstdebug.la
lib/gstreamer-0.8/libgstdecodebin.la
lib/gstreamer-0.8/libgstdeinterlace.la
+lib/gstreamer-0.8/libgstdvdlpcmdec.la
lib/gstreamer-0.8/libgstefence.la
lib/gstreamer-0.8/libgsteffectv.la
lib/gstreamer-0.8/libgstequalizer.la
@@ -63,6 +65,7 @@ lib/gstreamer-0.8/libgstffmpegcolorspace.la
lib/gstreamer-0.8/libgstfilter.la
lib/gstreamer-0.8/libgstflxdec.la
lib/gstreamer-0.8/libgstgamma.la
+lib/gstreamer-0.8/libgstgconfelements.la
lib/gstreamer-0.8/libgstgoom.la
lib/gstreamer-0.8/libgstidct.la
lib/gstreamer-0.8/libgstinterleave.la
@@ -86,8 +89,10 @@ lib/gstreamer-0.8/libgstoverlay.la
lib/gstreamer-0.8/libgstpassthrough.la
lib/gstreamer-0.8/libgstplaybin.la
lib/gstreamer-0.8/libgstplayondemand.la
+lib/gstreamer-0.8/libgstpuzzle.la
lib/gstreamer-0.8/libgstqtdemux.la
lib/gstreamer-0.8/libgstresample.la
+lib/gstreamer-0.8/libgstrfbsrc.la
lib/gstreamer-0.8/libgstriff.la
lib/gstreamer-0.8/libgstrmdemux.la
lib/gstreamer-0.8/libgstrtjpeg.la
@@ -99,6 +104,7 @@ lib/gstreamer-0.8/libgstsmpte.la
lib/gstreamer-0.8/libgstspectrum.la
lib/gstreamer-0.8/libgstspeed.la
lib/gstreamer-0.8/libgststereo.la
+lib/gstreamer-0.8/libgstsubparse.la
lib/gstreamer-0.8/libgstswitch.la
lib/gstreamer-0.8/libgstsynaesthesia.la
lib/gstreamer-0.8/libgsttagedit.la
@@ -152,6 +158,7 @@ ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gst-plugins-0.8.mo
${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gst-plugins-0.8.mo
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gst-plugins-0.8.mo
${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gst-plugins-0.8.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gst-plugins-0.8.mo
@comment in GConf2: @dirrm share/gconf/schemas
@comment in gstreamer: @dirrm lib/gstreamer-0.8
@dirrm include/gstreamer-0.8/gst/xwindowlistener
diff --git a/multimedia/gst-plugins/distinfo b/multimedia/gst-plugins/distinfo
index b736829098d..06f1db79207 100644
--- a/multimedia/gst-plugins/distinfo
+++ b/multimedia/gst-plugins/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.17 2005/03/12 09:09:34 jmmv Exp $
+$NetBSD: distinfo,v 1.18 2005/03/22 16:16:33 jmmv Exp $
-SHA1 (gst-plugins-0.8.7.tar.bz2) = fbfb1a23ef805e58f5617649590d065440470628
-RMD160 (gst-plugins-0.8.7.tar.bz2) = faa220713f09824367795ad08bbce1f4293912a0
-Size (gst-plugins-0.8.7.tar.bz2) = 2134878 bytes
+SHA1 (gst-plugins-0.8.8.tar.bz2) = 5ba9908c3a09c1b7554ed0194a85ba63c2cc1ced
+RMD160 (gst-plugins-0.8.8.tar.bz2) = e141c576b668109d41f32541a96da5c79016e55c
+Size (gst-plugins-0.8.8.tar.bz2) = 2214274 bytes
SHA1 (patch-aa) = c9173d53f594236f114cb5356aca79f41e13240b
-SHA1 (patch-ab) = f7e6c495ebcddb49f9e01ff6de36ed11c6d98dd5
-SHA1 (patch-ac) = 31c3283a17d6e667e0296eb7bf102cc5213cf92f
-SHA1 (patch-ae) = d51997b93689753fa0a34eec21ac14dc22af7500
+SHA1 (patch-ae) = 3509dd08d3e010e9eb85c71ae6c42e28f6f9ec2d
diff --git a/multimedia/gst-plugins/patches/patch-ab b/multimedia/gst-plugins/patches/patch-ab
deleted file mode 100644
index 2d11dad5fd8..00000000000
--- a/multimedia/gst-plugins/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2005/01/16 22:54:37 kristerw Exp $
-
---- gst/tta/gstttaparse.c.orig Sun Jan 16 23:27:29 2005
-+++ gst/tta/gstttaparse.c Sun Jan 16 23:28:36 2005
-@@ -161,12 +161,13 @@
- switch (GST_EVENT_TYPE (event)) {
- case GST_EVENT_SEEK:
- {
-+ GstEvent *seek_event;
-+ guint64 time, seek_frame, seekpos;
- if (GST_EVENT_SEEK_FORMAT (event) == GST_FORMAT_TIME) {
- GST_DEBUG_OBJECT (ttaparse, "got seek event");
-- GstEvent *seek_event;
-- guint64 time = GST_EVENT_SEEK_OFFSET (event);
-- guint64 seek_frame = time / (FRAME_TIME * 1000000000);
-- guint64 seekpos = ttaparse->index[seek_frame].pos;
-+ time = GST_EVENT_SEEK_OFFSET (event);
-+ seek_frame = time / (FRAME_TIME * 1000000000);
-+ seekpos = ttaparse->index[seek_frame].pos;
-
- GST_DEBUG_OBJECT (ttaparse, "seeking to %u", (guint) seekpos);
- seek_event =
diff --git a/multimedia/gst-plugins/patches/patch-ac b/multimedia/gst-plugins/patches/patch-ac
deleted file mode 100644
index 73613bedf2d..00000000000
--- a/multimedia/gst-plugins/patches/patch-ac
+++ /dev/null
@@ -1,105 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2005/03/12 09:09:34 jmmv Exp $
-
---- gst/qtdemux/qtdemux.c.orig 2004-12-23 13:42:49.000000000 +0100
-+++ gst/qtdemux/qtdemux.c 2005-03-11 16:47:54.000000000 +0100
-@@ -511,10 +511,11 @@
-
- switch (GST_STATE_TRANSITION (element)) {
- case GST_STATE_NULL_TO_READY:
-- break;
-- case GST_STATE_READY_TO_PAUSED:
- qtdemux->bs = gst_bytestream_new (qtdemux->sinkpad);
- qtdemux->state = QTDEMUX_STATE_HEADER;
-+ GST_DEBUG("new bytestream");
-+ break;
-+ case GST_STATE_READY_TO_PAUSED:
- break;
- case GST_STATE_PAUSED_TO_PLAYING:
- break;
-@@ -524,9 +525,9 @@
- qtdemux->last_ts = GST_CLOCK_TIME_NONE;
- qtdemux->need_discont = FALSE;
- qtdemux->need_flush = FALSE;
-- gst_bytestream_destroy (qtdemux->bs);
- break;
- case GST_STATE_READY_TO_NULL:
-+ gst_bytestream_destroy (qtdemux->bs);
- break;
- default:
- break;
-@@ -614,6 +615,7 @@
- break;
- }
- } while (1);
-+ qtdemux->offset += length;
-
- qtdemux_parse_moov (qtdemux, GST_BUFFER_DATA (moov), length);
- if (1) {
-@@ -632,11 +634,18 @@
- }
- ret = gst_bytestream_seek (qtdemux->bs, cur_offset + length,
- GST_SEEK_METHOD_SET);
-- if (!ret) {
-- g_warning ("seek failed");
-+ GST_DEBUG ("seek returned %d", ret);
-+ if (ret == FALSE) {
-+ length = cur_offset + length;
-+ cur_offset = qtdemux->offset;
-+ length -= cur_offset;
-+ if (gst_bytestream_flush (qtdemux->bs, length) == FALSE) {
-+ if (!gst_qtdemux_handle_sink_event (qtdemux)) {
-+ return;
-+ }
-+ }
- }
- qtdemux->offset = cur_offset + length;
-- GST_DEBUG ("seek returned %d", ret);
- break;
- }
- case QTDEMUX_STATE_SEEKING_EOS:
-@@ -685,8 +694,8 @@
- GST_DATA (gst_event_new (GST_EVENT_EOS)));
- }
- ret = gst_bytestream_seek (qtdemux->bs, 0, GST_SEEK_METHOD_END);
-- if (!ret) {
-- g_warning ("seek failed");
-+ if (ret == FALSE) {
-+ gst_bytestream_flush(qtdemux->bs, 0xffffffff);
- }
- GST_DEBUG ("seek returned %d", ret);
-
-@@ -706,16 +715,23 @@
-
- /* don't believe bytestream */
- //cur_offset = gst_bytestream_tell (qtdemux->bs);
-+ cur_offset = qtdemux->offset;
-
- if (offset != cur_offset) {
- GST_DEBUG ("seeking to offset %d (currently at %d)", offset,
- cur_offset);
- ret = gst_bytestream_seek (qtdemux->bs, offset, GST_SEEK_METHOD_SET);
-- if (!ret) {
-- g_warning ("seek failed");
-+ GST_DEBUG ("seek returned %d", ret);
-+ if (ret == FALSE && offset > cur_offset) {
-+ if (gst_bytestream_flush (qtdemux->bs, offset - cur_offset) == FALSE) {
-+ if (!gst_qtdemux_handle_sink_event (qtdemux)) {
-+ return;
-+ }
- }
-+ }
-+ else if (ret == FALSE && offset < cur_offset)
-+ GST_ERROR("cannot flush backwards");
- qtdemux->offset = offset;
-- GST_DEBUG ("seek returned %d", ret);
- return;
- }
-
-@@ -732,6 +748,7 @@
- break;
- }
- } while (TRUE);
-+ qtdemux->offset += size;
-
- if (buf) {
- /* hum... FIXME changing framerate breaks horribly, better set
diff --git a/multimedia/gst-plugins/patches/patch-ae b/multimedia/gst-plugins/patches/patch-ae
index d3d314fb3ce..7844cb1a266 100644
--- a/multimedia/gst-plugins/patches/patch-ae
+++ b/multimedia/gst-plugins/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.3 2004/06/20 20:23:34 agc Exp $
+$NetBSD: patch-ae,v 1.4 2005/03/22 16:16:33 jmmv Exp $
---- ext/artsd/Makefile.in 2004/06/14 10:12:01 1.1
-+++ ext/artsd/Makefile.in 2004/06/14 10:12:17
-@@ -49,9 +49,9 @@
- AMDEP_TRUE = @AMDEP_TRUE@
+--- ext/artsd/Makefile.in.orig 2005-03-07 17:41:49.000000000 +0100
++++ ext/artsd/Makefile.in
+@@ -121,9 +121,9 @@ AMDEP_TRUE = @AMDEP_TRUE@
+ AMRNB_LIBS = @AMRNB_LIBS@
AMTAR = @AMTAR@
AR = @AR@
-ARTSC_CFLAGS = @ARTSC_CFLAGS@