CVS commit: pkgsrc/multimedia/gpac

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Oct 11 00:31:28 UTC 2016

Modified Files:
        pkgsrc/multimedia/gpac: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/multimedia/gpac/patches: patch-modules_oss__audio_Makefile
Added Files:
        pkgsrc/multimedia/gpac/patches: patch-Makefile

Log Message:
Update to gpac-0.6.1

0.6.1:
Fixing packaging bugs in 0.6.0 (wrong version numbers were used).

0.6.0:
General:
    Improved very high resolutions, high framerate, and high colorspace (10 bits) playback support.
    HEVC top-notch support.
    Improved video playback through OpenGL and OpenGL ES.
    Video 360 navigation support on all platforms.
    Many adaptive streaming improvement (HLS and DASH), see specific section below.
    MP42TS (MPEG2-TS multiplexer) is production grade for adaptive streaming and reference vector streams.
    TEMI extension for fine synchronization and hybrid delivery (mandated by HbbTV 2.0).
    Better language tagging support.
    UTF16 name handling.
    Better multi-channel audio support.
    Improved support for encryption (CENC/PIFF - both AES CTR and CBC are supported).
    Improved generic support for subtitles (METX/METT, STPP TTML, WebVTT, SBTT, STXT, etc.).
    Parallel execution of GPAC tools.
    Better network support for TTL and multi-interface.
    SHVC (scalable) experimental (based on SHM4.1 and old ISOBMFF spec)


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/multimedia/gpac/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/multimedia/gpac/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/gpac/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/multimedia/gpac/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/gpac/patches/patch-Makefile
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/multimedia/gpac/patches/patch-modules_oss__audio_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/gpac/Makefile
diff -u pkgsrc/multimedia/gpac/Makefile:1.47 pkgsrc/multimedia/gpac/Makefile:1.48
--- pkgsrc/multimedia/gpac/Makefile:1.47        Wed Aug 17 00:06:43 2016
+++ pkgsrc/multimedia/gpac/Makefile     Tue Oct 11 00:31:28 2016
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2016/08/17 00:06:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.48 2016/10/11 00:31:28 tnn Exp $
 
