<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/329e9dcb872722888dd46ca8fb52e87c05c7b960">https://github.com/macports/macports-ports/commit/329e9dcb872722888dd46ca8fb52e87c05c7b960</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 329e9dcb872 cmus: links and make sure it links ffmpeg v7
</span>329e9dcb872 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 329e9dcb872722888dd46ca8fb52e87c05c7b960
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Sat Sep 21 00:11:25 2024 -0400

<span style='display:block; white-space:pre;color:#404040;'>    cmus: links and make sure it links ffmpeg v7
</span>---
 audio/cmus/Portfile | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/cmus/Portfile b/audio/cmus/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4c35facf00b..4a751cd9da6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/cmus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/cmus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup           compiler_blacklist_versions 1.0
</span> PortGroup           legacysupport 1.0
 
 github.setup        cmus cmus 2.11.0 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            2
</span> categories          audio
 maintainers         {@Traace hotmail.de:xxtraacexx} \
                     openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,11 +120,22 @@ variant opus  description {Support Opus files} {
</span> }
 
 variant ffmpeg  description {Support ffmpeg} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append    port:ffmpeg6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set ffmpeg_ver        7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append    port:ffmpeg${ffmpeg_ver}
</span>     configure.pkg_config_path-prepend \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                          ${prefix}/libexec/ffmpeg6/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                          ${prefix}/libexec/ffmpeg${ffmpeg_ver}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Without this build process cannot find libswresample in nonstandard location
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # (even though configure finds other ffmpeg libraries)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    build.env-append      PKG_CONFIG_PATH=\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                          ${prefix}/libexec/ffmpeg${ffmpeg_ver}/lib/pkgconfig:${prefix}/lib/pkgconfig
</span>     configure.args-delete CONFIG_FFMPEG=n
     configure.args-append CONFIG_FFMPEG=y
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Without these build process links ffmpeg v4 if present
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # With these present the build env line above is redundant, but I'm keeping it anyways
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.cflags-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                          -I${prefix}/libexec/ffmpeg${ffmpeg_ver}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.ldflags-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                          -L${prefix}/libexec/ffmpeg${ffmpeg_ver}/lib
</span>     # https://github.com/cmus/cmus/pull/1330
     post-patch {
         reinplace "s|LIBAVCODEC_VERSION_MAJOR >= 58|LIBAVCODEC_VERSION_MAJOR >= 60|g" ip/ffmpeg.c
</pre><pre style='margin:0'>

</pre>