diff options
-rw-r--r-- | audio/gstreamer-plugins-cdparanoia/Makefile | 4 | ||||
-rw-r--r-- | audio/gstreamer-plugins-ogg/Makefile | 4 | ||||
-rw-r--r-- | audio/gstreamer-plugins-vorbis/Makefile | 4 | ||||
-rw-r--r-- | devel/gstreamer-plugins-gnomevfs/Makefile | 4 | ||||
-rw-r--r-- | graphics/gstreamer-plugins-libvisual/Makefile | 4 | ||||
-rw-r--r-- | multimedia/gstreamer-plugins-theora/Makefile | 4 | ||||
-rw-r--r-- | multimedia/gstreamer-plugins/Makefile | 6 | ||||
-rw-r--r-- | multimedia/gstreamer-plugins/distinfo | 6 | ||||
-rw-r--r-- | multimedia/gstreamer-plugins/files/patch-sys_v4l_v4lsrc_calls.c | 53 | ||||
-rw-r--r-- | multimedia/gstreamer-plugins/pkg-plist | 1 | ||||
-rw-r--r-- | x11-toolkits/gstreamer-plugins-pango/Makefile | 4 |
11 files changed, 48 insertions, 46 deletions
diff --git a/audio/gstreamer-plugins-cdparanoia/Makefile b/audio/gstreamer-plugins-cdparanoia/Makefile index b0d053842..dfb1cb793 100644 --- a/audio/gstreamer-plugins-cdparanoia/Makefile +++ b/audio/gstreamer-plugins-cdparanoia/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/gstreamer-plugins-cdparanoia/Makefile,v 1.4 2008/03/15 21:09:27 ahze Exp $ +# $MCom: ports/audio/gstreamer-plugins-cdparanoia/Makefile,v 1.5 2008/03/19 14:05:28 ahze Exp $ # -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= audio COMMENT= Gstreamer CDDA extraction (aka audio ripping) plugin diff --git a/audio/gstreamer-plugins-ogg/Makefile b/audio/gstreamer-plugins-ogg/Makefile index b6eb75d27..a30bf56d8 100644 --- a/audio/gstreamer-plugins-ogg/Makefile +++ b/audio/gstreamer-plugins-ogg/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/gstreamer-plugins-ogg/Makefile,v 1.4 2008/03/15 21:09:30 ahze Exp $ +# $MCom: ports/audio/gstreamer-plugins-ogg/Makefile,v 1.5 2008/03/19 14:05:31 ahze Exp $ # -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= audio COMMENT= Gstreamer Ogg bitstream plugin diff --git a/audio/gstreamer-plugins-vorbis/Makefile b/audio/gstreamer-plugins-vorbis/Makefile index fd4dc7a67..7bea0a90f 100644 --- a/audio/gstreamer-plugins-vorbis/Makefile +++ b/audio/gstreamer-plugins-vorbis/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/gstreamer-plugins-vorbis/Makefile,v 1.4 2008/03/15 21:09:31 ahze Exp $ +# $MCom: ports/audio/gstreamer-plugins-vorbis/Makefile,v 1.5 2008/03/19 14:05:32 ahze Exp $ # -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= audio COMMENT= Gstreamer vorbis encoder/decoder plugin diff --git a/devel/gstreamer-plugins-gnomevfs/Makefile b/devel/gstreamer-plugins-gnomevfs/Makefile index 673444b96..599b9020f 100644 --- a/devel/gstreamer-plugins-gnomevfs/Makefile +++ b/devel/gstreamer-plugins-gnomevfs/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gstreamer-plugins-gnomevfs/Makefile,v 1.4 2008/03/15 21:09:32 ahze Exp $ +# $MCom: ports/devel/gstreamer-plugins-gnomevfs/Makefile,v 1.5 2008/03/19 14:05:33 ahze Exp $ # -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= devel COMMENT= Gstreamer gnomevfs plugin diff --git a/graphics/gstreamer-plugins-libvisual/Makefile b/graphics/gstreamer-plugins-libvisual/Makefile index 366e15964..45236d97a 100644 --- a/graphics/gstreamer-plugins-libvisual/Makefile +++ b/graphics/gstreamer-plugins-libvisual/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/gstreamer-plugins-libvisual/Makefile,v 1.4 2008/03/15 21:09:34 ahze Exp $ +# $MCom: ports/graphics/gstreamer-plugins-libvisual/Makefile,v 1.5 2008/03/19 14:05:35 ahze Exp $ # -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= graphics COMMENT= Gstreamer libvisual plugin diff --git a/multimedia/gstreamer-plugins-theora/Makefile b/multimedia/gstreamer-plugins-theora/Makefile index ca0f0b14a..0720e7aeb 100644 --- a/multimedia/gstreamer-plugins-theora/Makefile +++ b/multimedia/gstreamer-plugins-theora/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/multimedia/gstreamer-plugins-theora/Makefile,v 1.2 2008/03/15 21:09:36 ahze Exp $ +# $MCom: ports/multimedia/gstreamer-plugins-theora/Makefile,v 1.3 2008/03/19 14:05:37 ahze Exp $ # -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= multimedia COMMENT= Gstreamer theora plugin diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index 2b274fe5d..796d952cb 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -3,12 +3,12 @@ # Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.109 2008/03/15 21:09:34 ahze Exp $ +# $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.110 2008/03/19 14:05:35 ahze Exp $ # PORTNAME= gstreamer PORTVERSION?= ${BASE_PORTVERSION} -PORTREVISION?= 5 +PORTREVISION?= 0 PORTEPOCH= 3 CATEGORIES?= multimedia audio MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \ @@ -31,7 +31,7 @@ LIB_DEPENDS+= gstreamer-0.10.0:${PORTSDIR}/multimedia/gstreamer \ CFLAGS:= ${CFLAGS} -O2 -BASE_PORTVERSION= 0.10.17 +BASE_PORTVERSION= 0.10.18 BASE_DISTNAME= gst-plugins-base-${BASE_PORTVERSION} BASE_DISTFILE= ${BASE_DISTNAME}${EXTRACT_SUFX} BAD_PORTVERSION= 0.10.6 diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo index 4f4cc4436..b2538abda 100644 --- a/multimedia/gstreamer-plugins/distinfo +++ b/multimedia/gstreamer-plugins/distinfo @@ -1,6 +1,6 @@ -MD5 (gst-plugins-base-0.10.17.tar.bz2) = 151b66228e08ab0c7601713030fb1c3f -SHA256 (gst-plugins-base-0.10.17.tar.bz2) = f82cfd5669c756726f503dde5936e2fbe2969631095f0efc40df1fae1a74f70d -SIZE (gst-plugins-base-0.10.17.tar.bz2) = 1849092 +MD5 (gst-plugins-base-0.10.18.tar.bz2) = 422e654b049dedef6fdbf4456f2259d1 +SHA256 (gst-plugins-base-0.10.18.tar.bz2) = 72298b2d2ecd989c273f3952d534139b018beb1a4d2ce15c74cbdfe48ed15757 +SIZE (gst-plugins-base-0.10.18.tar.bz2) = 1911898 MD5 (gst-plugins-bad-0.10.6.tar.bz2) = fb47838aa0ccef52683cea5d89364053 SHA256 (gst-plugins-bad-0.10.6.tar.bz2) = c702dab34d3b330ec06d915a91a937dadb0a93ace25bbe8e337223ddb834efe6 SIZE (gst-plugins-bad-0.10.6.tar.bz2) = 1776962 diff --git a/multimedia/gstreamer-plugins/files/patch-sys_v4l_v4lsrc_calls.c b/multimedia/gstreamer-plugins/files/patch-sys_v4l_v4lsrc_calls.c index afbfb75e3..24088dc9f 100644 --- a/multimedia/gstreamer-plugins/files/patch-sys_v4l_v4lsrc_calls.c +++ b/multimedia/gstreamer-plugins/files/patch-sys_v4l_v4lsrc_calls.c @@ -1,5 +1,5 @@ ---- sys/v4l/v4lsrc_calls.c.orig 2008-03-13 23:13:21.000000000 -0400 -+++ sys/v4l/v4lsrc_calls.c 2008-03-14 01:18:32.000000000 -0400 +--- sys/v4l/v4lsrc_calls.c.orig 2008-03-03 17:29:52.000000000 -0500 ++++ sys/v4l/v4lsrc_calls.c 2008-03-20 23:50:39.000000000 -0400 @@ -26,12 +26,14 @@ #include <stdlib.h> @@ -15,7 +15,7 @@ #include "v4lsrc_calls.h" #include <sys/time.h> -@@ -87,6 +89,51 @@ gst_v4lsrc_queue_frame (GstV4lSrc * v4ls +@@ -87,6 +89,51 @@ return FALSE; } @@ -67,7 +67,7 @@ /* instruct the driver to prepare capture using buffer frame num */ v4lsrc->mmap.frame = num; if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, -@@ -95,6 +142,7 @@ gst_v4lsrc_queue_frame (GstV4lSrc * v4ls +@@ -95,6 +142,7 @@ ("Error queueing a buffer (%d): %s", num, g_strerror (errno))); return FALSE; } @@ -75,7 +75,7 @@ v4lsrc->frame_queue_state[num] = QUEUE_STATE_QUEUED; v4lsrc->num_queued++; -@@ -117,6 +165,10 @@ gst_v4lsrc_sync_frame (GstV4lSrc * v4lsr +@@ -117,6 +165,10 @@ return FALSE; } @@ -86,7 +86,7 @@ while (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCSYNC, &num) < 0) { /* if the sync() got interrupted, we can retry */ if (errno != EINTR) { -@@ -126,6 +178,7 @@ gst_v4lsrc_sync_frame (GstV4lSrc * v4lsr +@@ -126,6 +178,7 @@ } GST_DEBUG_OBJECT (v4lsrc, "Sync got interrupted"); } @@ -94,7 +94,7 @@ GST_LOG_OBJECT (v4lsrc, "VIOIOCSYNC on frame %d done", num); v4lsrc->frame_queue_state[num] = QUEUE_STATE_SYNCED; -@@ -168,13 +221,28 @@ gst_v4lsrc_capture_init (GstV4lSrc * v4l +@@ -168,13 +221,28 @@ GST_V4L_CHECK_OPEN (GST_V4LELEMENT (v4lsrc)); GST_V4L_CHECK_NOT_ACTIVE (GST_V4LELEMENT (v4lsrc)); @@ -126,7 +126,7 @@ } if (v4lsrc->mbuf.frames < MIN_BUFFERS_QUEUED) { -@@ -205,6 +273,7 @@ gst_v4lsrc_capture_init (GstV4lSrc * v4l +@@ -205,6 +273,7 @@ GST_V4LELEMENT (v4lsrc)->buffer = NULL; return FALSE; } @@ -134,7 +134,7 @@ return TRUE; } -@@ -413,10 +482,14 @@ gst_v4lsrc_capture_deinit (GstV4lSrc * v +@@ -413,10 +482,14 @@ v4lsrc->frame_queue_state = NULL; /* unmap the buffer */ @@ -153,7 +153,7 @@ } GST_V4LELEMENT (v4lsrc)->buffer = NULL; -@@ -446,6 +519,7 @@ gst_v4lsrc_try_capture (GstV4lSrc * v4ls +@@ -446,6 +519,7 @@ /* so, we need a buffer and some more stuff */ int frame = 0; guint8 *buffer; @@ -161,7 +161,7 @@ struct video_mbuf vmbuf; struct video_mmap vmmap; -@@ -456,17 +530,17 @@ gst_v4lsrc_try_capture (GstV4lSrc * v4ls +@@ -456,24 +530,72 @@ /* let's start by requesting a buffer and mmap()'ing it */ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCGMBUF, &vmbuf) < 0) { @@ -170,27 +170,28 @@ - return FALSE; - } - /* Map the buffers */ -- buffer = mmap (0, vmbuf.size, PROT_READ | PROT_WRITE, +- buffer = mmap (NULL, vmbuf.size, PROT_READ | PROT_WRITE, - MAP_SHARED, GST_V4LELEMENT (v4lsrc)->video_fd, 0); - if (buffer == MAP_FAILED) { - GST_ELEMENT_ERROR (v4lsrc, RESOURCE, OPEN_READ_WRITE, (NULL), - ("Error mapping our try-out buffer: %s", g_strerror (errno))); - return FALSE; -+ buffer = (gint8 *) g_malloc0 (sizeof (gint8) * 1024 * 768 * 3); -+ use_read = TRUE; -+ } else { -+ /* Map the buffers */ -+ buffer = mmap (0, vmbuf.size, PROT_READ | PROT_WRITE, -+ MAP_SHARED, GST_V4LELEMENT (v4lsrc)->video_fd, 0); -+ if (buffer == MAP_FAILED) { -+ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, OPEN_READ_WRITE, (NULL), -+ ("Error mapping our try-out buffer: %s", g_strerror (errno))); -+ return FALSE; -+ } - } +- } ++ buffer = (gint8 *) g_malloc0 (sizeof (gint8) * 1024 * 768 * 3); ++ use_read = TRUE; ++ } else { ++ /* Map the buffers */ ++ buffer = mmap (0, vmbuf.size, PROT_READ | PROT_WRITE, ++ MAP_SHARED, GST_V4LELEMENT (v4lsrc)->video_fd, 0); ++ if (buffer == MAP_FAILED) { ++ GST_ELEMENT_ERROR (v4lsrc, RESOURCE, OPEN_READ_WRITE, (NULL), ++ ("Error mapping our try-out buffer: %s", g_strerror (errno))); ++ return FALSE; ++ } ++ } /* now that we have a buffer, let's try out our format */ -@@ -474,6 +548,54 @@ gst_v4lsrc_try_capture (GstV4lSrc * v4ls + vmmap.width = width; vmmap.height = height; vmmap.format = palette; vmmap.frame = frame; @@ -245,7 +246,7 @@ if (ioctl (GST_V4LELEMENT (v4lsrc)->video_fd, VIDIOCMCAPTURE, &vmmap) < 0) { if (errno != EINVAL) /* our format failed! */ GST_ERROR_OBJECT (v4lsrc, -@@ -488,7 +610,11 @@ gst_v4lsrc_try_capture (GstV4lSrc * v4ls +@@ -488,7 +610,11 @@ return FALSE; } diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist index e9c6135f8..4d856ec04 100644 --- a/multimedia/gstreamer-plugins/pkg-plist +++ b/multimedia/gstreamer-plugins/pkg-plist @@ -198,6 +198,7 @@ share/locale/es/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/fi/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/hu/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/it/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo +share/locale/lt/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/nb/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/nl/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/or/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo diff --git a/x11-toolkits/gstreamer-plugins-pango/Makefile b/x11-toolkits/gstreamer-plugins-pango/Makefile index 975b17526..1d6d6b52d 100644 --- a/x11-toolkits/gstreamer-plugins-pango/Makefile +++ b/x11-toolkits/gstreamer-plugins-pango/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gstreamer-plugins-pango/Makefile,v 1.4 2008/03/15 21:09:38 ahze Exp $ +# $MCom: ports/x11-toolkits/gstreamer-plugins-pango/Makefile,v 1.5 2008/03/19 14:05:38 ahze Exp $ # -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= x11-toolkits COMMENT= Gstreamer pango textoverlay plugin |