pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/multimedia/gpac
Module Name: pkgsrc
Committed By: adam
Date: Sat Jul 22 13:07:04 UTC 2017
Modified Files:
pkgsrc/multimedia/gpac: Makefile PLIST distinfo
pkgsrc/multimedia/gpac/patches: patch-Makefile
Added Files:
pkgsrc/multimedia/gpac: options.mk
pkgsrc/multimedia/gpac/patches: patch-configure
Removed Files:
pkgsrc/multimedia/gpac/patches: patch-modules_oss__audio_Makefile
patch-modules_pulseaudio_Makefile
Log Message:
0.7.1:
Minor bug fixes from 0.7.0
0.7.0:
General
* Many security fixes (static compile and fuzzing through AFL, always ongoing).
* Colorized log.
* Changed default audio volume to 100% instead of 75%.
* Expose more experimental options through the documentation.
* Improved GLES renderer on mobile platforms.
* Improvements on AVI dump.
* Fixed pkg-config Private.libs.
* SAT>IP playback support.
Codecs and File Formats
* Added L-HEVC File Format support (SHVC/MV-HEVC tracks and HEVC Tile Tracks).
* Added MPEG IFF (image File Format) support.
* Range extension support for AVC and HEVC.
* SHVC and MV-HEVC importers and playback: moved to final spec version (SHM6+).
Adaptive streaming
* Support of HLS with fragmented MP4 playback.
* APIs: gf_mpd_() functions and new segmenter API.
* Improved alternate groups.
* More support for PIFF PSEC and Smooth Streaming ( file format & playback).
* DASH client: pluggable algorithms + improvements with scalable contents.
* The counter source from the DASH sequences added to the public content.
* HLS and DASH playback minor fixes.
* DASH client logs are clearer.
VR and 360
* Added support for DASH SRD in 360 for independent videos videos (NxM partial spheres) more
* Added support for DASH SRD in 360 for HEVC tiled videos (NxM tiles on one sphere) - checkout tuto
Mobile
* Apple VideoToolBox hardware decoding support for OSX and iOS for AVC|H264.
* Android hardware decoding hardware acceleration for AVC|H264 (HEVC on its way).
* YUV422 and YUV444 8 and 10 bit support in GLES renderer.
* Android build is based on Android Studio.
* Android: new File Manager.
Subtitles
* Import of TTML via NHML according to MPEG-4 part 30 improved.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/multimedia/gpac/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/multimedia/gpac/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/multimedia/gpac/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/gpac/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/gpac/patches/patch-Makefile
cvs rdiff -u -r0 -r1.3 pkgsrc/multimedia/gpac/patches/patch-configure
cvs rdiff -u -r1.4 -r0 \
pkgsrc/multimedia/gpac/patches/patch-modules_oss__audio_Makefile
cvs rdiff -u -r1.2 -r0 \
pkgsrc/multimedia/gpac/patches/patch-modules_pulseaudio_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.52 pkgsrc/multimedia/gpac/Makefile:1.53
--- pkgsrc/multimedia/gpac/Makefile:1.52 Mon May 15 11:31:16 2017
+++ pkgsrc/multimedia/gpac/Makefile Sat Jul 22 13:07:04 2017
@@ -1,49 +1,65 @@
-# $NetBSD: Makefile,v 1.52 2017/05/15 11:31:16 jperkin Exp $
+# $NetBSD: Makefile,v 1.53 2017/07/22 13:07:04 adam Exp $
-DISTNAME= gpac-0.6.1
-PKGREVISION= 3
+DISTNAME= gpac-0.7.1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_GITHUB:=gpac/}
GITHUB_TAG= v${PKGVERSION_NOREV}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://gpac.wp.mines-telecom.fr/
+HOMEPAGE= http://gpac.io/
COMMENT= Open source multimedia framework
LICENSE= gnu-lgpl-v2.1
-USE_TOOLS+= gmake grep gsed pkg-config
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++
+USE_TOOLS+= gmake grep gsed pkg-config
# not really GNU configure, but close enough
-GNU_CONFIGURE= yes
-
-.include "../../mk/bsd.prefs.mk"
-
+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}
+PLIST_VARS+= oss x11
+
+.include "options.mk"
+
# Pre-generate header and avoid git dependency.
pre-build:
${ECHO} "#define GPAC_GIT_REVISION \"release\"" > ${WRKSRC}/include/gpac/revision.h
+.include "../../mk/bsd.prefs.mk"
+
+.if ${SHLIB_TYPE} == "dylib"
+PLIST_SUBST+= LIBEXT=dylib
+post-install:
+ cd ${DESTDIR}${PREFIX} && find lib/gpac -name "*.dylib" | while read lib; do \
+ install_name_tool -id ${PREFIX}/$${lib} $${lib}; \
+ done
+.else
+PLIST_SUBST+= LIBEXT=so
+.endif
+
.include "../../audio/faad2/buildlink3.mk"
.include "../../audio/liba52/buildlink3.mk"
.include "../../audio/libmad/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
.include "../../audio/pulseaudio/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/openjpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
# doesn't work yet
#.include "../../lang/spidermonkey/buildlink3.mk"
.include "../../multimedia/ffmpeg3/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
+.include "../../multimedia/libtheora/buildlink3.mk"
.include "../../multimedia/xvidcore/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXv/buildlink3.mk"
+.include "../../textproc/xmlrpc-c/buildlink3.mk"
+.if ${OPSYS} != "Darwin"
.include "../../mk/oss.buildlink3.mk"
+PLIST.oss= yes
+.endif
+.include "../../mk/jpeg.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/multimedia/gpac/PLIST
diff -u pkgsrc/multimedia/gpac/PLIST:1.5 pkgsrc/multimedia/gpac/PLIST:1.6
--- pkgsrc/multimedia/gpac/PLIST:1.5 Tue Oct 11 00:31:28 2016
+++ pkgsrc/multimedia/gpac/PLIST Sat Jul 22 13:07:04 2017
@@ -1,42 +1,43 @@
-@comment $NetBSD: PLIST,v 1.5 2016/10/11 00:31:28 tnn Exp $
+@comment $NetBSD: PLIST,v 1.6 2017/07/22 13:07:04 adam Exp $
bin/DashCast
bin/MP42TS
bin/MP4Box
bin/MP4Client
-lib/gpac/gm_aac_in.so
-lib/gpac/gm_ac3_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_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/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}
lib/libgpac.so
-lib/libgpac.so.6
-lib/libgpac.so.6.0.0
+lib/libgpac.so.7
+lib/libgpac.so.7.5.0
man/man1/gpac.1
man/man1/mp4box.1
man/man1/mp4client.1
@@ -70,6 +71,7 @@ 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/compass.svg
share/gpac/gui/icons/cross.svg
share/gpac/gui/icons/down.svg
share/gpac/gui/icons/expand.svg
@@ -121,5 +123,6 @@ 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/gui/webvtt-renderer.js
share/gpac/shaders/fragment.glsl
share/gpac/shaders/vertex.glsl
Index: pkgsrc/multimedia/gpac/distinfo
diff -u pkgsrc/multimedia/gpac/distinfo:1.12 pkgsrc/multimedia/gpac/distinfo:1.13
--- pkgsrc/multimedia/gpac/distinfo:1.12 Tue Oct 11 00:31:28 2016
+++ pkgsrc/multimedia/gpac/distinfo Sat Jul 22 13:07:04 2017
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.12 2016/10/11 00:31:28 tnn Exp $
+$NetBSD: distinfo,v 1.13 2017/07/22 13:07:04 adam Exp $
-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
+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 (patch-configure) = b76d24b134b7e10c613411f08d8374f0e0202599
Index: pkgsrc/multimedia/gpac/patches/patch-Makefile
diff -u pkgsrc/multimedia/gpac/patches/patch-Makefile:1.1 pkgsrc/multimedia/gpac/patches/patch-Makefile:1.2
--- pkgsrc/multimedia/gpac/patches/patch-Makefile:1.1 Tue Oct 11 00:31:28 2016
+++ pkgsrc/multimedia/gpac/patches/patch-Makefile Sat Jul 22 13:07:04 2017
@@ -1,19 +1,44 @@
-$NetBSD: patch-Makefile,v 1.1 2016/10/11 00:31:28 tnn Exp $
+$NetBSD: patch-Makefile,v 1.2 2017/07/22 13:07:04 adam Exp $
-Remove non-standard cp(1) option
+Fix DashCast installation.
+Remove non-standard cp(1) option.
+Use VERSION_MAJOR also on Darwin (without git, VERSION is defined as UNKNOWN).
---- Makefile.orig 2016-03-04 16:03:40.000000000 +0000
+--- Makefile.orig 2017-04-26 11:33:17.000000000 +0000
+++ Makefile
-@@ -125,9 +125,9 @@ ifeq ($(CONFIG_DARWIN),yes)
+@@ -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/"
+-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/"
- 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
+-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/
+-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)
Added files:
Index: pkgsrc/multimedia/gpac/options.mk
diff -u /dev/null pkgsrc/multimedia/gpac/options.mk:1.1
--- /dev/null Sat Jul 22 13:07:04 2017
+++ pkgsrc/multimedia/gpac/options.mk Sat Jul 22 13:07:04 2017
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2017/07/22 13:07:04 adam Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.gpac
+PKG_SUPPORTED_OPTIONS= x11
+PKG_SUGGESTED_OPTIONS= x11
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mx11)
+CONFIGURE_ARGS+= --X11-path=${X11BASE}
+PLIST.x11= yes
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXv/buildlink3.mk"
+.endif
Index: pkgsrc/multimedia/gpac/patches/patch-configure
diff -u /dev/null pkgsrc/multimedia/gpac/patches/patch-configure:1.3
--- /dev/null Sat Jul 22 13:07:04 2017
+++ pkgsrc/multimedia/gpac/patches/patch-configure Sat Jul 22 13:07:04 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.3 2017/07/22 13:07:04 adam Exp $
+
+On Darwin, use system libtool.
+
+--- configure.orig 2017-07-22 06:56:04.000000000 +0000
++++ configure
+@@ -2927,7 +2927,7 @@ echo "STRIP=@$strip" >> config.mak
+ echo "WINDRES=$windres" >> config.mak
+ fi
+ echo "INSTALL=$install" >> config.mak
+-echo "LIBTOOL=libtool" >> config.mak
++echo "LIBTOOL=/usr/bin/libtool" >> config.mak
+
+ echo "INSTFLAGS=$instflags" >> config.mak
+ echo "OPTFLAGS=$CFLAGS" >> config.mak
Home |
Main Index |
Thread Index |
Old Index