<pre style='margin:0'>
Dan Villiom Podlaski Christiansen (danchr) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4093c754e05e31f5498bfe06eb5644b75be1f642">https://github.com/macports/macports-ports/commit/4093c754e05e31f5498bfe06eb5644b75be1f642</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 4093c754e05 ffmpeg-upstream: prevent autodetection of xlib
</span>4093c754e05 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4093c754e05e31f5498bfe06eb5644b75be1f642
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Sun Feb 5 14:03:40 2023 +0100
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg-upstream: prevent autodetection of xlib
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The packages from ffmpeg-upstream currently have an incorrect
</span><span style='display:block; white-space:pre;color:#404040;'> dependency on X11:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> $ ffmpeg
</span><span style='display:block; white-space:pre;color:#404040;'> dyld[51531]: Library not loaded: '/opt/local/lib/libX11.6.dylib'
</span><span style='display:block; white-space:pre;color:#404040;'> Referenced from: '/opt/local/bin/ffmpeg'
</span><span style='display:block; white-space:pre;color:#404040;'> Reason: tried: '/opt/local/lib/libX11.6.dylib' (no such file), '/usr/local/lib/libX11.6.dylib' (no such file), '/usr/lib/libX11.6.dylib' (no such file)
</span><span style='display:block; white-space:pre;color:#404040;'> zsh: abort ffmpeg
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> My best guess is that this is caused by detecting Xlib on the builder;
</span><span style='display:block; white-space:pre;color:#404040;'> since I don't have it installed locally, and always build in trace
</span><span style='display:block; white-space:pre;color:#404040;'> mode, I cannot reproduce it myself.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> While at it, I added a dependency to LZO2, that tracemode prevented
</span><span style='display:block; white-space:pre;color:#404040;'> the configure script from picking up.
</span>---
multimedia/ffmpeg-upstream/Portfile | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-upstream/Portfile b/multimedia/ffmpeg-upstream/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7808d94f7a3..64cf9e25a56 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-upstream/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-upstream/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@ conflicts ffmpeg ffmpeg-devel
</span>
# Please increase the revision of mpv whenever ffmpeg's version is updated.
version 5.1.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> epoch 0
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,6 +94,7 @@ depends_lib-append \
</span> path:lib/libspeex.dylib:speex \
port:soxr \
port:bzip2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lzo2 \
</span> port:xz \
port:zimg \
port:zlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,6 +154,7 @@ configure.args-append \
</span> --disable-libjack \
--disable-libopencore-amrnb \
--disable-libopencore-amrwb \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-xlib \
</span> --disable-libxcb \
--disable-libxcb-shm \
--disable-libxcb-xfixes \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -316,7 +318,8 @@ variant x11 {
</span> depends_lib-append port:xorg-libxcb \
port:xorg-libXext \
port:xorg-libXfixes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-libxcb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-xlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-libxcb \
</span> --disable-libxcb-shm \
--disable-libxcb-xfixes
}
</pre><pre style='margin:0'>
</pre>