Update to gpac-0.5.2.

Changes unknown. Previous version couldn't import VTT subtitles,
this version can.

While here switch from ffmpeg1 to ffmpeg2 and drop MAKE_JOBS_SAFE=no.

6 files changed, 93 insertions, 99 deletions

diff --git a/multimedia/gpac/Makefile b/multimedia/gpac/Makefile
index 20cb575a5fb..7a2ca7b438e 100644
--- a/multimedia/gpac/Makefile
+++ b/multimedia/gpac/Makefile
@@ -1,18 +1,15 @@
-# $NetBSD: Makefile,v 1.42 2015/06/30 09:57:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.43 2015/11/05 22:02:08 tnn Exp $
 
-DISTNAME=	gpac-0.5.0
-PKGREVISION=	14
+DISTNAME=	gpac-0.5.2
 CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gpac/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=gpac/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gpac.wp.mines-telecom.fr/
 COMMENT=	Open source multimedia framework
 LICENSE=	gnu-lgpl-v2.1
 
-MAKE_JOBS_SAFE=		no
-
-WRKSRC=		${WRKDIR}/gpac
 USE_TOOLS+=	gmake grep gsed pkg-config
 USE_LANGUAGES=	c c++
 # not really GNU configure, but close enough
@@ -23,6 +20,9 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-wx
 CONFIGURE_ARGS+=	--X11-path=${X11BASE}
 CONFIGURE_ARGS+=	--enable-pic
+CONFIGURE_ARGS+=	--extra-cflags="${CFLAGS}"
+CONFIGURE_ARGS+=	--extra-ldflags="${LDFLAGS}"
+CFLAGS+=		-I${BUILDLINK_PREFIX.faad2}/${BUILDLINK_INCDIRS.faad2}
 
 .include "../../audio/faad2/buildlink3.mk"
 .include "../../audio/liba52/buildlink3.mk"
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+=	--enable-pic
 .include "../../graphics/png/buildlink3.mk"
 # doesn't work yet
 #.include "../../lang/spidermonkey/buildlink3.mk"
-.include "../../multimedia/ffmpeg1/buildlink3.mk"
+.include "../../multimedia/ffmpeg2/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../multimedia/xvidcore/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/multimedia/gpac/PLIST b/multimedia/gpac/PLIST
index 7893c9008b5..227c9062c12 100644
--- a/multimedia/gpac/PLIST
+++ b/multimedia/gpac/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2012/12/09 17:15:06 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/11/05 22:02:08 tnn Exp $
+bin/MP42TS
 bin/MP4Box
 bin/MP4Client
 lib/gpac/gm_aac_in.so
@@ -21,84 +22,93 @@ lib/gpac/gm_ogg_xiph.so
 lib/gpac/gm_osd.so
 lib/gpac/gm_oss_audio.so
 lib/gpac/gm_pulseaudio.so
+lib/gpac/gm_raw_out.so
 lib/gpac/gm_rtp_in.so
 lib/gpac/gm_saf_in.so
 lib/gpac/gm_soft_raster.so
 lib/gpac/gm_svg_in.so
 lib/gpac/gm_timedtext.so
+lib/gpac/gm_validator.so
+lib/gpac/gm_vtt_in.so
 lib/gpac/gm_widgetman.so
 lib/gpac/gm_x11_out.so
 lib/gpac/gm_xvid_dec.so
 lib/libgpac.so
-lib/libgpac.so.2
-lib/libgpac.so.2.0.0
+lib/libgpac.so.4
+lib/libgpac.so.4.2.0
 man/man1/gpac.1
 man/man1/mp4box.1
 man/man1/mp4client.1
 share/gpac/gpac.mp4
