<pre style='margin:0'>
Mohamed Akram (mohd-akram) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6fe26f7fbd8351d2949861f69f43c8514ec9877b">https://github.com/macports/macports-ports/commit/6fe26f7fbd8351d2949861f69f43c8514ec9877b</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 6fe26f7fbd8 gpac: update to 2.4.0
</span>6fe26f7fbd8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6fe26f7fbd8351d2949861f69f43c8514ec9877b
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Thu Apr 25 17:51:33 2024 +0400
<span style='display:block; white-space:pre;color:#404040;'> gpac: update to 2.4.0
</span>---
multimedia/gpac/Portfile | 23 ++++++++++++++---------
multimedia/gpac/files/patch-configure.diff | 29 +++++++++++++++++------------
multimedia/gpac/files/patch-ffmpeg6.diff | 11 +++++++++++
3 files changed, 42 insertions(+), 21 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 d0eced29056..35ef054b335 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;'>@@ -5,8 +5,8 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup github 1.0
PortGroup legacysupport 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup gpac gpac 2.2.1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup gpac gpac 2.4.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories multimedia
maintainers {outlook.com:mohd.akram @mohd-akram} openmaintainer
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +22,9 @@ long_description GPAC is an Open Source multimedia framework for \
</span> homepage https://gpac.wp.imt.fr
github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e4d98e4053ea317a0042ced770f44d007a03f088 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8173ecc4143631d7f2c59f77e1144b429ccadb8de0d53a4e254389fb5948d8b8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11377184
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a07a94f6bd0e8aafbe3a822fe55df9a324e4df13 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 99c8c994d5364b963d18eff24af2576b38d38b3460df27d451248982ea16157a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9914579
</span>
# Needed for clock_gettime()
legacysupport.newest_darwin_requires_legacy \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,6 +33,8 @@ legacysupport.newest_darwin_requires_legacy \
</span> depends_build port:pkgconfig \
port:zlib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set ffmpeg_ver 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib port:freetype \
path:include/turbojpeg.h:libjpeg-turbo \
port:libpng \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +45,7 @@ depends_lib port:freetype \
</span> port:libvorbis \
port:libtheora \
port:a52dec \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libavcodec.dylib:ffmpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libavcodec.dylib:ffmpeg${ffmpeg_ver} \
</span> port:x264 \
port:aom \
port:XviD \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,8 +56,10 @@ depends_lib port:freetype \
</span> # kCMVideoCodecType_HEVC is available in 10.11+ [1][2]
# [1] https://build.macports.org/builders/ports-10.10_x86_64-builder/builds/94933/steps/install-port/logs/stdio
# [2] https://build.macports.org/builders/ports-10.11_x86_64-builder/builds/94369/steps/install-port/logs/stdio
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix for FFmpeg 6 - https://github.com/gpac/gpac/issues/2810
</span> patchfiles patch-configure.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-no-hevc-yosemite.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-no-hevc-yosemite.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ffmpeg6.diff
</span>
post-patch {
reinplace "s|@APPLICATIONS_DIR@|${applications_dir}|g" ${worksrcpath}/configure
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,11 +78,12 @@ if {${os.platform} eq "darwin" && ${os.major} < 12} {
</span> compiler.blacklist-append {clang < 700}
compiler.c_standard 2011
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pkg_config_path ${prefix}/libexec/ffmpeg${ffmpeg_ver}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # pulseaudio is recognized if installed but build fails
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# -fno-builtin-strrchr to fix https://trac.macports.org/ticket/68589
</span> configure.args --cc="${configure.cc}" \
--cxx="${configure.cxx}" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --extra-cflags="${configure.cc_archflags} -fno-builtin-strrchr" \
</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 \
--disable-pulseaudio \
<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 576b3a0e34d..a064e51a0ba 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,18 +1,23 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2022-12-19 20:03:06.000000000 +0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2022-12-29 19:50:49.000000000 +0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -788,17 +788,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2024-04-17 21:18:21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2024-04-25 16:48:45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -959,22 +959,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS="-L$prefix/$libdir"
</span> else
LDFLAGS="$LDFLAGS -L$prefix/$libdir"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test -d /sw/bin ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- alt_macosx_dir="/sw"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS_DIR="-I/sw/include $CFLAGS_DIR"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LDFLAGS="-L/sw/lib $LDFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elif test -d /opt/local/bin ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- alt_macosx_dir="/opt/local"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS_DIR="-I/opt/local/include $CFLAGS_DIR"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LDFLAGS="-L/opt/local/lib $LDFLAGS"
</span> - fi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "$is_em" != "yes" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test -d /sw/bin ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- alt_macosx_dir="/sw"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elif test -d /opt/local/bin ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- alt_macosx_dir="/opt/local"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "$alt_macosx_dir" != "" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS_DIR="-I$alt_macosx_dir $CFLAGS_DIR"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS="-L$alt_macosx_dir $LDFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> CFLAGS="$CFLAGS_DIR $CFLAGS"
- Mac_Applications="/Applications"
+ Mac_Applications="@APPLICATIONS_DIR@"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/gpac/files/patch-ffmpeg6.diff b/multimedia/gpac/files/patch-ffmpeg6.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ca5b551cbe5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/gpac/files/patch-ffmpeg6.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/filters/ff_mx.c.orig 2024-04-17 21:18:21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/filters/ff_mx.c 2024-04-25 17:19:33
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -247,7 +247,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (LIBAVFORMAT_VERSION_MAJOR <= 59)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (LIBAVFORMAT_VERSION_MAJOR < 61)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int ffavio_write_packet(void *opaque, uint8_t *buf, int buf_size)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int ffavio_write_packet(void *opaque, const uint8_t *buf, int buf_size)
</span></pre><pre style='margin:0'>
</pre>