Import of pkgsrc-2015Q2

2015-08-30 02:56:09 -07:00
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.234 2015/03/14 18:06:03 tnn Exp $
+# $NetBSD: Makefile,v 1.236 2015/04/21 08:56:39 jperkin Exp $
 #

 COMMENT=	Multimedia utilities
@@ -42,6 +42,7 @@ SUBDIR+=	gecko-mediaplayer
 SUBDIR+=	ggrab
 SUBDIR+=	gmediaserver
 SUBDIR+=	gmencoder
+SUBDIR+=	gmp-api
 SUBDIR+=	gmplayer
 SUBDIR+=	gnash
 SUBDIR+=	gnome-media
@@ -200,6 +201,7 @@ SUBDIR+=	x265
 SUBDIR+=	xanim
 SUBDIR+=	xawtv
 SUBDIR+=	xfce4-mpc-plugin
+SUBDIR+=	xfce4-thunar-media-tags
 SUBDIR+=	xfmedia
 SUBDIR+=	xine-lib
 SUBDIR+=	xine-ui
--- a/multimedia/acidrip/Makefile
+++ b/multimedia/acidrip/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2014/05/29 23:37:00 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2015/06/12 10:50:37 wiz Exp $
 #

 DISTNAME=	acidrip-0.14
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=acidrip/}

--- a/multimedia/adobe-flash-plugin11/Makefile
+++ b/multimedia/adobe-flash-plugin11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2015/03/14 16:36:59 tnn Exp $
+# $NetBSD: Makefile,v 1.46 2015/06/12 15:01:54 tsutsui Exp $

 DISTNAME=		flash-plugin-${FLASH_VERSION}-release.${FLASH_ARCH}
 PKGNAME=		adobe-${DISTNAME:C/-release.*//}
@@ -31,7 +31,7 @@ EMUL_PLATFORMS=		linux-i386 #linux-x86_64
 EMUL_MODULES.linux=	gtk2 x11 krb5 alsa curl nss nspr
 EMUL_REQD=		suse>=11.3

-FLASH_VERSION=		11.2.202.451
+FLASH_VERSION=		11.2.202.466

 .include "../../mk/bsd.prefs.mk"

--- a/multimedia/adobe-flash-plugin11/distinfo
+++ b/multimedia/adobe-flash-plugin11/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.40 2015/03/14 16:36:59 tnn Exp $
+$NetBSD: distinfo,v 1.43 2015/06/12 15:01:54 tsutsui Exp $

-SHA1 (flash-plugin-11.2.202.451-release.i386.rpm) = 11339ff05ec9dea43ec020071ea5101889d39130
-RMD160 (flash-plugin-11.2.202.451-release.i386.rpm) = e574ab2d962b21d2073d4938d545777bf688167d
-Size (flash-plugin-11.2.202.451-release.i386.rpm) = 6913727 bytes
+SHA1 (flash-plugin-11.2.202.466-release.i386.rpm) = 5be642b5d5850323105afc3a9c5bed723310aa44
+RMD160 (flash-plugin-11.2.202.466-release.i386.rpm) = 47f3fcb568c1f0dc54f73e8d79a1ccd79e2e28a2
+Size (flash-plugin-11.2.202.466-release.i386.rpm) = 6916635 bytes
--- a/multimedia/audiocd-kio/Makefile
+++ b/multimedia/audiocd-kio/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2014/11/13 12:06:45 markd Exp $
+# $NetBSD: Makefile,v 1.18 2015/04/25 14:23:37 tnn Exp $

 DISTNAME=	audiocd-kio-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	multimedia
 COMMENT=	Kioslave for accessing audio CDs

--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.93 2015/02/21 23:35:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.94 2015/04/25 14:23:37 tnn Exp $
 #

 DISTNAME=	avidemux_2.5.4
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	28
+PKGREVISION=	29
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.berlios.de/avidemux/

--- a/multimedia/clutter-gst/Makefile
+++ b/multimedia/clutter-gst/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2015/01/17 16:02:53 prlw1 Exp $
+# $NetBSD: Makefile,v 1.36 2015/04/25 14:23:37 tnn Exp $

 DISTNAME=	clutter-gst-2.0.12
+PKGREVISION=	1
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/clutter-gst/2.0/}
 EXTRACT_SUFX=	.tar.xz
--- a/multimedia/clutter-gst/buildlink3.mk
+++ b/multimedia/clutter-gst/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2015/01/17 14:36:12 prlw1 Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2015/04/25 14:23:37 tnn Exp $
 #

 BUILDLINK_TREE+=	clutter-gst
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=	clutter-gst
 CLUTTER_GST_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.clutter-gst+=	clutter-gst>=2.0.0
-BUILDLINK_ABI_DEPENDS.clutter-gst?=	clutter-gst>=2.0.8nb2
+BUILDLINK_ABI_DEPENDS.clutter-gst?=	clutter-gst>=2.0.12nb1
 BUILDLINK_PKGSRCDIR.clutter-gst?=	../../multimedia/clutter-gst

 .include "../../graphics/clutter/buildlink3.mk"
--- a/multimedia/deforaos-player/Makefile
+++ b/multimedia/deforaos-player/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2014/05/05 00:48:10 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2015/04/25 14:23:38 tnn Exp $
 #

 DISTNAME=	Player-0.1.6
 PKGNAME=	deforaos-player-0.1.6
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.defora.org/os/download/download/4297/

--- a/multimedia/deforaos-player/buildlink3.mk
+++ b/multimedia/deforaos-player/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2014/05/05 00:48:10 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2015/04/25 14:23:38 tnn Exp $
 #

 BUILDLINK_TREE+=	deforaos-player
@@ -7,7 +7,7 @@ BUILDLINK_TREE+=	deforaos-player
 DEFORAOS_PLAYER_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.deforaos-player+=	deforaos-player>=0.1.6
-BUILDLINK_ABI_DEPENDS.deforaos-player?=	deforaos-player>=0.1.6nb3
+BUILDLINK_ABI_DEPENDS.deforaos-player?=	deforaos-player>=0.1.6nb4
 BUILDLINK_PKGSRCDIR.deforaos-player?=	../../multimedia/deforaos-player

 .include "../../x11/deforaos-libdesktop/buildlink3.mk"
--- a/multimedia/dirac/Makefile
+++ b/multimedia/dirac/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2014/05/29 23:37:00 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2015/06/12 10:50:37 wiz Exp $
 #

 DISTNAME=		dirac-1.0.2
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=dirac/}

--- a/multimedia/dragon/Makefile
+++ b/multimedia/dragon/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2014/11/13 12:06:45 markd Exp $
+# $NetBSD: Makefile,v 1.18 2015/04/25 14:23:38 tnn Exp $

 DISTNAME=	dragon-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	multimedia
 COMMENT=	a simple video player for KDE

--- a/multimedia/dumpmpeg/Makefile
+++ b/multimedia/dumpmpeg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2012/10/08 09:20:58 asau Exp $
+# $NetBSD: Makefile,v 1.14 2015/04/25 14:23:38 tnn Exp $
 #

 DISTNAME=	dumpmpeg-0.6
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dumpmpeg/}

--- a/multimedia/dvb-apps/Makefile
+++ b/multimedia/dvb-apps/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2015/03/14 14:27:28 tnn Exp $
+# $NetBSD: Makefile,v 1.9 2015/06/12 10:50:37 wiz Exp $
 #

 PKGNAME=	dvb-apps-20110713
-PKGREVISION=	4
+PKGREVISION=	5
 DISTNAME=	148ede2a6809
 DIST_SUBDIR=	dvb-apps
 CATEGORIES=	multimedia
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.57 2014/05/29 23:37:00 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2015/06/12 10:50:37 wiz Exp $
 #

 DISTNAME=	dvdrip-0.98.11
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	multimedia x11 sysutils
 MASTER_SITES=	http://www.exit1.org/dvdrip/dist/

--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2014/09/25 14:53:05 jperkin Exp $
+# $NetBSD: Makefile,v 1.65 2015/04/25 14:23:38 tnn Exp $

 DISTNAME=	DVDStyler-2.7.1
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dvdstyler/}
 EXTRACT_SUFX=	.tar.bz2
--- a/multimedia/farsight2/Makefile
+++ b/multimedia/farsight2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2014/10/07 16:47:31 adam Exp $
+# $NetBSD: Makefile,v 1.50 2015/04/25 14:23:38 tnn Exp $

 DISTNAME=	farsight2-0.0.31
-PKGREVISION=	13
+PKGREVISION=	15
 CATEGORIES=	chat multimedia
 MASTER_SITES=	http://farsight.freedesktop.org/releases/farsight2/

--- a/multimedia/ffmpeg2/Makefile.common
+++ b/multimedia/ffmpeg2/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.30 2015/03/08 08:10:13 adam Exp $
+# $NetBSD: Makefile.common,v 1.34 2015/06/11 17:02:35 adam Exp $
 # used by multimedia/ffmpeg2/Makefile
 # used by multimedia/ffplay2/Makefile

-DISTNAME=	ffmpeg-2.6
+DISTNAME=	ffmpeg-2.7
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=	.tar.bz2
--- a/multimedia/ffmpeg2/PLIST
+++ b/multimedia/ffmpeg2/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.8 2015/03/08 08:10:13 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2015/06/11 17:02:35 adam Exp $
 bin/ffmpeg2
 bin/ffprobe2
 bin/ffserver2
 include/ffmpeg2/libavcodec/avcodec.h
 include/ffmpeg2/libavcodec/avfft.h
