From 8b5d6d26e26467a399bb4ff3803fd6434803b521 Mon Sep 17 00:00:00 2001 From: Koop Mast Date: Wed, 31 Mar 2010 10:40:29 +0000 Subject: Update to 0.10.21. Fix detection of libpng. New plugin v4l2. --- Mk/bsd.gstreamer.mk | 4 +++- audio/gstreamer-plugins-pulse/Makefile | 2 +- audio/gstreamer-plugins-taglib/Makefile | 2 +- devel/gstreamer-plugins-gconf/Makefile | 2 +- devel/gstreamer-plugins-soup/Makefile | 2 +- graphics/gstreamer-plugins-cairo/Makefile | 2 +- graphics/gstreamer-plugins-gdkpixbuf/Makefile | 2 +- graphics/gstreamer-plugins-jpeg/Makefile | 2 +- graphics/gstreamer-plugins-libcaca/Makefile | 2 +- graphics/gstreamer-plugins-libpng/Makefile | 2 +- multimedia/Makefile | 1 + multimedia/gstreamer-plugins-dv/Makefile | 2 +- .../gstreamer-plugins-good/files/patch-configure | 25 +++++++++++++++++++--- .../files/patch-sys_v4l2_gstv4l2object.h | 21 ++++++++++++++++++ multimedia/gstreamer-plugins-good/pkg-plist | 3 +++ multimedia/gstreamer-plugins-v4l2/Makefile | 18 ++++++++++++++++ multimedia/gstreamer-plugins/Makefile | 5 +++-- multimedia/gstreamer-plugins/Makefile.common | 11 +++++++++- multimedia/gstreamer-plugins/distinfo | 6 +++--- 19 files changed, 94 insertions(+), 20 deletions(-) create mode 100644 multimedia/gstreamer-plugins-good/files/patch-sys_v4l2_gstv4l2object.h create mode 100644 multimedia/gstreamer-plugins-v4l2/Makefile diff --git a/Mk/bsd.gstreamer.mk b/Mk/bsd.gstreamer.mk index 10e1254ff4bc..d018867fad27 100644 --- a/Mk/bsd.gstreamer.mk +++ b/Mk/bsd.gstreamer.mk @@ -59,7 +59,7 @@ _USE_GSTREAMER10_ALL= a52dec aalib annodex bz2 cairo cdaudio cdparanoia dts \ libcaca libmms libpng libvisual mm mp3 mpeg2enc mpeg2dec \ musepack nas neon ogg pango pulse python sdl shout2 sidplay \ sndfile spc soundtouch soup speex taglib \ - theora vorbis wavpack x264 xvid + theora v4l2 vorbis wavpack x264 xvid # other plugins OTHER_GSTREAMER_PLUGINS+=bad good ugly core yes ${_USE_GSTREAMER10_ALL} fluendo-mp3 mad @@ -212,6 +212,8 @@ mpeg2enc_DEPENDS= multimedia/gstreamer-plugins-mpeg2enc mplex_DEPENDS= multimedia/gstreamer-plugins-mplex +v4l2_DEPENDS= multimedia/gstreamer-plugins-v4l2 + # XXX: This is a quick solution for ports with USE_GSTREAMER=python # but without USE_PYTHON. PYTHON_PKGNAMEPREFIX?= py*- diff --git a/audio/gstreamer-plugins-pulse/Makefile b/audio/gstreamer-plugins-pulse/Makefile index 50a051bc23f5..4d0fa6ad5722 100644 --- a/audio/gstreamer-plugins-pulse/Makefile +++ b/audio/gstreamer-plugins-pulse/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= audio COMMENT= GStreamer plugin for pulseaudio diff --git a/audio/gstreamer-plugins-taglib/Makefile b/audio/gstreamer-plugins-taglib/Makefile index cfc94cc2e0c3..87a3189ab3e0 100644 --- a/audio/gstreamer-plugins-taglib/Makefile +++ b/audio/gstreamer-plugins-taglib/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/audio/gstreamer-plugins-taglib/Makefile,v 1.3 2008/03/19 14:05:32 ahze Exp $ # -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= audio COMMENT= Gstreamer taglib plugin diff --git a/devel/gstreamer-plugins-gconf/Makefile b/devel/gstreamer-plugins-gconf/Makefile index 4fd80989507e..68e8f37f8791 100644 --- a/devel/gstreamer-plugins-gconf/Makefile +++ b/devel/gstreamer-plugins-gconf/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/devel/gstreamer-plugins-gconf/Makefile,v 1.6 2008/03/19 14:05:33 ahze Exp $ # -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= devel COMMENT= Gstreamer gconf plugin diff --git a/devel/gstreamer-plugins-soup/Makefile b/devel/gstreamer-plugins-soup/Makefile index 996824d2f7ae..6d63b1398793 100644 --- a/devel/gstreamer-plugins-soup/Makefile +++ b/devel/gstreamer-plugins-soup/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/devel/gstreamer-plugins-soup/Makefile,v 1.3 2008/03/19 14:05:33 ahze Exp $ # -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= devel COMMENT= Gstreamer soup http src plugin diff --git a/graphics/gstreamer-plugins-cairo/Makefile b/graphics/gstreamer-plugins-cairo/Makefile index 7f355a036c7e..f9ec2a574507 100644 --- a/graphics/gstreamer-plugins-cairo/Makefile +++ b/graphics/gstreamer-plugins-cairo/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/graphics/gstreamer-plugins-cairo/Makefile,v 1.6 2008/03/19 14:05:34 ahze Exp $ # -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= graphics COMMENT= Gstreamer vector graphics plugin diff --git a/graphics/gstreamer-plugins-gdkpixbuf/Makefile b/graphics/gstreamer-plugins-gdkpixbuf/Makefile index ae4ab4ce3dda..f124f1982f4d 100644 --- a/graphics/gstreamer-plugins-gdkpixbuf/Makefile +++ b/graphics/gstreamer-plugins-gdkpixbuf/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/graphics/gstreamer-plugins-gdkpixbuf/Makefile,v 1.5 2008/03/19 14:05:34 ahze Exp $ # -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= graphics COMMENT= Gstreamer image decoder plugin diff --git a/graphics/gstreamer-plugins-jpeg/Makefile b/graphics/gstreamer-plugins-jpeg/Makefile index b30f8eaf61c9..710f1f14f686 100644 --- a/graphics/gstreamer-plugins-jpeg/Makefile +++ b/graphics/gstreamer-plugins-jpeg/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/graphics/gstreamer-plugins-jpeg/Makefile,v 1.5 2008/03/19 14:05:34 ahze Exp $ # -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= graphics COMMENT= Gstreamer jpeg encoder/decoder plugin diff --git a/graphics/gstreamer-plugins-libcaca/Makefile b/graphics/gstreamer-plugins-libcaca/Makefile index 4f68f1651a3f..847abc85da42 100644 --- a/graphics/gstreamer-plugins-libcaca/Makefile +++ b/graphics/gstreamer-plugins-libcaca/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/graphics/gstreamer-plugins-libcaca/Makefile,v 1.5 2008/03/19 14:05:34 ahze Exp $ # -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= graphics COMMENT= Gstreamer color ascii art plugin diff --git a/graphics/gstreamer-plugins-libpng/Makefile b/graphics/gstreamer-plugins-libpng/Makefile index dd8c0e3ceb0a..50367404bc5f 100644 --- a/graphics/gstreamer-plugins-libpng/Makefile +++ b/graphics/gstreamer-plugins-libpng/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # $MCom: ports/graphics/gstreamer-plugins-libpng/Makefile,v 1.5 2008/03/19 14:05:34 ahze Exp $ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= graphics COMMENT= Gstreamer png plugin diff --git a/multimedia/Makefile b/multimedia/Makefile index 12a8c48c4f2f..7cec22376c3a 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -103,6 +103,7 @@ SUBDIR += gstreamer-plugins-mpeg2enc SUBDIR += gstreamer-plugins-theora SUBDIR += gstreamer-plugins-ugly + SUBDIR += gstreamer-plugins-v4l2 SUBDIR += gstreamer-plugins-x264 SUBDIR += gstreamer-plugins-xvid SUBDIR += gstreamermm diff --git a/multimedia/gstreamer-plugins-dv/Makefile b/multimedia/gstreamer-plugins-dv/Makefile index fe80ec202506..4e3d271f5719 100644 --- a/multimedia/gstreamer-plugins-dv/Makefile +++ b/multimedia/gstreamer-plugins-dv/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/multimedia/gstreamer-plugins-dv/Makefile,v 1.5 2008/03/19 14:05:36 ahze Exp $ # -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= multimedia COMMENT= Gstreamer dv plugin diff --git a/multimedia/gstreamer-plugins-good/files/patch-configure b/multimedia/gstreamer-plugins-good/files/patch-configure index 6f58672361fd..c33e0a02e4a9 100644 --- a/multimedia/gstreamer-plugins-good/files/patch-configure +++ b/multimedia/gstreamer-plugins-good/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2008-08-10 13:30:19.813061935 -0500 -+++ configure 2008-08-10 13:29:56.315341694 -0500 -@@ -32905,7 +32905,7 @@ +--- configure.orig 2010-02-11 17:29:54.000000000 +0100 ++++ configure 2010-02-11 17:34:38.000000000 +0100 +@@ -24271,7 +24271,7 @@ if test "${with_default_audiosink+set}" else @@ -8,3 +8,22 @@ + DEFAULT_VISUALIZER="$DEFAULT_VISUALIZER" fi + +@@ -26653,6 +26653,8 @@ $as_echo_n "checking Checking for up to + #ifdef __sun /* Solaris */ + #include + #include ++#elif __FreeBSD__ ++#include + #else /* Linux */ + #include + #define _LINUX_TIME_H +@@ -26726,6 +26728,8 @@ $as_echo_n "checking struct v4l2_buffer + #ifdef __sun /* Solaris */ + #include + #include ++#elif __FreeBSD__ ++#include + #else /* Linux */ + #include + #define _LINUX_TIME_H diff --git a/multimedia/gstreamer-plugins-good/files/patch-sys_v4l2_gstv4l2object.h b/multimedia/gstreamer-plugins-good/files/patch-sys_v4l2_gstv4l2object.h new file mode 100644 index 000000000000..af186ea7ff3a --- /dev/null +++ b/multimedia/gstreamer-plugins-good/files/patch-sys_v4l2_gstv4l2object.h @@ -0,0 +1,21 @@ +--- sys/v4l2/gstv4l2object.h.orig 2010-02-11 17:52:41.000000000 +0100 ++++ sys/v4l2/gstv4l2object.h 2010-02-11 17:57:50.000000000 +0100 +@@ -38,13 +38,15 @@ + */ + #include + #include +-#ifndef __sun ++#ifdef __sun ++#include ++#elif defined(__FreeBSD__) ++#include ++#else /* linux */ + #include + #define _LINUX_TIME_H + #define __user + #include +-#else +-#include + #endif + + #include diff --git a/multimedia/gstreamer-plugins-good/pkg-plist b/multimedia/gstreamer-plugins-good/pkg-plist index c89168050014..2d3659e84bb3 100644 --- a/multimedia/gstreamer-plugins-good/pkg-plist +++ b/multimedia/gstreamer-plugins-good/pkg-plist @@ -64,6 +64,8 @@ lib/gstreamer-%%VERSION%%/libgstrtpmanager.la lib/gstreamer-%%VERSION%%/libgstrtpmanager.so lib/gstreamer-%%VERSION%%/libgstrtsp.la lib/gstreamer-%%VERSION%%/libgstrtsp.so +lib/gstreamer-%%VERSION%%/libgstshapewipe.la +lib/gstreamer-%%VERSION%%/libgstshapewipe.so lib/gstreamer-%%VERSION%%/libgstsmpte.la lib/gstreamer-%%VERSION%%/libgstsmpte.so lib/gstreamer-%%VERSION%%/libgstspectrum.la @@ -97,6 +99,7 @@ share/locale/ca/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/cs/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/da/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/de/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo +share/locale/el/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/en_GB/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/es/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo share/locale/eu/LC_MESSAGES/gst-plugins-good-%%VERSION%%.mo diff --git a/multimedia/gstreamer-plugins-v4l2/Makefile b/multimedia/gstreamer-plugins-v4l2/Makefile new file mode 100644 index 000000000000..3fe11235952f --- /dev/null +++ b/multimedia/gstreamer-plugins-v4l2/Makefile @@ -0,0 +1,18 @@ +# New ports collection makefile for: gstreamer-plugins-v4l2 +# Date created: 27 Mar 2010 +# Whom: Koop Mast +# +# $FreeBSD$ +# + +PORTREVISION= 0 +CATEGORIES= multimedia + +COMMENT= Gstreamer Video 4 Linux 2 source plugin + +GST_PLUGIN= gst_v4l2 +PKGNAMESUFFIX?= -plugins-v4l2 + +MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins + +.include "${MASTERDIR}/Makefile" diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index 1b1d412329c9..edc351c24e2c 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -19,7 +19,7 @@ MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \ ${MASTER_SITE_LOCAL:S|$|ahze/:good|} \ ${MASTER_SITE_LOCAL:S|$|ahze/:bad|} \ ${MASTER_SITE_LOCAL:S|$|ahze/:ugly|} -PKGNAMESUFFIX= -plugins${GST_PLUGIN_SUFFIX} +PKGNAMESUFFIX?= -plugins${GST_PLUGIN_SUFFIX} MAINTAINER= multimedia@FreeBSD.org COMMENT?= GStreamer written collection of plugins handling several media types @@ -37,7 +37,7 @@ BASE_DISTFILE= ${BASE_DISTNAME}${EXTRACT_SUFX} BAD_PORTVERSION= 0.10.18 BAD_DISTNAME= gst-plugins-bad-${BAD_PORTVERSION} BAD_DISTFILE= ${BAD_DISTNAME}${EXTRACT_SUFX} -GOOD_PORTVERSION= 0.10.17 +GOOD_PORTVERSION= 0.10.21 GOOD_DISTNAME= gst-plugins-good-${GOOD_PORTVERSION} GOOD_DISTFILE= ${GOOD_DISTNAME}${EXTRACT_SUFX} UGLY_PORTVERSION= 0.10.14 @@ -151,6 +151,7 @@ post-patch: s|$$(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la|${LOCALBASE}/lib/libgstcdda-@GST_MAJORMINOR@.la|' @${REINPLACE_CMD} -e 's|DEFAULT_AUDIOSINK="alsasink"|DEFAULT_AUDIOSINK="${DEFAULT_AUDIOSINK}"|; \ s|DEFAULT_AUDIOSRC="alsasrc"|DEFAULT_AUDIOSRC="${DEFAULT_AUDIOSRC}"|' \ + -e 's|libpng12.pc|libpng14.pc|g' \ ${WRKSRC}/configure .include diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common index adff6907f72c..6d11723f7e86 100644 --- a/multimedia/gstreamer-plugins/Makefile.common +++ b/multimedia/gstreamer-plugins/Makefile.common @@ -80,6 +80,7 @@ GOOD_GST_ALL_PLUGINS+= \ soup \ speex \ taglib \ + gst_v4l2 \ wavpack # ugly @@ -131,7 +132,6 @@ CONFIGURE_ARGS+=--disable-tests \ --disable-osx_video \ --disable-directdrawsink \ --disable-directsoundsink \ - --disable-v4l2src \ --disable-tarkin \ --enable-static \ --disable-sunaudio \ @@ -456,6 +456,15 @@ gst_theora_PLIST_FILES= ${GST_LIB_DIR}/libgsttheora.la \ ${GST_LIB_DIR}/libgsttheora.so gst_theora_DIST= base +# gst_v4l2 +gst_gst_v4l2_LIB_DEPENDS+= v4l2.0:${PORTSDIR}/multimedia/libv4l +gst_gst_v4l2_RUN_DEPENDS+= webcamd:${PORTSDIR}/multimedia/webcamd +gst_gst_v4l2_PLIST_FILES= ${GST_LIB_DIR}/libgstvideo4linux2.la \ + ${GST_LIB_DIR}/libgstvideo4linux2.so +gst_gst_v4l2_CONFIGURE_ARGS+= --enable-gst_v4l2 +gst_gst_v4l2_GST_PLUGIN_DIR=sys/v4l2 +gst_gst_v4l2_DIST= good + # vorbis gst_vorbis_USE_GSTREAMER+= ogg gst_vorbis_LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo index 23f5da5f497a..cfc9dcb87e98 100644 --- a/multimedia/gstreamer-plugins/distinfo +++ b/multimedia/gstreamer-plugins/distinfo @@ -7,6 +7,6 @@ SIZE (gst-plugins-bad-0.10.18.tar.bz2) = 3028412 MD5 (gst-plugins-ugly-0.10.14.tar.bz2) = 0bc0d27bcce88c73ef6c81e88624e686 SHA256 (gst-plugins-ugly-0.10.14.tar.bz2) = 78dba9963e130cfd09f294b60219e6562459c5d848bc3b38a653db7f21fc850b SIZE (gst-plugins-ugly-0.10.14.tar.bz2) = 1028518 -MD5 (gst-plugins-good-0.10.17.tar.bz2) = 833546cd2b8bbf86b8ed083b00897918 -SHA256 (gst-plugins-good-0.10.17.tar.bz2) = 4f41fbd325270416c9f55d900e470482a7d1e7efbdbb725ed03a085dec307ad6 -SIZE (gst-plugins-good-0.10.17.tar.bz2) = 2671700 +MD5 (gst-plugins-good-0.10.21.tar.bz2) = 9bc5c9b390edbb96bda42fc553eae5ae +SHA256 (gst-plugins-good-0.10.21.tar.bz2) = 24445a1cf56302ab4ad5f56055d5c3d81c704b8f9f6875fe78a25d4f72716d22 +SIZE (gst-plugins-good-0.10.21.tar.bz2) = 2675836 -- cgit v1.2.3