From 0b8dd741155a66a528ee6b51baad056115cde456 Mon Sep 17 00:00:00 2001
From: adam <adam@pkgsrc.org>
Date: Sun, 15 Apr 2018 09:40:04 +0000
Subject: gstreamer1: updated to 1.12.5

Bugs fixed in 1.12.5:

pad: fix some stream deactivation deadlocks/races
registrychunks: don't read from unaligned memory when loading registry
ptp: fix build failure with #undef USE_MEASUREMENT_FILTERING
downloadbuffer: Don't hold the mutex while posting the download-complete message
playbin3: Fix accessing invalid index in GstStream when received select-stream event
id3v2: re-fix handling of ID3 v2.4 tags with extended headers
audio: fix handling of U32BE format
videodecoder: Reset QoS time after pushing segment. This fixes playbin gapless playback with videos.
subparse: push out of last chunk of text if last line has no newline
aacparse: When parsing raw input, accept frames of any size. This fixes handling of encoded silence.
splitmuxsrc: Improve not-linked handling.
rtspsrc: also proxy multicast-iface property to RTCP udpsrc
flacdec: flush flac decoder on lost sync, so that it can re-sync.
matroskamux: Only mark new clusters as keyframe if they start on a keyframe or we're muxing only audio
matroskamux: Clip maximum cluster duration to the maximum possible value
h264parse: reset internal 'state' variable properly
x264enc: fix build with newer x264 with support for multiple bit depths
x265enc: Fix tagging of keyframes on output buffers
glimagesink: Correct PAR in output caps when transforming
vtdec: destroy and create the GL context on start()/stop(), fixing a refcount loop
player: fix criticals when reading info/track properties that are NULL
lv2: fix inverted boolean properties
rtponviftimestamp: fix state change function init/reset, fixing memory corruption or leaks on shutdown
libav: some build issues fixes
rtsp-server: Place netaddress meta on packets received via TCP. Fixes keep-alive via RTCP in TCP interleaved mode.
rtsp-server: gi annotation fixes
gst-libav: internal ffmpeg copy was updated to ffmpeg 3.3.6
Various fixes for memory leaks, deadlocks and crashes in all modules
... and many, many more!
---
 multimedia/gst-plugins1-bad/Makefile.common        |  5 +-
 multimedia/gst-plugins1-bad/PLIST                  |  5 +-
 multimedia/gst-plugins1-bad/PLIST.Darwin           |  5 +-
 multimedia/gst-plugins1-bad/distinfo               | 10 +--
 multimedia/gst-plugins1-base/Makefile.common       |  5 +-
 multimedia/gst-plugins1-base/PLIST                 | 13 +++-
 multimedia/gst-plugins1-base/distinfo              | 10 +--
 multimedia/gst-plugins1-base/plugins.mk            |  4 +-
 multimedia/gst-plugins1-good/Makefile.common       |  4 +-
 multimedia/gst-plugins1-good/distinfo              | 10 +--
 multimedia/gst-plugins1-libav/Makefile             | 16 ++---
 multimedia/gst-plugins1-libav/distinfo             | 10 +--
 multimedia/gst-plugins1-ugly/Makefile.common       |  4 +-
 multimedia/gst-plugins1-ugly/distinfo              | 12 ++--
 .../gst-plugins1-ugly/patches/patch-configure      | 15 ----
 .../patches/patch-ext_x264_gstx264enc.c            | 80 ----------------------
 multimedia/gst-plugins1-x264/Makefile              |  3 +-
 multimedia/gstreamer1/Makefile                     |  9 ++-
 multimedia/gstreamer1/PLIST                        |  4 +-
 multimedia/gstreamer1/distinfo                     | 10 +--
 multimedia/py-gstreamer1/Makefile                  |  5 +-
 multimedia/py-gstreamer1/PLIST                     |  4 +-
 multimedia/py-gstreamer1/distinfo                  | 10 +--
 23 files changed, 81 insertions(+), 172 deletions(-)
 delete mode 100644 multimedia/gst-plugins1-ugly/patches/patch-configure
 delete mode 100644 multimedia/gst-plugins1-ugly/patches/patch-ext_x264_gstx264enc.c

(limited to 'multimedia')

diff --git a/multimedia/gst-plugins1-bad/Makefile.common b/multimedia/gst-plugins1-bad/Makefile.common
index 04c2b2c6c45..003fa036be7 100644
--- a/multimedia/gst-plugins1-bad/Makefile.common
+++ b/multimedia/gst-plugins1-bad/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2018/01/28 19:33:09 wiz Exp $
+# $NetBSD: Makefile.common,v 1.28 2018/04/15 09:40:04 adam Exp $
 #
 # used by audio/gst-plugins1-dts/Makefile
 # used by audio/gst-plugins1-faac/Makefile
@@ -10,10 +10,9 @@
 # used by multimedia/gst-plugins1-resindvd/Makefile
 ## used by multimedia/gst-plugins1-xvid/Makefile (broken)
 ## used by audio/gst-plugins1-musepack/Makefile (probably newer libmusepack or libmpcdec is needed)
