<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5d1860cb66c9654135b07d1b439fffd6c7e947eb">https://github.com/macports/macports-ports/commit/5d1860cb66c9654135b07d1b439fffd6c7e947eb</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 5d1860cb66c gpac: Link with libxvidcore.dylib; other cleanup
</span>5d1860cb66c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5d1860cb66c9654135b07d1b439fffd6c7e947eb
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Tue Apr 30 23:55:27 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> gpac: Link with libxvidcore.dylib; other cleanup
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix configure test to find xvid.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/69855
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use platforms keyword to specify OS compatibility.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> zlib is a library dependency, not just a build dependency.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use path:-based dependency for pkgconfig.
</span>---
multimedia/gpac/Portfile | 19 +++-----
multimedia/gpac/files/patch-configure.diff | 56 +++++++++++++++++++----
multimedia/gpac/files/patch-no-hevc-yosemite.diff | 10 ++--
3 files changed, 57 insertions(+), 28 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 4afff528670..b38a2a47d6e 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;'>@@ -6,8 +6,10 @@ PortGroup github 1.0
</span> PortGroup legacysupport 1.1
github.setup gpac gpac 2.4.0 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories multimedia
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/56408
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {darwin >= 12}
</span> maintainers {outlook.com:mohd.akram @mohd-akram} openmaintainer
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,11 +32,10 @@ checksums rmd160 a07a94f6bd0e8aafbe3a822fe55df9a324e4df13 \
</span> legacysupport.newest_darwin_requires_legacy \
15
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set ffmpeg_ver 6
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build path:bin/pkg-config:pkgconfig
</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;'>@@ -49,6 +50,7 @@ depends_lib port:freetype \
</span> port:x264 \
port:aom \
port:XviD \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span> path:lib/libssl.dylib:openssl \
port:libsdl2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,15 +67,6 @@ post-patch {
</span> reinplace "s|@APPLICATIONS_DIR@|${applications_dir}|g" ${worksrcpath}/configure
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 12} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See https://trac.macports.org/ticket/56408
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} @${version} requires OS X 10.8 or greater."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible Mac OS X version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # fatal error: 'stdatomic.h' file not found
compiler.blacklist-append {clang < 700}
compiler.c_standard 2011
<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 a064e51a0ba..083ac3290b7 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,11 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2024-04-17 21:18:21
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2024-04-25 16:48:45
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -959,22 +959,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="-L$prefix/$libdir"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Remove code that looks for default Fink and MacPorts prefixes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Patch in a placeholder for the applications directory which will be replaced
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+with the real value by the Portfile.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Include <stddef.h> anytime NULL is used so that tests don't fail, specifically
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the xvid test.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/gpac/gpac/pull/2822
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2024-04-17 12:18:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2024-04-30 23:52:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -961,20 +961,8 @@
</span> 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;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> - if test "$is_em" != "yes" ; then
- if test -d /sw/bin ; then
- alt_macosx_dir="/sw"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,11 +22,43 @@
</span> - CFLAGS_DIR="-I$alt_macosx_dir $CFLAGS_DIR"
- LDFLAGS="-L$alt_macosx_dir $LDFLAGS"
- fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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@"
SHFLAGS="-dynamiclib"
DYN_LIB_SUFFIX=".dylib"
extralibs=""
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1591,6 +1579,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <openssl/x509.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <openssl/err.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <openssl/rand.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stddef.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main( void ) { SSL_CTX_set_options(NULL, SSL_OP_ALL); return 0; }'
</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;'>+@@ -1617,6 +1606,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config_package png "libpng" "" "-lpng -lz" "png" '#include <png.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stddef.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main( void ) { png_struct *png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); return 0; }'
</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;'>+@@ -1633,6 +1623,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;'>+ config_package xvid "xvid" "" "-lxvidcore $PTHREAD_LDFLAGS" "" '#include <xvid.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stddef.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main( void ) { void *codec; xvid_decore(codec, XVID_DEC_DESTROY, NULL, NULL); return 0; }'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config_package faad "faad2" "" "-lfaad -lm" "" '#include <faad.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1686,6 +1677,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;'>+ config_package freenect "libfreenect" "" "-lfreenect" "freenect" '#include <libfreenect/libfreenect.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stddef.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main( void ) { freenect_context *f_ctx; freenect_init(&f_ctx, NULL); return 0; }'
</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;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 0c041a61785..2cdad06ba65 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,8 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/filters/dec_vtb.c src/filters/dec_vtb.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9ad6e6d4a..1a012e8b8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/filters/dec_vtb.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/filters/dec_vtb.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -468,6 +468,7 @@ static GF_Err vtbdec_init_decoder(GF_Filter *filter, GF_VTBDecCtx *ctx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/filters/dec_vtb.c.orig 2024-04-17 12:18:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/filters/dec_vtb.c 2024-05-01 00:08:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -488,6 +488,7 @@
</span> }
break;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +8,7 @@ index 9ad6e6d4a..1a012e8b8 100644
</span> case GF_CODECID_HEVC:
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;'>-@@ -614,6 +615,7 @@ static GF_Err vtbdec_init_decoder(GF_Filter *filter, GF_VTBDecCtx *ctx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -635,6 +636,7 @@
</span> gf_free(dsi_data);
}
break;
</pre><pre style='margin:0'>
</pre>