+share/gpac/gui/extensions/H2B2VS/H2B2VS.png
+share/gpac/gui/extensions/H2B2VS/h2b2vs.js
+share/gpac/gui/extensions/H2B2VS/init.js
+share/gpac/gui/extensions/player/applications-multimedia.svg
+share/gpac/gui/extensions/player/fileopen.js
+share/gpac/gui/extensions/player/init.js
+share/gpac/gui/extensions/player/player.js
+share/gpac/gui/extensions/player/playlist.js
+share/gpac/gui/extensions/player/stats.js
 share/gpac/gui/extensions/widget_manager/applications-system.svg
 share/gpac/gui/extensions/widget_manager/init.js
 share/gpac/gui/gui.bt
 share/gpac/gui/gui.js
 share/gpac/gui/gwlib.js
-share/gpac/gui/icons/applications-internet.svg
-share/gpac/gui/icons/applications-multimedia.svg
-share/gpac/gui/icons/applications-system.svg
-share/gpac/gui/icons/audio-volume-high.svg
-share/gpac/gui/icons/audio-volume-low.svg
-share/gpac/gui/icons/audio-volume-medium.svg
-share/gpac/gui/icons/audio-volume-muted.svg
-share/gpac/gui/icons/audio-x-generic.svg
-share/gpac/gui/icons/battery-caution.svg
-share/gpac/gui/icons/camera-photo.svg
-share/gpac/gui/icons/camera-video.svg
-share/gpac/gui/icons/dialog-error.svg
-share/gpac/gui/icons/dialog-information.svg
-share/gpac/gui/icons/dialog-warning.svg
-share/gpac/gui/icons/document-new.svg
-share/gpac/gui/icons/document-print-preview.svg
-share/gpac/gui/icons/document-print.svg
-share/gpac/gui/icons/document-save-as.svg
-share/gpac/gui/icons/document-save.svg
-share/gpac/gui/icons/edit-find.svg
-share/gpac/gui/icons/emblem-symbolic-link.svg
-share/gpac/gui/icons/emblem-unreadable.svg
-share/gpac/gui/icons/face-surprise.svg
-share/gpac/gui/icons/folder-open.svg
+share/gpac/gui/icons/add.svg
+share/gpac/gui/icons/app.svg
+share/gpac/gui/icons/audio.svg
+share/gpac/gui/icons/audio_full.svg
+share/gpac/gui/icons/audio_mute.svg
+share/gpac/gui/icons/check.svg
+share/gpac/gui/icons/close.svg
+share/gpac/gui/icons/cross.svg
+share/gpac/gui/icons/down.svg
+share/gpac/gui/icons/expand.svg
+share/gpac/gui/icons/file.svg
+share/gpac/gui/icons/film.svg
 share/gpac/gui/icons/folder.svg