-#
 
 GST_PLUGINS1_TYPE=	bad
-GST_PLUGINS1_VER=	1.12.4
+GST_PLUGINS1_VER=	1.12.5
 
 # Disable all drivers and features by default.
 .for driver in	\
diff --git a/multimedia/gst-plugins1-bad/PLIST b/multimedia/gst-plugins1-bad/PLIST
index 04152c8a620..79fce216b6e 100644
--- a/multimedia/gst-plugins1-bad/PLIST
+++ b/multimedia/gst-plugins1-bad/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2017/09/12 09:32:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2018/04/15 09:40:04 adam Exp $
 include/gstreamer-1.0/gst/allocators/badallocators.h
 include/gstreamer-1.0/gst/allocators/gstphysmemory.h
 include/gstreamer-1.0/gst/audio/gstaudioaggregator.h
@@ -334,7 +334,9 @@ share/doc/gst-plugins-0.10/gst-plugins-bad-plugins-1.0/gst-plugins-bad-plugins-p
 share/doc/gst-plugins-0.10/gst-plugins-bad-plugins-1.0/gst-plugins-bad-plugins-plugin-gaudieffects.html
 share/doc/gst-plugins-0.10/gst-plugins-bad-plugins-1.0/gst-plugins-bad-plugins-plugin-geometrictransform.html
 share/doc/gst-plugins-0.10/gst-plugins-bad-plugins-1.0/gst-plugins-bad-plugins-plugin-gsm.html
+share/doc/gst-plugins-0.10/gst-plugins-bad-plugins-1.0/gst-plugins-bad-plugins-plugin-gtk.html
 share/doc/gst-plugins-0.10/gst-plugins-bad-plugins-1.0/gst-plugins-bad-plugins-plugin-jpegformat.html
+share/doc/gst-plugins-0.10/gst-plugins-bad-plugins-1.0/gst-plugins-bad-plugins-plugin-legacyrawparse.html
 share/doc/gst-plugins-0.10/gst-plugins-bad-plugins-1.0/gst-plugins-bad-plugins-plugin-mms.html
 share/doc/gst-plugins-0.10/gst-plugins-bad-plugins-1.0/gst-plugins-bad-plugins-plugin-modplug.html
 share/doc/gst-plugins-0.10/gst-plugins-bad-plugins-1.0/gst-plugins-bad-plugins-plugin-mpeg2enc.html
@@ -347,7 +349,6 @@ share/doc/gst-plugins-0.10/gst-plugins-bad-plugins-1.0/gst-plugins-bad-plugins-p
 share/doc/gst-plugins-0.10/gst-plugins-bad-plugins-1.0/gst-plugins-bad-plugins-plugin-opencv.html
 share/doc/gst-plugins-0.10/gst-plugins-bad-plugins-1.0/gst-plugins-bad-plugins-plugin-opengl.html
 share/doc/gst-plugins-0.10/gst-plugins-bad-plugins-1.0/gst-plugins-bad-plugins-plugin-pcapparse.html
-share/doc/gst-plugins-0.10/gst-plugins-bad-plugins-1.0/gst-plugins-bad-plugins-plugin-rawparse.html
 share/doc/gst-plugins-0.10/gst-plugins-bad-plugins-1.0/gst-plugins-bad-plugins-plugin-rfbsrc.html
 share/doc/gst-plugins-0.10/gst-plugins-bad-plugins-1.0/gst-plugins-bad-plugins-plugin-rtmp.html
 share/doc/gst-plugins-0.10/gst-plugins-bad-plugins-1.0/gst-plugins-bad-plugins-plugin-sdpelem.html
diff --git a/multimedia/gst-plugins1-bad/PLIST.Darwin b/multimedia/gst-plugins1-bad/PLIST.Darwin
index 369b4b2df0b..ab3413b9557 100644
--- a/multimedia/gst-plugins1-bad/PLIST.Darwin
+++ b/multimedia/gst-plugins1-bad/PLIST.Darwin
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.Darwin,v 1.4 2018/01/28 19:33:09 wiz Exp $
+@comment $NetBSD: PLIST.Darwin,v 1.5 2018/04/15 09:40:04 adam Exp $
 include/gstreamer-1.0/gst/gl/cocoa/gstglcaopengllayer.h
 include/gstreamer-1.0/gst/gl/cocoa/gstgldisplay_cocoa.h
 include/gstreamer-1.0/gst/gl/gl.h
@@ -51,8 +51,5 @@ lib/gstreamer-1.0/include/gst/gl/gstglconfig.h
 lib/gstreamer-1.0/libgstapplemedia.la
 lib/gstreamer-1.0/libgstdecklink.la
 lib/gstreamer-1.0/libgstopengl.la
-lib/libgstgl-1.0.0.dylib
-lib/libgstgl-1.0.a
-lib/libgstgl-1.0.dylib
 lib/libgstgl-1.0.la
 lib/pkgconfig/gstreamer-gl-1.0.pc
