<pre style='margin:0'>
Mohamed Akram (mohd-akram) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7d104cd676241499080aebe3e6582b2f8106f750">https://github.com/macports/macports-ports/commit/7d104cd676241499080aebe3e6582b2f8106f750</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7d104cd676241499080aebe3e6582b2f8106f750
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Tue Mar 4 16:16:53 2025 +0400
<span style='display:block; white-space:pre;color:#404040;'> x264: update to 0.164.3108
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - add maintainer
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62079
</span>---
multimedia/x264/Portfile | 56 ++++---
multimedia/x264/files/altivec-x264.patch | 83 +++++++++
.../x264/files/patch-x264-apple-silicon.diff | 93 -----------
.../x264/files/patch-x264-older-ppc-code.diff | 186 ---------------------
4 files changed, 119 insertions(+), 299 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/x264/Portfile b/multimedia/x264/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a5fbe0e737d..11eeaaeab94 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/x264/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/x264/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,24 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup gitlab 1.0
</span> PortGroup muniversal 1.0
PortGroup xcodeversion 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup xcode_workaround 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name x264
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20191217
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.instance https://code.videolan.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Get latest stable commit id from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://code.videolan.org/videolan/x264/-/tree/stable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Get minor version (X264_BUILD) from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://code.videolan.org/videolan/x264/-/blob/stable/x264.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Run port livecheck to get patch version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Change in minor version requires rev-bumping dependents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.setup videolan x264 31e19f92f00c7003fa115047ce50978bc98c3a0d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.164.3108
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch 1
</span> categories multimedia
license GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {devans @dbevans} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {devans @dbevans} {makr @mohd-akram} openmaintainer
</span> description x264 - a free h264/avc encoder
long_description x264 is a free library for encoding H264/AVC video streams. \
The code is written by Laurent Aimar, Eric Petit(OS X), Min \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,25 +26,26 @@ long_description x264 is a free library for encoding H264/AVC video streams.
</span> Merritt from scratch. It is released under the terms of the \
GPL license.
homepage https://www.videolan.org/x264.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://download.videolan.org/pub/videolan/x264/snapshots/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir x264
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}-snapshot-${version}-2245-stable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6a204dfd1d56faf2d9c0ff2b90642507112f291d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b2495c8f2930167d470994b1ce02b0f4bfb24b3317ba36ba7f112e9809264160 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 770169
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e006e270e1c87c70ddee225ebaf2f586ad8620f3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 01a4acb74eea1118c3aa96c3e18ee3384bc1f2bc670f31fb0f63be853e4d9d08 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 778279
</span>
minimum_xcodeversions {9 3.1}
depends_build port:nasm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# as of 20190313 the PPC assembly uses VSX, which is Power7+ only. We could disable asm, but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# instead we can use the previous ppc assembly, which does compile and provides the same functions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-x264-older-ppc-code.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-x264-apple-silicon.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles altivec-x264.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set rev [lindex [split ${version} .] 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set sha [string range ${gitlab.version} 0 6]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|ver=\"x\"|ver=\"$rev $sha\"|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/version.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|version=\"\"|version=\" r$rev $sha\"|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/version.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
configure.args --enable-pic \
--enable-shared \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,6 +57,10 @@ configure.args --enable-pic \
</span> --disable-gpac \
--disable-lsmash
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin powerpc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-vsx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # as of build 148 asm optimizations are believed to work with x86_64 Snow Leopard and up
# please file a ticket if you have evidence to the contrary
# i386 clang build issues remain which break i386 build when asm optimizations are enabled
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,10 +99,13 @@ platform darwin 8 {
</span>
# sets its own optflags
configure.optflags
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append -I. -fno-common -read_only_relocs suppress
</span>
destroot.args DIR_INSTALL=${destroot}${prefix}
build.target default
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Can't livecheck stable branch but use it to validate version matches commit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://artifacts.videolan.org/x264/release-macos-arm64/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.version $rev
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex "r(\[0-9]+)-$sha"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/x264/files/altivec-x264.patch b/multimedia/x264/files/altivec-x264.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6853ca1b77b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/x264/files/altivec-x264.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,83 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- common/ppc/ppccommon.h 2021-01-10 14:00:05.489543000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ common/ppc/ppccommon.h 2021-01-10 14:03:38.828554000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -90,6 +90,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vec_s8_t v;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } vec_s8_u;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// vec_xxpermdi is quite useful but some version of clang do not expose it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !HAVE_VSX || (defined(__clang__) && __clang_major__ < 6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const vec_u8_t xxpermdi0_perm = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 0x06, 0x07, 0x10, 0x11, 0x12, 0x13,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 0x14, 0x15, 0x16, 0x17 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const vec_u8_t xxpermdi1_perm = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 0x06, 0x07, 0x18, 0x19, 0x1A, 0x1B,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 0x1C, 0x1D, 0x1E, 0x1F };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const vec_u8_t xxpermdi2_perm = { 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 0x14, 0x15, 0x16, 0x17 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const vec_u8_t xxpermdi3_perm = { 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 0x0E, 0x0F, 0x18, 0x19, 0x1A, 0x1B,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 0x1C, 0x1D, 0x1E, 0x1F };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define xxpermdi(a, b, c) vec_perm(a, b, xxpermdi##c##_perm)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif (defined(__GNUC__) && (__GNUC__ > 6 || (__GNUC__ == 6 && __GNUC_MINOR__ >= 3))) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (defined(__clang__) && __clang_major__ >= 7) && __POWER7_VECTOR__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define xxpermdi(a, b, c) vec_xxpermdi(a, b, c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// vec_xxpermdi has its endianness bias exposed in early gcc and clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef WORDS_BIGENDIAN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef xxpermdi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define xxpermdi(a, b, c) vec_xxpermdi(a, b, c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef xxpermdi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define xxpermdi(a, b, c) vec_xxpermdi(b, a, ((c >> 1) | (c & 1) << 1) ^ 3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</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;'>+ * Null vector
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ **********************************************************************/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -150,7 +181,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ **********************************************************************/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef __POWER9_VECTOR__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define VEC_STORE8( v, p ) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vec_vsx_st( vec_xxpermdi( v, vec_vsx_ld( 0, p ), 1 ), 0, p )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vec_vsx_st( xxpermdi( v, vec_vsx_ld( 0, p ), 1 ), 0, p )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define VEC_STORE8( v, p ) vec_xst_len( v, p, 8 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -304,33 +335,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define vec_absd( a, b ) vec_sub( vec_max( a, b ), vec_min( a, b ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// vec_xxpermdi is quite useful but some version of clang do not expose it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !HAVE_VSX || (defined(__clang__) && __clang_major__ < 6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static const vec_u8_t xxpermdi0_perm = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 0x06, 0x07, 0x10, 0x11, 0x12, 0x13,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 0x14, 0x15, 0x16, 0x17 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static const vec_u8_t xxpermdi1_perm = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 0x06, 0x07, 0x18, 0x19, 0x1A, 0x1B,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 0x1C, 0x1D, 0x1E, 0x1F };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static const vec_u8_t xxpermdi2_perm = { 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 0x14, 0x15, 0x16, 0x17 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static const vec_u8_t xxpermdi3_perm = { 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 0x0E, 0x0F, 0x18, 0x19, 0x1A, 0x1B,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 0x1C, 0x1D, 0x1E, 0x1F };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define xxpermdi(a, b, c) vec_perm(a, b, xxpermdi##c##_perm)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif (defined(__GNUC__) && (__GNUC__ > 6 || (__GNUC__ == 6 && __GNUC_MINOR__ >= 3))) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (defined(__clang__) && __clang_major__ >= 7)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define xxpermdi(a, b, c) vec_xxpermdi(a, b, c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// vec_xxpermdi has its endianness bias exposed in early gcc and clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef WORDS_BIGENDIAN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef xxpermdi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define xxpermdi(a, b, c) vec_xxpermdi(a, b, c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef xxpermdi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define xxpermdi(a, b, c) vec_xxpermdi(b, a, ((c >> 1) | (c & 1) << 1) ^ 3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/x264/files/patch-x264-apple-silicon.diff b/multimedia/x264/files/patch-x264-apple-silicon.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 27b7b43d80d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/x264/files/patch-x264-apple-silicon.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,93 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://code.videolan.org/videolan/x264/-/commit/eb95c2965299ba5b8598e2388d71b02e23c9fba7.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From eb95c2965299ba5b8598e2388d71b02e23c9fba7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Damiano Galassi <damiog@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 23 Jul 2020 17:23:09 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] update config.* and configure: add Apple Silicon support.
</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;'>- config.guess | 3 +++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.sub | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure | 24 ++++++++++++------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 17 insertions(+), 14 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/config.guess b/config.guess
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2fb9f880..ab192f67 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.guess
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.guess
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1238,6 +1238,9 @@ EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *:Rhapsody:*:*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ arm64:Darwin:*:*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo arm64-apple-darwin${UNAME_RELEASE}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exit ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *:Darwin:*:*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case $UNAME_PROCESSOR in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/config.sub b/config.sub
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8df55110..72e9265b 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.sub
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.sub
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -255,7 +255,7 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Some are omitted here because they have special meanings below.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1750a | 580 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | a29k \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- | aarch64 | aarch64_be \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ | aarch64 | aarch64_be | arm64 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | am33_2.0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -369,7 +369,7 @@ case $basic_machine in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Recognize the basic CPU types with company name.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 580-* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | a29k-* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- | aarch64-* | aarch64_be-* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ | aarch64-* | aarch64_be-* | arm64*-* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/configure b/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 266fcffa..10aa2fd4 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -821,6 +821,18 @@ case $host_cpu in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AS="${AS-${CC}}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AS_EXT=".c"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ aarch64|arm64*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ARCH="AARCH64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ stack_alignment=16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if [ "$SYS" = MACOSX ] ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AS="${AS-${CC}}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ASFLAGS="$ASFLAGS -DPREFIX -DPIC"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elif [ "$SYS" = WINDOWS ] && [ "$compiler" = CL ] ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AS="${AS-${SRCPATH}/tools/gas-preprocessor.pl -arch aarch64 -as-type armasm -- armasm64 -nologo}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AS="${AS-${CC}}"
</span><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:#ffe0e0;'>- arm*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ARCH="ARM"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "$SYS" = MACOSX ] ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -839,18 +851,6 @@ case $host_cpu in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AS="${AS-${CC}}"
</span><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:#ffe0e0;'>-- aarch64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ARCH="AARCH64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- stack_alignment=16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "$SYS" = MACOSX ] ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AS="${AS-${CC}}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ASFLAGS="$ASFLAGS -DPREFIX -DPIC"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elif [ "$SYS" = WINDOWS ] && [ "$compiler" = CL ] ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AS="${AS-${SRCPATH}/tools/gas-preprocessor.pl -arch aarch64 -as-type armasm -- armasm64 -nologo}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AS="${AS-${CC}}"
</span><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:#ffe0e0;'>- s390|s390x)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ARCH="S390"
</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;'>-GitLab
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/x264/files/patch-x264-older-ppc-code.diff b/multimedia/x264/files/patch-x264-older-ppc-code.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 01d471efeb4..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/x264/files/patch-x264-older-ppc-code.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,186 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git common/ppc/quant.c common/ppc/quant.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index dfb8a80..6a54aa9 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- common/ppc/quant.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ common/ppc/quant.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,8 +39,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- biasvB = vec_ld((idx1), bias); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mskA = vec_cmplt(temp1v, zero_s16v); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mskB = vec_cmplt(temp2v, zero_s16v); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- coefvA = (vec_u16_t)vec_abs( temp1v ); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- coefvB = (vec_u16_t)vec_abs( temp2v ); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ coefvA = (vec_u16_t)vec_max(vec_sub(zero_s16v, temp1v), temp1v);\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ coefvB = (vec_u16_t)vec_max(vec_sub(zero_s16v, temp2v), temp2v);\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- coefvA = vec_adds(coefvA, biasvA); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- coefvB = vec_adds(coefvB, biasvB); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- multEvenvA = vec_mule(coefvA, mfvA); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -51,12 +51,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- multOddvA = vec_sr(multOddvA, i_qbitsv); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- multEvenvB = vec_sr(multEvenvB, i_qbitsv); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- multOddvB = vec_sr(multOddvB, i_qbitsv); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- temp1v = (vec_s16_t) vec_packs( multEvenvA, multOddvA ); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- tmpv = xxpermdi( temp1v, temp1v, 2 ); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- temp1v = vec_mergeh( temp1v, tmpv ); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- temp2v = (vec_s16_t) vec_packs( multEvenvB, multOddvB ); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- tmpv = xxpermdi( temp2v, temp2v, 2 ); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- temp2v = vec_mergeh( temp2v, tmpv ); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ temp1v = (vec_s16_t) vec_packs(vec_mergeh(multEvenvA, multOddvA), vec_mergel(multEvenvA, multOddvA)); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ temp2v = (vec_s16_t) vec_packs(vec_mergeh(multEvenvB, multOddvB), vec_mergel(multEvenvB, multOddvB)); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- temp1v = vec_xor(temp1v, mskA); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- temp2v = vec_xor(temp2v, mskB); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- temp1v = vec_adds(temp1v, vec_and(mskA, one)); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -84,7 +80,7 @@ int x264_quant_4x4_altivec( int16_t dct[16], uint16_t mf[16], uint16_t bias[16]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_u16_t mfvB;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_u16_t biasvB;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vec_s16_t temp1v, temp2v, tmpv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vec_s16_t temp1v, temp2v;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_u32_u qbits_u;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qbits_u.s[0]=16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -143,9 +139,17 @@ int x264_quant_4x4_dc_altivec( int16_t dct[16], int mf, int bias )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_u16_t mfv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_u16_t biasv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- mfv = vec_splats( (uint16_t)mf );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- i_qbitsv = vec_splats( (uint32_t) 16 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- biasv = vec_splats( (uint16_t)bias );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vec_u16_u mf_u;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mf_u.s[0]=mf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mfv = vec_splat( mf_u.v, 0 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vec_u32_u qbits_u;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ qbits_u.s[0]=16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i_qbitsv = vec_splat(qbits_u.v, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vec_u16_u bias_u;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bias_u.s[0]=bias;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ biasv = vec_splat(bias_u.v, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QUANT_16_U_DC( 0, 16 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return vec_any_ne(nz, zero_s16v);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -186,9 +190,17 @@ int x264_quant_2x2_dc_altivec( int16_t dct[4], int mf, int bias )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_u16_t mfv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_u16_t biasv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- mfv = vec_splats( (uint16_t)mf );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- i_qbitsv = vec_splats( (uint32_t) 16 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- biasv = vec_splats( (uint16_t)bias );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vec_u16_u mf_u;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mf_u.s[0]=mf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mfv = vec_splat( mf_u.v, 0 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vec_u32_u qbits_u;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ qbits_u.s[0]=16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i_qbitsv = vec_splat(qbits_u.v, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vec_u16_u bias_u;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bias_u.s[0]=bias;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ biasv = vec_splat(bias_u.v, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static const vec_s16_t mask2 = CV(-1, -1, -1, -1, 0, 0, 0, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QUANT_4_U_DC(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -213,7 +225,7 @@ int x264_quant_8x8_altivec( int16_t dct[64], uint16_t mf[64], uint16_t bias[64]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_u16_t mfvB;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_u16_t biasvB;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vec_s16_t temp1v, temp2v, tmpv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vec_s16_t temp1v, temp2v;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_u32_u qbits_u;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qbits_u.s[0]=16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -235,9 +247,6 @@ int x264_quant_8x8_altivec( int16_t dct[64], uint16_t mf[64], uint16_t bias[64]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- multOddvA = vec_mulo(dctv, mfv); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dctv = (vec_s16_t) vec_packs(vec_mergeh(multEvenvA, multOddvA), \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_mergel(multEvenvA, multOddvA)); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dctv = (vec_s16_t) vec_packs( multEvenvA, multOddvA ); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- tmpv = xxpermdi( dctv, dctv, 2 ); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dctv = vec_mergeh( dctv, tmpv ); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dctv = vec_sl(dctv, i_qbitsv); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_st(dctv, 8*y, dct); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -279,7 +288,7 @@ void x264_dequant_4x4_altivec( int16_t dct[16], int dequant_mf[6][16], int i_qp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int i_mf = i_qp%6;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int i_qbits = i_qp/6 - 4;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vec_s16_t dctv, tmpv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vec_s16_t dctv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_s16_t dct1v, dct2v;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_s32_t mf1v, mf2v;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_s16_t mfv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -289,7 +298,9 @@ void x264_dequant_4x4_altivec( int16_t dct[16], int dequant_mf[6][16], int i_qp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( i_qbits >= 0 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_u16_t i_qbitsv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- i_qbitsv = vec_splats( (uint16_t) i_qbits );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vec_u16_u qbits_u;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ qbits_u.s[0]=i_qbits;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i_qbitsv = vec_splat(qbits_u.v, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for( int y = 0; y < 4; y+=2 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEQUANT_SHL();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -299,13 +310,19 @@ void x264_dequant_4x4_altivec( int16_t dct[16], int dequant_mf[6][16], int i_qp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const int f = 1 << (-i_qbits-1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_s32_t fv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fv = vec_splats( f );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vec_u32_u f_u;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ f_u.s[0]=f;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fv = (vec_s32_t)vec_splat(f_u.v, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_u32_t i_qbitsv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- i_qbitsv = vec_splats( (uint32_t)-i_qbits );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vec_u32_u qbits_u;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ qbits_u.s[0]=-i_qbits;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i_qbitsv = vec_splat(qbits_u.v, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_u32_t sixteenv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sixteenv = vec_splats( (uint32_t)16 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vec_u32_u sixteen_u;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sixteen_u.s[0]=16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sixteenv = vec_splat(sixteen_u.v, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for( int y = 0; y < 4; y+=2 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEQUANT_SHR();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -317,7 +334,7 @@ void x264_dequant_8x8_altivec( int16_t dct[64], int dequant_mf[6][64], int i_qp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int i_mf = i_qp%6;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int i_qbits = i_qp/6 - 6;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vec_s16_t dctv, tmpv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vec_s16_t dctv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_s16_t dct1v, dct2v;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_s32_t mf1v, mf2v;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_s16_t mfv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -327,7 +344,9 @@ void x264_dequant_8x8_altivec( int16_t dct[64], int dequant_mf[6][64], int i_qp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( i_qbits >= 0 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_u16_t i_qbitsv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- i_qbitsv = vec_splats((uint16_t)i_qbits );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vec_u16_u qbits_u;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ qbits_u.s[0]=i_qbits;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i_qbitsv = vec_splat(qbits_u.v, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for( int y = 0; y < 16; y+=2 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEQUANT_SHL();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -337,13 +356,19 @@ void x264_dequant_8x8_altivec( int16_t dct[64], int dequant_mf[6][64], int i_qp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const int f = 1 << (-i_qbits-1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_s32_t fv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fv = vec_splats( f );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vec_u32_u f_u;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ f_u.s[0]=f;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fv = (vec_s32_t)vec_splat(f_u.v, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_u32_t i_qbitsv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- i_qbitsv = vec_splats( (uint32_t)-i_qbits );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vec_u32_u qbits_u;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ qbits_u.s[0]=-i_qbits;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ i_qbitsv = vec_splat(qbits_u.v, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vec_u32_t sixteenv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sixteenv = vec_splats( (uint32_t)16 );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vec_u32_u sixteen_u;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sixteen_u.s[0]=16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sixteenv = vec_splat(sixteen_u.v, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for( int y = 0; y < 16; y+=2 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEQUANT_SHR();
</span></pre><pre style='margin:0'>
</pre>