+include/ffmpeg2/libavcodec/d3d11va.h
 include/ffmpeg2/libavcodec/dv_profile.h
 include/ffmpeg2/libavcodec/dxva2.h
 include/ffmpeg2/libavcodec/old_codec_ids.h
@@ -100,7 +101,7 @@ include/ffmpeg2/libswscale/version.h
 lib/ffmpeg2/libavcodec.a
 lib/ffmpeg2/libavcodec.so
 lib/ffmpeg2/libavcodec.so.56
-lib/ffmpeg2/libavcodec.so.56.26.100
+lib/ffmpeg2/libavcodec.so.56.41.100
 lib/ffmpeg2/libavdevice.a
 lib/ffmpeg2/libavdevice.so
 lib/ffmpeg2/libavdevice.so.56
@@ -108,15 +109,15 @@ lib/ffmpeg2/libavdevice.so.56.4.100
 lib/ffmpeg2/libavfilter.a
 lib/ffmpeg2/libavfilter.so
 lib/ffmpeg2/libavfilter.so.5
-lib/ffmpeg2/libavfilter.so.5.11.102
+lib/ffmpeg2/libavfilter.so.5.16.101
 lib/ffmpeg2/libavformat.a
 lib/ffmpeg2/libavformat.so
 lib/ffmpeg2/libavformat.so.56
-lib/ffmpeg2/libavformat.so.56.25.101
+lib/ffmpeg2/libavformat.so.56.36.100
 lib/ffmpeg2/libavutil.a
 lib/ffmpeg2/libavutil.so
 lib/ffmpeg2/libavutil.so.54
-lib/ffmpeg2/libavutil.so.54.20.100
+lib/ffmpeg2/libavutil.so.54.27.100
 lib/ffmpeg2/libpostproc.a
 lib/ffmpeg2/libpostproc.so
 lib/ffmpeg2/libpostproc.so.53
@@ -124,7 +125,7 @@ lib/ffmpeg2/libpostproc.so.53.3.100
 lib/ffmpeg2/libswresample.a
 lib/ffmpeg2/libswresample.so
 lib/ffmpeg2/libswresample.so.1
-lib/ffmpeg2/libswresample.so.1.1.100
+lib/ffmpeg2/libswresample.so.1.2.100
 lib/ffmpeg2/libswscale.a
 lib/ffmpeg2/libswscale.so
 lib/ffmpeg2/libswscale.so.3
@@ -154,6 +155,7 @@ share/doc/ffmpeg2/writing_filters.txt
 share/examples/ffmpeg2/ffserver.conf
 share/ffmpeg2/examples/Makefile
 share/ffmpeg2/examples/README
+share/ffmpeg2/examples/avio_list_dir.c
 share/ffmpeg2/examples/avio_reading.c
 share/ffmpeg2/examples/decoding_encoding.c
 share/ffmpeg2/examples/demuxing_decoding.c
--- a/multimedia/ffmpeg2/distinfo
+++ b/multimedia/ffmpeg2/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.29 2015/03/08 08:10:13 adam Exp $
+$NetBSD: distinfo,v 1.33 2015/06/11 17:02:35 adam Exp $

-SHA1 (ffmpeg-2.6.tar.bz2) = 3bfc61fc3906373aecaaa523a9d13cfa9ff7e7ed
-RMD160 (ffmpeg-2.6.tar.bz2) = 86c4af5b3f43fde318a7a8557f6787449a4d28c5
-Size (ffmpeg-2.6.tar.bz2) = 7799342 bytes
+SHA1 (ffmpeg-2.7.tar.bz2) = 70bd3bef074b269ff0b1f78d12e05b5a04025585
+RMD160 (ffmpeg-2.7.tar.bz2) = c56462f4ff60d0de00f80b2a247076cc6a7681e7
+Size (ffmpeg-2.7.tar.bz2) = 8149595 bytes
 SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
-SHA1 (patch-configure) = 580e744f44bc6b7622a21d27fcf14f934a280179
-SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = 8634661d76bc3bce43437caa4244b4f52237709f
+SHA1 (patch-configure) = 17d22d134a2cdab83f03ea1fe94e24ea55eaf349
+SHA1 (patch-libavcodec_x86_ac3dsp_init.c) = f997271f4f4604987591d7f17c571aaaa8a6188a
 SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
-SHA1 (patch-libavutil_opencl.c) = 46da890f06ab3db7fbed84aff0f6f30fa1d2adfe
+SHA1 (patch-libavutil_opencl.c) = 2404f98c677c9fe92bcc49be01ebf76bebba0eea
 SHA1 (patch-libavutil_x86_asm.h) = 3fe732ec6da9f0920d3c6e3a5db9bed65b0a3e40
 SHA1 (patch-libavutil_x86_cpu.c) = ece66a5b22130754c11c643dae48171d04d3246f
--- a/multimedia/ffmpeg2/patches/patch-configure
+++ b/multimedia/ffmpeg2/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.6 2015/02/14 15:41:42 adam Exp $
+$NetBSD: patch-configure,v 1.7 2015/06/11 17:02:35 adam Exp $

--- configure.orig	2015-02-13 15:56:33.000000000 +0000
+--- configure.orig	2015-06-09 23:27:49.000000000 +0000
 +++ configure
-@@ -4011,6 +4011,11 @@ case $target_os in
+@@ -4197,6 +4197,11 @@ case $target_os in
         ;;
     netbsd)
         disable symver
@@ -14,7 +14,7 @@ $NetBSD: patch-configure,v 1.6 2015/02/14 15:41:42 adam Exp $
         oss_indev_extralibs="-lossaudio"
         oss_outdev_extralibs="-lossaudio"
         enabled gcc || check_ldflags -Wl,-zmuldefs
-@@ -4407,10 +4412,13 @@ check_cc <<EOF && enable attribute_may_a
+@@ -4602,10 +4607,13 @@ check_cc <<EOF && enable attribute_may_a
 union { int x; } __attribute__((may_alias)) x;
 EOF
 
@@ -29,9 +29,9 @@ $NetBSD: patch-configure,v 1.6 2015/02/14 15:41:42 adam Exp $
 EOF
 -od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
 