diff --git a/multimedia/gst-plugins1-bad/distinfo b/multimedia/gst-plugins1-bad/distinfo
index 403ffc03d84..69e704792f0 100644
--- a/multimedia/gst-plugins1-bad/distinfo
+++ b/multimedia/gst-plugins1-bad/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.28 2018/01/28 19:33:09 wiz Exp $
+$NetBSD: distinfo,v 1.29 2018/04/15 09:40:04 adam Exp $
 
-SHA1 (gst-plugins-bad-1.12.4.tar.xz) = 90e3c0990bbc6e2ed20688993d89bf6fd256ae00
-RMD160 (gst-plugins-bad-1.12.4.tar.xz) = f44d9fceda3c8e9f3b8c1af5a3d00aac514952e1
-SHA512 (gst-plugins-bad-1.12.4.tar.xz) = a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
-Size (gst-plugins-bad-1.12.4.tar.xz) = 4709272 bytes
+SHA1 (gst-plugins-bad-1.12.5.tar.xz) = 7d8b2058a49ec19d20ee82300879ebd33dca6d50
+RMD160 (gst-plugins-bad-1.12.5.tar.xz) = b71fb57e15194a7db9bba1a47185f3d9663776f3
+SHA512 (gst-plugins-bad-1.12.5.tar.xz) = cbe55762d452a16220f8a58f4dd796fcd91a90b1ca7a94f797f786c01c25ac879a50433446378a83fe60c80c7a4c67a19c249fd8c9dde8a248acccbcd997a8b7
+Size (gst-plugins-bad-1.12.5.tar.xz) = 4699112 bytes
 SHA1 (patch-configure) = 15bf1bba34f40b90f60b2849c391b48324e11ac5
diff --git a/multimedia/gst-plugins1-base/Makefile.common b/multimedia/gst-plugins1-base/Makefile.common
index 8df216aac12..5a8c0d22ec3 100644
--- a/multimedia/gst-plugins1-base/Makefile.common
+++ b/multimedia/gst-plugins1-base/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2018/01/28 19:33:09 wiz Exp $
+# $NetBSD: Makefile.common,v 1.28 2018/04/15 09:40:05 adam Exp $
 #
 # used by audio/gst-plugins1-alsa/Makefile
 # used by audio/gst-plugins1-cdparanoia/Makefile
@@ -10,10 +10,9 @@
 # used by multimedia/gst-plugins1-theora/Makefile
 # used by audio/gst-plugins1-vorbis/Makefile
 # used by x11/gst-plugins1-x11/Makefile
-#
 
 GST_PLUGINS1_TYPE=	base
-GST_PLUGINS1_VER=	1.12.4
+GST_PLUGINS1_VER=	1.12.5
 BUILDLINK_API_DEPENDS.gstreamer1+= gstreamer1>=1.12.0
 LICENSE=		gnu-lgpl-v2
 
diff --git a/multimedia/gst-plugins1-base/PLIST b/multimedia/gst-plugins1-base/PLIST
index 3e1283aa2eb..9d0fc51847b 100644
--- a/multimedia/gst-plugins1-base/PLIST
+++ b/multimedia/gst-plugins1-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2017/09/12 09:32:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2018/04/15 09:40:05 adam Exp $
 bin/gst-device-monitor-1.0
 bin/gst-discoverer-1.0
 bin/gst-play-1.0
@@ -268,6 +268,17 @@ share/doc/gst-plugins-0.10/gst-plugins-base-libs-1.0/gstreamer-tag.html
 share/doc/gst-plugins-0.10/gst-plugins-base-libs-1.0/gstreamer-video.html
 share/doc/gst-plugins-0.10/gst-plugins-base-libs-1.0/home.png
 share/doc/gst-plugins-0.10/gst-plugins-base-libs-1.0/index.html
+share/doc/gst-plugins-0.10/gst-plugins-base-libs-1.0/ix03.html
+share/doc/gst-plugins-0.10/gst-plugins-base-libs-1.0/ix04.html
+share/doc/gst-plugins-0.10/gst-plugins-base-libs-1.0/ix05.html
+share/doc/gst-plugins-0.10/gst-plugins-base-libs-1.0/ix06.html
+share/doc/gst-plugins-0.10/gst-plugins-base-libs-1.0/ix07.html
+share/doc/gst-plugins-0.10/gst-plugins-base-libs-1.0/ix08.html
+share/doc/gst-plugins-0.10/gst-plugins-base-libs-1.0/ix09.html
+share/doc/gst-plugins-0.10/gst-plugins-base-libs-1.0/ix10.html
+share/doc/gst-plugins-0.10/gst-plugins-base-libs-1.0/ix11.html
+share/doc/gst-plugins-0.10/gst-plugins-base-libs-1.0/ix12.html
+share/doc/gst-plugins-0.10/gst-plugins-base-libs-1.0/ix13.html
 share/doc/gst-plugins-0.10/gst-plugins-base-libs-1.0/left-insensitive.png
 share/doc/gst-plugins-0.10/gst-plugins-base-libs-1.0/left.png
 share/doc/gst-plugins-0.10/gst-plugins-base-libs-1.0/right-insensitive.png
diff --git a/multimedia/gst-plugins1-base/distinfo b/multimedia/gst-plugins1-base/distinfo
index 679c194fb9b..86a7dc7d8e1 100644
--- a/multimedia/gst-plugins1-base/distinfo
+++ b/multimedia/gst-plugins1-base/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.29 2018/01/28 19:33:09 wiz Exp $
+$NetBSD: distinfo,v 1.30 2018/04/15 09:40:05 adam Exp $
 
-SHA1 (gst-plugins-base-1.12.4.tar.xz) = 8b87967aa2feb36b8028e39163d5de2533674b0f
-RMD160 (gst-plugins-base-1.12.4.tar.xz) = 384e91223f068e7ef684313a786ef473f2592a86
-SHA512 (gst-plugins-base-1.12.4.tar.xz) = 89a6e92cd294612cf1406eb156416ab4606643f6b43637e64a18f6f28ab789ca8d4cf1308434ed85e5fc679c79cc3ca115db48f37e0065a6ab3cdfdbaaad9f53
-Size (gst-plugins-base-1.12.4.tar.xz) = 3119468 bytes
+SHA1 (gst-plugins-base-1.12.5.tar.xz) = 8204be5b81c7be7f86a244feb7cd4f9b849ab06a
+RMD160 (gst-plugins-base-1.12.5.tar.xz) = e2a208d1b6146431d46b585b69c0c94c6fe6412e
+SHA512 (gst-plugins-base-1.12.5.tar.xz) = 6fe492a28dfb1c42a71e54eaafb6c642e750ad0be59e93b01f0920295d572e929c0e1661a219d4804285295b4414af1c36ecf3228025c110a1bbe82d036b73f7
+Size (gst-plugins-base-1.12.5.tar.xz) = 3093500 bytes
diff --git a/multimedia/gst-plugins1-base/plugins.mk b/multimedia/gst-plugins1-base/plugins.mk
index 8f1a24ef166..5c0152b3f7f 100644
--- a/multimedia/gst-plugins1-base/plugins.mk
+++ b/multimedia/gst-plugins1-base/plugins.mk
@@ -1,10 +1,9 @@
-# $NetBSD: plugins.mk,v 1.4 2017/09/08 06:14:03 wiz Exp $
+# $NetBSD: plugins.mk,v 1.5 2018/04/15 09:40:05 adam Exp $
 #
 # This file is shared across the gst-plugins-{base,good} packages to
 # simplify their code.  It provides a framework to write simple packages
 # providing individual plugins; note that these packages must not include
 # this file, but use the correct Makefile.common instead.
-#
 
 DISTNAME=	gst-plugins-${GST_PLUGINS1_TYPE}-${GST_PLUGINS1_VER}
 PKGNAME=	${DISTNAME:S/plugins/plugins1/}
@@ -15,6 +14,7 @@ EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://gstreamer.freedesktop.org/
 COMMENT=	Open source multimedia framework -
+LICENSE=	gnu-gpl-v2
 
 DISTINFO_FILE=	${.CURDIR}/../../multimedia/gst-plugins1-${GST_PLUGINS1_TYPE}/distinfo
 FILESDIR=	${.CURDIR}/../../multimedia/gst-plugins1-${GST_PLUGINS1_TYPE}/files
diff --git a/multimedia/gst-plugins1-good/Makefile.common b/multimedia/gst-plugins1-good/Makefile.common
index 379555590a7..2ba2fa5e413 100644
--- a/multimedia/gst-plugins1-good/Makefile.common
+++ b/multimedia/gst-plugins1-good/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2018/01/28 19:33:09 wiz Exp $
+# $NetBSD: Makefile.common,v 1.28 2018/04/15 09:40:05 adam Exp $
 #
 # used by audio/gst-plugins1-flac/Makefile
 # used by audio/gst-plugins1-jack/Makefile
@@ -15,7 +15,7 @@
 # used by x11/gst-plugins1-x11/Makefile
 
 GST_PLUGINS1_TYPE=	good
-GST_PLUGINS1_VER=	1.12.4
+GST_PLUGINS1_VER=	1.12.5
 
 # Disable all drivers and features by default.
 .for driver in	aalib \
diff --git a/multimedia/gst-plugins1-good/distinfo b/multimedia/gst-plugins1-good/distinfo
index e2ef549598e..3da8ffc9ac0 100644
--- a/multimedia/gst-plugins1-good/distinfo
+++ b/multimedia/gst-plugins1-good/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.34 2018/01/28 19:33:09 wiz Exp $
+$NetBSD: distinfo,v 1.35 2018/04/15 09:40:05 adam Exp $
 
-SHA1 (gst-plugins-good-1.12.4.tar.xz) = 8758fde4b937551776773f89f7e50eb3027aea69
-RMD160 (gst-plugins-good-1.12.4.tar.xz) = 9ec4a9709d62b4ac156547674fbfef6da8d9e6c1
-SHA512 (gst-plugins-good-1.12.4.tar.xz) = 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
-Size (gst-plugins-good-1.12.4.tar.xz) = 3489992 bytes
+SHA1 (gst-plugins-good-1.12.5.tar.xz) = fc1b8166d7e7a2d527ddf8ec7acb69b3e0be93e9
+RMD160 (gst-plugins-good-1.12.5.tar.xz) = 85bca34658067d794488fc2fbe99fd50263ea006
+SHA512 (gst-plugins-good-1.12.5.tar.xz) = 4755f9a27769ed3079ed46ffa4de5122224bae3b3e366d71504c77a04b1f0d788f8cb4d7f62a80d62bfccdfe7a305bbcae4bde3bc709ca0fcf4be85140247a7a
+Size (gst-plugins-good-1.12.5.tar.xz) = 3507556 bytes
diff --git a/multimedia/gst-plugins1-libav/Makefile b/multimedia/gst-plugins1-libav/Makefile
index a3817f95afe..0df97bf153e 100644
--- a/multimedia/gst-plugins1-libav/Makefile
+++ b/multimedia/gst-plugins1-libav/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2018/03/12 11:17:12 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2018/04/15 09:40:05 adam Exp $
 
-DISTNAME=	gst-libav-1.12.4
+DISTNAME=	gst-libav-1.12.5
 PKGNAME=	${DISTNAME:S/gst/gst-plugins1/}
-PKGREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	https://gstreamer.freedesktop.org/src/gst-libav/
 EXTRACT_SUFX=	.tar.xz
@@ -10,14 +9,14 @@ EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://gstreamer.freedesktop.org/src/gst-libav/
 COMMENT=	GStreamer libav/ffmpeg plugin
+LICENSE=	gnu-gpl-v2
 
-USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
+USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		pkg-config gmake perl
-PKGSRC_MAKE_ENV+=	PERL=${PERL5}
-
-#BUILD_DEPENDS+=		yasm>=0.7.2:../../devel/yasm
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-system-libav
+PKGSRC_MAKE_ENV+=	PERL=${PERL5:Q}
 
 BUILDLINK_API_DEPENDS.gstreamer1+=	gstreamer1>=1.10.0
 .include "../../multimedia/gstreamer1/buildlink3.mk"
@@ -26,6 +25,5 @@ BUILDLINK_API_DEPENDS.gstreamer1+=	gstreamer1>=1.10.0
 # the included ffmpeg version, since the ffmpeg API/ABI is unstable
 # and there are no releases
 .include "../../multimedia/ffmpeg3/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-system-libav
 .include "../../devel/orc/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gst-plugins1-libav/distinfo b/multimedia/gst-plugins1-libav/distinfo
index 0f1bdd223da..c825532d96d 100644
--- a/multimedia/gst-plugins1-libav/distinfo
+++ b/multimedia/gst-plugins1-libav/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.27 2018/01/28 19:33:09 wiz Exp $
+$NetBSD: distinfo,v 1.28 2018/04/15 09:40:05 adam Exp $
 
-SHA1 (gst-libav-1.12.4.tar.xz) = 4aadb887babfc81b931ed3dc7942e9f8c146dca5
-RMD160 (gst-libav-1.12.4.tar.xz) = 5b9e1eb2a27fe66907419c32e4b1b714e07e9683
-SHA512 (gst-libav-1.12.4.tar.xz) = 80ef9b7e179c081996875e452f66a3c5124cb99b5439e15b6ed4edf43e7ed1821b56639eea0db24050f0d5291d2b67d59e884dd71ab9193b5d1820153976f879
-Size (gst-libav-1.12.4.tar.xz) = 8792776 bytes
+SHA1 (gst-libav-1.12.5.tar.xz) = 1accf00df67bfbedae870e8f2f12956b36950195
+RMD160 (gst-libav-1.12.5.tar.xz) = b54d21f34502bac3404941755394c4138907ab38
+SHA512 (gst-libav-1.12.5.tar.xz) = b23b1ca335d9616c60fec0802787f0657960a7f3f4c325de995da0ccf6c9fdc66c3ca1a1bdfe0279dd1329017f14cde62de6a8b055a572f6636cb3053cd5b5c2
+Size (gst-libav-1.12.5.tar.xz) = 8833656 bytes
 SHA1 (patch-configure) = c78918ecac8eae3b9cc63f06e99dadcfa4a3f7ba
 SHA1 (patch-ext_libav_gstavviddec.c) = c397a6c7e027453353a79c5d64f7b1d648c21739
diff --git a/multimedia/gst-plugins1-ugly/Makefile.common b/multimedia/gst-plugins1-ugly/Makefile.common
index e1667157e7f..243f8dfe514 100644
--- a/multimedia/gst-plugins1-ugly/Makefile.common
+++ b/multimedia/gst-plugins1-ugly/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2017/11/10 09:26:48 prlw1 Exp $
+# $NetBSD: Makefile.common,v 1.25 2018/04/15 09:40:05 adam Exp $
 #
 # used by audio/gst-plugins1-a52/Makefile
 # used by audio/gst-plugins1-lame/Makefile
@@ -10,7 +10,7 @@
 # used by multimedia/gst-plugins1-x264/Makefile
 
 GST_PLUGINS1_TYPE=	ugly