-share/gpac/gui/icons/go-bottom.svg
-share/gpac/gui/icons/go-down.svg
-share/gpac/gui/icons/go-first.svg
-share/gpac/gui/icons/go-home.svg
-share/gpac/gui/icons/go-jump.svg
-share/gpac/gui/icons/go-last.svg
-share/gpac/gui/icons/go-next.svg
-share/gpac/gui/icons/go-previous.svg
-share/gpac/gui/icons/go-top.svg
-share/gpac/gui/icons/go-up.svg
-share/gpac/gui/icons/image-missing.svg
-share/gpac/gui/icons/left_arrow.svg
-share/gpac/gui/icons/list-add.svg
-share/gpac/gui/icons/list-remove.svg
-share/gpac/gui/icons/media-eject.svg
-share/gpac/gui/icons/media-playback-pause.svg
-share/gpac/gui/icons/media-playback-start.svg
-share/gpac/gui/icons/media-playback-stop.svg
-share/gpac/gui/icons/media-record.svg
-share/gpac/gui/icons/media-seek-backward.svg
-share/gpac/gui/icons/media-seek-forward.svg
-share/gpac/gui/icons/media-skip-backward.svg
-share/gpac/gui/icons/media-skip-forward.svg
-share/gpac/gui/icons/preferences-desktop-remote-desktop.svg
-share/gpac/gui/icons/preferences-system-windows.svg
-share/gpac/gui/icons/process-stop.svg
-share/gpac/gui/icons/right_arrow.svg
-share/gpac/gui/icons/tennis_ball.svg
-share/gpac/gui/icons/tennis_black.svg
-share/gpac/gui/icons/tennis_racket.svg
-share/gpac/gui/icons/tennis_racket_color.svg
-share/gpac/gui/icons/user-trash.svg
-share/gpac/gui/icons/video-display.svg
-share/gpac/gui/icons/video-x-generic.svg
-share/gpac/gui/icons/view-fullscreen.svg
+share/gpac/gui/icons/harddrive.svg
+share/gpac/gui/icons/heart.svg
+share/gpac/gui/icons/home.svg
+share/gpac/gui/icons/image.svg
+share/gpac/gui/icons/info.svg
+share/gpac/gui/icons/laptop.svg
+share/gpac/gui/icons/left.svg
+share/gpac/gui/icons/list.svg
+share/gpac/gui/icons/live.svg
+share/gpac/gui/icons/media_next.svg
+share/gpac/gui/icons/media_prev.svg
+share/gpac/gui/icons/monitor.svg
+share/gpac/gui/icons/more.svg
+share/gpac/gui/icons/musical.svg
+share/gpac/gui/icons/navigation.svg
+share/gpac/gui/icons/network.svg
+share/gpac/gui/icons/next.svg
+share/gpac/gui/icons/osmo.svg
+share/gpac/gui/icons/overflowing.svg
+share/gpac/gui/icons/pause.svg
+share/gpac/gui/icons/pl_next.svg
+share/gpac/gui/icons/pl_prev.svg
+share/gpac/gui/icons/play.svg
+share/gpac/gui/icons/play_loop.svg
+share/gpac/gui/icons/play_shuffle.svg
+share/gpac/gui/icons/play_single.svg
+share/gpac/gui/icons/power.svg
+share/gpac/gui/icons/previous.svg
+share/gpac/gui/icons/remove.svg
+share/gpac/gui/icons/resize.svg
+share/gpac/gui/icons/rewind.svg
+share/gpac/gui/icons/right.svg
+share/gpac/gui/icons/seek_forward.svg
+share/gpac/gui/icons/shrink.svg
+share/gpac/gui/icons/sort.svg
+share/gpac/gui/icons/speed.svg
+share/gpac/gui/icons/star.svg
+share/gpac/gui/icons/stop.svg
+share/gpac/gui/icons/stop2.svg
+share/gpac/gui/icons/trash.svg
+share/gpac/gui/icons/tray.svg
+share/gpac/gui/icons/tv.svg
+share/gpac/gui/icons/up.svg
+share/gpac/gui/icons/world.svg
 share/gpac/gui/mpegu-core.js
diff --git a/multimedia/gpac/distinfo b/multimedia/gpac/distinfo
index e6b47bb4ad4..55ea51178ce 100644
--- a/multimedia/gpac/distinfo
+++ b/multimedia/gpac/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.10 2015/11/03 23:54:25 agc Exp $
+$NetBSD: distinfo,v 1.11 2015/11/05 22:02:08 tnn Exp $
 
