diff options
| -rw-r--r-- | multimedia/gpac/Makefile | 7 | ||||
| -rw-r--r-- | multimedia/gpac/PLIST | 176 | ||||
| -rw-r--r-- | multimedia/gpac/buildlink3.mk | 6 | ||||
| -rw-r--r-- | multimedia/gpac/distinfo | 12 | ||||
| -rw-r--r-- | multimedia/gpac/patches/patch-Makefile | 40 |
5 files changed, 164 insertions, 77 deletions
diff --git a/multimedia/gpac/Makefile b/multimedia/gpac/Makefile index 18abbd97450..ea81ca6f46f 100644 --- a/multimedia/gpac/Makefile +++ b/multimedia/gpac/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.68 2019/09/18 14:17:13 ryoon Exp $ +# $NetBSD: Makefile,v 1.69 2020/01/05 04:11:15 ryoon Exp $ -DISTNAME= gpac-0.7.1 -PKGREVISION= 15 +DISTNAME= gpac-0.8.0 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_GITHUB:=gpac/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -52,7 +51,7 @@ PLIST_SUBST+= LIBEXT=so .include "../../graphics/png/buildlink3.mk" # doesn't work yet #.include "../../lang/spidermonkey/buildlink3.mk" -.include "../../multimedia/ffmpeg3/buildlink3.mk" +.include "../../multimedia/ffmpeg4/buildlink3.mk" .include "../../multimedia/libogg/buildlink3.mk" .include "../../multimedia/libtheora/buildlink3.mk" .include "../../multimedia/xvidcore/buildlink3.mk" diff --git a/multimedia/gpac/PLIST b/multimedia/gpac/PLIST index d54ed5537db..b97d5c6ae53 100644 --- a/multimedia/gpac/PLIST +++ b/multimedia/gpac/PLIST @@ -1,43 +1,146 @@ -@comment $NetBSD: PLIST,v 1.6 2017/07/22 13:07:04 adam Exp $ +@comment $NetBSD: PLIST,v 1.7 2020/01/05 04:11:15 ryoon Exp $ bin/DashCast bin/MP42TS bin/MP4Box bin/MP4Client -lib/gpac/gm_aac_in.${LIBEXT} -lib/gpac/gm_ac3_in.${LIBEXT} -lib/gpac/gm_amr_in.${LIBEXT} -lib/gpac/gm_audio_filter.${LIBEXT} -lib/gpac/gm_bifs_dec.${LIBEXT} -lib/gpac/gm_ctx_load.${LIBEXT} -lib/gpac/gm_dummy_in.${LIBEXT} -lib/gpac/gm_ffmpeg_in.${LIBEXT} -lib/gpac/gm_ft_font.${LIBEXT} -lib/gpac/gm_img_in.${LIBEXT} -lib/gpac/gm_ismacryp.${LIBEXT} -lib/gpac/gm_isom_in.${LIBEXT} -lib/gpac/gm_laser_dec.${LIBEXT} -lib/gpac/gm_mp3_in.${LIBEXT} -lib/gpac/gm_mpd_in.${LIBEXT} -lib/gpac/gm_mpegts_in.${LIBEXT} -lib/gpac/gm_odf_dec.${LIBEXT} -lib/gpac/gm_ogg_xiph.${LIBEXT} -lib/gpac/gm_osd.${LIBEXT} -${PLIST.oss}lib/gpac/gm_oss_audio.${LIBEXT} -lib/gpac/gm_pulseaudio.${LIBEXT} -lib/gpac/gm_raw_out.${LIBEXT} -lib/gpac/gm_rtp_in.${LIBEXT} -lib/gpac/gm_saf_in.${LIBEXT} -lib/gpac/gm_soft_raster.${LIBEXT} -lib/gpac/gm_svg_in.${LIBEXT} -lib/gpac/gm_timedtext.${LIBEXT} -lib/gpac/gm_validator.${LIBEXT} -lib/gpac/gm_vtt_in.${LIBEXT} -lib/gpac/gm_widgetman.${LIBEXT} -${PLIST.x11}lib/gpac/gm_x11_out.${LIBEXT} -lib/gpac/gm_xvid_dec.${LIBEXT} +include/gpac/ait.h +include/gpac/atsc.h +include/gpac/avparse.h +include/gpac/base_coding.h +include/gpac/bifs.h +include/gpac/bitstream.h +include/gpac/cache.h +include/gpac/color.h +include/gpac/compositor.h +include/gpac/config_file.h +include/gpac/configuration.h +include/gpac/constants.h +include/gpac/crypt.h +include/gpac/dash.h +include/gpac/download.h +include/gpac/dsmcc.h +include/gpac/dvb_mpe.h +include/gpac/esi.h +include/gpac/events.h +include/gpac/events_constants.h +include/gpac/filestreamer.h +include/gpac/html5_media.h +include/gpac/html5_mse.h +include/gpac/ietf.h +include/gpac/internal/avilib.h +include/gpac/internal/bifs_dev.h +include/gpac/internal/bifs_tables.h +include/gpac/internal/camera.h +include/gpac/internal/compositor_dev.h +include/gpac/internal/crypt_dev.h +include/gpac/internal/dvb_mpe_dev.h +include/gpac/internal/ietf_dev.h +include/gpac/internal/isomedia_dev.h +include/gpac/internal/laser_dev.h +include/gpac/internal/m3u8.h +include/gpac/internal/media_dev.h +include/gpac/internal/mesh.h +include/gpac/internal/mpd.h +include/gpac/internal/odf_dev.h +include/gpac/internal/odf_parse_common.h +include/gpac/internal/ogg.h +include/gpac/internal/reedsolomon.h +include/gpac/internal/scenegraph_dev.h +include/gpac/internal/smjs_api.h +include/gpac/internal/swf_dev.h +include/gpac/internal/terminal_dev.h +include/gpac/internal/vobsub.h +include/gpac/ismacryp.h +include/gpac/iso639.h +include/gpac/isomedia.h +include/gpac/laser.h +include/gpac/list.h +include/gpac/map.h +include/gpac/maths.h +include/gpac/media_tools.h +include/gpac/mediaobject.h +include/gpac/module.h +include/gpac/modules/audio_out.h +include/gpac/modules/codec.h +include/gpac/modules/font.h +include/gpac/modules/hardcoded_proto.h +include/gpac/modules/ipmp.h +include/gpac/modules/js_usr.h +include/gpac/modules/raster2d.h +include/gpac/modules/service.h +include/gpac/modules/term_ext.h +include/gpac/modules/video_out.h +include/gpac/mpeg4_odf.h +include/gpac/mpegts.h +include/gpac/network.h +include/gpac/nodes_mpeg4.h +include/gpac/nodes_svg.h +include/gpac/nodes_x3d.h +include/gpac/nodes_xbl.h +include/gpac/options.h +include/gpac/path2d.h +include/gpac/revision.h +include/gpac/ringbuffer.h +include/gpac/rtp_streamer.h +include/gpac/scene_engine.h +include/gpac/scene_manager.h +include/gpac/scenegraph.h +include/gpac/scenegraph_svg.h +include/gpac/scenegraph_vrml.h +include/gpac/setup.h +include/gpac/svg_types.h +include/gpac/sync_layer.h +include/gpac/term_info.h +include/gpac/terminal.h +include/gpac/thread.h +include/gpac/token.h +include/gpac/tools.h +include/gpac/unicode.h +include/gpac/user.h +include/gpac/utf.h +include/gpac/version.h +include/gpac/webvtt.h +include/gpac/xml.h +include/win32/inttypes.h +include/win32/stdint.h +include/wince/errno.h +lib/gpac/gm_aac_in.so +lib/gpac/gm_ac3_in.so +lib/gpac/gm_amr_in.so +lib/gpac/gm_atsc_in.so +lib/gpac/gm_audio_filter.so +lib/gpac/gm_bifs_dec.so +lib/gpac/gm_ctx_load.so +lib/gpac/gm_dummy_in.so +lib/gpac/gm_ffmpeg_in.so +lib/gpac/gm_ft_font.so +lib/gpac/gm_img_in.so +lib/gpac/gm_ismacryp.so +lib/gpac/gm_isom_in.so +lib/gpac/gm_laser_dec.so +lib/gpac/gm_mp3_in.so +lib/gpac/gm_mpd_in.so +lib/gpac/gm_mpegts_in.so +lib/gpac/gm_netctrl.so +lib/gpac/gm_odf_dec.so +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.7 -lib/libgpac.so.7.5.0 +lib/libgpac.so.8 +lib/libgpac.so.8.0.0 man/man1/gpac.1 man/man1/mp4box.1 man/man1/mp4client.1 @@ -47,6 +150,9 @@ 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/about/info.js +share/gpac/gui/extensions/about/info.svg +share/gpac/gui/extensions/about/init.js 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 diff --git a/multimedia/gpac/buildlink3.mk b/multimedia/gpac/buildlink3.mk index 1f0c28bc40b..52bd91da114 100644 --- a/multimedia/gpac/buildlink3.mk +++ b/multimedia/gpac/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.4 2016/10/11 00:31:28 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2020/01/05 04:11:15 ryoon Exp $ BUILDLINK_TREE+= gpac .if !defined(GPAC_BUILDLINK3_MK) GPAC_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.gpac+= gpac>=0.6.0 -BUILDLINK_ABI_DEPENDS.gpac+= gpac>=0.6.0 +BUILDLINK_API_DEPENDS.gpac+= gpac>=0.8.0 +BUILDLINK_ABI_DEPENDS.gpac+= gpac>=0.8.0 BUILDLINK_PKGSRCDIR.gpac?= ../../multimedia/gpac .endif # GPAC_BUILDLINK3_MK diff --git a/multimedia/gpac/distinfo b/multimedia/gpac/distinfo index 34f7bef482c..dada3f4ac55 100644 --- a/multimedia/gpac/distinfo +++ b/multimedia/gpac/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.13 2017/07/22 13:07:04 adam Exp $ +$NetBSD: distinfo,v 1.14 2020/01/05 04:11:15 ryoon Exp $ -SHA1 (gpac-0.7.1.tar.gz) = 2ef4191b062abe5c030e407f1100ecf9f0e9a1b9 -RMD160 (gpac-0.7.1.tar.gz) = 1dc9b6f76b78f01d12e0ac56059d490a09397574 -SHA512 (gpac-0.7.1.tar.gz) = 0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403 -Size (gpac-0.7.1.tar.gz) = 10654838 bytes -SHA1 (patch-Makefile) = eaafa4e919ed017a223096f7441837012cd2192e +SHA1 (gpac-0.8.0.tar.gz) = eb9254a64210992d0fab44dbebe4dd6b9ed169dc +RMD160 (gpac-0.8.0.tar.gz) = a73c08fc4be9b43e9f2173f0a3125a7734347ef6 +SHA512 (gpac-0.8.0.tar.gz) = 47771b9f5143f103993d9c2ebbd0fccdca5f34b9a6ea08febc90113ce8db5a4c1279ad3363a433bd3d3d4a728b63e99d80881bf167f60c6b49b7ef49aa8f840d +Size (gpac-0.8.0.tar.gz) = 11405239 bytes +SHA1 (patch-Makefile) = 9f6cf58175ab3d95cbcf1c9fdd7b024432f6d08c SHA1 (patch-configure) = b76d24b134b7e10c613411f08d8374f0e0202599 diff --git a/multimedia/gpac/patches/patch-Makefile b/multimedia/gpac/patches/patch-Makefile index a154daced5b..8a704780710 100644 --- a/multimedia/gpac/patches/patch-Makefile +++ b/multimedia/gpac/patches/patch-Makefile @@ -1,44 +1,26 @@ -$NetBSD: patch-Makefile,v 1.2 2017/07/22 13:07:04 adam Exp $ +$NetBSD: patch-Makefile,v 1.3 2020/01/05 04:11:16 ryoon Exp $ Fix DashCast installation. Remove non-standard cp(1) option. Use VERSION_MAJOR also on Darwin (without git, VERSION is defined as UNKNOWN). ---- Makefile.orig 2017-04-26 11:33:17.000000000 +0000 +--- Makefile.orig 2019-06-27 10:20:45.000000000 +0000 +++ Makefile -@@ -112,7 +112,7 @@ ifneq ($(CONFIG_WIN32), yes) - ifneq ($(CONFIG_FFMPEG), no) - ifneq ($(DISABLE_CORE_TOOLS), yes) - ifneq ($(DISABLE_AV_PARSERS), yes) -- if [ -f bin/gcc/DashCast$(EXE_SUFFIX)g ] ; then \ -+ if [ -f bin/gcc/DashCast$(EXE_SUFFIX) ] ; then \ - $(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/DashCast$(EXE_SUFFIX) "$(DESTDIR)$(prefix)/bin" ; \ - fi - endif -@@ -154,15 +154,9 @@ endif - $(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/gui/icons" - $(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/gui/extensions" - $(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/shaders/" +@@ -159,17 +159,10 @@ endif + + $(INSTALL) -d "$(DESTDIR)$(prefix)/include" + -ifeq ($(CONFIG_DARWIN),yes) - 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/" + 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/" + cp -R $(SRC_PATH)/include/* "$(DESTDIR)$(prefix)/include/" -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 -R --no-preserve=mode,ownership,timestamp $(SRC_PATH)/include/* $(DESTDIR)$(prefix)/include/ -endif lninstall: $(INSTALL) -d "$(DESTDIR)$(prefix)" -@@ -226,8 +220,8 @@ ifeq ($(DEBUGBUILD),no) - $(STRIP) bin/gcc/libgpac$(DYN_LIB_SUFFIX) - endif - ifeq ($(CONFIG_DARWIN),yes) -- $(INSTALL) -m 755 bin/gcc/libgpac$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(VERSION)$(DYN_LIB_SUFFIX) -- ln -sf libgpac.$(VERSION)$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX) -+ $(INSTALL) -m 755 bin/gcc/libgpac$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(VERSION_MAJOR)$(DYN_LIB_SUFFIX) -+ ln -sf libgpac.$(VERSION_MAJOR)$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX) - else - $(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME) - ln -sf libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac.so.$(VERSION_MAJOR) |