-GST_PLUGINS1_VER=	1.12.3
+GST_PLUGINS1_VER=	1.12.5
 
 # Disable all drivers and features by default.
 .for driver in	a52dec \
diff --git a/multimedia/gst-plugins1-ugly/distinfo b/multimedia/gst-plugins1-ugly/distinfo
index 7d19a0ff38f..f9c71665453 100644
--- a/multimedia/gst-plugins1-ugly/distinfo
+++ b/multimedia/gst-plugins1-ugly/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.29 2018/03/01 22:31:08 snj Exp $
+$NetBSD: distinfo,v 1.30 2018/04/15 09:40:05 adam Exp $
 
-SHA1 (gst-plugins-ugly-1.12.3.tar.xz) = 28e7a492a96ff6845d9fe8509031a2ab9fcbf046
-RMD160 (gst-plugins-ugly-1.12.3.tar.xz) = 6c740784b09e73523dc568cb32ab7d86522a3855
-SHA512 (gst-plugins-ugly-1.12.3.tar.xz) = 9ca5769c325df3d2d97ba83d785fab08da5119f6d26c4ac4db72853af143477ea8fb7087464a8614b6e59f384463ac01087ee76cec2af8acd80a4dc15e392e34
-Size (gst-plugins-ugly-1.12.3.tar.xz) = 903784 bytes
-SHA1 (patch-configure) = f8fcbcebcb55334ba66c22076d6d01382444c930
-SHA1 (patch-ext_x264_gstx264enc.c) = e7001ca77a1397b76bf70bdc257f1a6d448b1809
+SHA1 (gst-plugins-ugly-1.12.5.tar.xz) = afa3a19b96bd65c2509791a205365ab0f9a3c1fe
+RMD160 (gst-plugins-ugly-1.12.5.tar.xz) = b3ad581030045a2271ceefe05ebaeb415b46eace
+SHA512 (gst-plugins-ugly-1.12.5.tar.xz) = 31c855c2cab31c27432525177d7b5d3cf20186bed57eb84d2a3e05c0056d866079b7fea2df3ea9e74073899c2c7602dc148f14edc759f25112f857dddea35a83
+Size (gst-plugins-ugly-1.12.5.tar.xz) = 905956 bytes
diff --git a/multimedia/gst-plugins1-ugly/patches/patch-configure b/multimedia/gst-plugins1-ugly/patches/patch-configure
deleted file mode 100644
index c8dfd03889a..00000000000
--- a/multimedia/gst-plugins1-ugly/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure,v 1.3 2017/09/12 09:32:44 wiz Exp $
-
-Allow building with python 3.4-3.6.
-
---- configure.orig	2017-07-14 08:23:30.000000000 +0000
-+++ configure
-@@ -22295,7 +22295,7 @@ fi
- 
-         # Find any Python interpreter.
-     if test -z "$PYTHON"; then
--      for ac_prog in python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7  python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
-+      for ac_prog in python python2 python3 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7  python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
diff --git a/multimedia/gst-plugins1-ugly/patches/patch-ext_x264_gstx264enc.c b/multimedia/gst-plugins1-ugly/patches/patch-ext_x264_gstx264enc.c
deleted file mode 100644
index 614fa70a2ca..00000000000
--- a/multimedia/gst-plugins1-ugly/patches/patch-ext_x264_gstx264enc.c
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-ext_x264_gstx264enc.c,v 1.1 2018/03/01 22:31:08 snj Exp $
-
-Fix build with newer libx264.  From:
-https://cgit.freedesktop.org/gstreamer/gst-plugins-ugly/commit/?id=83c38dc44622611c1f67dd26e4cb383c5aef90f6
-
---- ext/x264/gstx264enc.c.orig	2017-07-25 01:26:28.000000000 -0700
-+++ ext/x264/gstx264enc.c	2018-03-01 14:16:58.880753252 -0800
-@@ -117,7 +117,9 @@ struct _GstX264EncVTable
- {
-   GModule *module;
- 
-+#if X264_BUILD < 153
-   const int *x264_bit_depth;
-+#endif
-   const int *x264_chroma_format;
-   void (*x264_encoder_close) (x264_t *);
-   int (*x264_encoder_delayed_frames) (x264_t *);
-@@ -170,8 +172,9 @@ load_x264 (const gchar * filename)
-         "' from '%s'. Incompatible version?", filename);
-     goto error;
-   }
--
-+#if X264_BUILD < 153
-   LOAD_SYMBOL (x264_bit_depth);
-+#endif
-   LOAD_SYMBOL (x264_chroma_format);
-   LOAD_SYMBOL (x264_encoder_close);
-   LOAD_SYMBOL (x264_encoder_delayed_frames);
-@@ -288,6 +291,7 @@ gst_x264_enc_add_x264_chroma_format (Gst
-   return ret;
- }
- 
-+#if X264_BUILD < 153
- static gboolean
- load_x264_libraries (void)
- {
-@@ -326,6 +330,33 @@ load_x264_libraries (void)
-   return TRUE;
- }
- 
-+#else /* X264_BUILD >= 153 */
-+
-+static gboolean
-+load_x264_libraries (void)
-+{
-+#if X264_BIT_DEPTH == 0         /* all */
-+  vtable_8bit = &default_vtable;
-+  vtable_10bit = &default_vtable;
-+#elif X264_BIT_DEPTH == 8
-+  vtable_8bit = &default_vtable;
-+#elif X264_BIT_DEPTH == 10
-+  vtable_10bit = &default_vtable;
-+#else
-+#error "unexpected X264_BIT_DEPTH value"
-+#endif
-+
-+#ifdef HAVE_X264_ADDITIONAL_LIBRARIES
-+  GST_WARNING ("Ignoring configured additional libraries %s, using libx264 "
-+      "version enabled for multiple bit depths",
-+      HAVE_X264_ADDITIONAL_LIBRARIES);
-+#endif
-+
-+  return TRUE;
-+}
-+
-+#endif
-+
- enum
- {
-   ARG_0,
-@@ -2897,7 +2928,9 @@ plugin_init (GstPlugin * plugin)
-    * if needed. We can't initialize statically because these values are not
-    * constant on Windows. */
-   default_vtable.module = NULL;
-+#if X264_BUILD < 153
-   default_vtable.x264_bit_depth = &x264_bit_depth;
-+#endif
-   default_vtable.x264_chroma_format = &x264_chroma_format;
-   default_vtable.x264_encoder_close = x264_encoder_close;
-   default_vtable.x264_encoder_delayed_frames = x264_encoder_delayed_frames;
diff --git a/multimedia/gst-plugins1-x264/Makefile b/multimedia/gst-plugins1-x264/Makefile
index 5d4eed74cd2..568b1a3f7bb 100644
--- a/multimedia/gst-plugins1-x264/Makefile
+++ b/multimedia/gst-plugins1-x264/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2018/02/26 08:19:29 adam Exp $
+# $NetBSD: Makefile,v 1.5 2018/04/15 09:40:05 adam Exp $
 
 GST_PLUGINS1_NAME=	x264
 GST_PLUGINS1_DIRS=	ext/x264
 
-PKGREVISION= 1
 .include "../../multimedia/gst-plugins1-ugly/Makefile.common"
 
 # need shared lib
diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile
index 619f3298666..c459114b455 100644
--- a/multimedia/gstreamer1/Makefile
+++ b/multimedia/gstreamer1/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2018/01/28 19:33:09 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2018/04/15 09:40:05 adam Exp $
 
-DISTNAME=	gstreamer-1.12.4
+DISTNAME=	gstreamer-1.12.5
 PKGNAME=	${DISTNAME:S/gstreamer/gstreamer1/}
 CATEGORIES=	multimedia
 MASTER_SITES=	https://gstreamer.freedesktop.org/src/gstreamer/
@@ -11,11 +11,10 @@ HOMEPAGE=	https://gstreamer.freedesktop.org/
 COMMENT=	Open source multimedia framework
 LICENSE=	gnu-lgpl-v2
 
-GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		bison flex gmake perl pkg-config
 USE_PKGLOCALEDIR=	yes
-USE_LANGUAGES=		c
+USE_TOOLS+=		bison flex gmake perl pkg-config
+GNU_CONFIGURE=		yes
 FLEX_REQD=		2.5.31
 
 .include "options.mk"
diff --git a/multimedia/gstreamer1/PLIST b/multimedia/gstreamer1/PLIST
index 4757c25be0b..83c6b01d34f 100644
--- a/multimedia/gstreamer1/PLIST
+++ b/multimedia/gstreamer1/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2018/01/01 22:29:45 rillig Exp $
+@comment $NetBSD: PLIST,v 1.12 2018/04/15 09:40:05 adam Exp $
 bin/gst-inspect-1.0
 bin/gst-launch-1.0
 bin/gst-stats-1.0
@@ -298,6 +298,8 @@ share/gtk-doc/html/gstreamer-libs-1.0/ix05.html
 share/gtk-doc/html/gstreamer-libs-1.0/ix06.html
 share/gtk-doc/html/gstreamer-libs-1.0/ix07.html
 share/gtk-doc/html/gstreamer-libs-1.0/ix08.html
+share/gtk-doc/html/gstreamer-libs-1.0/ix09.html
+share/gtk-doc/html/gstreamer-libs-1.0/ix10.html
 share/gtk-doc/html/gstreamer-libs-1.0/left-insensitive.png
 share/gtk-doc/html/gstreamer-libs-1.0/left.png
 share/gtk-doc/html/gstreamer-libs-1.0/right-insensitive.png
diff --git a/multimedia/gstreamer1/distinfo b/multimedia/gstreamer1/distinfo
index 3758a486ea6..d1e0e214271 100644
--- a/multimedia/gstreamer1/distinfo
+++ b/multimedia/gstreamer1/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.30 2018/01/28 19:33:09 wiz Exp $
+$NetBSD: distinfo,v 1.31 2018/04/15 09:40:05 adam Exp $
 
-SHA1 (gstreamer-1.12.4.tar.xz) = 71ed76a339252d551c5da6bdcb641c31bea77612
-RMD160 (gstreamer-1.12.4.tar.xz) = 55c1a266742610f69dcf27e26eff933e2b9f298f
-SHA512 (gstreamer-1.12.4.tar.xz) = 849aa4ddf8ef465f2915e05d36fc0c31c2e31ae28be2fa38f8069a64a91b7347020fac5b881b7f3ee54c2198c3596138d49f27b09f258303834164a5d68b38a2
-Size (gstreamer-1.12.4.tar.xz) = 3177208 bytes
+SHA1 (gstreamer-1.12.5.tar.xz) = 04769e60cc0031f7b9e707f2512f2d8f59aaa36f
+RMD160 (gstreamer-1.12.5.tar.xz) = 0a6187246953509a5ffa9e2b57776879fa6601d8
+SHA512 (gstreamer-1.12.5.tar.xz) = 2f56bb7d7a9660e7c6ced180124b5a92ba48ebed46f252acaea8a79ed15525e61f9d1e42003f5d8df49b1895d821e83a676e6d5184e77f2a9bc981f2ecf77e17
+Size (gstreamer-1.12.5.tar.xz) = 3160248 bytes
 SHA1 (patch-plugins_tracers_gstrusage.c) = 36ab41bc208cd9146bed3208f56eb332f2535591
diff --git a/multimedia/py-gstreamer1/Makefile b/multimedia/py-gstreamer1/Makefile
index 71f1234ce7d..82ef5e57a04 100644
--- a/multimedia/py-gstreamer1/Makefile
+++ b/multimedia/py-gstreamer1/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2018/04/14 12:24:32 adam Exp $
+# $NetBSD: Makefile,v 1.10 2018/04/15 09:40:05 adam Exp $
 
-DISTNAME=	gst-python-1.12.4
+DISTNAME=	gst-python-1.12.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/gst-python/gstreamer1/}
 CATEGORIES=	multimedia
 MASTER_SITES=	https://gstreamer.freedesktop.org/src/gst-python/
