From 25c13917153088e862839e430f7b4620d72f4085 Mon Sep 17 00:00:00 2001 From: drochner Date: Tue, 8 Sep 2009 20:22:02 +0000 Subject: update to 0.10.16 changes: Moved rtpmanager from -bad to -good Implement SEEKING query in more demuxers and decoders (notably mkv, flv, flac) avimux: adds support to WMA/WMV cairo: Add cairo-based PDF/PS/SVG encoder element (cairorender) dv1394src: fix element for live usage effectv: new elements: rippletv, streaktv, radioactv, optv flacdec: fix intermittent FLAC__STREAM_DECODER_ABORTED errors when seeking flacenc: fix issue with broken duration / sample count into flac header in some cases flvmux: lots of fixes and improvements id3demux: fix parsing of unsync'ed ID3 v2.4 tags and frames matroska: add kate subtitle support, add/improve WMA/WMV handling and read bluray PGS subpicture streams multipartdemux: support more mime types, do proper flow aggregation pulsesrc: cleanups, report real latency, set the default slave method to skew qtdemux: support for agsm, misc. tag reading fixes rtp: new QDM2 and CELT depayloaders; fix SVQ3 depayloader and make it autopluggable souphttpsrc: Only assume seekability if the server provides Content-Length v4l2: add v4l2sink element, open device in NULL->READY, optional gudev support v4l2src: fix 'hang' with some cameras caused by bad timestamping if no framerate is available videomixer: add RGB format support; fix I420 blending --- multimedia/gst-plugins0.10-good/Makefile | 4 +- multimedia/gst-plugins0.10-good/Makefile.common | 4 +- multimedia/gst-plugins0.10-good/PLIST | 6 ++- multimedia/gst-plugins0.10-good/distinfo | 12 +++--- multimedia/gst-plugins0.10-good/patches/patch-ab | 16 +++---- multimedia/gst-plugins0.10-good/patches/patch-ad | 54 ------------------------ multimedia/gst-plugins0.10-good/patches/patch-bb | 17 ++++++++ 7 files changed, 40 insertions(+), 73 deletions(-) delete mode 100644 multimedia/gst-plugins0.10-good/patches/patch-ad create mode 100644 multimedia/gst-plugins0.10-good/patches/patch-bb (limited to 'multimedia/gst-plugins0.10-good') diff --git a/multimedia/gst-plugins0.10-good/Makefile b/multimedia/gst-plugins0.10-good/Makefile index d03a44d4815..163f16261b5 100644 --- a/multimedia/gst-plugins0.10-good/Makefile +++ b/multimedia/gst-plugins0.10-good/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2009/05/25 15:50:12 drochner Exp $ +# $NetBSD: Makefile,v 1.19 2009/09/08 20:22:02 drochner Exp $ # PKG_DESTDIR_SUPPORT= user-destdir @@ -8,7 +8,7 @@ PKG_DESTDIR_SUPPORT= user-destdir COMMENT+= good plugins # some plugins were moved from bad to good -CONFLICTS+= gst-plugins0.10-bad<0.10.12 +CONFLICTS+= gst-plugins0.10-bad<0.10.14 CONFIGURE_ARGS+= --enable-gconf CONFIGURE_ARGS+= --enable-gconftool diff --git a/multimedia/gst-plugins0.10-good/Makefile.common b/multimedia/gst-plugins0.10-good/Makefile.common index 6c4d305c4f6..9f2182401ae 100644 --- a/multimedia/gst-plugins0.10-good/Makefile.common +++ b/multimedia/gst-plugins0.10-good/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.20 2009/05/26 01:53:55 obache Exp $ +# $NetBSD: Makefile.common,v 1.21 2009/09/08 20:22:02 drochner Exp $ # # used by audio/gst-plugins0.10-esound/Makefile # used by audio/gst-plugins0.10-flac/Makefile @@ -13,7 +13,7 @@ # used by net/gst-plugins0.10-soup/Makefile GST_PLUGINS0.10_TYPE= good -GST_PLUGINS0.10_VER= 0.10.15 +GST_PLUGINS0.10_VER= 0.10.16 # Disable all drivers and features by default. .for driver in aalib \ diff --git a/multimedia/gst-plugins0.10-good/PLIST b/multimedia/gst-plugins0.10-good/PLIST index d9f8a4ca323..7be2f660f78 100644 --- a/multimedia/gst-plugins0.10-good/PLIST +++ b/multimedia/gst-plugins0.10-good/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2009/06/14 18:08:05 joerg Exp $ +@comment $NetBSD: PLIST,v 1.18 2009/09/08 20:22:02 drochner Exp $ lib/gstreamer-0.10/libgstalaw.la lib/gstreamer-0.10/libgstalpha.la lib/gstreamer-0.10/libgstalphacolor.la @@ -32,6 +32,7 @@ lib/gstreamer-0.10/libgstnavigationtest.la lib/gstreamer-0.10/libgstqtdemux.la lib/gstreamer-0.10/libgstreplaygain.la lib/gstreamer-0.10/libgstrtp.la +lib/gstreamer-0.10/libgstrtpmanager.la lib/gstreamer-0.10/libgstrtsp.la lib/gstreamer-0.10/libgstsmpte.la lib/gstreamer-0.10/libgstspectrum.la @@ -53,6 +54,7 @@ share/locale/bg/LC_MESSAGES/gst-plugins-good-0.10.mo share/locale/ca/LC_MESSAGES/gst-plugins-good-0.10.mo share/locale/cs/LC_MESSAGES/gst-plugins-good-0.10.mo share/locale/da/LC_MESSAGES/gst-plugins-good-0.10.mo +share/locale/de/LC_MESSAGES/gst-plugins-good-0.10.mo share/locale/en_GB/LC_MESSAGES/gst-plugins-good-0.10.mo share/locale/es/LC_MESSAGES/gst-plugins-good-0.10.mo share/locale/eu/LC_MESSAGES/gst-plugins-good-0.10.mo @@ -63,6 +65,7 @@ share/locale/id/LC_MESSAGES/gst-plugins-good-0.10.mo share/locale/it/LC_MESSAGES/gst-plugins-good-0.10.mo share/locale/ja/LC_MESSAGES/gst-plugins-good-0.10.mo share/locale/lt/LC_MESSAGES/gst-plugins-good-0.10.mo +share/locale/lv/LC_MESSAGES/gst-plugins-good-0.10.mo share/locale/mt/LC_MESSAGES/gst-plugins-good-0.10.mo share/locale/nb/LC_MESSAGES/gst-plugins-good-0.10.mo share/locale/nl/LC_MESSAGES/gst-plugins-good-0.10.mo @@ -74,6 +77,7 @@ share/locale/sk/LC_MESSAGES/gst-plugins-good-0.10.mo share/locale/sq/LC_MESSAGES/gst-plugins-good-0.10.mo share/locale/sr/LC_MESSAGES/gst-plugins-good-0.10.mo share/locale/sv/LC_MESSAGES/gst-plugins-good-0.10.mo +share/locale/tr/LC_MESSAGES/gst-plugins-good-0.10.mo share/locale/uk/LC_MESSAGES/gst-plugins-good-0.10.mo share/locale/vi/LC_MESSAGES/gst-plugins-good-0.10.mo share/locale/zh_CN/LC_MESSAGES/gst-plugins-good-0.10.mo diff --git a/multimedia/gst-plugins0.10-good/distinfo b/multimedia/gst-plugins0.10-good/distinfo index 188aa2920a8..93af0425572 100644 --- a/multimedia/gst-plugins0.10-good/distinfo +++ b/multimedia/gst-plugins0.10-good/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.22 2009/06/05 11:14:16 wiz Exp $ +$NetBSD: distinfo,v 1.23 2009/09/08 20:22:02 drochner Exp $ -SHA1 (gst-plugins-good-0.10.15.tar.bz2) = b37611f5b4e28c19159ed3f71aeaf7dfff513174 -RMD160 (gst-plugins-good-0.10.15.tar.bz2) = 6caa4c4f93285f03c15c23ac0ae5d390c20bfd07 -Size (gst-plugins-good-0.10.15.tar.bz2) = 2354906 bytes -SHA1 (patch-ab) = ab70993a71c4b288c21e72847186011c33bd0fb1 +SHA1 (gst-plugins-good-0.10.16.tar.bz2) = 655a22ea3f4f4dc0f9f200af7c85b4b725d960e7 +RMD160 (gst-plugins-good-0.10.16.tar.bz2) = 51f6dfc95932ae3a25d017257a3587e3081ad163 +Size (gst-plugins-good-0.10.16.tar.bz2) = 2573811 bytes +SHA1 (patch-ab) = ebcc3d155af4683d820764e92c5056edfebcfd9b SHA1 (patch-ac) = 8867119011dc8cca89cc3a35fb3f095212887bf7 -SHA1 (patch-ad) = 24b3cb1e94385f4189655c74738188e00af8ded5 SHA1 (patch-ba) = e296bbcfc606967b71765988ae1c3ffe96b9359a +SHA1 (patch-bb) = ec781545a7583405a25e8a4dcf689e777f6ac51f diff --git a/multimedia/gst-plugins0.10-good/patches/patch-ab b/multimedia/gst-plugins0.10-good/patches/patch-ab index 81bbee4dbf3..9c0c0374fe3 100644 --- a/multimedia/gst-plugins0.10-good/patches/patch-ab +++ b/multimedia/gst-plugins0.10-good/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.13 2009/01/27 22:59:16 sketch Exp $ +$NetBSD: patch-ab,v 1.14 2009/09/08 20:22:03 drochner Exp $ ---- configure.orig Thu Jan 22 21:25:11 2009 -+++ configure Tue Jan 27 22:46:45 2009 -@@ -26274,6 +26274,9 @@ +--- configure.orig 2009-08-28 22:05:53.000000000 +0200 ++++ configure +@@ -21808,6 +21808,9 @@ main () #error GCC before 3.4 has critical bugs compiling inline assembly #endif #endif @@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.13 2009/01/27 22:59:16 sketch Exp $ __asm__ (""::) ; return 0; -@@ -26884,7 +26887,7 @@ +@@ -22043,7 +22046,7 @@ $as_echo "#define HAVE_MMAP 1" >>confdef fi rm -f conftest.mmap @@ -21,7 +21,7 @@ $NetBSD: patch-ab,v 1.13 2009/01/27 22:59:16 sketch Exp $ GST_HAVE_MMAP_TRUE= GST_HAVE_MMAP_FALSE='#' else -@@ -28297,7 +28300,7 @@ +@@ -23411,7 +23414,7 @@ rm -f core conftest.err conftest.$ac_obj $as_echo "$flag_ok" >&6; } @@ -29,8 +29,8 @@ $NetBSD: patch-ab,v 1.13 2009/01/27 22:59:16 sketch Exp $ + if test "x$ERROR_CFLAGS" = "x" then - { $as_echo "$as_me:$LINENO: checking to see if compiler understands -errwarn=%all" >&5 -@@ -32949,6 +32952,10 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -errwarn=%all" >&5 +@@ -26464,6 +26467,10 @@ $as_echo_n "checking struct v4l2_buffer #ifdef __sun /* Solaris */ #include #include diff --git a/multimedia/gst-plugins0.10-good/patches/patch-ad b/multimedia/gst-plugins0.10-good/patches/patch-ad deleted file mode 100644 index 9c3f797b8a1..00000000000 --- a/multimedia/gst-plugins0.10-good/patches/patch-ad +++ /dev/null @@ -1,54 +0,0 @@ -$NetBSD: patch-ad,v 1.6 2009/06/05 11:14:16 wiz Exp $ - -Fix for SA35205 from upstream CVS. - ---- ext/libpng/gstpngdec.c.orig 2009-05-12 02:00:06.000000000 +0200 -+++ ext/libpng/gstpngdec.c -@@ -201,7 +201,14 @@ user_info_callback (png_structp png_ptr, - - /* Allocate output buffer */ - pngdec->rowbytes = png_get_rowbytes (pngdec->png, pngdec->info); -- buffer_size = pngdec->height * GST_ROUND_UP_4 (pngdec->rowbytes); -+ if (pngdec->rowbytes > (G_MAXUINT32 - 3) -+ || pngdec->height > G_MAXUINT32 / pngdec->rowbytes) { -+ ret = GST_FLOW_ERROR; -+ goto beach; -+ } -+ pngdec->rowbytes = GST_ROUND_UP_4 (pngdec->rowbytes); -+ buffer_size = pngdec->height * pngdec->rowbytes; -+ - ret = - gst_pad_alloc_buffer_and_set_caps (pngdec->srcpad, GST_BUFFER_OFFSET_NONE, - buffer_size, GST_PAD_CAPS (pngdec->srcpad), &buffer); -@@ -228,7 +235,7 @@ user_endrow_callback (png_structp png_pt - /* If buffer_out doesn't exist, it means buffer_alloc failed, which - * will already have set the return code */ - if (GST_IS_BUFFER (pngdec->buffer_out)) { -- size_t offset = row_num * GST_ROUND_UP_4 (pngdec->rowbytes); -+ size_t offset = row_num * pngdec->rowbytes; - - GST_LOG ("got row %u, copying in buffer %p at offset %" G_GSIZE_FORMAT, - (guint) row_num, pngdec->buffer_out, offset); -@@ -496,7 +503,12 @@ gst_pngdec_task (GstPad * pad) - - /* Allocate output buffer */ - rowbytes = png_get_rowbytes (pngdec->png, pngdec->info); -- buffer_size = pngdec->height * GST_ROUND_UP_4 (rowbytes); -+ if (rowbytes > (G_MAXUINT32 - 3) || pngdec->height > G_MAXUINT32 / rowbytes) { -+ ret = GST_FLOW_ERROR; -+ goto pause; -+ } -+ rowbytes = GST_ROUND_UP_4 (rowbytes); -+ buffer_size = pngdec->height * rowbytes; - ret = - gst_pad_alloc_buffer_and_set_caps (pngdec->srcpad, GST_BUFFER_OFFSET_NONE, - buffer_size, GST_PAD_CAPS (pngdec->srcpad), &buffer); -@@ -509,7 +521,7 @@ gst_pngdec_task (GstPad * pad) - - for (i = 0; i < pngdec->height; i++) { - rows[i] = inp; -- inp += GST_ROUND_UP_4 (rowbytes); -+ inp += rowbytes; - } - - /* Read the actual picture */ diff --git a/multimedia/gst-plugins0.10-good/patches/patch-bb b/multimedia/gst-plugins0.10-good/patches/patch-bb new file mode 100644 index 00000000000..70a318866a2 --- /dev/null +++ b/multimedia/gst-plugins0.10-good/patches/patch-bb @@ -0,0 +1,17 @@ +$NetBSD: patch-bb,v 1.1 2009/09/08 20:22:03 drochner Exp $ + +--- sys/v4l2/v4l2_calls.h.orig 2009-09-07 12:46:03.000000000 +0200 ++++ sys/v4l2/v4l2_calls.h +@@ -30,8 +30,12 @@ + # include + #else + # include ++#ifdef __NetBSD__ ++#include ++#else + # include + # include ++#endif + # define v4l2_fd_open(fd, flags) (fd) + # define v4l2_close close + # define v4l2_dup dup -- cgit v1.2.3