diff options
author | Koop Mast <kwm@FreeBSD.org> | 2014-12-16 13:35:01 +0000 |
---|---|---|
committer | Koop Mast <kwm@FreeBSD.org> | 2014-12-16 13:35:01 +0000 |
commit | c6e9859c13cd4827ad2782f678ec0a3633d122ce (patch) | |
tree | 9f5703f594896a48eae53e004be52fd12fcce700 /multimedia/gstreamer1 | |
parent | 0d5a1fd6c437b0c40b926ff0920b2c65f4f6250b (diff) | |
download | ports-c6e9859c13cd4827ad2782f678ec0a3633d122ce.tar.gz ports-c6e9859c13cd4827ad2782f678ec0a3633d122ce.zip |
Big Gstreamer update:
Update gstreamer, gstreamer-plugins, -good, -bad and -ugly ports to 1.4.4.
Update gstreamer1-plugins-gnonlin to 1.4.0.
Update py-gstreamer1 and py3-gstreamer1 to 1.4.0.
Add multimedia/gstreamer1-editing-services. GES is a high-level library
for facilitating the creation of audio/video non-linear editors.
Add pulseaudio plugin now that pulseaudio is updated and add the gl plugin.
Drop :keepla from USES=libtool.
Drop @dirrm[try] from plists and drop gnomehier from USE_GNOME
Switch to optionhelpers in multimedia/gstreamer1.
PR: 194922 (merged with my own WIP)
Submitted by: olivierd
Notes
Notes:
svn path=/head/; revision=374804
Diffstat (limited to 'multimedia/gstreamer1')
-rw-r--r-- | multimedia/gstreamer1/Makefile | 21 | ||||
-rw-r--r-- | multimedia/gstreamer1/distinfo | 4 | ||||
-rw-r--r-- | multimedia/gstreamer1/files/patch-libs_gst_base_gstbasesrc.c | 28 | ||||
-rw-r--r-- | multimedia/gstreamer1/pkg-plist | 45 |
4 files changed, 27 insertions, 71 deletions
diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile index da07cd935ea9..a8d88886e32b 100644 --- a/multimedia/gstreamer1/Makefile +++ b/multimedia/gstreamer1/Makefile @@ -3,7 +3,7 @@ # $MCom: ports/multimedia/gstreamer1/Makefile,v 1.5 2013/01/15 21:43:45 kwm Exp $ PORTNAME= gstreamer1 -PORTVERSION= 1.2.4 +PORTVERSION= 1.4.4 CATEGORIES= multimedia MASTER_SITES= http://gstreamer.freedesktop.org/src/gstreamer/ DISTNAME= ${PORTNAME:S/1//}-${PORTVERSION} @@ -12,12 +12,13 @@ MAINTAINER= multimedia@FreeBSD.org COMMENT= Media applications framework LICENSE= LGPL20 +LICENSE_FILE= ${WRKSRC}/COPYING PORTSCOUT= limitw:1,even CFLAGS:= ${CFLAGS} -O2 -Wno-format -USES= bison gettext gmake libtool:keepla pathfix pkgconfig tar:xz -USE_GNOME= glib20 gnomehier introspection:build +USES= bison gettext gmake libtool pathfix pkgconfig tar:xz +USE_GNOME= glib20 introspection:build GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-tests \ --disable-examples \ @@ -27,12 +28,15 @@ CONFIGURE_ARGS= --disable-tests \ CONFIGURE_ENV= ac_cv_func_register_printf_function="no" INSTALL_TARGET= install-strip PLIST_SUB= VERSION=${GST10_VERSION} \ - SOVERSION=0.204.0 + SOVERSION=0.404.0 USE_LDCONFIG= yes GST10_VERSION= 1.0 +OPTIONS_SUB= yes OPTIONS_DEFINE= LIBCHECK LIBCHECK_DESC= Unit tests support +LIBCHECK_CONFIGURE_ENABLE= check +LIBCHECK_LIB_DEPENDS= libcheck.so:${PORTSDIR}/devel/libcheck .include <bsd.port.options.mk> @@ -47,15 +51,6 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex CONFIGURE_ENV+= FLEX_PATH="${LOCALBASE}/bin/flex" .endif -.if ${PORT_OPTIONS:MLIBCHECK} -LIB_DEPENDS+= libcheck.so:${PORTSDIR}/devel/libcheck -CONFIGURE_ARGS+=--enable-check -PLIST_SUB+= CHECK="" -.else -CONFIGURE_ARGS+=--disable-check -PLIST_SUB+= CHECK="@comment " -.endif - post-patch: @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure diff --git a/multimedia/gstreamer1/distinfo b/multimedia/gstreamer1/distinfo index e005fbcf06cc..a67eec3c8099 100644 --- a/multimedia/gstreamer1/distinfo +++ b/multimedia/gstreamer1/distinfo @@ -1,2 +1,2 @@ -SHA256 (gstreamer-1.2.4.tar.xz) = 1e7ca67a7870a82c9ed51d51d0008cdbc550c41d64cc3ff3f9a1c2fc311b4929 -SIZE (gstreamer-1.2.4.tar.xz) = 3225208 +SHA256 (gstreamer-1.4.4.tar.xz) = f0e305d91a93d05bf9e332cd4256ca07d77f5186a4d73847b7ae6db218f2c237 +SIZE (gstreamer-1.4.4.tar.xz) = 3323860 diff --git a/multimedia/gstreamer1/files/patch-libs_gst_base_gstbasesrc.c b/multimedia/gstreamer1/files/patch-libs_gst_base_gstbasesrc.c deleted file mode 100644 index 3881355bdd94..000000000000 --- a/multimedia/gstreamer1/files/patch-libs_gst_base_gstbasesrc.c +++ /dev/null @@ -1,28 +0,0 @@ -From 63c17280408410d799e1c2f2ed49c5ab04cc80ae Mon Sep 17 00:00:00 2001 -From: Sebastian Dröge <sebastian@centricular.com> -Date: Sun, 20 Apr 2014 09:59:02 +0000 -Subject: basesrc: Make sure to always hold the LIVE_LOCK when going to the flushing label - -https://bugzilla.gnome.org/show_bug.cgi?id=728596 ---- -diff --git a/libs/gst/base/gstbasesrc.c b/libs/gst/base/gstbasesrc.c -index 9f2e52c..fc5a3af 100644 ---- libs/gst/base/gstbasesrc.c -+++ libs/gst/base/gstbasesrc.c -@@ -2684,10 +2684,12 @@ gst_base_src_loop (GstPad * pad) - if (gst_pad_check_reconfigure (pad)) { - if (!gst_base_src_negotiate (src)) { - gst_pad_mark_reconfigure (pad); -- if (GST_PAD_IS_FLUSHING (pad)) -+ if (GST_PAD_IS_FLUSHING (pad)) { -+ GST_LIVE_LOCK (src); - goto flushing; -- else -+ } else { - goto negotiate_failed; -+ } - } - } - --- -cgit v0.9.0.2-2-gbebe diff --git a/multimedia/gstreamer1/pkg-plist b/multimedia/gstreamer1/pkg-plist index 72f7075826bc..93e2a58a23b4 100644 --- a/multimedia/gstreamer1/pkg-plist +++ b/multimedia/gstreamer1/pkg-plist @@ -13,14 +13,15 @@ include/gstreamer-%%VERSION%%/gst/base/gstbitreader.h include/gstreamer-%%VERSION%%/gst/base/gstbytereader.h include/gstreamer-%%VERSION%%/gst/base/gstbytewriter.h include/gstreamer-%%VERSION%%/gst/base/gstcollectpads.h +include/gstreamer-%%VERSION%%/gst/base/gstflowcombiner.h include/gstreamer-%%VERSION%%/gst/base/gstpushsrc.h include/gstreamer-%%VERSION%%/gst/base/gsttypefindhelper.h -%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/check.h -%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/gstbufferstraw.h -%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/gstcheck.h -%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/gstconsistencychecker.h -%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/gsttestclock.h -%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/internal-check.h +%%LIBCHECK%%include/gstreamer-%%VERSION%%/gst/check/check.h +%%LIBCHECK%%include/gstreamer-%%VERSION%%/gst/check/gstbufferstraw.h +%%LIBCHECK%%include/gstreamer-%%VERSION%%/gst/check/gstcheck.h +%%LIBCHECK%%include/gstreamer-%%VERSION%%/gst/check/gstconsistencychecker.h +%%LIBCHECK%%include/gstreamer-%%VERSION%%/gst/check/gsttestclock.h +%%LIBCHECK%%include/gstreamer-%%VERSION%%/gst/check/internal-check.h include/gstreamer-%%VERSION%%/gst/controller/controller.h include/gstreamer-%%VERSION%%/gst/controller/gstargbcontrolbinding.h include/gstreamer-%%VERSION%%/gst/controller/gstdirectcontrolbinding.h @@ -48,6 +49,10 @@ include/gstreamer-%%VERSION%%/gst/gstcontrolbinding.h include/gstreamer-%%VERSION%%/gst/gstcontrolsource.h include/gstreamer-%%VERSION%%/gst/gstdatetime.h include/gstreamer-%%VERSION%%/gst/gstdebugutils.h +include/gstreamer-%%VERSION%%/gst/gstdevice.h +include/gstreamer-%%VERSION%%/gst/gstdevicemonitor.h +include/gstreamer-%%VERSION%%/gst/gstdeviceprovider.h +include/gstreamer-%%VERSION%%/gst/gstdeviceproviderfactory.h include/gstreamer-%%VERSION%%/gst/gstelement.h include/gstreamer-%%VERSION%%/gst/gstelementfactory.h include/gstreamer-%%VERSION%%/gst/gstelementmetadata.h @@ -100,34 +105,28 @@ include/gstreamer-%%VERSION%%/gst/net/gstnettimepacket.h include/gstreamer-%%VERSION%%/gst/net/gstnettimeprovider.h lib/girepository-1.0/Gst-%%VERSION%%.typelib lib/girepository-1.0/GstBase-%%VERSION%%.typelib -%%CHECK%%lib/girepository-1.0/GstCheck-%%VERSION%%.typelib +%%LIBCHECK%%lib/girepository-1.0/GstCheck-%%VERSION%%.typelib lib/girepository-1.0/GstController-%%VERSION%%.typelib lib/girepository-1.0/GstNet-%%VERSION%%.typelib -lib/gstreamer-%%VERSION%%/libgstcoreelements.la lib/gstreamer-%%VERSION%%/libgstcoreelements.so -lib/libgstbase-%%VERSION%%.la lib/libgstbase-%%VERSION%%.so lib/libgstbase-%%VERSION%%.so.0 lib/libgstbase-%%VERSION%%.so.%%SOVERSION%% -%%CHECK%%lib/libgstcheck-%%VERSION%%.la -%%CHECK%%lib/libgstcheck-%%VERSION%%.so -%%CHECK%%lib/libgstcheck-%%VERSION%%.so.0 -%%CHECK%%lib/libgstcheck-%%VERSION%%.so.%%SOVERSION%% -lib/libgstcontroller-%%VERSION%%.la +%%LIBCHECK%%lib/libgstcheck-%%VERSION%%.so +%%LIBCHECK%%lib/libgstcheck-%%VERSION%%.so.0 +%%LIBCHECK%%lib/libgstcheck-%%VERSION%%.so.%%SOVERSION%% lib/libgstcontroller-%%VERSION%%.so lib/libgstcontroller-%%VERSION%%.so.0 lib/libgstcontroller-%%VERSION%%.so.%%SOVERSION%% -lib/libgstnet-%%VERSION%%.la lib/libgstnet-%%VERSION%%.so lib/libgstnet-%%VERSION%%.so.0 lib/libgstnet-%%VERSION%%.so.%%SOVERSION%% -lib/libgstreamer-%%VERSION%%.la lib/libgstreamer-%%VERSION%%.so lib/libgstreamer-%%VERSION%%.so.0 lib/libgstreamer-%%VERSION%%.so.%%SOVERSION%% libdata/pkgconfig/gstreamer-%%VERSION%%.pc libdata/pkgconfig/gstreamer-base-%%VERSION%%.pc -%%CHECK%%libdata/pkgconfig/gstreamer-check-%%VERSION%%.pc +%%LIBCHECK%%libdata/pkgconfig/gstreamer-check-%%VERSION%%.pc libdata/pkgconfig/gstreamer-controller-%%VERSION%%.pc libdata/pkgconfig/gstreamer-net-%%VERSION%%.pc libexec/gstreamer-%%VERSION%%/gst-plugin-scanner @@ -137,7 +136,7 @@ man/man1/gst-typefind-1.0.1.gz share/aclocal/gst-element-check-%%VERSION%%.m4 share/gir-1.0/Gst-%%VERSION%%.gir share/gir-1.0/GstBase-%%VERSION%%.gir -%%CHECK%%share/gir-1.0/GstCheck-%%VERSION%%.gir +%%LIBCHECK%%share/gir-1.0/GstCheck-%%VERSION%%.gir share/gir-1.0/GstController-%%VERSION%%.gir share/gir-1.0/GstNet-%%VERSION%%.gir share/locale/af/LC_MESSAGES/gstreamer-%%VERSION%%.mo @@ -179,13 +178,3 @@ share/locale/uk/LC_MESSAGES/gstreamer-%%VERSION%%.mo share/locale/vi/LC_MESSAGES/gstreamer-%%VERSION%%.mo share/locale/zh_CN/LC_MESSAGES/gstreamer-%%VERSION%%.mo share/locale/zh_TW/LC_MESSAGES/gstreamer-%%VERSION%%.mo -@dirrmtry share/locale/rw/LC_MESSAGES -@dirrmtry share/locale/rw -@dirrm libexec/gstreamer-%%VERSION%% -@dirrm lib/gstreamer-%%VERSION%% -@dirrm include/gstreamer-%%VERSION%%/gst/net -@dirrm include/gstreamer-%%VERSION%%/gst/controller -%%CHECK%%@dirrm include/gstreamer-%%VERSION%%/gst/check -@dirrm include/gstreamer-%%VERSION%%/gst/base -@dirrm include/gstreamer-%%VERSION%%/gst -@dirrm include/gstreamer-%%VERSION%% |