-DISTNAME=      gpac-0.5.2
-PKGREVISION=   4
+DISTNAME=      gpac-0.6.1
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=gpac/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -35,7 +34,7 @@ CFLAGS+=              -I${BUILDLINK_PREFIX.faad2}/${
 .include "../../graphics/png/buildlink3.mk"
 # doesn't work yet
 #.include "../../lang/spidermonkey/buildlink3.mk"
-.include "../../multimedia/ffmpeg2/buildlink3.mk"
+.include "../../multimedia/ffmpeg3/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../multimedia/xvidcore/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/multimedia/gpac/PLIST
diff -u pkgsrc/multimedia/gpac/PLIST:1.4 pkgsrc/multimedia/gpac/PLIST:1.5
--- pkgsrc/multimedia/gpac/PLIST:1.4    Thu Nov  5 22:02:08 2015
+++ pkgsrc/multimedia/gpac/PLIST        Tue Oct 11 00:31:28 2016
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2015/11/05 22:02:08 tnn Exp $
+@comment $NetBSD: PLIST,v 1.5 2016/10/11 00:31:28 tnn Exp $
+bin/DashCast
 bin/MP42TS
 bin/MP4Box
 bin/MP4Client
@@ -34,8 +35,8 @@ lib/gpac/gm_widgetman.so
 lib/gpac/gm_x11_out.so
 lib/gpac/gm_xvid_dec.so
 lib/libgpac.so
-lib/libgpac.so.4
-lib/libgpac.so.4.2.0
+lib/libgpac.so.6
+lib/libgpac.so.6.0.0
 man/man1/gpac.1
 man/man1/mp4box.1
 man/man1/mp4client.1
@@ -43,12 +44,20 @@ 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/H2B2VS/logo_hd.png
+share/gpac/gui/extensions/H2B2VS/logo_uhd.png
+share/gpac/gui/extensions/bifs_tests/applications-other.svg
+share/gpac/gui/extensions/bifs_tests/bifs_tests.js
+share/gpac/gui/extensions/bifs_tests/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/showroom/init.js
+share/gpac/gui/extensions/showroom/osmo.bt
+share/gpac/gui/extensions/showroom/showroom.js
 share/gpac/gui/extensions/widget_manager/applications-system.svg
 share/gpac/gui/extensions/widget_manager/init.js
 share/gpac/gui/gui.bt
@@ -112,3 +121,5 @@ share/gpac/gui/icons/tv.svg
 share/gpac/gui/icons/up.svg
 share/gpac/gui/icons/world.svg
 share/gpac/gui/mpegu-core.js
+share/gpac/shaders/fragment.glsl
+share/gpac/shaders/vertex.glsl

Index: pkgsrc/multimedia/gpac/buildlink3.mk
diff -u pkgsrc/multimedia/gpac/buildlink3.mk:1.3 pkgsrc/multimedia/gpac/buildlink3.mk:1.4
--- pkgsrc/multimedia/gpac/buildlink3.mk:1.3    Sun Dec  9 17:15:06 2012
+++ pkgsrc/multimedia/gpac/buildlink3.mk        Tue Oct 11 00:31:28 2016
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2012/12/09 17:15:06 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2016/10/11 00:31:28 tnn Exp $
 
 BUILDLINK_TREE+=       gpac
 
 .if !defined(GPAC_BUILDLINK3_MK)
 GPAC_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gpac+=   gpac>=0.5.0
-BUILDLINK_ABI_DEPENDS.gpac+=   gpac>=0.5.0
+BUILDLINK_API_DEPENDS.gpac+=   gpac>=0.6.0
+BUILDLINK_ABI_DEPENDS.gpac+=   gpac>=0.6.0
 BUILDLINK_PKGSRCDIR.gpac?=     ../../multimedia/gpac
 .endif # GPAC_BUILDLINK3_MK
 

Index: pkgsrc/multimedia/gpac/distinfo
diff -u pkgsrc/multimedia/gpac/distinfo:1.11 pkgsrc/multimedia/gpac/distinfo:1.12
--- pkgsrc/multimedia/gpac/distinfo:1.11        Thu Nov  5 22:02:08 2015
+++ pkgsrc/multimedia/gpac/distinfo     Tue Oct 11 00:31:28 2016
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.11 2015/11/05 22:02:08 tnn Exp $
+$NetBSD: distinfo,v 1.12 2016/10/11 00:31:28 tnn Exp $
 
-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 (gpac-0.6.1.tar.gz) = 2c915d8300833e4aacf4de14a9ab758bab181f95
+RMD160 (gpac-0.6.1.tar.gz) = 2c5a6620c1e2a7cf1213f5aa66e47dd03c04edb2
+SHA512 (gpac-0.6.1.tar.gz) = b1409a8ebcda08c3af504d7de591528ef84f5c3d8d506dd490502e16493de11c2435ea3f5957f39100a2ce040d5e431c86a5a203f806fcc865ae4b08f6cf5595
+Size (gpac-0.6.1.tar.gz) = 9113143 bytes
+SHA1 (patch-Makefile) = 2986ba71e8872033473391da0aa1981a04daf015
+SHA1 (patch-modules_oss__audio_Makefile) = e92db6141f0332317a3ce1af9b747c994b239375
 SHA1 (patch-modules_pulseaudio_Makefile) = f98e3994f5fb99c3c2e86564237c3cd8c12e732b

Index: pkgsrc/multimedia/gpac/patches/patch-modules_oss__audio_Makefile
diff -u pkgsrc/multimedia/gpac/patches/patch-modules_oss__audio_Makefile:1.3 pkgsrc/multimedia/gpac/patches/patch-modules_oss__audio_Makefile:1.4
--- pkgsrc/multimedia/gpac/patches/patch-modules_oss__audio_Makefile:1.3        Thu Nov  5 22:02:08 2015
+++ pkgsrc/multimedia/gpac/patches/patch-modules_oss__audio_Makefile    Tue Oct 11 00:31:28 2016
@@ -1,13 +1,13 @@
-$NetBSD: patch-modules_oss__audio_Makefile,v 1.3 2015/11/05 22:02:08 tnn Exp $
+$NetBSD: patch-modules_oss__audio_Makefile,v 1.4 2016/10/11 00:31:28 tnn Exp $
 
---- modules/oss_audio/Makefile.orig    2015-01-20 11:56:44.000000000 +0000
+--- modules/oss_audio/Makefile.orig    2016-03-04 16:03:40.000000000 +0000
 +++ modules/oss_audio/Makefile
-@@ -35,7 +35,7 @@ LIB=gm_oss_audio.$(DYN_LIB_SUFFIX)
+@@ -35,7 +35,7 @@ LIB=gm_oss_audio$(DYN_LIB_SUFFIX)
  all: $(LIB)
  
  $(LIB): $(OBJS)
 -      $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac $(OSS_LDFLAGS)
 +      $(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac $(LDFLAGS)
  ifeq ($(STATICBUILD),yes)
-       $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/gm_oss_audio-static.$(DYN_LIB_SUFFIX) $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac_static $(OSS_LDFLAGS)
+       $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/gm_oss_audio-static$(DYN_LIB_SUFFIX) $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac_static $(OSS_LDFLAGS)
  endif

Added files:

Index: pkgsrc/multimedia/gpac/patches/patch-Makefile
diff -u /dev/null pkgsrc/multimedia/gpac/patches/patch-Makefile:1.1
--- /dev/null   Tue Oct 11 00:31:28 2016
+++ pkgsrc/multimedia/gpac/patches/patch-Makefile       Tue Oct 11 00:31:28 2016
@@ -0,0 +1,19 @@
+$NetBSD: patch-Makefile,v 1.1 2016/10/11 00:31:28 tnn Exp $
+
+Remove non-standard cp(1) option
+
+--- Makefile.orig      2016-03-04 16:03:40.000000000 +0000
++++ Makefile
+@@ -125,9 +125,9 @@ ifeq ($(CONFIG_DARWIN),yes)
+       cp -R $(SRC_PATH)/gui/extensions/* "$(DESTDIR)$(prefix)/share/gpac/gui/extensions/" 
+       cp $(SRC_PATH)/shaders/* "$(DESTDIR)$(prefix)/share/gpac/shaders/" 
+ else
+-      cp --no-preserve=mode,ownership,timestamp $(SRC_PATH)/gui/icons/* "$(DESTDIR)$(prefix)/share/gpac/gui/icons/" 
+-      cp -R --no-preserve=mode,ownership,timestamp $(SRC_PATH)/gui/extensions/* "$(DESTDIR)$(prefix)/share/gpac/gui/extensions/" 
+-      cp --no-preserve=mode,ownership,timestamp $(SRC_PATH)/shaders/* "$(DESTDIR)$(prefix)/share/gpac/shaders/" 
++      cp $(SRC_PATH)/gui/icons/* "$(DESTDIR)$(prefix)/share/gpac/gui/icons/" 
++      cp -R $(SRC_PATH)/gui/extensions/* "$(DESTDIR)$(prefix)/share/gpac/gui/extensions/" 
++      cp $(SRC_PATH)/shaders/* "$(DESTDIR)$(prefix)/share/gpac/shaders/" 
+ endif
+ 
+ lninstall: