<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e7810e8754ecc1cd8f28dbaefd26d4145e606bde">https://github.com/macports/macports-ports/commit/e7810e8754ecc1cd8f28dbaefd26d4145e606bde</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 e7810e8754e ffmpeg7, ffmpeg-devel: non-functional fix for variants on powerpc
</span>e7810e8754e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e7810e8754ecc1cd8f28dbaefd26d4145e606bde
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Tue Nov 19 09:49:45 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg7, ffmpeg-devel: non-functional fix for variants on powerpc
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [skip ci]
</span>---
multimedia/ffmpeg-devel/Portfile | 12 ++++++++----
multimedia/ffmpeg7/Portfile | 12 ++++++++----
2 files changed, 16 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg-devel/Portfile b/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dcb5c7259e0..27cf32ba121 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -421,10 +421,14 @@ variant x11 {
</span> --disable-libxcb-xfixes
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants libsdl2 x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants libsdl2 "" x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# On PowerPC libsdl2 is a stub for libsdl2-powerpc, which is always built
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# with X11 backend. It is meaningless to require it as a variant there.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${configure.build_arch} ni [list ppc ppc64]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants libsdl2 x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants libsdl2 "" x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant libdc1394 description {Enable IIDC-1394 frame grabbing using libdc1394 (experimental)} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg7/Portfile b/multimedia/ffmpeg7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 250d468e7e6..cd413bfc956 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -423,10 +423,14 @@ variant x11 {
</span> --disable-libxcb-xfixes
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants libsdl2 x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants libsdl2 "" x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# On PowerPC libsdl2 is a stub for libsdl2-powerpc, which is always built
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# with X11 backend. It is meaningless to require it as a variant there.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${configure.build_arch} ni [list ppc ppc64]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants libsdl2 x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants libsdl2 "" x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant libdc1394 description {Enable IIDC-1394 frame grabbing using libdc1394 (experimental)} {
</pre><pre style='margin:0'>
</pre>