@@ -21,6 +21,7 @@ PY_PATCHPLIST=		yes
 
 CONFIGURE_ENV.SunOS+=	ac_cv_prog_cc_c99=no
 
+.include "../../devel/py-gobject3-common/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gstreamer1+=	gstreamer1>=1.12.0
 .include "../../multimedia/gstreamer1/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
diff --git a/multimedia/py-gstreamer1/PLIST b/multimedia/py-gstreamer1/PLIST
index 6e81ca36be0..14b27f4064d 100644
--- a/multimedia/py-gstreamer1/PLIST
+++ b/multimedia/py-gstreamer1/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2017/09/12 14:05:51 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/04/15 09:40:05 adam Exp $
+lib/gstreamer-1.0/libgstpythonplugin.la
 ${PYSITELIB}/gi/overrides/Gst.py
 ${PYSITELIB}/gi/overrides/Gst.pyc
 ${PYSITELIB}/gi/overrides/Gst.pyo
@@ -6,4 +7,3 @@ ${PYSITELIB}/gi/overrides/GstPbutils.py
 ${PYSITELIB}/gi/overrides/GstPbutils.pyc
 ${PYSITELIB}/gi/overrides/GstPbutils.pyo
 ${PYSITELIB}/gi/overrides/_gi_gst.la
