<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8964eba923243a6e5e17944f689c3b5346481449">https://github.com/macports/macports-ports/commit/8964eba923243a6e5e17944f689c3b5346481449</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 8964eba9232 ffmpeg PowerPC fixes (#8181)
</span>8964eba9232 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8964eba923243a6e5e17944f689c3b5346481449
</span>Author: Ken <21211439+kencu@users.noreply.github.com>
AuthorDate: Sat Aug 22 21:15:45 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> ffmpeg PowerPC fixes (#8181)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * ffmpeg: vec_xl intrinsic does not exist on older PowerPC processors
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> use upstream patch (not yet committed)
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/61001
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * ffmpeg: remove no-longer-needed compiler selection
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> this is now taken care of by base and the
</span><span style='display:block; white-space:pre;color:#404040;'> compiler.c_standard setting
</span>---
multimedia/ffmpeg/Portfile | 12 ++++--------
.../patch-ffmpeg-powerpc-yuv2rgb-altivec-fix.diff | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg/Portfile b/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7b16017494c..7dfc74b7525 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,6 +90,10 @@ depends_lib port:lame \
</span>
patchfiles patch-libavcodec-audiotoolboxenc.c.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# work around vec_xl intrinsic does not exist on older PowerPC processors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.ffmpeg.org/ticket/8750
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-ffmpeg-powerpc-yuv2rgb-altivec-fix.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #
# enable auto configure of asm optimizations
# requires Xcode 3.1 or better on Leopard
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,14 +109,6 @@ if {[lsearch [get_canonical_archs] i386] != -1} {
</span> compiler.blacklist-append {clang < 422.1.7}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin powerpc {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/55124
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # requires newer compiler than gcc4.2 to build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.whitelist macports-gcc-6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # The old ffmpeg port was GPL-2+ as base and had a no_gpl variant, so this keeps us consistent
# Also, -gpl2 causes other ports to fail to build due to the missing libpostproc (#35473)
default_variants-append +gpl2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/ffmpeg/files/patch-ffmpeg-powerpc-yuv2rgb-altivec-fix.diff b/multimedia/ffmpeg/files/patch-ffmpeg-powerpc-yuv2rgb-altivec-fix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d6cbdfe3445
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/ffmpeg/files/patch-ffmpeg-powerpc-yuv2rgb-altivec-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libswscale/ppc/yuv2rgb_altivec.c.orig 2020-08-22 16:39:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libswscale/ppc/yuv2rgb_altivec.c 2020-08-22 16:46:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -283,6 +283,17 @@
</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;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !HAVE_VSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static inline vector unsigned char vec_xl(signed long long offset, const ubyte *addr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const vector unsigned char *v_addr = (const vector unsigned char *) (addr + offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vector unsigned char align_perm = vec_lvsl(offset, addr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (vector unsigned char) vec_perm(v_addr[0], v_addr[1], align_perm);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* !HAVE_VSX */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define DEFCSP420_CVT(name, out_pixels) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int altivec_ ## name(SwsContext *c, const unsigned char **in, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int *instrides, int srcSliceY, int srcSliceH, \
</span></pre><pre style='margin:0'>
</pre>