<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/78ad2b2cc69d66c09a0b690a483adc46cc786c9e">https://github.com/macports/macports-ports/commit/78ad2b2cc69d66c09a0b690a483adc46cc786c9e</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 78ad2b2cc69 gpac: update to 1.0.1
</span>78ad2b2cc69 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 78ad2b2cc69d66c09a0b690a483adc46cc786c9e
</span>Author: Andrew Udvare <audvare@gmail.com>
AuthorDate: Mon Nov 16 16:07:57 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> gpac: update to 1.0.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/61459
</span>---
multimedia/gpac/Portfile | 15 ++++++------
multimedia/gpac/files/patch-configure.diff | 12 ++++++----
multimedia/gpac/files/patch-no-hevc-yosemite.diff | 29 +++++++----------------
3 files changed, 23 insertions(+), 33 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/gpac/Portfile b/multimedia/gpac/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0e95752d962..08fc4770116 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/gpac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/gpac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup gpac gpac 0.8.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup gpac gpac 1.0.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories multimedia
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +20,10 @@ long_description GPAC is an Open Source multimedia framework for \
</span>
homepage http://gpac.wp.mines-telecom.fr/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9a95cf4b2bd0a98e995b21e13ba3ad1ccdb29246 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c5ac9846b313a718b030de629d9ed9c0a5db9fec40fdb4f803a571525eb63a8d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11406479
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1e19dba1a2770268f64947f6ba34fb458028764f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3b0ffba73c68ea8847027c23f45cd81d705110ec47cf3c36f60e669de867e0af \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10352926
</span>
depends_build port:pkgconfig \
port:zlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +32,6 @@ depends_lib port:a52dec \
</span> port:faad2 \
path:lib/libavcodec.dylib:ffmpeg \
port:jpeg \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:openjpeg15 \
</span> port:libmad \
port:libogg \
port:libpng \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,11 +68,10 @@ if {${os.platform} eq "darwin" && ${os.major} < 12} {
</span>
# external spidermonkey (--use-js=no) is not recognized because it doesn't provide a pkg-config file and build fails with local copy
# pulseaudio is recognized if installed but build fails
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# builds with openjpeg15 if include path is added, build fails using openjpeg 2.1
</span>
configure.args --cc="${configure.cc}" \
--cxx="${configure.cxx}" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --extra-cflags="-I${prefix}/include/openjpeg-1.5 ${configure.cc_archflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --extra-cflags="${configure.cc_archflags}" \
</span> --extra-ldflags="${configure.ld_archflags}" \
--mandir=${prefix}/share/man \
--X11-path=${prefix} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/gpac/files/patch-configure.diff b/multimedia/gpac/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6dffd3e0be4..a98df85c58f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/gpac/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/gpac/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2016-03-04 10:03:40.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2016-04-17 14:20:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -552,16 +552,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xul_flags=-DXP_MAC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git configure configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index de8ea9965..017b55aa9 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -554,16 +554,7 @@ EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Darwin)
</span> CFLAGS_DIR="-I$prefix/include"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="-L$prefix/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS="-L$prefix/$libdir"
</span> - if test -d /sw/bin ; then
- alt_macosx_dir="/sw"
- CFLAGS_DIR="-I/sw/include $CFLAGS_DIR"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/gpac/files/patch-no-hevc-yosemite.diff b/multimedia/gpac/files/patch-no-hevc-yosemite.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f7e4f41e5d4..0c041a61785 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/gpac/files/patch-no-hevc-yosemite.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/gpac/files/patch-no-hevc-yosemite.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +1,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/vtb_decode/vtb_decode.c modules/vtb_decode/vtb_decode.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index af0e9be78..176ce0e2e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/vtb_decode/vtb_decode.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/vtb_decode/vtb_decode.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -275,6 +275,7 @@ static GF_Err VTBDec_InitDecoder(VTBDec *ctx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/filters/dec_vtb.c src/filters/dec_vtb.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9ad6e6d4a..1a012e8b8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/filters/dec_vtb.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/filters/dec_vtb.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -468,6 +468,7 @@ static GF_Err vtbdec_init_decoder(GF_Filter *filter, GF_VTBDecCtx *ctx)
</span> }
break;
+#ifdef AVAILABLE_MAC_OS_X_VERSION_10_11_AND_LATER
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case GPAC_OTI_VIDEO_HEVC:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case GF_CODECID_HEVC:
</span> if (gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs) && gf_list_count(ctx->VPSs)) {
s32 idx;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -426,6 +427,7 @@ static GF_Err VTBDec_InitDecoder(VTBDec *ctx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -614,6 +615,7 @@ static GF_Err vtbdec_init_decoder(GF_Filter *filter, GF_VTBDecCtx *ctx)
</span> gf_free(dsi_data);
}
break;
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case GPAC_OTI_VIDEO_MPEG2_SIMPLE:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case GPAC_OTI_VIDEO_MPEG2_MAIN:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1548,8 +1550,10 @@ static const char *VTBDec_GetCodecName(GF_BaseDecoder *dec)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (ctx->vtb_type) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case kCMVideoCodecType_H264:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ctx->is_hardware ? "VTB hardware AVC|H264" : "VTB software AVC|H264";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef AVAILABLE_MAC_OS_X_VERSION_10_11_AND_LATER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case kCMVideoCodecType_HEVC:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ctx->is_hardware ? "VTB hardware HEVC" : "VTB software HEVC";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case kCMVideoCodecType_MPEG2Video:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ctx->is_hardware ? "VTB hardware MPEG-2" : "VTB software MPEG-2";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case kCMVideoCodecType_MPEG4Video:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case GF_CODECID_MPEG2_SIMPLE:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case GF_CODECID_MPEG2_MAIN:
</span></pre><pre style='margin:0'>
</pre>