- if  [ "$cpu" = "power7" ] || [ "$cpu" = "power8" ] || enabled ppc64; then
-     if ! enabled bigendian && enabled altivec ;then
-@@ -5163,6 +5171,7 @@ enabled xmm_clobber_test &&
+ 
+ check_gas() {
+@@ -5423,6 +5431,7 @@ enabled xmm_clobber_test &&
                   -Wl,--wrap,sws_scale ||
     disable xmm_clobber_test
 
@@ -39,7 +39,7 @@ $NetBSD: patch-configure,v 1.6 2015/02/14 15:41:42 adam Exp $
 echo "X{};" > $TMPV
 if test_ldflags -Wl,--version-script,$TMPV; then
     append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
-@@ -5175,6 +5184,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
+@@ -5435,6 +5444,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
 void ff_foo(void) {}
 EOF
 fi
@@ -47,7 +47,7 @@ $NetBSD: patch-configure,v 1.6 2015/02/14 15:41:42 adam Exp $
 
 if [ -z "$optflags" ]; then
     if enabled small; then
-@@ -5767,7 +5777,7 @@ Version: $version
+@@ -6038,7 +6048,7 @@ Version: $version
 Requires: $(enabled shared || echo $requires)
 Requires.private: $(enabled shared && echo $requires)
 Conflicts:
--- a/multimedia/ffmpeg2/patches/patch-libavcodec_x86_ac3dsp_init.c
+++ b/multimedia/ffmpeg2/patches/patch-libavcodec_x86_ac3dsp_init.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-libavcodec_x86_ac3dsp_init.c,v 1.1 2014/12/03 15:06:11 bouyer Exp $
+$NetBSD: patch-libavcodec_x86_ac3dsp_init.c,v 1.2 2015/06/11 17:02:35 adam Exp $

 Fix from PR pkg/48680

@@ -65,15 +65,6 @@ Fix from PR pkg/48680
         "add             $16, %0            \n"                 \
         "jl               1b                \n"                 \
         : "+&r"(i), "=&r"(j), "=&r"(k), "=&r"(m)                \
-@@ -166,7 +168,7 @@
-                matrix_cmp[3][0] == matrix_cmp[4][0]) {
-         MIX5(IF1, IF0);
-     } else {
-        DECLARE_ALIGNED(16, float, matrix_simd)[AC3_MAX_CHANNELS][2][4];
-+        float matrix_simd[AC3_MAX_CHANNELS][2][4];
-         float *samp[AC3_MAX_CHANNELS];
-
-         for (j = 0; j < in_ch; j++)
@@ -180,8 +182,8 @@
             "movss    4(%2, %0), %%xmm5         \n"
             "shufps          $0, %%xmm4, %%xmm4 \n"
--- a/multimedia/ffmpeg2/patches/patch-libavutil_opencl.c
+++ b/multimedia/ffmpeg2/patches/patch-libavutil_opencl.c
@@ -1,15 +1,15 @@
-$NetBSD: patch-libavutil_opencl.c,v 1.1 2015/03/08 08:10:13 adam Exp $
+$NetBSD: patch-libavutil_opencl.c,v 1.2 2015/04/02 22:40:04 wiz Exp $

 Fix undeclared identifier error.

--- libavutil/opencl.c.orig	2015-03-08 07:52:00.000000000 +0000
+--- libavutil/opencl.c.orig	2015-03-16 19:26:04.000000000 +0000
 +++ libavutil/opencl.c
-@@ -611,7 +611,7 @@ void av_opencl_uninit(void)
-         }
-         opencl_ctx.context = NULL;
-     }
+@@ -423,7 +423,7 @@ cl_program av_opencl_compile(const char 
+     cl_program program = NULL;
+ 
+     LOCK_OPENCL;
 -    for (i = 0; i < opencl_ctx.kernel_code_count; i++) {
 +    for (int i = 0; i < opencl_ctx.kernel_code_count; i++) {
-         opencl_ctx.kernel_code[i].is_compiled = 0;
-     }
-     free_device_list(&opencl_ctx.device_list);
+         // identify a program using a unique name within the kernel source
+         ptr = av_stristr(opencl_ctx.kernel_code[i].kernel_string, program_name);
+         if (ptr && !opencl_ctx.kernel_code[i].is_compiled) {
--- a/multimedia/ffmpegthumbs/Makefile
+++ b/multimedia/ffmpegthumbs/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2014/11/13 12:06:45 markd Exp $
+# $NetBSD: Makefile,v 1.20 2015/04/25 14:23:38 tnn Exp $

 DISTNAME=	ffmpegthumbs-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	multimedia
 COMMENT=	FFmpeg-based thumbnail creator for video files

--- a/multimedia/ffplay1/Makefile
+++ b/multimedia/ffplay1/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2014/12/30 13:49:20 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2015/04/25 14:23:38 tnn Exp $

 PKGNAME=	${DISTNAME:S/ffmpeg/ffplay1/}
+PKGREVISION=	1
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
 COMMENT=	Simple SDL frontend for FFmpeg
--- a/multimedia/ffplay2/Makefile
+++ b/multimedia/ffplay2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/12/06 09:18:41 adam Exp $
+# $NetBSD: Makefile,v 1.8 2015/05/18 11:57:07 adam Exp $

 PKGNAME=	${DISTNAME:S/ffmpeg/ffplay2/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/multimedia/fuppes/Makefile
+++ b/multimedia/fuppes/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2014/10/07 16:47:31 adam Exp $
+# $NetBSD: Makefile,v 1.53 2015/04/06 08:17:33 adam Exp $

 DISTNAME=	fuppes-0.660
-PKGREVISION=	20
+PKGREVISION=	21
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fuppes/}

--- a/multimedia/gecko-mediaplayer/Makefile
+++ b/multimedia/gecko-mediaplayer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2015/03/15 17:41:59 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.40 2015/04/25 14:23:38 tnn Exp $
 #

 DISTNAME=	gecko-mediaplayer-1.0.9
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	multimedia www
 MASTER_SITES=	http://gecko-mediaplayer.googlecode.com/svn/packages/

--- a/multimedia/gmediaserver/Makefile
+++ b/multimedia/gmediaserver/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2015/03/15 17:15:02 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.14 2015/06/12 10:50:37 wiz Exp $

 DISTNAME=		gmediaserver-0.13.0
-PKGREVISION=		9
+PKGREVISION=		10
 CATEGORIES=		multimedia net
 MASTER_SITES=		http://download.savannah.gnu.org/releases/gmediaserver/

--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.67 2014/05/05 00:48:11 ryoon Exp $
+# $NetBSD: Makefile,v 1.68 2015/04/25 14:23:38 tnn Exp $
 #

 DISTNAME=	gmencoder-0.1.0
-PKGREVISION=	54
+PKGREVISION=	55
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gmencoder/}
 EXTRACT_SUFX=	.tgz
--- a/multimedia/gmp-api/DESCR
+++ b/multimedia/gmp-api/DESCR
@@ -0,0 +1,3 @@
+This package contains gmp (Gecko Media Plugin) headers to simplify building
+OpenH264 and other plugins without requiring the entire mozilla-central source
+tree.
--- a/multimedia/gmp-api/Makefile
+++ b/multimedia/gmp-api/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.2 2015/04/04 16:15:05 tnn Exp $
+
+DISTNAME=	gmp-api-38.0
+CATEGORIES=	multimedia www
+MASTER_SITES=	${MASTER_SITE_GITHUB:=mozilla/}
+GITHUB_TAG=	2b8954c5dde595152d34dd378952e26aabb02dc3
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	https://wiki.mozilla.org/GeckoMediaPlugins
+COMMENT=	Headers for developing Gecko Media Plugins
+LICENSE=	modified-bsd
+
+USE_LANGUAGES=	# none
+NO_BUILD=	yes
+
+INSTALLATION_DIRS=	include/gmp-api
+
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/*.h ${DESTDIR}${PREFIX}/include/gmp-api
+
+.include "../../mk/bsd.pkg.mk"
--- a/multimedia/gmp-api/PLIST
+++ b/multimedia/gmp-api/PLIST
@@ -0,0 +1,19 @@
+@comment $NetBSD: PLIST,v 1.1 2015/04/04 15:45:53 tnn Exp $
+include/gmp-api/gmp-async-shutdown.h
+include/gmp-api/gmp-audio-codec.h
+include/gmp-api/gmp-audio-decode.h
+include/gmp-api/gmp-audio-host.h
+include/gmp-api/gmp-audio-samples.h
+include/gmp-api/gmp-decryption.h
+include/gmp-api/gmp-entrypoints.h
+include/gmp-api/gmp-errors.h
+include/gmp-api/gmp-platform.h
+include/gmp-api/gmp-storage.h
+include/gmp-api/gmp-video-codec.h
+include/gmp-api/gmp-video-decode.h
+include/gmp-api/gmp-video-encode.h
+include/gmp-api/gmp-video-frame-encoded.h
+include/gmp-api/gmp-video-frame-i420.h
+include/gmp-api/gmp-video-frame.h
+include/gmp-api/gmp-video-host.h
+include/gmp-api/gmp-video-plane.h
--- a/multimedia/gmp-api/buildlink3.mk
+++ b/multimedia/gmp-api/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD: buildlink3.mk,v 1.1 2015/04/04 15:45:53 tnn Exp $
+
+BUILDLINK_TREE+=	gmp-api
+
+.if !defined(GMP_API_BUILDLINK3_MK)
+GMP_API_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.gmp-api+=	gmp-api>=38.0
+BUILDLINK_PKGSRCDIR.gmp-api?=	../../multimedia/gmp-api
+BUILDLINK_DEPMETHOD.gmp-api?=	build
+.endif	# GMP_API_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-gmp-api
--- a/multimedia/gmp-api/distinfo
+++ b/multimedia/gmp-api/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/04/04 15:45:53 tnn Exp $
+
+SHA1 (gmp-api-38.0-2b8954c5dde595152d34dd378952e26aabb02dc3.tar.gz) = 8fe4e3ad6116c582ad35169d4d2961d718ba0509
+RMD160 (gmp-api-38.0-2b8954c5dde595152d34dd378952e26aabb02dc3.tar.gz) = 8e664a945f2b8f15516de9ddc935b8a284ea866a
+Size (gmp-api-38.0-2b8954c5dde595152d34dd378952e26aabb02dc3.tar.gz) = 16202 bytes
--- a/multimedia/gmplayer/Makefile
+++ b/multimedia/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.123 2015/02/24 08:43:31 wiz Exp $
+# $NetBSD: Makefile,v 1.126 2015/04/25 14:23:38 tnn Exp $
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
 # that *both* distinfo files contain the correct, up-to-date files and
@@ -8,7 +8,7 @@
 #

 PKGNAME=	gmplayer-${MPLAYER_VERSION}
-PKGREVISION=	23
+PKGREVISION=	26

 SKIN_SITES=	http://www1.mplayerhq.hu/MPlayer/skins/		\
 		http://www2.mplayerhq.hu/MPlayer/skins/		\
@@ -69,6 +69,14 @@ do-install:
 	@${ECHO_MSG} "Installing skin ${skin}..."
 	${BZCAT} ${DISTDIR}/${DIST_SUBDIR}/${skin} |	\
 	  ${GTAR} xCmf ${DESTDIR}${PREFIX}/share/mplayer/skins -
+.endfor
+.for skin in ${SKINS:C,-[0-9]+\.[0-9]+${SKIN_EXTRACT_SUFX},,}
+	${MV} ${DESTDIR}${PREFIX}/share/mplayer/skins/${skin}/skin \
+	  ${DESTDIR}${PREFIX}/share/mplayer/skins/${skin}/skin.orig
+	${SED} -e 's/pimage/potmeter/' -e 's/rpotmeter/;rpotmeter/' \
+	  < ${DESTDIR}${PREFIX}/share/mplayer/skins/${skin}/skin.orig \
+	  > ${DESTDIR}${PREFIX}/share/mplayer/skins/${skin}/skin
+	${RM} ${DESTDIR}${PREFIX}/share/mplayer/skins/${skin}/skin.orig
 .endfor
 	${CHMOD} -R a+rX ${DESTDIR}${PREFIX}/share/mplayer/skins
 	${RM} -f ${DESTDIR}${PREFIX}/share/mplayer/skins/default
--- a/multimedia/gmplayer/distinfo
+++ b/multimedia/gmplayer/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.90 2015/03/31 15:51:42 joerg Exp $
+$NetBSD: distinfo,v 1.92 2015/04/07 09:22:40 martin Exp $

 SHA1 (mplayer/AlienMind-1.2.tar.bz2) = 34370da1e003e4accceae194a63483aa6eebc4dc
 RMD160 (mplayer/AlienMind-1.2.tar.bz2) = f3fda7d44a59f98097162f76d0a0d58840974998
@@ -63,21 +63,20 @@ Size (mplayer/xanim-1.7.tar.bz2) = 94526 bytes
 SHA1 (mplayer/xine-lcd-1.2.tar.bz2) = 2fa7811e0dc7316d0c996b0a5bc37f5c97d1dd18
 RMD160 (mplayer/xine-lcd-1.2.tar.bz2) = 785f6826d49eddabd7ebc431db77139771f208f5
 Size (mplayer/xine-lcd-1.2.tar.bz2) = 172270 bytes
-SHA1 (patch-.._MPlayer-1.1.1_ffmpeg_libavcodec_arm_asm.S) = 33085da1b4a2b235c02ea645f7950e2be26e8c60
-SHA1 (patch-.._MPlayer-1.1.1_ffmpeg_libavcodec_arm_simple__idct__arm.S) = ae43f230cc19896d1284e46d5b219dcdcc74d6e7
 SHA1 (patch-CVE-2014-4610) = 855276c8e301494942a03e13712cc53615d8f4d5
-SHA1 (patch-aa) = da461823d0731624de964323ab630f6e295be7b7
+SHA1 (patch-aa) = abe6709d87c0a1b4f4da15e93a5bc4d923ed0793
 SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
 SHA1 (patch-an) = a1d16ce7a4ff5a2071a7bac1b6836dc197b849e4
 SHA1 (patch-ffmpeg_libavcodec_arm_asm.S) = dfe8670bcbb6e6dc17b65bf6459b9550da06f73f
 SHA1 (patch-ffmpeg_libavcodec_arm_simple__idct__arm.S) = 7ffa3a0dc52afe28a6c184a72586a1392719d885
 SHA1 (patch-ffmpeg_libavutil_x86__cpu.h) = ea2c6e179840c7746930848b751b6fd1dcd67e90
-SHA1 (patch-gui_interface.c) = 25ada9d9af1e76ffa7b4b97ee07fa1f5250ac000
+SHA1 (patch-gui_interface.c) = b5b1b2da84aaa7555e9ff8b75186684e2439717d
 SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
 SHA1 (patch-libmpdemux_demux__gif.c) = 4efec4ea1fe395e24760530e532d3251c64a8fb8
 SHA1 (patch-libvo_vo__corevideo.h) = 2d0b1702363227363343a29060a7b027ce96b5bb
 SHA1 (patch-libvo_vo__gif89a.c) = 88e20df5ea5d5f294d312dddab08cb0e40fb8483
 SHA1 (patch-stream_dvb_tune.c) = 46cb5fb4700d7da5ed997dd468033c1edbe9be03
 SHA1 (patch-stream_dvbin.h) = ee4f74eb786100e7cc62be228d73ce29d88638d1
+SHA1 (patch-stream_stream__dvdnav.c) = 25215d7764fe481f7cec85b30dc554aeda448fd0
 SHA1 (patch-sub_osd.c) = 00dceec6ddd10d5ccb6561a18663fe1ca0635be5
 SHA1 (patch-sub_subreader.c) = dc653c1e1cc9583a7e0998b4000e87859a4753a0
--- a/multimedia/gnash/Makefile
+++ b/multimedia/gnash/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.91 2014/11/07 19:39:39 adam Exp $
+# $NetBSD: Makefile,v 1.93 2015/04/25 14:23:38 tnn Exp $

 DISTNAME=		gnash-0.8.10
-PKGREVISION=		39
+PKGREVISION=		41
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_GNU:=gnash/${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=		.tar.bz2
--- a/multimedia/gnome-media/Makefile
+++ b/multimedia/gnome-media/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2015/02/21 23:35:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.64 2015/06/12 10:50:37 wiz Exp $

 DISTNAME=		gnome-media-2.28.5
-PKGREVISION=		33
+PKGREVISION=		35
 CATEGORIES=		multimedia gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.28/}
 EXTRACT_SUFX=		.tar.bz2
--- a/multimedia/gnome-media/buildlink3.mk
+++ b/multimedia/gnome-media/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2014/05/05 00:48:11 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2015/04/25 14:23:38 tnn Exp $

 BUILDLINK_TREE+=	gnome-media

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gnome-media
 GNOME_MEDIA_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.gnome-media+=		gnome-media>=2.12.0nb1
-BUILDLINK_ABI_DEPENDS.gnome-media+=	gnome-media>=2.28.5nb30
+BUILDLINK_ABI_DEPENDS.gnome-media+=	gnome-media>=2.28.5nb34
 BUILDLINK_PKGSRCDIR.gnome-media?=	../../multimedia/gnome-media

 .include "../../devel/GConf-ui/buildlink3.mk"
--- a/multimedia/gnome-mplayer/Makefile
+++ b/multimedia/gnome-mplayer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2015/03/15 20:13:24 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.44 2015/04/25 14:23:38 tnn Exp $
 #

 DISTNAME=	gnome-mplayer-1.0.9
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://gnome-mplayer.googlecode.com/svn/packages/

--- a/multimedia/goggles/Makefile
+++ b/multimedia/goggles/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2013/06/06 12:54:51 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2015/04/25 14:23:39 tnn Exp $
 #

 DISTNAME=		goggles-0.9.1
-PKGREVISION=		13
+PKGREVISION=		14
 CATEGORIES=		multimedia
 MASTER_SITES=		http://www.fifthplanet.net/files/
 EXTRACT_SUFX=		.tar.bz2
--- a/multimedia/gopchop/Makefile
+++ b/multimedia/gopchop/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2014/05/05 00:48:11 ryoon Exp $
+# $NetBSD: Makefile,v 1.46 2015/04/25 14:23:39 tnn Exp $
 #

 DISTNAME=		gopchop-1.1.8
-PKGREVISION=		22
+PKGREVISION=		23
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gopchop/} \
 			http://outflux.net/unix/software/GOPchop/download/
--- a/multimedia/gpac/Makefile
+++ b/multimedia/gpac/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2015/02/21 23:35:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.41 2015/04/28 12:04:33 joerg Exp $

 DISTNAME=	gpac-0.5.0
-PKGREVISION=	12
+PKGREVISION=	13
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gpac/}

@@ -22,9 +22,7 @@ GNU_CONFIGURE=	yes

 CONFIGURE_ARGS+=	--disable-wx
 CONFIGURE_ARGS+=	--X11-path=${X11BASE}
-.if ${OPSYS} == "SunOS"
 CONFIGURE_ARGS+=	--enable-pic
-.endif

 .include "../../audio/faad2/buildlink3.mk"
 .include "../../audio/liba52/buildlink3.mk"
--- a/multimedia/gst-plugins0.10-base/Makefile
+++ b/multimedia/gst-plugins0.10-base/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2014/05/29 23:37:01 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2015/06/12 10:50:37 wiz Exp $
 #

 .include "Makefile.common"
-PKGREVISION=		8
+PKGREVISION=		9

 #CONFIGURE_ARGS+= --disable-silent-rules

--- a/multimedia/gst-plugins0.10-ffmpeg/Makefile
+++ b/multimedia/gst-plugins0.10-ffmpeg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2014/05/29 23:37:01 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2015/06/12 10:50:38 wiz Exp $
 #

 DISTNAME=	gst-ffmpeg-0.10.13
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	multimedia
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-ffmpeg/

--- a/multimedia/gst-plugins1-base/Makefile
+++ b/multimedia/gst-plugins1-base/Makefile
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2014/08/08 21:25:41 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2015/06/12 10:50:38 wiz Exp $

+PKGREVISION= 1
 .include "Makefile.common"

 #CONFIGURE_ARGS+= --disable-silent-rules
--- a/multimedia/gst-plugins1-libav/Makefile
+++ b/multimedia/gst-plugins1-libav/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2015/01/03 18:09:31 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2015/06/12 10:50:38 wiz Exp $

 DISTNAME=	gst-libav-1.4.5
+PKGREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-libav/
 EXTRACT_SUFX=	.tar.xz
--- a/multimedia/gst-plugins1-omx/Makefile
+++ b/multimedia/gst-plugins1-omx/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2015/01/30 01:37:08 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2015/06/12 10:50:38 wiz Exp $

 DISTNAME=	gst-omx-1.2.0
+PKGREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-omx/
 EXTRACT_SUFX=	.tar.xz
--- a/multimedia/gst123/Makefile
+++ b/multimedia/gst123/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2014/10/01 14:32:59 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2015/04/25 14:23:39 tnn Exp $

 DISTNAME=	gst123-0.3.3
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://space.twc.de/~stefan/gst123/
 EXTRACT_SUFX=	.tar.bz2
--- a/multimedia/gstreamer0.10/Makefile
+++ b/multimedia/gstreamer0.10/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.55 2014/05/29 23:37:01 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2015/06/12 10:50:38 wiz Exp $
 #

 DISTNAME=		gstreamer-0.10.36
 PKGNAME=		${DISTNAME:S/gstreamer/gstreamer0.10/}
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		multimedia gnome
 MASTER_SITES=		http://gstreamer.freedesktop.org/src/gstreamer/
 EXTRACT_SUFX=		.tar.bz2
--- a/multimedia/gstreamer1/Makefile
+++ b/multimedia/gstreamer1/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2015/01/03 18:09:31 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2015/06/12 10:50:38 wiz Exp $

 DISTNAME=	gstreamer-1.4.5
 PKGNAME=	${DISTNAME:S/gstreamer/gstreamer1/}
+PKGREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gstreamer/
 EXTRACT_SUFX=	.tar.xz
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.85 2014/10/01 16:09:35 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2015/06/12 10:50:38 wiz Exp $

 DISTNAME=	gxine-0.5.905
-PKGREVISION=	37
+PKGREVISION=	39
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xine/}
 EXTRACT_SUFX=	.tar.bz2
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2015/03/17 19:54:12 tnn Exp $
+# $NetBSD: Makefile,v 1.37 2015/06/12 10:50:38 wiz Exp $
 #

 DISTNAME=	HandBrake-0.9.3
 PKGNAME=	${DISTNAME:S/HandBrake/handbrake/}
-PKGREVISION=	26
+PKGREVISION=	28
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.m0k.org/handbrake/releases/ \
 		http://download.m0k.org/handbrake/contrib/ \
--- a/multimedia/hwdecode-demos/Makefile
+++ b/multimedia/hwdecode-demos/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2014/09/23 15:09:54 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2015/04/25 14:23:39 tnn Exp $
 #

 DISTNAME=	hwdecode-demos-0.9.4
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.splitted-desktop.com/~gbeauchesne/hwdecode-demos/

--- a/multimedia/juk/Makefile
+++ b/multimedia/juk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2014/11/13 12:06:45 markd Exp $
+# $NetBSD: Makefile,v 1.19 2015/04/25 14:23:39 tnn Exp $

 DISTNAME=	juk-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	multimedia
 COMMENT=	a jukebox, tagger and music collection manager.

--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2014/11/07 19:39:39 adam Exp $
+# $NetBSD: Makefile,v 1.54 2015/04/25 14:23:39 tnn Exp $
 #

 DISTNAME=	kaffeine-1.2.2
-PKGREVISION=	18
+PKGREVISION=	20
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kaffeine/}

--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.110 2014/10/01 16:09:34 wiz Exp $
+# $NetBSD: Makefile,v 1.111 2015/04/25 14:23:39 tnn Exp $

 DISTNAME=	kdemultimedia-${_KDE_VERSION}
-PKGREVISION=	40
+PKGREVISION=	41
 CATEGORIES=	multimedia
 COMMENT=	Multimedia tools for the KDE integrated X11 desktop

--- a/multimedia/kdemultimedia3/buildlink3.mk
+++ b/multimedia/kdemultimedia3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.60 2014/10/01 16:09:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.61 2015/04/25 14:23:39 tnn Exp $

 BUILDLINK_TREE+=	kdemultimedia

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	kdemultimedia
 KDEMULTIMEDIA_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.kdemultimedia+=	kdemultimedia>=3.5.0nb2
-BUILDLINK_ABI_DEPENDS.kdemultimedia+=	kdemultimedia>=3.5.10nb40
+BUILDLINK_ABI_DEPENDS.kdemultimedia+=	kdemultimedia>=3.5.10nb41
 BUILDLINK_PKGSRCDIR.kdemultimedia?=	../../multimedia/kdemultimedia3

 .include "../../audio/arts/buildlink3.mk"
--- a/multimedia/kdenlive/Makefile
+++ b/multimedia/kdenlive/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2014/11/07 19:39:39 adam Exp $
+# $NetBSD: Makefile,v 1.34 2015/06/12 10:50:38 wiz Exp $

 DISTNAME=	kdenlive-0.9.6
-PKGREVISION=	5
+PKGREVISION=	8
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.kde.org/stable/kdenlive/0.9.6/src/
 EXTRACT_SUFX=	.tar.bz2
--- a/multimedia/kmix/Makefile
+++ b/multimedia/kmix/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2015/02/21 23:35:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.27 2015/04/25 14:23:39 tnn Exp $

 DISTNAME=	kmix-${_KDE_VERSION}
-PKGREVISION=	1
+PKGREVISION=	3
 CATEGORIES=	multimedia
 COMMENT=	KDE's soundcard mixer program

--- a/multimedia/kmplayer-kde3/Makefile
+++ b/multimedia/kmplayer-kde3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2014/10/01 16:09:35 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2015/06/12 10:50:38 wiz Exp $
 #

 DISTNAME=	kmplayer-0.10.0c
-PKGREVISION=	39
+PKGREVISION=	41
 CATEGORIES=	multimedia kde
 MASTER_SITES=	http://kmplayer.kde.org/pkgs/
 EXTRACT_SUFX=	.tar.bz2
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.96 2014/11/07 19:39:39 adam Exp $
+# $NetBSD: Makefile,v 1.99 2015/06/12 10:50:38 wiz Exp $
 #

 DISTNAME=	kmplayer-0.11.3d
-PKGREVISION=	23
+PKGREVISION=	26
 CATEGORIES=	multimedia kde
 MASTER_SITES=	http://kmplayer.kde.org/pkgs/
 EXTRACT_SUFX=	.tar.bz2
--- a/multimedia/kscd/Makefile
+++ b/multimedia/kscd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2014/11/21 23:22:18 mef Exp $
+# $NetBSD: Makefile,v 1.19 2015/04/25 14:23:39 tnn Exp $

 DISTNAME=	kscd-${_KDE_VERSION}
-PKGREVISION=	1
+PKGREVISION=	3
 CATEGORIES=	multimedia
 COMMENT=	KDE CD player

--- a/multimedia/libaacs/Makefile
+++ b/multimedia/libaacs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2015/03/17 18:29:17 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2015/04/05 06:31:51 adam Exp $

-DISTNAME=	libaacs-0.8.0
+DISTNAME=	libaacs-0.8.1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.videolan.org/pub/videolan/libaacs/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.bz2
--- a/multimedia/libaacs/distinfo
+++ b/multimedia/libaacs/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.5 2015/02/05 17:34:09 joerg Exp $
+$NetBSD: distinfo,v 1.6 2015/04/05 06:31:51 adam Exp $

-SHA1 (libaacs-0.8.0.tar.bz2) = 667fd744ddd73c8a3e51192dd3822f7e5002883c
-RMD160 (libaacs-0.8.0.tar.bz2) = fb27b9a65b3902ce66671a9d3578acba4f50604b
-Size (libaacs-0.8.0.tar.bz2) = 311904 bytes
+SHA1 (libaacs-0.8.1.tar.bz2) = 85f5f92e0979fc16fdfac90fa53e2a7a917ee75a
+RMD160 (libaacs-0.8.1.tar.bz2) = 9913f0cab24a989329d38a370b99a3e12d55dcc6
+Size (libaacs-0.8.1.tar.bz2) = 315231 bytes
 SHA1 (patch-src_file_file__posix.c) = 0e4b7849f2b3c9c13f71132bbb13216c758a6b14
-SHA1 (patch-src_file_mmc__device__linux.c) = 7e88ad3c842443f36feb970ddf2f6f4f01b83803
--- a/multimedia/libaacs/patches/patch-src_file_mmcdevicelinux.c
+++ b/multimedia/libaacs/patches/patch-src_file_mmcdevicelinux.c
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_file_mmc__device__linux.c,v 1.1 2015/02/05 17:34:09 joerg Exp $
-
--- src/file/mmc_device_linux.c.orig	2015-02-04 13:50:55.000000000 +0000
-+++ src/file/mmc_device_linux.c
-@@ -32,6 +32,7 @@
- #include "util/strutl.h"
- 
- #include <stdlib.h>
-+#include <stdio.h>
- #include <string.h>
- #include <unistd.h>
- #include <fcntl.h>
-@@ -180,8 +181,8 @@ MMCDEV *device_open(const char *path)
-         } else {
-             BD_DEBUG(DBG_MMC | DBG_CRIT, "Error opening /proc/mounts\n");
-         }
-#endif
-     }
-+#endif
- 
-     if (fd >= 0) {
-         dev = calloc(1, sizeof(MMCDEV));
--- a/multimedia/libass/Makefile
+++ b/multimedia/libass/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2015/02/11 10:58:02 adam Exp $
+# $NetBSD: Makefile,v 1.14 2015/05/23 11:00:02 adam Exp $

-DISTNAME=	libass-0.12.1
+DISTNAME=	libass-0.12.2
 CATEGORIES=	multimedia
-MASTER_SITES=	https://github.com/libass/libass/releases/download/${PKGVERSION_NOREV}/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=libass/}
+GITHUB_PROJECT=	libass
+GITHUB_RELEASE=	${PKGVERSION_NOREV}
 EXTRACT_SUFX=	.tar.xz

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/multimedia/libass/distinfo
+++ b/multimedia/libass/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2015/02/11 10:58:02 adam Exp $
+$NetBSD: distinfo,v 1.7 2015/05/23 11:00:02 adam Exp $

-SHA1 (libass-0.12.1.tar.xz) = 1b890101276bddc3a5a55c158d212269246516c3
-RMD160 (libass-0.12.1.tar.xz) = 42b6964b93edc8a7e8c65aaee1124d8096d03394
-Size (libass-0.12.1.tar.xz) = 312020 bytes
+SHA1 (libass-0.12.2.tar.xz) = d2d9cde28210ffecb40cb51046f5ff7a23ca58fd
+RMD160 (libass-0.12.2.tar.xz) = 21aca9102829270269923d5f7d3111dcecb04b6d
+Size (libass-0.12.2.tar.xz) = 313208 bytes
--- a/multimedia/libbluray/Makefile
+++ b/multimedia/libbluray/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2015/01/31 21:45:30 adam Exp $
+# $NetBSD: Makefile,v 1.3 2015/05/29 12:00:20 adam Exp $

-DISTNAME=	libbluray-0.7.0
+DISTNAME=	libbluray-0.8.1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.videolan.org/pub/videolan/libbluray/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.bz2
@@ -13,6 +13,7 @@ LICENSE=	gnu-lgpl-v2.1
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--disable-bdjava
 CONFIGURE_ARGS+=	--disable-optimizations
 PKGCONFIG_OVERRIDE+=	src/libbluray.pc.in

--- a/multimedia/libbluray/distinfo
+++ b/multimedia/libbluray/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2015/01/31 21:45:30 adam Exp $
+$NetBSD: distinfo,v 1.3 2015/05/29 12:00:20 adam Exp $

-SHA1 (libbluray-0.7.0.tar.bz2) = 12baf71accac2ae9efe7fb077999821ea1430d7b
-RMD160 (libbluray-0.7.0.tar.bz2) = 9992b101cc3fff089b66ad246a23d439ccc98646
-Size (libbluray-0.7.0.tar.bz2) = 597266 bytes
-SHA1 (patch-src_file_file__posix.c) = f9f0bb9f9174f93a69259bea16217d686e4079bc
+SHA1 (libbluray-0.8.1.tar.bz2) = 08b82b10388cb538da83e60841d01d16953f476e
+RMD160 (libbluray-0.8.1.tar.bz2) = 637cfd352f1a202f58904cb79eebb7de8e0ffe9f
+Size (libbluray-0.8.1.tar.bz2) = 623402 bytes
--- a/multimedia/libbluray/patches/patch-src_file_file__posix.c
+++ b/multimedia/libbluray/patches/patch-src_file_file__posix.c
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_file_file__posix.c,v 1.1 2014/08/09 20:19:35 wiz Exp $
-
-Use ftell/fseek if ftello/fseeko are not defined.
-
--- src/file/file_posix.c.orig	2014-05-27 10:34:15.000000000 +0000
-+++ src/file/file_posix.c
-@@ -30,6 +30,14 @@
- #include <stdlib.h>
- #include <inttypes.h>
- 
-+#ifndef ftello
-+#define ftello ftell
-+#endif
-+
-+#ifndef fseeko
-+#define fseeko fseek
-+#endif
-+
- static void file_close_linux(BD_FILE_H *file)
- {
-     if (file) {
--- a/multimedia/libdvbcsa/Makefile
+++ b/multimedia/libdvbcsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/08/09 20:09:48 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2015/04/27 14:54:23 jperkin Exp $

 DISTNAME=	libdvbcsa-1.1.0
 CATEGORIES=	multimedia
@@ -10,6 +10,7 @@ COMMENT=	Free implementation of the DVB Common Scrambling Algorithm
 LICENSE=	gnu-gpl-v2

 GNU_CONFIGURE=	yes
+USE_LANGUAGES=	c99
 USE_LIBTOOL=	yes

 .include "../../mk/bsd.pkg.mk"
--- a/multimedia/libkate/Makefile
+++ b/multimedia/libkate/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2014/05/05 00:48:11 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2015/04/25 14:23:40 tnn Exp $
 #

 DISTNAME=	libkate-0.4.1
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	multimedia
 MASTER_SITES=	http://libkate.googlecode.com/files/

--- a/multimedia/libkcddb/Makefile
+++ b/multimedia/libkcddb/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2014/11/13 12:06:45 markd Exp $
+# $NetBSD: Makefile,v 1.18 2015/04/25 14:23:40 tnn Exp $

 DISTNAME=	libkcddb-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	multimedia
 COMMENT=	KDE CDDB library

--- a/multimedia/libkcompactdisc/Makefile
+++ b/multimedia/libkcompactdisc/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2014/11/13 12:06:45 markd Exp $
+# $NetBSD: Makefile,v 1.18 2015/04/25 14:23:40 tnn Exp $

 DISTNAME=	libkcompactdisc-${_KDE_VERSION}
+PKGREVISION=	2
 CATEGORIES=	multimedia
 COMMENT=	a library for interfacing with CDs

--- a/multimedia/libmediainfo/DESCR
+++ b/multimedia/libmediainfo/DESCR
@@ -0,0 +1,22 @@
+MediaInfo supplies technical and tag information about a video or audio file,
+this package provides the libmediainfo library.
+
+What information can I get from MediaInfo?
+  - General: title, author, director, album, track number, date, duration...
+  - Video: codec, aspect, fps, bitrate...
+  - Audio: codec, sample rate, channels, language, bitrate...
+  - Text: language of subtitle
+  - Chapters: number of chapters, list of chapters
+What format (container) does MediaInfo support?
+  - Video: MKV, OGM, AVI, DivX, WMV, QuickTime, Real, MPEG-1, MPEG-2, MPEG-4,
+    DVD (VOB)... (Codecs: DivX, XviD, MSMPEG4, ASP, H.264, AVC...)
+  - Audio: OGG, MP3, WAV, RA, AC3, DTS, AAC, M4A, AU, AIFF...
+  - Subtitles: SRT, SSA, ASS, SAMI...
+What can I do with it?
+  - Read many video and audio file formats
+  - Different methods of viewing information (text, sheet, tree, HTML...)
+  - You can customise these views
+  - Exporting information as text, CSV, HTML...
+  - Internationalisation: Any language display on any version of your
+    operating system
+  - Localisation capability (but volunteers needed)
--- a/multimedia/libmpeg3/Makefile
+++ b/multimedia/libmpeg3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2012/10/08 09:21:07 asau Exp $
+# $NetBSD: Makefile,v 1.19 2015/04/26 13:29:42 joerg Exp $
 #

 DISTNAME=	libmpeg3-1.8-src
@@ -29,7 +29,6 @@ NO_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 WRKSRC= 	${WRKDIR}/${PKGNAME_NOREV}

-ONLY_FOR_COMPILER=	gcc
 PTHREAD_AUTO_VARS=	yes
 PTHREAD_OPTS+=		require

--- a/multimedia/libva/Makefile
+++ b/multimedia/libva/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2013/04/14 00:30:02 cheusov Exp $
+# $NetBSD: Makefile,v 1.8 2015/04/28 06:56:18 tnn Exp $
 #

 DISTNAME=	libva-1.1.0
+PKGREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.freedesktop.org/software/vaapi/releases/libva/
 EXTRACT_SUFX=	.tar.bz2
@@ -25,11 +26,18 @@ CONFIGURE_ARGS+=	--with-drivers-path=${DRIVER_SEARCH_PATH:Q}

 LIBS+=			${BUILDLINK_LDADD.dl}

+PKGCONFIG_OVERRIDE+=	libva-drm.pc.in
+PKGCONFIG_OVERRIDE+=	libva-egl.pc.in
 PKGCONFIG_OVERRIDE+=	libva-glx.pc.in
 PKGCONFIG_OVERRIDE+=	libva-tpi.pc.in
 PKGCONFIG_OVERRIDE+=	libva-x11.pc.in
 PKGCONFIG_OVERRIDE+=	libva.pc.in

+PLIST_VARS+=		egl
+.if ${X11_TYPE} == "modular" || exists(${X11BASE}/include/EGL/egl.h)
+PLIST.egl=		yes
+.endif
+
 pre-configure:
 	cd ${WRKSRC} && autoreconf -i

--- a/multimedia/libva/PLIST
+++ b/multimedia/libva/PLIST
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST,v 1.2 2013/04/14 00:30:02 cheusov Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/04/28 06:57:59 tnn Exp $
 include/va/va.h
 include/va/va_backend.h
+${PLIST.egl}include/va/va_backend_egl.h
 include/va/va_backend_glx.h
 include/va/va_backend_tpi.h
 include/va/va_dec_jpeg.h
 include/va/va_dri2.h
 include/va/va_dricommon.h
+${PLIST.egl}include/va/va_egl.h
 include/va/va_drm.h
 include/va/va_drmcommon.h
 include/va/va_glx.h
@@ -13,11 +15,13 @@ include/va/va_tpi.h
 include/va/va_version.h
 include/va/va_x11.h
 lib/libva-drm.la
+${PLIST.egl}lib/libva-egl.la
 lib/libva-glx.la
 lib/libva-tpi.la
 lib/libva-x11.la
 lib/libva.la
 lib/pkgconfig/libva-drm.pc
+${PLIST.egl}lib/pkgconfig/libva-egl.pc
 lib/pkgconfig/libva-glx.pc
 lib/pkgconfig/libva-tpi.pc
 lib/pkgconfig/libva-x11.pc
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2015/02/25 11:13:54 adam Exp $
+# $NetBSD: Makefile,v 1.55 2015/06/12 10:50:38 wiz Exp $

 DISTNAME=	libvpx_1.3.0.orig
 PKGNAME=	${DISTNAME:S/_/-/:S/.orig//}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/libv/libvpx/}
 EXTRACT_SUFX=	.tar.bz2
@@ -93,9 +93,15 @@ CONFIGURE_ARGS+=	--target=x86-solaris-gcc
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 CXXFLAGS+=	-std=c++11
-.  if ${OPSYS} == "NetBSD"
+.  if ${OPSYS} == "NetBSD" || ${OPSYS} == "Darwin"
 # https://bugzilla.mozilla.org/show_bug.cgi?id=982693
-CFLAGS+=	-fno-integrated-as
+SUBST_CLASSES+=		clang
+SUBST_STAGE.clang=	pre-configure
+SUBST_FILES.clang=	build/make/Makefile
+SUBST_MESSAGE.clang=	Disabling clang integrated assembler
+# Test for whether clang supports -fno-integrated-as instead of -no-integrated-as
+CLANG_INTEGRATED_AS!=  if ${CCPATH} --version -fno-integrated-as > /dev/null 2>&1; then ${ECHO} "-fno-integrated-as"; else ${ECHO} "-no-integrated-as"; fi
+SUBST_SED.clang=	-e 's/-DINLINE_ASM/-DINLINE_ASM ${CLANG_INTEGRATED_AS}/'
 .  endif
 .endif

--- a/multimedia/mediainfo/distinfo
+++ b/multimedia/mediainfo/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2014/10/13 09:43:13 wiz Exp $
+$NetBSD: distinfo,v 1.9 2015/05/14 13:20:06 jperkin Exp $

 SHA1 (mediainfo_0.7.65_AllInclusive.7z) = 80d8b289e6ef9e11a68b960ccd709032452d9e1c
 RMD160 (mediainfo_0.7.65_AllInclusive.7z) = 35a6ad9ed28e15688597465640a427be4ea70651
 Size (mediainfo_0.7.65_AllInclusive.7z) = 2286326 bytes
+SHA1 (patch-MediaInfoLib_Source_MediaInfo_MediaInfo__Config.h) = c55f25c0781c1902dd2459d138a88117e3f43de5
 SHA1 (patch-MediaInfoLib_Source_MediaInfo_Text_File__Ttml.h) = 9e2e86b46b5106c39be3e07f28c16a9b1a033435
--- a/multimedia/mediainfo/patches/patch-MediaInfoLib_Source_MediaInfo_MediaInfo__Config.h
+++ b/multimedia/mediainfo/patches/patch-MediaInfoLib_Source_MediaInfo_MediaInfo__Config.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-MediaInfoLib_Source_MediaInfo_MediaInfo__Config.h,v 1.1 2015/05/14 13:20:06 jperkin Exp $
+
+Avoid CS pollution from sys/regset.h on SunOS.
+
+--- MediaInfoLib/Source/MediaInfo/MediaInfo_Config.h.orig	2013-10-11 14:18:26.000000000 +0000
+++ MediaInfoLib/Source/MediaInfo/MediaInfo_Config.h
+@@ -29,6 +29,9 @@
+ #include "ZenLib/Translation.h"
+ #include "ZenLib/InfoMap.h"
+ #include <bitset>
+#ifdef __sun
+#undef CS
+#endif
+ using namespace ZenLib;
+ using std::vector;
+ using std::string;
--- a/multimedia/mediatomb/Makefile
+++ b/multimedia/mediatomb/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.43 2014/10/07 16:47:31 adam Exp $
+# $NetBSD: Makefile,v 1.45 2015/04/14 06:21:41 tron Exp $

 DISTNAME=	mediatomb-0.12.1
-PKGREVISION=	23
+PKGREVISION=	24
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mediatomb/}

-MAINTAINER=	tron@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://mediatomb.cc/
 COMMENT=	UPnP MediaServer with a web user interface
 LICENSE=	gnu-gpl-v2
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.62 2015/02/22 09:52:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.64 2015/04/23 18:27:11 joerg Exp $

 PKGNAME=	mencoder-${MPLAYER_VERSION}
-PKGREVISION=	4
+PKGREVISION=	5

 COMMENT=	Simple movie encoder for MPlayer-playable movies

+USE_TOOLS+=	pkg-config
+
 .include "../../multimedia/mplayer-share/Makefile.common"

 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
--- a/multimedia/ming/Makefile
+++ b/multimedia/ming/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2014/09/28 03:00:45 obache Exp $
+# $NetBSD: Makefile,v 1.25 2015/06/12 10:50:38 wiz Exp $
 #

 .include "Makefile.common"

-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	multimedia

 MAINTAINER=	pkgsrc-users@NetBSD.org
--- a/multimedia/minidlna/Makefile
+++ b/multimedia/minidlna/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2015/01/20 09:59:33 degroote Exp $
+# $NetBSD: Makefile,v 1.13 2015/04/06 08:17:33 adam Exp $

 DISTNAME=	minidlna-1.1.4
-PKGREVISION= 	2
+PKGREVISION= 	3
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=minidlna/}

--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2013/02/16 11:23:37 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2015/04/25 14:23:40 tnn Exp $

 DISTNAME=	mjpegtools-2.0.0
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mjpeg/}

--- a/multimedia/mjpegtools/buildlink3.mk
+++ b/multimedia/mjpegtools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2013/01/26 21:36:38 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2015/04/25 14:23:40 tnn Exp $

 .include "../../mk/bsd.fast.prefs.mk"

@@ -8,7 +8,7 @@ BUILDLINK_TREE+=	mjpegtools
 MJPEGTOOLS_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.mjpegtools+=		mjpegtools>=1.8.0
-BUILDLINK_ABI_DEPENDS.mjpegtools+=	mjpegtools>=2.0.0nb2
+BUILDLINK_ABI_DEPENDS.mjpegtools+=	mjpegtools>=2.0.0nb4
 BUILDLINK_PKGSRCDIR.mjpegtools?=	../../multimedia/mjpegtools

 .include "../../audio/lame/buildlink3.mk"
--- a/multimedia/mkvtoolnix-old/Makefile
+++ b/multimedia/mkvtoolnix-old/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2015/01/06 14:59:18 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2015/04/25 14:23:40 tnn Exp $

 DISTNAME=	mkvtoolnix-2.9.8
-PKGREVISION=	35
+PKGREVISION=	37
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/
 EXTRACT_SUFX=	.tar.bz2
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.73 2015/03/02 19:59:07 joerg Exp $
+# $NetBSD: Makefile,v 1.75 2015/04/25 14:23:40 tnn Exp $

 DISTNAME=	mkvtoolnix-5.0.1
-PKGREVISION=	24
+PKGREVISION=	26
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/
 EXTRACT_SUFX=	.tar.bz2
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.33 2014/07/09 11:36:29 jperkin Exp $
+$NetBSD: distinfo,v 1.34 2015/04/23 18:28:57 joerg Exp $

 SHA1 (mkvtoolnix-5.0.1.tar.bz2) = 900211d47ba6cbeb4188bb45a492a2b9edf08ed2
 RMD160 (mkvtoolnix-5.0.1.tar.bz2) = 3c6220a1ff304a18e4d7125d6981966c3e9d368e
 Size (mkvtoolnix-5.0.1.tar.bz2) = 2155095 bytes
 SHA1 (patch-aa) = f34d52914908e54fef20c857c3fde28aa560ff91
+SHA1 (patch-lib_boost_utf8__codecvt__facet_utf8__codecvt__facet.cpp) = 42e184abf518fd4d77a6b9737abe6bbe20a5ca41
 SHA1 (patch-src_common_common.cpp) = 04955bcef7fdc825bd97aed62211ad91b7a58c30
 SHA1 (patch-src_common_terminal.cpp) = 7bb0178f1fe58ce50feed7c8fc5974ba1172fa13
--- a/multimedia/mkvtoolnix/patches/patch-lib_boost_utf8codecvtfacet_utf8codecvtfacet.cpp
+++ b/multimedia/mkvtoolnix/patches/patch-lib_boost_utf8codecvtfacet_utf8codecvtfacet.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_boost_utf8__codecvt__facet_utf8__codecvt__facet.cpp,v 1.1 2015/04/23 18:28:57 joerg Exp $
+
+--- lib/boost/utf8_codecvt_facet/utf8_codecvt_facet.cpp.orig	2011-10-09 09:48:12.000000000 +0000
+++ lib/boost/utf8_codecvt_facet/utf8_codecvt_facet.cpp
+@@ -171,7 +171,7 @@ std::codecvt_base::result utf8_codecvt_f
+ // How many char objects can I process to get <= max_limit
+ // wchar_t objects?
+ int utf8_codecvt_facet::do_length(
+-    BOOST_CODECVT_DO_LENGTH_CONST std::mbstate_t &,
+    const std::mbstate_t &,
+     const char * from,
+     const char * from_end, 
+     std::size_t max_limit
--- a/multimedia/mlt/Makefile
+++ b/multimedia/mlt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2015/02/21 23:35:41 ryoon Exp $
+# $NetBSD: Makefile,v 1.54 2015/04/25 14:23:40 tnn Exp $

 DISTNAME=	mlt-0.9.0
-PKGREVISION=	15
+PKGREVISION=	18
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.sourceforge.net/project/mlt/mlt/
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mlt/}
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2012/10/12 08:04:04 marino Exp $
+# $NetBSD: Makefile,v 1.21 2015/04/25 14:23:40 tnn Exp $

 DISTNAME=		mpeg4ip-1.5.0.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mpeg4ip/}

--- a/multimedia/mplayer-plugin/Makefile
+++ b/multimedia/mplayer-plugin/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.36 2014/05/05 00:48:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.37 2015/04/25 14:23:40 tnn Exp $
 #

 DISTNAME=		mplayerplug-in-3.55
 PKGNAME=		mplayer-plugin-3.55
-PKGREVISION=		31
+PKGREVISION=		32
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mplayerplug-in/}

--- a/multimedia/mplayer-share/Makefile
+++ b/multimedia/mplayer-share/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.45 2015/02/21 23:35:41 ryoon Exp $
+# $NetBSD: Makefile,v 1.46 2015/04/25 14:23:40 tnn Exp $

 .include "Makefile.common"

 PKGNAME=	mplayer-share-${MPLAYER_VERSION}
-PKGREVISION=	8
+PKGREVISION=	9
 COMMENT=	Documentation used by mplayer and gmplayer

 DEPENDS+=	mplayer-fonts-[0-9]*:../../fonts/mplayer-fonts
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,21 +1,22 @@
-$NetBSD: distinfo,v 1.87 2015/03/24 14:27:20 joerg Exp $
+$NetBSD: distinfo,v 1.88 2015/04/05 08:27:08 dsainty Exp $

 SHA1 (mplayer/MPlayer-1.1.1.tar.xz) = ba2f3bd1442d04b17b0143680850273d928689c1
 RMD160 (mplayer/MPlayer-1.1.1.tar.xz) = 745b3fdf684ba7614dbec2a7143188b7c9cca3a1
 Size (mplayer/MPlayer-1.1.1.tar.xz) = 11202492 bytes
 SHA1 (patch-CVE-2014-4610) = 855276c8e301494942a03e13712cc53615d8f4d5
-SHA1 (patch-aa) = da461823d0731624de964323ab630f6e295be7b7
+SHA1 (patch-aa) = abe6709d87c0a1b4f4da15e93a5bc4d923ed0793
 SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
 SHA1 (patch-an) = a1d16ce7a4ff5a2071a7bac1b6836dc197b849e4
 SHA1 (patch-ffmpeg_libavcodec_arm_asm.S) = dfe8670bcbb6e6dc17b65bf6459b9550da06f73f
 SHA1 (patch-ffmpeg_libavcodec_arm_simple__idct__arm.S) = 7ffa3a0dc52afe28a6c184a72586a1392719d885
 SHA1 (patch-ffmpeg_libavutil_x86__cpu.h) = ea2c6e179840c7746930848b751b6fd1dcd67e90
-SHA1 (patch-gui_interface.c) = 25ada9d9af1e76ffa7b4b97ee07fa1f5250ac000
+SHA1 (patch-gui_interface.c) = b5b1b2da84aaa7555e9ff8b75186684e2439717d
 SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
 SHA1 (patch-libmpdemux_demux__gif.c) = 4efec4ea1fe395e24760530e532d3251c64a8fb8
 SHA1 (patch-libvo_vo__corevideo.h) = 2d0b1702363227363343a29060a7b027ce96b5bb
 SHA1 (patch-libvo_vo__gif89a.c) = 88e20df5ea5d5f294d312dddab08cb0e40fb8483
 SHA1 (patch-stream_dvb_tune.c) = 46cb5fb4700d7da5ed997dd468033c1edbe9be03
 SHA1 (patch-stream_dvbin.h) = ee4f74eb786100e7cc62be228d73ce29d88638d1
+SHA1 (patch-stream_stream__dvdnav.c) = 25215d7764fe481f7cec85b30dc554aeda448fd0
 SHA1 (patch-sub_osd.c) = 00dceec6ddd10d5ccb6561a18663fe1ca0635be5
 SHA1 (patch-sub_subreader.c) = dc653c1e1cc9583a7e0998b4000e87859a4753a0
--- a/multimedia/mplayer-share/options.mk
+++ b/multimedia/mplayer-share/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.51 2014/10/03 15:26:14 wiz Exp $
+# $NetBSD: options.mk,v 1.52 2015/04/05 08:27:08 dsainty Exp $

 .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)

@@ -24,7 +24,7 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
 # Options supported by both mplayer* or mencoder*.

 PKG_SUPPORTED_OPTIONS=	gif jpeg mad dts dv png theora vorbis x264 debug
-#PKG_SUPPORTED_OPTIONS+= dvdread dvdnav
+PKG_SUPPORTED_OPTIONS+= dvdread dvdnav
 .if ${OSS_TYPE} != "none"
 PKG_SUPPORTED_OPTIONS+=	oss
 .endif
--- a/multimedia/mplayer-share/patches/patch-aa
+++ b/multimedia/mplayer-share/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.31 2013/01/12 11:55:35 jmcneill Exp $
+$NetBSD: patch-aa,v 1.32 2015/04/05 08:27:08 dsainty Exp $

 o Handle properly sh3 and evbarm ports on NetBSD.
 o Fix CPU family detection on NetBSD with /proc mounted with "-o linux"
@@ -10,7 +10,7 @@ o Add support for dvb capture on NetBSD.

 --- configure.orig	2012-05-22 14:01:51.000000000 -0400
 +++ configure	2013-01-11 22:15:07.000000000 -0500
-@@ -1519,8 +1519,9 @@ if test -z "$_target" ; then
+@@ -1519,8 +1519,9 @@
       alpha) host_arch=alpha ;;
       sun4*|sparc*) host_arch=sparc ;;
       parisc*|hppa*|9000*) host_arch=hppa ;;
@@ -22,7 +22,7 @@ o Add support for dvb capture on NetBSD.
       s390) host_arch=s390 ;;
       s390x) host_arch=s390x ;;
       *mips*) host_arch=mips ;;
-@@ -1674,7 +1675,7 @@ else
+@@ -1674,7 +1675,7 @@
       cc_name=$cc_name_tmp
       echocheck "$_cc version"
       cc_vendor=gnu
@@ -31,7 +31,7 @@ o Add support for dvb capture on NetBSD.
       case $cc_version in
         2.96*)
           cc_fail=yes
-@@ -1798,7 +1799,7 @@ if x86 ; then
+@@ -1798,7 +1799,7 @@
   # gather more CPU information
   pname=$($_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -n 1)
   pvendor=$($_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2  | cut -d ' ' -f 2 | head -n 1)
@@ -40,7 +40,7 @@ o Add support for dvb capture on NetBSD.
   pmodel=$($_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1)
   pstepping=$($_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1)
 
-@@ -2274,7 +2275,12 @@ case "$host_arch" in
+@@ -2274,7 +2275,12 @@
     test $_fast_clz = "auto" && _fast_clz=yes
     ;;
 
@@ -54,7 +54,7 @@ o Add support for dvb capture on NetBSD.
     arch='sh4'
     iproc='sh4'
     ;;
-@@ -2591,7 +2597,7 @@ fi # if darwin && test "$cc_vendor" = "g
+@@ -2591,7 +2597,7 @@
 # Checking for CFLAGS
 _install_strip="-s"
 if test "$_profile" != "" || test "$_debug" != "" ; then
@@ -63,7 +63,7 @@ o Add support for dvb capture on NetBSD.
   WARNFLAGS="-W -Wall"
   _install_strip=
 elif test -z "$CFLAGS" ; then
-@@ -4288,7 +4294,11 @@ if test "$_x11" = auto && test "$_x11_he
+@@ -4288,7 +4294,11 @@
            -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 -L/usr/X11R6/lib64 \
            -L/usr/lib ; do
     if netbsd; then
@@ -76,7 +76,7 @@ o Add support for dvb capture on NetBSD.
     else
       ld_tmp="$I -lXext -lX11 $ld_pthread"
     fi
-@@ -4669,6 +4679,8 @@ if test "$_aa" = yes ; then
+@@ -4669,6 +4679,8 @@
   def_aa='#define CONFIG_AA 1'
   if cygwin ; then
     libs_mplayer="$libs_mplayer $(aalib-config --libs | cut -d " " -f 2,5,6)"
@@ -85,7 +85,7 @@ o Add support for dvb capture on NetBSD.
   fi
   vomodules="aa $vomodules"
 else
-@@ -4756,7 +4768,6 @@ EOF
+@@ -4756,7 +4768,6 @@
       extra_cflags="$extra_cflags $inc_tmp" && break
   done
 fi
@@ -93,7 +93,7 @@ o Add support for dvb capture on NetBSD.
 if test "$_dvb" = yes ; then
   _dvbin=yes
   inputmodules="dvb $inputmodules"
-@@ -4765,14 +4776,29 @@ if test "$_dvb" = yes ; then
+@@ -4765,14 +4776,29 @@
   aomodules="mpegpes(dvb) $aomodules"
   vomodules="mpegpes(dvb) $vomodules"
 else
@@ -129,3 +129,14 @@ o Add support for dvb capture on NetBSD.
 
 if darwin; then
 
+@@ -7764,8 +7790,8 @@
+     cflags_libdvdnav="-Ilibdvdnav"
+     inputmodules="dvdnav(internal) $inputmodules"
+   else
+-    extra_cflags="$extra_cflags $($_dvdnavconfig --cflags)"
+-    extra_ldflags="$extra_ldflags $($_dvdnavconfig --minilibs)"
+    extra_cflags="$extra_cflags $($_pkg_config --cflags dvdnav)"
+    extra_ldflags="$extra_ldflags $($_pkg_config --libs dvdnav)"
+     inputmodules="dvdnav $inputmodules"
+   fi
+ else
--- a/Show More
+++ b/Show More