-lib/gstreamer-1.0/libgstpythonplugin.la
diff --git a/multimedia/py-gstreamer1/distinfo b/multimedia/py-gstreamer1/distinfo
index c37d4024be1..a07b7822151 100644
--- a/multimedia/py-gstreamer1/distinfo
+++ b/multimedia/py-gstreamer1/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2018/01/28 19:37:14 wiz Exp $
+$NetBSD: distinfo,v 1.6 2018/04/15 09:40:05 adam Exp $
 
-SHA1 (gst-python-1.12.4.tar.xz) = 3686a1f6f7946a4fa73b8228a3da991cf81e08dd
-RMD160 (gst-python-1.12.4.tar.xz) = e18f7a4f3e60ae8815d5bfc0e7ed1bbe878ad590
-SHA512 (gst-python-1.12.4.tar.xz) = 6bad210a35cc7767e7e0531d81e4a2ab017d063044e980db6f3982b7147d45d512ffd1059b1d17fece01df9d904321f3e3f55cd15f03e77f9b188d421ecfa948
-Size (gst-python-1.12.4.tar.xz) = 388672 bytes
+SHA1 (gst-python-1.12.5.tar.xz) = 90af34572a0f4de74dc3d0700458a5ff6be7a126
+RMD160 (gst-python-1.12.5.tar.xz) = 27f16973c768023d70fc9aea1bcf90bbf12af89a
+SHA512 (gst-python-1.12.5.tar.xz) = f021834f67789d03bb60dca612295267fd58df6492c23168b621fb502cc6d287f4a46a487606b1a78ade968bd262040b0350b385aa8bc8375da336e9028a1ca5
+Size (gst-python-1.12.5.tar.xz) = 395328 bytes
-- 
cgit v1.2.3