-SHA1 (gpac-0.5.0.tar.gz) = 48ba16272bfa153abb281ff8ed31b5dddf60cf20
-RMD160 (gpac-0.5.0.tar.gz) = fc9cd2665a699dbe6d228e4e638baeae12b9e6af
-SHA512 (gpac-0.5.0.tar.gz) = dee7701c791c441c1f050d9591d4e4dd7bdd2908f535233b114959c9a0adc256b3d5e40f5c84fd0f8b1c6764bfe6b35ec0af6bfd1fb056d593aeedca75105278
-Size (gpac-0.5.0.tar.gz) = 7861057 bytes
-SHA1 (patch-configure) = aafff388e57f2fc90c965f3c8b89a1819c4e5538
-SHA1 (patch-modules_oss__audio_Makefile) = dd47cf086edfb8ea63b6c58b6d1548177be44786
-SHA1 (patch-modules_pulseaudio_Makefile) = bf3a4a1bfd3c2a622985c45b58577e4f951a58ea
+SHA1 (gpac-0.5.2.tar.gz) = 467128110636dc793be89f33765b42543dd97f7c
+RMD160 (gpac-0.5.2.tar.gz) = da37d2897a7358242f0f4e46de8a6bcf697554e7
+SHA512 (gpac-0.5.2.tar.gz) = b6828953333c6615a2a57845190c246681f4d83a73e1f96f200fed6bfe97b7273ab5d30618b7782cd442e68e8c9e37971792dfd6366dcf21b3b3bdbb1a8bc979
+Size (gpac-0.5.2.tar.gz) = 9044537 bytes
+SHA1 (patch-modules_oss__audio_Makefile) = 11e0f16a7124db96e630c1c9ec203e447510a8d1
+SHA1 (patch-modules_pulseaudio_Makefile) = f98e3994f5fb99c3c2e86564237c3cd8c12e732b
diff --git a/multimedia/gpac/patches/patch-configure b/multimedia/gpac/patches/patch-configure
deleted file mode 100644
index d96e176b2df..00000000000
--- a/multimedia/gpac/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2013/02/06 11:09:35 fhajny Exp $
-
-Fix bug for LDFLAGS parsing on SunOS.
-
---- configure.orig      2012-05-25 12:05:57.000000000 +0000
-+++ configure
-@@ -468,7 +468,7 @@ case $targetos in
-     SunOS)
-         make="gmake"
-         readelf="greadelf"
--        LDFLAGS="${opt#--extra-ldflags=}"
-+        LDFLAGS="$LDFLAGS"
-         instflags=""
-         #check for 64-bit
-         cat > $TMPC << EOF
diff --git a/multimedia/gpac/patches/patch-modules_oss__audio_Makefile b/multimedia/gpac/patches/patch-modules_oss__audio_Makefile
index b245a26ed09..677103e33ca 100644
--- a/multimedia/gpac/patches/patch-modules_oss__audio_Makefile
+++ b/multimedia/gpac/patches/patch-modules_oss__audio_Makefile
@@ -1,6 +1,6 @@
-$NetBSD: patch-modules_oss__audio_Makefile,v 1.2 2012/12/09 17:15:07 ryoon Exp $
+$NetBSD: patch-modules_oss__audio_Makefile,v 1.3 2015/11/05 22:02:08 tnn Exp $
 
---- modules/oss_audio/Makefile.orig	2012-02-14 15:18:34.000000000 +0000
+--- modules/oss_audio/Makefile.orig	2015-01-20 11:56:44.000000000 +0000
 +++ modules/oss_audio/Makefile
 @@ -35,7 +35,7 @@ LIB=gm_oss_audio.$(DYN_LIB_SUFFIX)
  all: $(LIB)
diff --git a/multimedia/gpac/patches/patch-modules_pulseaudio_Makefile b/multimedia/gpac/patches/patch-modules_pulseaudio_Makefile
index a0b6f6c5625..4b7c1bc2e3c 100644
--- a/multimedia/gpac/patches/patch-modules_pulseaudio_Makefile
+++ b/multimedia/gpac/patches/patch-modules_pulseaudio_Makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-modules_pulseaudio_Makefile,v 1.1 2014/07/25 18:13:54 jperkin Exp $
+$NetBSD: patch-modules_pulseaudio_Makefile,v 1.2 2015/11/05 22:02:08 tnn Exp $
 
 Pass through LDFLAGS for rpaths.
 
---- modules/pulseaudio/Makefile.orig	2011-04-21 15:06:51.000000000 +0000
+--- modules/pulseaudio/Makefile.orig	2015-01-20 11:56:44.000000000 +0000
 +++ modules/pulseaudio/Makefile
 @@ -25,7 +25,7 @@ LIB=gm_pulseaudio.$(DYN_LIB_SUFFIX)
  all: $(LIB)
@@ -11,5 +11,5 @@ Pass through LDFLAGS for rpaths.
 -	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac -L/usr/lib -lpulse-simple
 +	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) $(LDFLAGS) -L../../bin/gcc -lgpac -L/usr/lib -lpulse-simple
  
- 
- %.o: %.c
+ clean: 
+ 	rm -f $(OBJS) ../../bin/gcc/$(LIB)