public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/chromium] epel9-next: - Update to 137.0.7151.55
@ 2026-08-07 16:07 Than Ngo
  0 siblings, 0 replies; only message in thread
From: Than Ngo @ 2026-08-07 16:07 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/chromium
            Branch : epel9-next
            Commit : b7e0f6070bd446302940dfc63fece91c1e667d12
            Author : Than Ngo <than@redhat.com>
            Date   : 2025-05-27T23:18:23+02:00
            Stats  : +616/-2176 in 11 file(s)
            URL    : https://src.fedoraproject.org/rpms/chromium/c/b7e0f6070bd446302940dfc63fece91c1e667d12?branch=epel9-next

            Log:
            - Update to 137.0.7151.55
  * CVE-2025-5063: Use after free in Compositing
  * CVE-2025-5280: Out of bounds write in V8
  * CVE-2025-5064: Inappropriate implementation in Background Fetch API
  * CVE-2025-5065: Inappropriate implementation in FileSystemAccess API
  * CVE-2025-5066: Inappropriate implementation in Messages
  * CVE-2025-5281: Inappropriate implementation in BFCache
  * CVE-2025-5283: Use after free in libvpx
  * CVE-2025-5067: Inappropriate implementation in Tab Strip
- Fix FTBFS caused by simdutf and pdfium-png_decoder
- Remove chromium-135-gperf.patch and chromium-135-add-cfi-suppressions-for-pipewire-functions.patch, merged by upstream
- Refresh ppc64le patches
- Enable system simdutf for F43

---
diff --git a/0001-sandbox-Enable-seccomp_bpf-for-ppc64.patch b/0001-sandbox-Enable-seccomp_bpf-for-ppc64.patch
index a603ada..f069cc4 100644
--- a/0001-sandbox-Enable-seccomp_bpf-for-ppc64.patch
+++ b/0001-sandbox-Enable-seccomp_bpf-for-ppc64.patch
@@ -7,17 +7,14 @@ Subject: [PATCH 1/1] sandbox: Enable seccomp_bpf for ppc64
  sandbox/features.gni | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: chromium-128.0.6613.113/sandbox/features.gni
+Index: chromium-137.0.7151.40/sandbox/features.gni
 ===================================================================
---- chromium-128.0.6613.113.orig/sandbox/features.gni
-+++ chromium-128.0.6613.113/sandbox/features.gni
-@@ -9,7 +9,8 @@
+--- chromium-137.0.7151.40.orig/sandbox/features.gni
++++ chromium-137.0.7151.40/sandbox/features.gni
+@@ -9,4 +9,5 @@
  use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
                    (current_cpu == "x86" || current_cpu == "x64" ||
                     current_cpu == "arm" || current_cpu == "arm64" ||
 -                   current_cpu == "mipsel" || current_cpu == "mips64el")
 +                   current_cpu == "mipsel" || current_cpu == "mips64el" ||
 +                   current_cpu == "ppc64")
- 
- # SSBD (Speculative Store Bypass Disable) is a mitigation of Spectre Variant 4.
- # As Spectre Variant 4 can be mitigated by site isolation, opt-out SSBD on site

diff --git a/0002-third_party-libvpx-Remove-bad-ppc64-config.patch b/0002-third_party-libvpx-Remove-bad-ppc64-config.patch
index b952917..26410c5 100644
--- a/0002-third_party-libvpx-Remove-bad-ppc64-config.patch
+++ b/0002-third_party-libvpx-Remove-bad-ppc64-config.patch
@@ -1,8 +1,6 @@
-Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
-===================================================================
---- chromium-136.0.7103.48.orig/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h
-+++ /dev/null
-@@ -1,330 +0,0 @@
+--- chromium-137.0.7151.40/third_party/libvpx/source/config/linux/ppc64/vp8_rtcd.h	2025-05-26 21:02:11.891388790 +0200
++++ /dev/null	2025-05-26 08:38:43.246140177 +0200
+@@ -1,186 +0,0 @@
 -/*
 - *  Copyright (c) 2025 The WebM project authors. All Rights Reserved.
 - *
@@ -42,278 +40,133 @@ Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vp8_r
 -extern "C" {
 -#endif
 -
--void vp8_bilinear_predict16x16_c(unsigned char* src_ptr,
--                                 int src_pixels_per_line,
--                                 int xoffset,
--                                 int yoffset,
--                                 unsigned char* dst_ptr,
--                                 int dst_pitch);
+-void vp8_bilinear_predict16x16_c(unsigned char *src_ptr, int src_pixels_per_line, int xoffset, int yoffset, unsigned char *dst_ptr, int dst_pitch);
 -#define vp8_bilinear_predict16x16 vp8_bilinear_predict16x16_c
 -
--void vp8_bilinear_predict4x4_c(unsigned char* src_ptr,
--                               int src_pixels_per_line,
--                               int xoffset,
--                               int yoffset,
--                               unsigned char* dst_ptr,
--                               int dst_pitch);
+-void vp8_bilinear_predict4x4_c(unsigned char *src_ptr, int src_pixels_per_line, int xoffset, int yoffset, unsigned char *dst_ptr, int dst_pitch);
 -#define vp8_bilinear_predict4x4 vp8_bilinear_predict4x4_c
 -
--void vp8_bilinear_predict8x4_c(unsigned char* src_ptr,
--                               int src_pixels_per_line,
--                               int xoffset,
--                               int yoffset,
--                               unsigned char* dst_ptr,
--                               int dst_pitch);
+-void vp8_bilinear_predict8x4_c(unsigned char *src_ptr, int src_pixels_per_line, int xoffset, int yoffset, unsigned char *dst_ptr, int dst_pitch);
 -#define vp8_bilinear_predict8x4 vp8_bilinear_predict8x4_c
 -
--void vp8_bilinear_predict8x8_c(unsigned char* src_ptr,
--                               int src_pixels_per_line,
--                               int xoffset,
--                               int yoffset,
--                               unsigned char* dst_ptr,
--                               int dst_pitch);
+-void vp8_bilinear_predict8x8_c(unsigned char *src_ptr, int src_pixels_per_line, int xoffset, int yoffset, unsigned char *dst_ptr, int dst_pitch);
 -#define vp8_bilinear_predict8x8 vp8_bilinear_predict8x8_c
 -
--int vp8_block_error_c(short* coeff, short* dqcoeff);
+-int vp8_block_error_c(short *coeff, short *dqcoeff);
 -#define vp8_block_error vp8_block_error_c
 -
--void vp8_copy32xn_c(const unsigned char* src_ptr,
--                    int src_stride,
--                    unsigned char* dst_ptr,
--                    int dst_stride,
--                    int height);
+-void vp8_copy32xn_c(const unsigned char *src_ptr, int src_stride, unsigned char *dst_ptr, int dst_stride, int height);
 -#define vp8_copy32xn vp8_copy32xn_c
 -
--void vp8_copy_mem16x16_c(unsigned char* src,
--                         int src_stride,
--                         unsigned char* dst,
--                         int dst_stride);
+-void vp8_copy_mem16x16_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride);
 -#define vp8_copy_mem16x16 vp8_copy_mem16x16_c
 -
--void vp8_copy_mem8x4_c(unsigned char* src,
--                       int src_stride,
--                       unsigned char* dst,
--                       int dst_stride);
+-void vp8_copy_mem8x4_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride);
 -#define vp8_copy_mem8x4 vp8_copy_mem8x4_c
 -
--void vp8_copy_mem8x8_c(unsigned char* src,
--                       int src_stride,
--                       unsigned char* dst,
--                       int dst_stride);
+-void vp8_copy_mem8x8_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride);
 -#define vp8_copy_mem8x8 vp8_copy_mem8x8_c
 -
--void vp8_dc_only_idct_add_c(short input_dc,
--                            unsigned char* pred_ptr,
--                            int pred_stride,
--                            unsigned char* dst_ptr,
--                            int dst_stride);
+-void vp8_dc_only_idct_add_c(short input_dc, unsigned char *pred_ptr, int pred_stride, unsigned char *dst_ptr, int dst_stride);
 -#define vp8_dc_only_idct_add vp8_dc_only_idct_add_c
 -
--int vp8_denoiser_filter_c(unsigned char* mc_running_avg_y,
--                          int mc_avg_y_stride,
--                          unsigned char* running_avg_y,
--                          int avg_y_stride,
--                          unsigned char* sig,
--                          int sig_stride,
--                          unsigned int motion_magnitude,
--                          int increase_denoising);
+-int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride, unsigned char *running_avg_y, int avg_y_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
 -#define vp8_denoiser_filter vp8_denoiser_filter_c
 -
--int vp8_denoiser_filter_uv_c(unsigned char* mc_running_avg,
--                             int mc_avg_stride,
--                             unsigned char* running_avg,
--                             int avg_stride,
--                             unsigned char* sig,
--                             int sig_stride,
--                             unsigned int motion_magnitude,
--                             int increase_denoising);
+-int vp8_denoiser_filter_uv_c(unsigned char *mc_running_avg, int mc_avg_stride, unsigned char *running_avg, int avg_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
 -#define vp8_denoiser_filter_uv vp8_denoiser_filter_uv_c
 -
--void vp8_dequant_idct_add_c(short* input,
--                            short* dq,
--                            unsigned char* dest,
--                            int stride);
+-void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *dest, int stride);
 -#define vp8_dequant_idct_add vp8_dequant_idct_add_c
 -
--void vp8_dequant_idct_add_uv_block_c(short* q,
--                                     short* dq,
--                                     unsigned char* dst_u,
--                                     unsigned char* dst_v,
--                                     int stride,
--                                     char* eobs);
+-void vp8_dequant_idct_add_uv_block_c(short *q, short *dq, unsigned char *dst_u, unsigned char *dst_v, int stride, char *eobs);
 -#define vp8_dequant_idct_add_uv_block vp8_dequant_idct_add_uv_block_c
 -
--void vp8_dequant_idct_add_y_block_c(short* q,
--                                    short* dq,
--                                    unsigned char* dst,
--                                    int stride,
--                                    char* eobs);
+-void vp8_dequant_idct_add_y_block_c(short *q, short *dq, unsigned char *dst, int stride, char *eobs);
 -#define vp8_dequant_idct_add_y_block vp8_dequant_idct_add_y_block_c
 -
--void vp8_dequantize_b_c(struct blockd*, short* DQC);
+-void vp8_dequantize_b_c(struct blockd*, short *DQC);
 -#define vp8_dequantize_b vp8_dequantize_b_c
 -
--int vp8_diamond_search_sad_c(struct macroblock* x,
--                             struct block* b,
--                             struct blockd* d,
--                             union int_mv* ref_mv,
--                             union int_mv* best_mv,
--                             int search_param,
--                             int sad_per_bit,
--                             int* num00,
--                             struct variance_vtable* fn_ptr,
--                             int* mvcost[2],
--                             union int_mv* center_mv);
+-int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
 -#define vp8_diamond_search_sad vp8_diamond_search_sad_c
 -
--void vp8_fast_quantize_b_c(struct block*, struct blockd*);
+-void vp8_fast_quantize_b_c(struct block *, struct blockd *);
 -#define vp8_fast_quantize_b vp8_fast_quantize_b_c
 -
--void vp8_filter_by_weight16x16_c(unsigned char* src,
--                                 int src_stride,
--                                 unsigned char* dst,
--                                 int dst_stride,
--                                 int src_weight);
+-void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
 -#define vp8_filter_by_weight16x16 vp8_filter_by_weight16x16_c
 -
--void vp8_filter_by_weight4x4_c(unsigned char* src,
--                               int src_stride,
--                               unsigned char* dst,
--                               int dst_stride,
--                               int src_weight);
+-void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
 -#define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c
 -
--void vp8_filter_by_weight8x8_c(unsigned char* src,
--                               int src_stride,
--                               unsigned char* dst,
--                               int dst_stride,
--                               int src_weight);
+-void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight);
 -#define vp8_filter_by_weight8x8 vp8_filter_by_weight8x8_c
 -
--void vp8_loop_filter_bh_c(unsigned char* y_ptr,
--                          unsigned char* u_ptr,
--                          unsigned char* v_ptr,
--                          int y_stride,
--                          int uv_stride,
--                          struct loop_filter_info* lfi);
+-void vp8_loop_filter_bh_c(unsigned char *y_ptr, unsigned char *u_ptr, unsigned char *v_ptr, int y_stride, int uv_stride, struct loop_filter_info *lfi);
 -#define vp8_loop_filter_bh vp8_loop_filter_bh_c
 -
--void vp8_loop_filter_bv_c(unsigned char* y_ptr,
--                          unsigned char* u_ptr,
--                          unsigned char* v_ptr,
--                          int y_stride,
--                          int uv_stride,
--                          struct loop_filter_info* lfi);
+-void vp8_loop_filter_bv_c(unsigned char *y_ptr, unsigned char *u_ptr, unsigned char *v_ptr, int y_stride, int uv_stride, struct loop_filter_info *lfi);
 -#define vp8_loop_filter_bv vp8_loop_filter_bv_c
 -
--void vp8_loop_filter_mbh_c(unsigned char* y_ptr,
--                           unsigned char* u_ptr,
--                           unsigned char* v_ptr,
--                           int y_stride,
--                           int uv_stride,
--                           struct loop_filter_info* lfi);
+-void vp8_loop_filter_mbh_c(unsigned char *y_ptr, unsigned char *u_ptr, unsigned char *v_ptr, int y_stride, int uv_stride, struct loop_filter_info *lfi);
 -#define vp8_loop_filter_mbh vp8_loop_filter_mbh_c
 -
--void vp8_loop_filter_mbv_c(unsigned char* y_ptr,
--                           unsigned char* u_ptr,
--                           unsigned char* v_ptr,
--                           int y_stride,
--                           int uv_stride,
--                           struct loop_filter_info* lfi);
+-void vp8_loop_filter_mbv_c(unsigned char *y_ptr, unsigned char *u_ptr, unsigned char *v_ptr, int y_stride, int uv_stride, struct loop_filter_info *lfi);
 -#define vp8_loop_filter_mbv vp8_loop_filter_mbv_c
 -
--void vp8_loop_filter_bhs_c(unsigned char* y_ptr,
--                           int y_stride,
--                           const unsigned char* blimit);
+-void vp8_loop_filter_bhs_c(unsigned char *y_ptr, int y_stride, const unsigned char *blimit);
 -#define vp8_loop_filter_simple_bh vp8_loop_filter_bhs_c
 -
--void vp8_loop_filter_bvs_c(unsigned char* y_ptr,
--                           int y_stride,
--                           const unsigned char* blimit);
+-void vp8_loop_filter_bvs_c(unsigned char *y_ptr, int y_stride, const unsigned char *blimit);
 -#define vp8_loop_filter_simple_bv vp8_loop_filter_bvs_c
 -
--void vp8_loop_filter_simple_horizontal_edge_c(unsigned char* y_ptr,
--                                              int y_stride,
--                                              const unsigned char* blimit);
+-void vp8_loop_filter_simple_horizontal_edge_c(unsigned char *y_ptr, int y_stride, const unsigned char *blimit);
 -#define vp8_loop_filter_simple_mbh vp8_loop_filter_simple_horizontal_edge_c
 -
--void vp8_loop_filter_simple_vertical_edge_c(unsigned char* y_ptr,
--                                            int y_stride,
--                                            const unsigned char* blimit);
+-void vp8_loop_filter_simple_vertical_edge_c(unsigned char *y_ptr, int y_stride, const unsigned char *blimit);
 -#define vp8_loop_filter_simple_mbv vp8_loop_filter_simple_vertical_edge_c
 -
--int vp8_mbblock_error_c(struct macroblock* mb, int dc);
+-int vp8_mbblock_error_c(struct macroblock *mb, int dc);
 -#define vp8_mbblock_error vp8_mbblock_error_c
 -
--int vp8_mbuverror_c(struct macroblock* mb);
+-int vp8_mbuverror_c(struct macroblock *mb);
 -#define vp8_mbuverror vp8_mbuverror_c
 -
--int vp8_refining_search_sad_c(struct macroblock* x,
--                              struct block* b,
--                              struct blockd* d,
--                              union int_mv* ref_mv,
--                              int error_per_bit,
--                              int search_range,
--                              struct variance_vtable* fn_ptr,
--                              int* mvcost[2],
--                              union int_mv* center_mv);
+-int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int error_per_bit, int search_range, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
 -#define vp8_refining_search_sad vp8_refining_search_sad_c
 -
--void vp8_regular_quantize_b_c(struct block*, struct blockd*);
+-void vp8_regular_quantize_b_c(struct block *, struct blockd *);
 -#define vp8_regular_quantize_b vp8_regular_quantize_b_c
 -
--void vp8_short_fdct4x4_c(short* input, short* output, int pitch);
+-void vp8_short_fdct4x4_c(short *input, short *output, int pitch);
 -#define vp8_short_fdct4x4 vp8_short_fdct4x4_c
 -
--void vp8_short_fdct8x4_c(short* input, short* output, int pitch);
+-void vp8_short_fdct8x4_c(short *input, short *output, int pitch);
 -#define vp8_short_fdct8x4 vp8_short_fdct8x4_c
 -
--void vp8_short_idct4x4llm_c(short* input,
--                            unsigned char* pred_ptr,
--                            int pred_stride,
--                            unsigned char* dst_ptr,
--                            int dst_stride);
+-void vp8_short_idct4x4llm_c(short *input, unsigned char *pred_ptr, int pred_stride, unsigned char *dst_ptr, int dst_stride);
 -#define vp8_short_idct4x4llm vp8_short_idct4x4llm_c
 -
--void vp8_short_inv_walsh4x4_c(short* input, short* mb_dqcoeff);
+-void vp8_short_inv_walsh4x4_c(short *input, short *mb_dqcoeff);
 -#define vp8_short_inv_walsh4x4 vp8_short_inv_walsh4x4_c
 -
--void vp8_short_inv_walsh4x4_1_c(short* input, short* mb_dqcoeff);
+-void vp8_short_inv_walsh4x4_1_c(short *input, short *mb_dqcoeff);
 -#define vp8_short_inv_walsh4x4_1 vp8_short_inv_walsh4x4_1_c
 -
--void vp8_short_walsh4x4_c(short* input, short* output, int pitch);
+-void vp8_short_walsh4x4_c(short *input, short *output, int pitch);
 -#define vp8_short_walsh4x4 vp8_short_walsh4x4_c
 -
--void vp8_sixtap_predict16x16_c(unsigned char* src_ptr,
--                               int src_pixels_per_line,
--                               int xoffset,
--                               int yoffset,
--                               unsigned char* dst_ptr,
--                               int dst_pitch);
+-void vp8_sixtap_predict16x16_c(unsigned char *src_ptr, int src_pixels_per_line, int xoffset, int yoffset, unsigned char *dst_ptr, int dst_pitch);
 -#define vp8_sixtap_predict16x16 vp8_sixtap_predict16x16_c
 -
--void vp8_sixtap_predict4x4_c(unsigned char* src_ptr,
--                             int src_pixels_per_line,
--                             int xoffset,
--                             int yoffset,
--                             unsigned char* dst_ptr,
--                             int dst_pitch);
+-void vp8_sixtap_predict4x4_c(unsigned char *src_ptr, int src_pixels_per_line, int xoffset, int yoffset, unsigned char *dst_ptr, int dst_pitch);
 -#define vp8_sixtap_predict4x4 vp8_sixtap_predict4x4_c
 -
--void vp8_sixtap_predict8x4_c(unsigned char* src_ptr,
--                             int src_pixels_per_line,
--                             int xoffset,
--                             int yoffset,
--                             unsigned char* dst_ptr,
--                             int dst_pitch);
+-void vp8_sixtap_predict8x4_c(unsigned char *src_ptr, int src_pixels_per_line, int xoffset, int yoffset, unsigned char *dst_ptr, int dst_pitch);
 -#define vp8_sixtap_predict8x4 vp8_sixtap_predict8x4_c
 -
--void vp8_sixtap_predict8x8_c(unsigned char* src_ptr,
--                             int src_pixels_per_line,
--                             int xoffset,
--                             int yoffset,
--                             unsigned char* dst_ptr,
--                             int dst_pitch);
+-void vp8_sixtap_predict8x8_c(unsigned char *src_ptr, int src_pixels_per_line, int xoffset, int yoffset, unsigned char *dst_ptr, int dst_pitch);
 -#define vp8_sixtap_predict8x8 vp8_sixtap_predict8x8_c
 -
 -void vp8_rtcd(void);
@@ -322,9 +175,10 @@ Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vp8_r
 -
 -#ifdef RTCD_C
 -#include "vpx_ports/ppc.h"
--static void setup_rtcd_internal(void) {
--  int flags = ppc_simd_caps();
--  (void)flags;
+-static void setup_rtcd_internal(void)
+-{
+-    int flags = ppc_simd_caps();
+-    (void)flags;
 -}
 -#endif
 -
@@ -333,11 +187,9 @@ Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vp8_r
 -#endif
 -
 -#endif  // VP8_RTCD_H_
-Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
-===================================================================
---- chromium-136.0.7103.48.orig/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h
-+++ /dev/null
-@@ -1,206 +0,0 @@
+--- chromium-137.0.7151.40/third_party/libvpx/source/config/linux/ppc64/vp9_rtcd.h	2025-05-26 21:02:11.891388790 +0200
++++ /dev/null	2025-05-26 08:38:43.246140177 +0200
+@@ -1,119 +0,0 @@
 -/*
 - *  Copyright (c) 2025 The WebM project authors. All Rights Reserved.
 - *
@@ -362,10 +214,10 @@ Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vp9_r
 - * VP9
 - */
 -
+-#include "vpx/vpx_integer.h"
 -#include "vp9/common/vp9_common.h"
 -#include "vp9/common/vp9_enums.h"
 -#include "vp9/common/vp9_filter.h"
--#include "vpx/vpx_integer.h"
 -#if !CONFIG_REALTIME_ONLY && CONFIG_VP9_ENCODER
 -#include "vp9/encoder/vp9_temporal_filter.h"
 -#endif
@@ -386,145 +238,57 @@ Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vp9_r
 -extern "C" {
 -#endif
 -
--int64_t vp9_block_error_c(const tran_low_t* coeff,
--                          const tran_low_t* dqcoeff,
--                          intptr_t block_size,
--                          int64_t* ssz);
+-int64_t vp9_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz);
 -#define vp9_block_error vp9_block_error_c
 -
--int64_t vp9_block_error_fp_c(const tran_low_t* coeff,
--                             const tran_low_t* dqcoeff,
--                             int block_size);
+-int64_t vp9_block_error_fp_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, int block_size);
 -#define vp9_block_error_fp vp9_block_error_fp_c
 -
--int vp9_denoiser_filter_c(const uint8_t* sig,
--                          int sig_stride,
--                          const uint8_t* mc_avg,
--                          int mc_avg_stride,
--                          uint8_t* avg,
--                          int avg_stride,
--                          int increase_denoising,
--                          BLOCK_SIZE bs,
--                          int motion_magnitude);
+-int vp9_denoiser_filter_c(const uint8_t *sig, int sig_stride, const uint8_t *mc_avg, int mc_avg_stride, uint8_t *avg, int avg_stride, int increase_denoising, BLOCK_SIZE bs, int motion_magnitude);
 -#define vp9_denoiser_filter vp9_denoiser_filter_c
 -
--int vp9_diamond_search_sad_c(const struct macroblock* x,
--                             const struct search_site_config* cfg,
--                             struct mv* ref_mv,
--                             uint32_t start_mv_sad,
--                             struct mv* best_mv,
--                             int search_param,
--                             int sad_per_bit,
--                             int* num00,
--                             const struct vp9_sad_table* sad_fn_ptr,
--                             const struct mv* center_mv);
+-int vp9_diamond_search_sad_c(const struct macroblock *x, const struct search_site_config *cfg,  struct mv *ref_mv, uint32_t start_mv_sad, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct vp9_sad_table *sad_fn_ptr, const struct mv *center_mv);
 -#define vp9_diamond_search_sad vp9_diamond_search_sad_c
 -
--void vp9_fht16x16_c(const int16_t* input,
--                    tran_low_t* output,
--                    int stride,
--                    int tx_type);
+-void vp9_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
 -#define vp9_fht16x16 vp9_fht16x16_c
 -
--void vp9_fht4x4_c(const int16_t* input,
--                  tran_low_t* output,
--                  int stride,
--                  int tx_type);
+-void vp9_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
 -#define vp9_fht4x4 vp9_fht4x4_c
 -
--void vp9_fht8x8_c(const int16_t* input,
--                  tran_low_t* output,
--                  int stride,
--                  int tx_type);
+-void vp9_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type);
 -#define vp9_fht8x8 vp9_fht8x8_c
 -
--void vp9_filter_by_weight16x16_c(const uint8_t* src,
--                                 int src_stride,
--                                 uint8_t* dst,
--                                 int dst_stride,
--                                 int src_weight);
+-void vp9_filter_by_weight16x16_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int src_weight);
 -#define vp9_filter_by_weight16x16 vp9_filter_by_weight16x16_c
 -
--void vp9_filter_by_weight8x8_c(const uint8_t* src,
--                               int src_stride,
--                               uint8_t* dst,
--                               int dst_stride,
--                               int src_weight);
+-void vp9_filter_by_weight8x8_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int src_weight);
 -#define vp9_filter_by_weight8x8 vp9_filter_by_weight8x8_c
 -
--void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride);
+-void vp9_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride);
 -#define vp9_fwht4x4 vp9_fwht4x4_c
 -
--void vp9_iht16x16_256_add_c(const tran_low_t* input,
--                            uint8_t* dest,
--                            int stride,
--                            int tx_type);
--void vp9_iht16x16_256_add_vsx(const tran_low_t* input,
--                              uint8_t* dest,
--                              int stride,
--                              int tx_type);
+-void vp9_iht16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type);
+-void vp9_iht16x16_256_add_vsx(const tran_low_t *input, uint8_t *dest, int stride, int tx_type);
 -#define vp9_iht16x16_256_add vp9_iht16x16_256_add_vsx
 -
--void vp9_iht4x4_16_add_c(const tran_low_t* input,
--                         uint8_t* dest,
--                         int stride,
--                         int tx_type);
--void vp9_iht4x4_16_add_vsx(const tran_low_t* input,
--                           uint8_t* dest,
--                           int stride,
--                           int tx_type);
+-void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type);
+-void vp9_iht4x4_16_add_vsx(const tran_low_t *input, uint8_t *dest, int stride, int tx_type);
 -#define vp9_iht4x4_16_add vp9_iht4x4_16_add_vsx
 -
--void vp9_iht8x8_64_add_c(const tran_low_t* input,
--                         uint8_t* dest,
--                         int stride,
--                         int tx_type);
--void vp9_iht8x8_64_add_vsx(const tran_low_t* input,
--                           uint8_t* dest,
--                           int stride,
--                           int tx_type);
+-void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type);
+-void vp9_iht8x8_64_add_vsx(const tran_low_t *input, uint8_t *dest, int stride, int tx_type);
 -#define vp9_iht8x8_64_add vp9_iht8x8_64_add_vsx
 -
--void vp9_quantize_fp_c(const tran_low_t* coeff_ptr,
--                       intptr_t n_coeffs,
--                       const struct macroblock_plane* const mb_plane,
--                       tran_low_t* qcoeff_ptr,
--                       tran_low_t* dqcoeff_ptr,
--                       const int16_t* dequant_ptr,
--                       uint16_t* eob_ptr,
--                       const struct ScanOrder* const scan_order);
--void vp9_quantize_fp_vsx(const tran_low_t* coeff_ptr,
--                         intptr_t n_coeffs,
--                         const struct macroblock_plane* const mb_plane,
--                         tran_low_t* qcoeff_ptr,
--                         tran_low_t* dqcoeff_ptr,
--                         const int16_t* dequant_ptr,
--                         uint16_t* eob_ptr,
--                         const struct ScanOrder* const scan_order);
+-void vp9_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const struct macroblock_plane *const mb_plane, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const struct ScanOrder *const scan_order);
+-void vp9_quantize_fp_vsx(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const struct macroblock_plane *const mb_plane, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const struct ScanOrder *const scan_order);
 -#define vp9_quantize_fp vp9_quantize_fp_vsx
 -
--void vp9_quantize_fp_32x32_c(const tran_low_t* coeff_ptr,
--                             intptr_t n_coeffs,
--                             const struct macroblock_plane* const mb_plane,
--                             tran_low_t* qcoeff_ptr,
--                             tran_low_t* dqcoeff_ptr,
--                             const int16_t* dequant_ptr,
--                             uint16_t* eob_ptr,
--                             const struct ScanOrder* const scan_order);
--void vp9_quantize_fp_32x32_vsx(const tran_low_t* coeff_ptr,
--                               intptr_t n_coeffs,
--                               const struct macroblock_plane* const mb_plane,
--                               tran_low_t* qcoeff_ptr,
--                               tran_low_t* dqcoeff_ptr,
--                               const int16_t* dequant_ptr,
--                               uint16_t* eob_ptr,
--                               const struct ScanOrder* const scan_order);
+-void vp9_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const struct macroblock_plane *const mb_plane, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const struct ScanOrder *const scan_order);
+-void vp9_quantize_fp_32x32_vsx(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const struct macroblock_plane *const mb_plane, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const struct ScanOrder *const scan_order);
 -#define vp9_quantize_fp_32x32 vp9_quantize_fp_32x32_vsx
 -
--void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config* src,
--                                  struct yv12_buffer_config* dst,
--                                  INTERP_FILTER filter_type,
--                                  int phase_scaler);
+-void vp9_scale_and_extend_frame_c(const struct yv12_buffer_config *src, struct yv12_buffer_config *dst, INTERP_FILTER filter_type, int phase_scaler);
 -#define vp9_scale_and_extend_frame vp9_scale_and_extend_frame_c
 -
 -void vp9_rtcd(void);
@@ -533,9 +297,10 @@ Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vp9_r
 -
 -#ifdef RTCD_C
 -#include "vpx_ports/ppc.h"
--static void setup_rtcd_internal(void) {
--  int flags = ppc_simd_caps();
--  (void)flags;
+-static void setup_rtcd_internal(void)
+-{
+-    int flags = ppc_simd_caps();
+-    (void)flags;
 -}
 -#endif
 -
@@ -544,11 +309,9 @@ Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vp9_r
 -#endif
 -
 -#endif  // VP9_RTCD_H_
-Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
-===================================================================
---- chromium-136.0.7103.48.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm
-+++ /dev/null
-@@ -1,108 +0,0 @@
+--- chromium-137.0.7151.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.asm	2025-05-26 21:02:11.891388790 +0200
++++ /dev/null	2025-05-26 08:38:43.246140177 +0200
+@@ -1,107 +0,0 @@
 -@ This file was created from a .asm file
 -@  using the ads2gas.pl script.
 -.syntax unified
@@ -652,15 +415,12 @@ Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vpx_c
 -.equ CONFIG_FP_MB_STATS ,  0
 -.equ CONFIG_EMULATE_HARDWARE ,  0
 -.equ CONFIG_NON_GREEDY_MV ,  0
--.equ CONFIG_RATE_CTRL ,  0
 -.equ CONFIG_COLLECT_COMPONENT_TIMING ,  0
 -.equ DECODE_WIDTH_LIMIT ,  16384
 -.equ DECODE_HEIGHT_LIMIT ,  16384
 -    .section .note.GNU-stack,"",%progbits
-Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
-===================================================================
---- chromium-136.0.7103.48.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.c
-+++ /dev/null
+--- chromium-137.0.7151.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.c	2025-05-26 21:02:11.891388790 +0200
++++ /dev/null	2025-05-26 08:38:43.246140177 +0200
 @@ -1,10 +0,0 @@
 -/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
 -/*  */
@@ -672,11 +432,9 @@ Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vpx_c
 -#include "vpx/vpx_codec.h"
 -static const char* const cfg = "--target=ppc64le-linux-gcc --enable-external-build --enable-postproc --enable-multi-res-encoding --enable-temporal-denoising --enable-vp9-temporal-denoising --enable-vp9-postproc --size-limit=16384x16384 --enable-realtime-only --disable-install-docs --disable-libyuv --enable-unit-tests";
 -const char *vpx_codec_build_config(void) {return cfg;}
-Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
-===================================================================
---- chromium-136.0.7103.48.orig/third_party/libvpx/source/config/linux/ppc64/vpx_config.h
-+++ /dev/null
-@@ -1,117 +0,0 @@
+--- chromium-137.0.7151.40/third_party/libvpx/source/config/linux/ppc64/vpx_config.h	2025-05-26 21:02:11.892388814 +0200
++++ /dev/null	2025-05-26 08:38:43.246140177 +0200
+@@ -1,116 +0,0 @@
 -/* Copyright (c) 2011 The WebM project authors. All Rights Reserved. */
 -/*  */
 -/* Use of this source code is governed by a BSD-style license */
@@ -789,16 +547,13 @@ Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vpx_c
 -#define CONFIG_FP_MB_STATS 0
 -#define CONFIG_EMULATE_HARDWARE 0
 -#define CONFIG_NON_GREEDY_MV 0
--#define CONFIG_RATE_CTRL 0
 -#define CONFIG_COLLECT_COMPONENT_TIMING 0
 -#define DECODE_WIDTH_LIMIT 16384
 -#define DECODE_HEIGHT_LIMIT 16384
 -#endif /* VPX_CONFIG_H */
-Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
-===================================================================
---- chromium-136.0.7103.48.orig/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h
-+++ /dev/null
-@@ -1,2138 +0,0 @@
+--- chromium-137.0.7151.40/third_party/libvpx/source/config/linux/ppc64/vpx_dsp_rtcd.h	2025-05-26 21:02:11.892388814 +0200
++++ /dev/null	2025-05-26 08:38:43.246140177 +0200
+@@ -1,858 +0,0 @@
 -/*
 - *  Copyright (c) 2025 The WebM project authors. All Rights Reserved.
 - *
@@ -827,2097 +582,816 @@ Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vpx_d
 -#include "vpx_dsp/vpx_dsp_common.h"
 -#include "vpx_dsp/vpx_filter.h"
 -#if CONFIG_VP9_ENCODER
--struct macroblock_plane;
--struct ScanOrder;
+- struct macroblock_plane;
+- struct ScanOrder;
 -#endif
 -
+-
 -#ifdef __cplusplus
 -extern "C" {
 -#endif
 -
--unsigned int vpx_avg_4x4_c(const uint8_t*, int p);
+-unsigned int vpx_avg_4x4_c(const uint8_t *, int p);
 -#define vpx_avg_4x4 vpx_avg_4x4_c
 -
--unsigned int vpx_avg_8x8_c(const uint8_t*, int p);
+-unsigned int vpx_avg_8x8_c(const uint8_t *, int p);
 -#define vpx_avg_8x8 vpx_avg_8x8_c
 -
--void vpx_comp_avg_pred_c(uint8_t* comp_pred,
--                         const uint8_t* pred,
--                         int width,
--                         int height,
--                         const uint8_t* ref,
--                         int ref_stride);
--void vpx_comp_avg_pred_vsx(uint8_t* comp_pred,
--                           const uint8_t* pred,
--                           int width,
--                           int height,
--                           const uint8_t* ref,
--                           int ref_stride);
+-void vpx_comp_avg_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, int height, const uint8_t *ref, int ref_stride);
+-void vpx_comp_avg_pred_vsx(uint8_t *comp_pred, const uint8_t *pred, int width, int height, const uint8_t *ref, int ref_stride);
 -#define vpx_comp_avg_pred vpx_comp_avg_pred_vsx
 -
--void vpx_convolve8_c(const uint8_t* src,
--                     ptrdiff_t src_stride,
--                     uint8_t* dst,
--                     ptrdiff_t dst_stride,
--                     const InterpKernel* filter,
--                     int x0_q4,
--                     int x_step_q4,
--                     int y0_q4,
--                     int y_step_q4,
--                     int w,
--                     int h);
--void vpx_convolve8_vsx(const uint8_t* src,
--                       ptrdiff_t src_stride,
--                       uint8_t* dst,
--                       ptrdiff_t dst_stride,
--                       const InterpKernel* filter,
--                       int x0_q4,
--                       int x_step_q4,
--                       int y0_q4,
--                       int y_step_q4,
--                       int w,
--                       int h);
+-void vpx_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
+-void vpx_convolve8_vsx(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
 -#define vpx_convolve8 vpx_convolve8_vsx
 -
--void vpx_convolve8_avg_c(const uint8_t* src,
--                         ptrdiff_t src_stride,
--                         uint8_t* dst,
--                         ptrdiff_t dst_stride,
--                         const InterpKernel* filter,
--                         int x0_q4,
--                         int x_step_q4,
--                         int y0_q4,
--                         int y_step_q4,
--                         int w,
--                         int h);
--void vpx_convolve8_avg_vsx(const uint8_t* src,
--                           ptrdiff_t src_stride,
--                           uint8_t* dst,
--                           ptrdiff_t dst_stride,
--                           const InterpKernel* filter,
--                           int x0_q4,
--                           int x_step_q4,
--                           int y0_q4,
--                           int y_step_q4,
--                           int w,
--                           int h);
+-void vpx_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
+-void vpx_convolve8_avg_vsx(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
 -#define vpx_convolve8_avg vpx_convolve8_avg_vsx
 -
--void vpx_convolve8_avg_horiz_c(const uint8_t* src,
--                               ptrdiff_t src_stride,
--                               uint8_t* dst,
--                               ptrdiff_t dst_stride,
--                               const InterpKernel* filter,
--                               int x0_q4,
--                               int x_step_q4,
--                               int y0_q4,
--                               int y_step_q4,
--                               int w,
--                               int h);
--void vpx_convolve8_avg_horiz_vsx(const uint8_t* src,
--                                 ptrdiff_t src_stride,
--                                 uint8_t* dst,
--                                 ptrdiff_t dst_stride,
--                                 const InterpKernel* filter,
--                                 int x0_q4,
--                                 int x_step_q4,
--                                 int y0_q4,
--                                 int y_step_q4,
--                                 int w,
--                                 int h);
+-void vpx_convolve8_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
+-void vpx_convolve8_avg_horiz_vsx(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
 -#define vpx_convolve8_avg_horiz vpx_convolve8_avg_horiz_vsx
 -
--void vpx_convolve8_avg_vert_c(const uint8_t* src,
--                              ptrdiff_t src_stride,
--                              uint8_t* dst,
--                              ptrdiff_t dst_stride,
--                              const InterpKernel* filter,
--                              int x0_q4,
--                              int x_step_q4,
--                              int y0_q4,
--                              int y_step_q4,
--                              int w,
--                              int h);
--void vpx_convolve8_avg_vert_vsx(const uint8_t* src,
--                                ptrdiff_t src_stride,
--                                uint8_t* dst,
--                                ptrdiff_t dst_stride,
--                                const InterpKernel* filter,
--                                int x0_q4,
--                                int x_step_q4,
--                                int y0_q4,
--                                int y_step_q4,
--                                int w,
--                                int h);
+-void vpx_convolve8_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
+-void vpx_convolve8_avg_vert_vsx(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
 -#define vpx_convolve8_avg_vert vpx_convolve8_avg_vert_vsx
 -
--void vpx_convolve8_horiz_c(const uint8_t* src,
--                           ptrdiff_t src_stride,
--                           uint8_t* dst,
--                           ptrdiff_t dst_stride,
--                           const InterpKernel* filter,
--                           int x0_q4,
--                           int x_step_q4,
--                           int y0_q4,
--                           int y_step_q4,
--                           int w,
--                           int h);
--void vpx_convolve8_horiz_vsx(const uint8_t* src,
--                             ptrdiff_t src_stride,
--                             uint8_t* dst,
--                             ptrdiff_t dst_stride,
--                             const InterpKernel* filter,
--                             int x0_q4,
--                             int x_step_q4,
--                             int y0_q4,
--                             int y_step_q4,
--                             int w,
--                             int h);
+-void vpx_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
+-void vpx_convolve8_horiz_vsx(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
 -#define vpx_convolve8_horiz vpx_convolve8_horiz_vsx
 -
--void vpx_convolve8_vert_c(const uint8_t* src,
--                          ptrdiff_t src_stride,
--                          uint8_t* dst,
--                          ptrdiff_t dst_stride,
--                          const InterpKernel* filter,
--                          int x0_q4,
--                          int x_step_q4,
--                          int y0_q4,
--                          int y_step_q4,
--                          int w,
--                          int h);
--void vpx_convolve8_vert_vsx(const uint8_t* src,
--                            ptrdiff_t src_stride,
--                            uint8_t* dst,
--                            ptrdiff_t dst_stride,
--                            const InterpKernel* filter,
--                            int x0_q4,
--                            int x_step_q4,
--                            int y0_q4,
--                            int y_step_q4,
--                            int w,
--                            int h);
+-void vpx_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
+-void vpx_convolve8_vert_vsx(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
 -#define vpx_convolve8_vert vpx_convolve8_vert_vsx
 -
--void vpx_convolve_avg_c(const uint8_t* src,
--                        ptrdiff_t src_stride,
--                        uint8_t* dst,
--                        ptrdiff_t dst_stride,
--                        const InterpKernel* filter,
--                        int x0_q4,
--                        int x_step_q4,
--                        int y0_q4,
--                        int y_step_q4,
--                        int w,
--                        int h);
--void vpx_convolve_avg_vsx(const uint8_t* src,
--                          ptrdiff_t src_stride,
--                          uint8_t* dst,
--                          ptrdiff_t dst_stride,
--                          const InterpKernel* filter,
--                          int x0_q4,
--                          int x_step_q4,
--                          int y0_q4,
--                          int y_step_q4,
--                          int w,
--                          int h);
+-void vpx_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
+-void vpx_convolve_avg_vsx(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
 -#define vpx_convolve_avg vpx_convolve_avg_vsx
 -
--void vpx_convolve_copy_c(const uint8_t* src,
--                         ptrdiff_t src_stride,
--                         uint8_t* dst,
--                         ptrdiff_t dst_stride,
--                         const InterpKernel* filter,
--                         int x0_q4,
--                         int x_step_q4,
--                         int y0_q4,
--                         int y_step_q4,
--                         int w,
--                         int h);
--void vpx_convolve_copy_vsx(const uint8_t* src,
--                           ptrdiff_t src_stride,
--                           uint8_t* dst,
--                           ptrdiff_t dst_stride,
--                           const InterpKernel* filter,
--                           int x0_q4,
--                           int x_step_q4,
--                           int y0_q4,
--                           int y_step_q4,
--                           int w,
--                           int h);
+-void vpx_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
+-void vpx_convolve_copy_vsx(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
 -#define vpx_convolve_copy vpx_convolve_copy_vsx
 -
--void vpx_d117_predictor_16x16_c(uint8_t* dst,
--                                ptrdiff_t stride,
--                                const uint8_t* above,
--                                const uint8_t* left);
+-void vpx_d117_predictor_16x16_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d117_predictor_16x16 vpx_d117_predictor_16x16_c
 -
--void vpx_d117_predictor_32x32_c(uint8_t* dst,
--                                ptrdiff_t stride,
--                                const uint8_t* above,
--                                const uint8_t* left);
+-void vpx_d117_predictor_32x32_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d117_predictor_32x32 vpx_d117_predictor_32x32_c
 -
--void vpx_d117_predictor_4x4_c(uint8_t* dst,
--                              ptrdiff_t stride,
--                              const uint8_t* above,
--                              const uint8_t* left);
+-void vpx_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d117_predictor_4x4 vpx_d117_predictor_4x4_c
 -
--void vpx_d117_predictor_8x8_c(uint8_t* dst,
--                              ptrdiff_t stride,
--                              const uint8_t* above,
--                              const uint8_t* left);
+-void vpx_d117_predictor_8x8_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d117_predictor_8x8 vpx_d117_predictor_8x8_c
 -
--void vpx_d135_predictor_16x16_c(uint8_t* dst,
--                                ptrdiff_t stride,
--                                const uint8_t* above,
--                                const uint8_t* left);
+-void vpx_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d135_predictor_16x16 vpx_d135_predictor_16x16_c
 -
--void vpx_d135_predictor_32x32_c(uint8_t* dst,
--                                ptrdiff_t stride,
--                                const uint8_t* above,
--                                const uint8_t* left);
+-void vpx_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d135_predictor_32x32 vpx_d135_predictor_32x32_c
 -
--void vpx_d135_predictor_4x4_c(uint8_t* dst,
--                              ptrdiff_t stride,
--                              const uint8_t* above,
--                              const uint8_t* left);
+-void vpx_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d135_predictor_4x4 vpx_d135_predictor_4x4_c
 -
--void vpx_d135_predictor_8x8_c(uint8_t* dst,
--                              ptrdiff_t stride,
--                              const uint8_t* above,
--                              const uint8_t* left);
+-void vpx_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d135_predictor_8x8 vpx_d135_predictor_8x8_c
 -
--void vpx_d153_predictor_16x16_c(uint8_t* dst,
--                                ptrdiff_t stride,
--                                const uint8_t* above,
--                                const uint8_t* left);
+-void vpx_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d153_predictor_16x16 vpx_d153_predictor_16x16_c
 -
--void vpx_d153_predictor_32x32_c(uint8_t* dst,
--                                ptrdiff_t stride,
--                                const uint8_t* above,
--                                const uint8_t* left);
+-void vpx_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d153_predictor_32x32 vpx_d153_predictor_32x32_c
 -
--void vpx_d153_predictor_4x4_c(uint8_t* dst,
--                              ptrdiff_t stride,
--                              const uint8_t* above,
--                              const uint8_t* left);
+-void vpx_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d153_predictor_4x4 vpx_d153_predictor_4x4_c
 -
--void vpx_d153_predictor_8x8_c(uint8_t* dst,
--                              ptrdiff_t stride,
--                              const uint8_t* above,
--                              const uint8_t* left);
+-void vpx_d153_predictor_8x8_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d153_predictor_8x8 vpx_d153_predictor_8x8_c
 -
--void vpx_d207_predictor_16x16_c(uint8_t* dst,
--                                ptrdiff_t stride,
--                                const uint8_t* above,
--                                const uint8_t* left);
+-void vpx_d207_predictor_16x16_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d207_predictor_16x16 vpx_d207_predictor_16x16_c
 -
--void vpx_d207_predictor_32x32_c(uint8_t* dst,
--                                ptrdiff_t stride,
--                                const uint8_t* above,
--                                const uint8_t* left);
+-void vpx_d207_predictor_32x32_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d207_predictor_32x32 vpx_d207_predictor_32x32_c
 -
--void vpx_d207_predictor_4x4_c(uint8_t* dst,
--                              ptrdiff_t stride,
--                              const uint8_t* above,
--                              const uint8_t* left);
+-void vpx_d207_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d207_predictor_4x4 vpx_d207_predictor_4x4_c
 -
--void vpx_d207_predictor_8x8_c(uint8_t* dst,
--                              ptrdiff_t stride,
--                              const uint8_t* above,
--                              const uint8_t* left);
+-void vpx_d207_predictor_8x8_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d207_predictor_8x8 vpx_d207_predictor_8x8_c
 -
--void vpx_d45_predictor_16x16_c(uint8_t* dst,
--                               ptrdiff_t stride,
--                               const uint8_t* above,
--                               const uint8_t* left);
--void vpx_d45_predictor_16x16_vsx(uint8_t* dst,
--                                 ptrdiff_t stride,
--                                 const uint8_t* above,
--                                 const uint8_t* left);
+-void vpx_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
+-void vpx_d45_predictor_16x16_vsx(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d45_predictor_16x16 vpx_d45_predictor_16x16_vsx
 -
--void vpx_d45_predictor_32x32_c(uint8_t* dst,
--                               ptrdiff_t stride,
--                               const uint8_t* above,
--                               const uint8_t* left);
--void vpx_d45_predictor_32x32_vsx(uint8_t* dst,
--                                 ptrdiff_t stride,
--                                 const uint8_t* above,
--                                 const uint8_t* left);
+-void vpx_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
+-void vpx_d45_predictor_32x32_vsx(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d45_predictor_32x32 vpx_d45_predictor_32x32_vsx
 -
--void vpx_d45_predictor_4x4_c(uint8_t* dst,
--                             ptrdiff_t stride,
--                             const uint8_t* above,
--                             const uint8_t* left);
+-void vpx_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d45_predictor_4x4 vpx_d45_predictor_4x4_c
 -
--void vpx_d45_predictor_8x8_c(uint8_t* dst,
--                             ptrdiff_t stride,
--                             const uint8_t* above,
--                             const uint8_t* left);
+-void vpx_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d45_predictor_8x8 vpx_d45_predictor_8x8_c
 -
--void vpx_d45e_predictor_4x4_c(uint8_t* dst,
--                              ptrdiff_t stride,
--                              const uint8_t* above,
--                              const uint8_t* left);
+-void vpx_d45e_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d45e_predictor_4x4 vpx_d45e_predictor_4x4_c
 -
--void vpx_d63_predictor_16x16_c(uint8_t* dst,
--                               ptrdiff_t stride,
--                               const uint8_t* above,
--                               const uint8_t* left);
--void vpx_d63_predictor_16x16_vsx(uint8_t* dst,
--                                 ptrdiff_t stride,
--                                 const uint8_t* above,
--                                 const uint8_t* left);
+-void vpx_d63_predictor_16x16_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
+-void vpx_d63_predictor_16x16_vsx(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d63_predictor_16x16 vpx_d63_predictor_16x16_vsx
 -
--void vpx_d63_predictor_32x32_c(uint8_t* dst,
--                               ptrdiff_t stride,
--                               const uint8_t* above,
--                               const uint8_t* left);
--void vpx_d63_predictor_32x32_vsx(uint8_t* dst,
--                                 ptrdiff_t stride,
--                                 const uint8_t* above,
--                                 const uint8_t* left);
+-void vpx_d63_predictor_32x32_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
+-void vpx_d63_predictor_32x32_vsx(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d63_predictor_32x32 vpx_d63_predictor_32x32_vsx
 -
--void vpx_d63_predictor_4x4_c(uint8_t* dst,
--                             ptrdiff_t stride,
--                             const uint8_t* above,
--                             const uint8_t* left);
+-void vpx_d63_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d63_predictor_4x4 vpx_d63_predictor_4x4_c
 -
--void vpx_d63_predictor_8x8_c(uint8_t* dst,
--                             ptrdiff_t stride,
--                             const uint8_t* above,
--                             const uint8_t* left);
+-void vpx_d63_predictor_8x8_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d63_predictor_8x8 vpx_d63_predictor_8x8_c
 -
--void vpx_d63e_predictor_4x4_c(uint8_t* dst,
--                              ptrdiff_t stride,
--                              const uint8_t* above,
--                              const uint8_t* left);
+-void vpx_d63e_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_d63e_predictor_4x4 vpx_d63e_predictor_4x4_c
 -
--void vpx_dc_128_predictor_16x16_c(uint8_t* dst,
--                                  ptrdiff_t stride,
--                                  const uint8_t* above,
--                                  const uint8_t* left);
--void vpx_dc_128_predictor_16x16_vsx(uint8_t* dst,
--                                    ptrdiff_t stride,
--                                    const uint8_t* above,
--                                    const uint8_t* left);
+-void vpx_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
+-void vpx_dc_128_predictor_16x16_vsx(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_dc_128_predictor_16x16 vpx_dc_128_predictor_16x16_vsx
 -
--void vpx_dc_128_predictor_32x32_c(uint8_t* dst,
--                                  ptrdiff_t stride,
--                                  const uint8_t* above,
--                                  const uint8_t* left);
--void vpx_dc_128_predictor_32x32_vsx(uint8_t* dst,
--                                    ptrdiff_t stride,
--                                    const uint8_t* above,
--                                    const uint8_t* left);
+-void vpx_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
+-void vpx_dc_128_predictor_32x32_vsx(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_dc_128_predictor_32x32 vpx_dc_128_predictor_32x32_vsx
 -
--void vpx_dc_128_predictor_4x4_c(uint8_t* dst,
--                                ptrdiff_t stride,
--                                const uint8_t* above,
--                                const uint8_t* left);
+-void vpx_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_dc_128_predictor_4x4 vpx_dc_128_predictor_4x4_c
 -
--void vpx_dc_128_predictor_8x8_c(uint8_t* dst,
--                                ptrdiff_t stride,
--                                const uint8_t* above,
--                                const uint8_t* left);
+-void vpx_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_dc_128_predictor_8x8 vpx_dc_128_predictor_8x8_c
 -
--void vpx_dc_left_predictor_16x16_c(uint8_t* dst,
--                                   ptrdiff_t stride,
--                                   const uint8_t* above,
--                                   const uint8_t* left);
--void vpx_dc_left_predictor_16x16_vsx(uint8_t* dst,
--                                     ptrdiff_t stride,
--                                     const uint8_t* above,
--                                     const uint8_t* left);
+-void vpx_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
+-void vpx_dc_left_predictor_16x16_vsx(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_dc_left_predictor_16x16 vpx_dc_left_predictor_16x16_vsx
 -
--void vpx_dc_left_predictor_32x32_c(uint8_t* dst,
--                                   ptrdiff_t stride,
--                                   const uint8_t* above,
--                                   const uint8_t* left);
--void vpx_dc_left_predictor_32x32_vsx(uint8_t* dst,
--                                     ptrdiff_t stride,
--                                     const uint8_t* above,
--                                     const uint8_t* left);
+-void vpx_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
+-void vpx_dc_left_predictor_32x32_vsx(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_dc_left_predictor_32x32 vpx_dc_left_predictor_32x32_vsx
 -
--void vpx_dc_left_predictor_4x4_c(uint8_t* dst,
--                                 ptrdiff_t stride,
--                                 const uint8_t* above,
--                                 const uint8_t* left);
+-void vpx_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_dc_left_predictor_4x4 vpx_dc_left_predictor_4x4_c
 -
--void vpx_dc_left_predictor_8x8_c(uint8_t* dst,
--                                 ptrdiff_t stride,
--                                 const uint8_t* above,
--                                 const uint8_t* left);
+-void vpx_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_dc_left_predictor_8x8 vpx_dc_left_predictor_8x8_c
 -
--void vpx_dc_predictor_16x16_c(uint8_t* dst,
--                              ptrdiff_t stride,
--                              const uint8_t* above,
--                              const uint8_t* left);
--void vpx_dc_predictor_16x16_vsx(uint8_t* dst,
--                                ptrdiff_t stride,
--                                const uint8_t* above,
--                                const uint8_t* left);
+-void vpx_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
+-void vpx_dc_predictor_16x16_vsx(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_dc_predictor_16x16 vpx_dc_predictor_16x16_vsx
 -
--void vpx_dc_predictor_32x32_c(uint8_t* dst,
--                              ptrdiff_t stride,
--                              const uint8_t* above,
--                              const uint8_t* left);
--void vpx_dc_predictor_32x32_vsx(uint8_t* dst,
--                                ptrdiff_t stride,
--                                const uint8_t* above,
--                                const uint8_t* left);
+-void vpx_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
+-void vpx_dc_predictor_32x32_vsx(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_dc_predictor_32x32 vpx_dc_predictor_32x32_vsx
 -
--void vpx_dc_predictor_4x4_c(uint8_t* dst,
--                            ptrdiff_t stride,
--                            const uint8_t* above,
--                            const uint8_t* left);
+-void vpx_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_dc_predictor_4x4 vpx_dc_predictor_4x4_c
 -
--void vpx_dc_predictor_8x8_c(uint8_t* dst,
--                            ptrdiff_t stride,
--                            const uint8_t* above,
--                            const uint8_t* left);
+-void vpx_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_dc_predictor_8x8 vpx_dc_predictor_8x8_c
 -
--void vpx_dc_top_predictor_16x16_c(uint8_t* dst,
--                                  ptrdiff_t stride,
--                                  const uint8_t* above,
--                                  const uint8_t* left);
--void vpx_dc_top_predictor_16x16_vsx(uint8_t* dst,
--                                    ptrdiff_t stride,
--                                    const uint8_t* above,
--                                    const uint8_t* left);
+-void vpx_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
+-void vpx_dc_top_predictor_16x16_vsx(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_dc_top_predictor_16x16 vpx_dc_top_predictor_16x16_vsx
 -
--void vpx_dc_top_predictor_32x32_c(uint8_t* dst,
--                                  ptrdiff_t stride,
--                                  const uint8_t* above,
--                                  const uint8_t* left);
--void vpx_dc_top_predictor_32x32_vsx(uint8_t* dst,
--                                    ptrdiff_t stride,
--                                    const uint8_t* above,
--                                    const uint8_t* left);
+-void vpx_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
+-void vpx_dc_top_predictor_32x32_vsx(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_dc_top_predictor_32x32 vpx_dc_top_predictor_32x32_vsx
 -
--void vpx_dc_top_predictor_4x4_c(uint8_t* dst,
--                                ptrdiff_t stride,
--                                const uint8_t* above,
--                                const uint8_t* left);
+-void vpx_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_dc_top_predictor_4x4 vpx_dc_top_predictor_4x4_c
 -
--void vpx_dc_top_predictor_8x8_c(uint8_t* dst,
--                                ptrdiff_t stride,
--                                const uint8_t* above,
--                                const uint8_t* left);
+-void vpx_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_dc_top_predictor_8x8 vpx_dc_top_predictor_8x8_c
 -
--void vpx_fdct16x16_c(const int16_t* input, tran_low_t* output, int stride);
+-void vpx_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride);
 -#define vpx_fdct16x16 vpx_fdct16x16_c
 -
--void vpx_fdct16x16_1_c(const int16_t* input, tran_low_t* output, int stride);
+-void vpx_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride);
 -#define vpx_fdct16x16_1 vpx_fdct16x16_1_c
 -
--void vpx_fdct32x32_c(const int16_t* input, tran_low_t* output, int stride);
+-void vpx_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride);
 -#define vpx_fdct32x32 vpx_fdct32x32_c
 -
--void vpx_fdct32x32_1_c(const int16_t* input, tran_low_t* output, int stride);
+-void vpx_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride);
 -#define vpx_fdct32x32_1 vpx_fdct32x32_1_c
 -
--void vpx_fdct32x32_rd_c(const int16_t* input, tran_low_t* output, int stride);
--void vpx_fdct32x32_rd_vsx(const int16_t* input, tran_low_t* output, int stride);
+-void vpx_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride);
+-void vpx_fdct32x32_rd_vsx(const int16_t *input, tran_low_t *output, int stride);
 -#define vpx_fdct32x32_rd vpx_fdct32x32_rd_vsx
 -
--void vpx_fdct4x4_c(const int16_t* input, tran_low_t* output, int stride);
+-void vpx_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride);
 -#define vpx_fdct4x4 vpx_fdct4x4_c
 -
--void vpx_fdct4x4_1_c(const int16_t* input, tran_low_t* output, int stride);
+-void vpx_fdct4x4_1_c(const int16_t *input, tran_low_t *output, int stride);
 -#define vpx_fdct4x4_1 vpx_fdct4x4_1_c
 -
--void vpx_fdct8x8_c(const int16_t* input, tran_low_t* output, int stride);
+-void vpx_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride);
 -#define vpx_fdct8x8 vpx_fdct8x8_c
 -
--void vpx_fdct8x8_1_c(const int16_t* input, tran_low_t* output, int stride);
+-void vpx_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride);
 -#define vpx_fdct8x8_1 vpx_fdct8x8_1_c
 -
--void vpx_get16x16var_c(const uint8_t* src_ptr,
--                       int src_stride,
--                       const uint8_t* ref_ptr,
--                       int ref_stride,
--                       unsigned int* sse,
--                       int* sum);
--void vpx_get16x16var_vsx(const uint8_t* src_ptr,
--                         int src_stride,
--                         const uint8_t* ref_ptr,
--                         int ref_stride,
--                         unsigned int* sse,
--                         int* sum);
+-void vpx_get16x16var_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
+-void vpx_get16x16var_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
 -#define vpx_get16x16var vpx_get16x16var_vsx
 -
--unsigned int vpx_get4x4sse_cs_c(const unsigned char* src_ptr,
--                                int src_stride,
--                                const unsigned char* ref_ptr,
--                                int ref_stride);
--unsigned int vpx_get4x4sse_cs_vsx(const unsigned char* src_ptr,
--                                  int src_stride,
--                                  const unsigned char* ref_ptr,
--                                  int ref_stride);
+-unsigned int vpx_get4x4sse_cs_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride);
+-unsigned int vpx_get4x4sse_cs_vsx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride);
 -#define vpx_get4x4sse_cs vpx_get4x4sse_cs_vsx
 -
--void vpx_get8x8var_c(const uint8_t* src_ptr,
--                     int src_stride,
--                     const uint8_t* ref_ptr,
--                     int ref_stride,
--                     unsigned int* sse,
--                     int* sum);
--void vpx_get8x8var_vsx(const uint8_t* src_ptr,
--                       int src_stride,
--                       const uint8_t* ref_ptr,
--                       int ref_stride,
--                       unsigned int* sse,
--                       int* sum);
+-void vpx_get8x8var_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
+-void vpx_get8x8var_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum);
 -#define vpx_get8x8var vpx_get8x8var_vsx
 -
--unsigned int vpx_get_mb_ss_c(const int16_t*);
--unsigned int vpx_get_mb_ss_vsx(const int16_t*);
+-unsigned int vpx_get_mb_ss_c(const int16_t *);
+-unsigned int vpx_get_mb_ss_vsx(const int16_t *);
 -#define vpx_get_mb_ss vpx_get_mb_ss_vsx
 -
--void vpx_h_predictor_16x16_c(uint8_t* dst,
--                             ptrdiff_t stride,
--                             const uint8_t* above,
--                             const uint8_t* left);
--void vpx_h_predictor_16x16_vsx(uint8_t* dst,
--                               ptrdiff_t stride,
--                               const uint8_t* above,
--                               const uint8_t* left);
+-void vpx_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
+-void vpx_h_predictor_16x16_vsx(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_h_predictor_16x16 vpx_h_predictor_16x16_vsx
 -
--void vpx_h_predictor_32x32_c(uint8_t* dst,
--                             ptrdiff_t stride,
--                             const uint8_t* above,
--                             const uint8_t* left);
--void vpx_h_predictor_32x32_vsx(uint8_t* dst,
--                               ptrdiff_t stride,
--                               const uint8_t* above,
--                               const uint8_t* left);
+-void vpx_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
+-void vpx_h_predictor_32x32_vsx(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_h_predictor_32x32 vpx_h_predictor_32x32_vsx
 -
--void vpx_h_predictor_4x4_c(uint8_t* dst,
--                           ptrdiff_t stride,
--                           const uint8_t* above,
--                           const uint8_t* left);
+-void vpx_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_h_predictor_4x4 vpx_h_predictor_4x4_c
 -
--void vpx_h_predictor_8x8_c(uint8_t* dst,
--                           ptrdiff_t stride,
--                           const uint8_t* above,
--                           const uint8_t* left);
+-void vpx_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_h_predictor_8x8 vpx_h_predictor_8x8_c
 -
--void vpx_hadamard_16x16_c(const int16_t* src_diff,
--                          ptrdiff_t src_stride,
--                          int16_t* coeff);
--void vpx_hadamard_16x16_vsx(const int16_t* src_diff,
--                            ptrdiff_t src_stride,
--                            int16_t* coeff);
+-void vpx_hadamard_16x16_c(const int16_t *src_diff, ptrdiff_t src_stride, int16_t *coeff);
+-void vpx_hadamard_16x16_vsx(const int16_t *src_diff, ptrdiff_t src_stride, int16_t *coeff);
 -#define vpx_hadamard_16x16 vpx_hadamard_16x16_vsx
 -
--void vpx_hadamard_32x32_c(const int16_t* src_diff,
--                          ptrdiff_t src_stride,
--                          int16_t* coeff);
+-void vpx_hadamard_32x32_c(const int16_t *src_diff, ptrdiff_t src_stride, int16_t *coeff);
 -#define vpx_hadamard_32x32 vpx_hadamard_32x32_c
 -
--void vpx_hadamard_8x8_c(const int16_t* src_diff,
--                        ptrdiff_t src_stride,
--                        int16_t* coeff);
--void vpx_hadamard_8x8_vsx(const int16_t* src_diff,
--                          ptrdiff_t src_stride,
--                          int16_t* coeff);
+-void vpx_hadamard_8x8_c(const int16_t *src_diff, ptrdiff_t src_stride, int16_t *coeff);
+-void vpx_hadamard_8x8_vsx(const int16_t *src_diff, ptrdiff_t src_stride, int16_t *coeff);
 -#define vpx_hadamard_8x8 vpx_hadamard_8x8_vsx
 -
--void vpx_he_predictor_4x4_c(uint8_t* dst,
--                            ptrdiff_t stride,
--                            const uint8_t* above,
--                            const uint8_t* left);
+-void vpx_he_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_he_predictor_4x4 vpx_he_predictor_4x4_c
 -
--void vpx_idct16x16_10_add_c(const tran_low_t* input, uint8_t* dest, int stride);
+-void vpx_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 -#define vpx_idct16x16_10_add vpx_idct16x16_10_add_c
 -
--void vpx_idct16x16_1_add_c(const tran_low_t* input, uint8_t* dest, int stride);
+-void vpx_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 -#define vpx_idct16x16_1_add vpx_idct16x16_1_add_c
 -
--void vpx_idct16x16_256_add_c(const tran_low_t* input,
--                             uint8_t* dest,
--                             int stride);
--void vpx_idct16x16_256_add_vsx(const tran_low_t* input,
--                               uint8_t* dest,
--                               int stride);
+-void vpx_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride);
+-void vpx_idct16x16_256_add_vsx(const tran_low_t *input, uint8_t *dest, int stride);
 -#define vpx_idct16x16_256_add vpx_idct16x16_256_add_vsx
 -
--void vpx_idct16x16_38_add_c(const tran_low_t* input, uint8_t* dest, int stride);
+-void vpx_idct16x16_38_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 -#define vpx_idct16x16_38_add vpx_idct16x16_38_add_c
 -
--void vpx_idct32x32_1024_add_c(const tran_low_t* input,
--                              uint8_t* dest,
--                              int stride);
--void vpx_idct32x32_1024_add_vsx(const tran_low_t* input,
--                                uint8_t* dest,
--                                int stride);
+-void vpx_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride);
+-void vpx_idct32x32_1024_add_vsx(const tran_low_t *input, uint8_t *dest, int stride);
 -#define vpx_idct32x32_1024_add vpx_idct32x32_1024_add_vsx
 -
--void vpx_idct32x32_135_add_c(const tran_low_t* input,
--                             uint8_t* dest,
--                             int stride);
+-void vpx_idct32x32_135_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 -#define vpx_idct32x32_135_add vpx_idct32x32_135_add_c
 -
--void vpx_idct32x32_1_add_c(const tran_low_t* input, uint8_t* dest, int stride);
+-void vpx_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 -#define vpx_idct32x32_1_add vpx_idct32x32_1_add_c
 -
--void vpx_idct32x32_34_add_c(const tran_low_t* input, uint8_t* dest, int stride);
+-void vpx_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 -#define vpx_idct32x32_34_add vpx_idct32x32_34_add_c
 -
--void vpx_idct4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride);
--void vpx_idct4x4_16_add_vsx(const tran_low_t* input, uint8_t* dest, int stride);
+-void vpx_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride);
+-void vpx_idct4x4_16_add_vsx(const tran_low_t *input, uint8_t *dest, int stride);
 -#define vpx_idct4x4_16_add vpx_idct4x4_16_add_vsx
 -
--void vpx_idct4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride);
+-void vpx_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 -#define vpx_idct4x4_1_add vpx_idct4x4_1_add_c
 -
--void vpx_idct8x8_12_add_c(const tran_low_t* input, uint8_t* dest, int stride);
+-void vpx_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 -#define vpx_idct8x8_12_add vpx_idct8x8_12_add_c
 -
--void vpx_idct8x8_1_add_c(const tran_low_t* input, uint8_t* dest, int stride);
+-void vpx_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 -#define vpx_idct8x8_1_add vpx_idct8x8_1_add_c
 -
--void vpx_idct8x8_64_add_c(const tran_low_t* input, uint8_t* dest, int stride);
--void vpx_idct8x8_64_add_vsx(const tran_low_t* input, uint8_t* dest, int stride);
+-void vpx_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride);
+-void vpx_idct8x8_64_add_vsx(const tran_low_t *input, uint8_t *dest, int stride);
 -#define vpx_idct8x8_64_add vpx_idct8x8_64_add_vsx
 -
--int16_t vpx_int_pro_col_c(const uint8_t* ref, const int width);
+-int16_t vpx_int_pro_col_c(const uint8_t *ref, const int width);
 -#define vpx_int_pro_col vpx_int_pro_col_c
 -
--void vpx_int_pro_row_c(int16_t hbuf[16],
--                       const uint8_t* ref,
--                       const int ref_stride,
--                       const int height);
+-void vpx_int_pro_row_c(int16_t hbuf[16], const uint8_t *ref, const int ref_stride, const int height);
 -#define vpx_int_pro_row vpx_int_pro_row_c
 -
--void vpx_iwht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int stride);
--void vpx_iwht4x4_16_add_vsx(const tran_low_t* input, uint8_t* dest, int stride);
+-void vpx_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride);
+-void vpx_iwht4x4_16_add_vsx(const tran_low_t *input, uint8_t *dest, int stride);
 -#define vpx_iwht4x4_16_add vpx_iwht4x4_16_add_vsx
 -
--void vpx_iwht4x4_1_add_c(const tran_low_t* input, uint8_t* dest, int stride);
+-void vpx_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 -#define vpx_iwht4x4_1_add vpx_iwht4x4_1_add_c
 -
--void vpx_lpf_horizontal_16_c(uint8_t* s,
--                             int pitch,
--                             const uint8_t* blimit,
--                             const uint8_t* limit,
--                             const uint8_t* thresh);
+-void vpx_lpf_horizontal_16_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 -#define vpx_lpf_horizontal_16 vpx_lpf_horizontal_16_c
 -
--void vpx_lpf_horizontal_16_dual_c(uint8_t* s,
--                                  int pitch,
--                                  const uint8_t* blimit,
--                                  const uint8_t* limit,
--                                  const uint8_t* thresh);
+-void vpx_lpf_horizontal_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 -#define vpx_lpf_horizontal_16_dual vpx_lpf_horizontal_16_dual_c
 -
--void vpx_lpf_horizontal_4_c(uint8_t* s,
--                            int pitch,
--                            const uint8_t* blimit,
--                            const uint8_t* limit,
--                            const uint8_t* thresh);
+-void vpx_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 -#define vpx_lpf_horizontal_4 vpx_lpf_horizontal_4_c
 -
--void vpx_lpf_horizontal_4_dual_c(uint8_t* s,
--                                 int pitch,
--                                 const uint8_t* blimit0,
--                                 const uint8_t* limit0,
--                                 const uint8_t* thresh0,
--                                 const uint8_t* blimit1,
--                                 const uint8_t* limit1,
--                                 const uint8_t* thresh1);
+-void vpx_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
 -#define vpx_lpf_horizontal_4_dual vpx_lpf_horizontal_4_dual_c
 -
--void vpx_lpf_horizontal_8_c(uint8_t* s,
--                            int pitch,
--                            const uint8_t* blimit,
--                            const uint8_t* limit,
--                            const uint8_t* thresh);
+-void vpx_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 -#define vpx_lpf_horizontal_8 vpx_lpf_horizontal_8_c
 -
--void vpx_lpf_horizontal_8_dual_c(uint8_t* s,
--                                 int pitch,
--                                 const uint8_t* blimit0,
--                                 const uint8_t* limit0,
--                                 const uint8_t* thresh0,
--                                 const uint8_t* blimit1,
--                                 const uint8_t* limit1,
--                                 const uint8_t* thresh1);
+-void vpx_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
 -#define vpx_lpf_horizontal_8_dual vpx_lpf_horizontal_8_dual_c
 -
--void vpx_lpf_vertical_16_c(uint8_t* s,
--                           int pitch,
--                           const uint8_t* blimit,
--                           const uint8_t* limit,
--                           const uint8_t* thresh);
+-void vpx_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 -#define vpx_lpf_vertical_16 vpx_lpf_vertical_16_c
 -
--void vpx_lpf_vertical_16_dual_c(uint8_t* s,
--                                int pitch,
--                                const uint8_t* blimit,
--                                const uint8_t* limit,
--                                const uint8_t* thresh);
+-void vpx_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 -#define vpx_lpf_vertical_16_dual vpx_lpf_vertical_16_dual_c
 -
--void vpx_lpf_vertical_4_c(uint8_t* s,
--                          int pitch,
--                          const uint8_t* blimit,
--                          const uint8_t* limit,
--                          const uint8_t* thresh);
+-void vpx_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 -#define vpx_lpf_vertical_4 vpx_lpf_vertical_4_c
 -
--void vpx_lpf_vertical_4_dual_c(uint8_t* s,
--                               int pitch,
--                               const uint8_t* blimit0,
--                               const uint8_t* limit0,
--                               const uint8_t* thresh0,
--                               const uint8_t* blimit1,
--                               const uint8_t* limit1,
--                               const uint8_t* thresh1);
+-void vpx_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
 -#define vpx_lpf_vertical_4_dual vpx_lpf_vertical_4_dual_c
 -
--void vpx_lpf_vertical_8_c(uint8_t* s,
--                          int pitch,
--                          const uint8_t* blimit,
--                          const uint8_t* limit,
--                          const uint8_t* thresh);
+-void vpx_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 -#define vpx_lpf_vertical_8 vpx_lpf_vertical_8_c
 -
--void vpx_lpf_vertical_8_dual_c(uint8_t* s,
--                               int pitch,
--                               const uint8_t* blimit0,
--                               const uint8_t* limit0,
--                               const uint8_t* thresh0,
--                               const uint8_t* blimit1,
--                               const uint8_t* limit1,
--                               const uint8_t* thresh1);
+-void vpx_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
 -#define vpx_lpf_vertical_8_dual vpx_lpf_vertical_8_dual_c
 -
--void vpx_mbpost_proc_across_ip_c(unsigned char* src,
--                                 int pitch,
--                                 int rows,
--                                 int cols,
--                                 int flimit);
--void vpx_mbpost_proc_across_ip_vsx(unsigned char* src,
--                                   int pitch,
--                                   int rows,
--                                   int cols,
--                                   int flimit);
+-void vpx_mbpost_proc_across_ip_c(unsigned char *src, int pitch, int rows, int cols,int flimit);
+-void vpx_mbpost_proc_across_ip_vsx(unsigned char *src, int pitch, int rows, int cols,int flimit);
 -#define vpx_mbpost_proc_across_ip vpx_mbpost_proc_across_ip_vsx
 -
--void vpx_mbpost_proc_down_c(unsigned char* dst,
--                            int pitch,
--                            int rows,
--                            int cols,
--                            int flimit);
--void vpx_mbpost_proc_down_vsx(unsigned char* dst,
--                              int pitch,
--                              int rows,
--                              int cols,
--                              int flimit);
+-void vpx_mbpost_proc_down_c(unsigned char *dst, int pitch, int rows, int cols,int flimit);
+-void vpx_mbpost_proc_down_vsx(unsigned char *dst, int pitch, int rows, int cols,int flimit);
 -#define vpx_mbpost_proc_down vpx_mbpost_proc_down_vsx
 -
--void vpx_minmax_8x8_c(const uint8_t* s,
--                      int p,
--                      const uint8_t* d,
--                      int dp,
--                      int* min,
--                      int* max);
+-void vpx_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, int *min, int *max);
 -#define vpx_minmax_8x8 vpx_minmax_8x8_c
 -
--unsigned int vpx_mse16x16_c(const uint8_t* src_ptr,
--                            int src_stride,
--                            const uint8_t* ref_ptr,
--                            int ref_stride,
--                            unsigned int* sse);
--unsigned int vpx_mse16x16_vsx(const uint8_t* src_ptr,
--                              int src_stride,
--                              const uint8_t* ref_ptr,
--                              int ref_stride,
--                              unsigned int* sse);
+-unsigned int vpx_mse16x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+-unsigned int vpx_mse16x16_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 -#define vpx_mse16x16 vpx_mse16x16_vsx
 -
--unsigned int vpx_mse16x8_c(const uint8_t* src_ptr,
--                           int src_stride,
--                           const uint8_t* ref_ptr,
--                           int ref_stride,
--                           unsigned int* sse);
--unsigned int vpx_mse16x8_vsx(const uint8_t* src_ptr,
--                             int src_stride,
--                             const uint8_t* ref_ptr,
--                             int ref_stride,
--                             unsigned int* sse);
+-unsigned int vpx_mse16x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+-unsigned int vpx_mse16x8_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 -#define vpx_mse16x8 vpx_mse16x8_vsx
 -
--unsigned int vpx_mse8x16_c(const uint8_t* src_ptr,
--                           int src_stride,
--                           const uint8_t* ref_ptr,
--                           int ref_stride,
--                           unsigned int* sse);
--unsigned int vpx_mse8x16_vsx(const uint8_t* src_ptr,
--                             int src_stride,
--                             const uint8_t* ref_ptr,
--                             int ref_stride,
--                             unsigned int* sse);
+-unsigned int vpx_mse8x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+-unsigned int vpx_mse8x16_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 -#define vpx_mse8x16 vpx_mse8x16_vsx
 -
--unsigned int vpx_mse8x8_c(const uint8_t* src_ptr,
--                          int src_stride,
--                          const uint8_t* ref_ptr,
--                          int ref_stride,
--                          unsigned int* sse);
--unsigned int vpx_mse8x8_vsx(const uint8_t* src_ptr,
--                            int src_stride,
--                            const uint8_t* ref_ptr,
--                            int ref_stride,
--                            unsigned int* sse);
+-unsigned int vpx_mse8x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+-unsigned int vpx_mse8x8_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 -#define vpx_mse8x8 vpx_mse8x8_vsx
 -
--void vpx_plane_add_noise_c(uint8_t* start,
--                           const int8_t* noise,
--                           int blackclamp,
--                           int whiteclamp,
--                           int width,
--                           int height,
--                           int pitch);
+-void vpx_plane_add_noise_c(uint8_t *start, const int8_t *noise, int blackclamp, int whiteclamp, int width, int height, int pitch);
 -#define vpx_plane_add_noise vpx_plane_add_noise_c
 -
--void vpx_post_proc_down_and_across_mb_row_c(unsigned char* src,
--                                            unsigned char* dst,
--                                            int src_pitch,
--                                            int dst_pitch,
--                                            int cols,
--                                            unsigned char* flimits,
--                                            int size);
--void vpx_post_proc_down_and_across_mb_row_vsx(unsigned char* src,
--                                              unsigned char* dst,
--                                              int src_pitch,
--                                              int dst_pitch,
--                                              int cols,
--                                              unsigned char* flimits,
--                                              int size);
--#define vpx_post_proc_down_and_across_mb_row \
--  vpx_post_proc_down_and_across_mb_row_vsx
--
--void vpx_quantize_b_c(const tran_low_t* coeff_ptr,
--                      intptr_t n_coeffs,
--                      const struct macroblock_plane* const mb_plane,
--                      tran_low_t* qcoeff_ptr,
--                      tran_low_t* dqcoeff_ptr,
--                      const int16_t* dequant_ptr,
--                      uint16_t* eob_ptr,
--                      const struct ScanOrder* const scan_order);
--void vpx_quantize_b_vsx(const tran_low_t* coeff_ptr,
--                        intptr_t n_coeffs,
--                        const struct macroblock_plane* const mb_plane,
--                        tran_low_t* qcoeff_ptr,
--                        tran_low_t* dqcoeff_ptr,
--                        const int16_t* dequant_ptr,
--                        uint16_t* eob_ptr,
--                        const struct ScanOrder* const scan_order);
+-void vpx_post_proc_down_and_across_mb_row_c(unsigned char *src, unsigned char *dst, int src_pitch, int dst_pitch, int cols, unsigned char *flimits, int size);
+-void vpx_post_proc_down_and_across_mb_row_vsx(unsigned char *src, unsigned char *dst, int src_pitch, int dst_pitch, int cols, unsigned char *flimits, int size);
+-#define vpx_post_proc_down_and_across_mb_row vpx_post_proc_down_and_across_mb_row_vsx
+-
+-void vpx_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const struct macroblock_plane *const mb_plane, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const struct ScanOrder *const scan_order);
+-void vpx_quantize_b_vsx(const tran_low_t *coeff_ptr, intptr_t n_coeffs, const struct macroblock_plane *const mb_plane, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const struct ScanOrder *const scan_order);
 -#define vpx_quantize_b vpx_quantize_b_vsx
 -
--void vpx_quantize_b_32x32_c(const tran_low_t* coeff_ptr,
--                            const struct macroblock_plane* const mb_plane,
--                            tran_low_t* qcoeff_ptr,
--                            tran_low_t* dqcoeff_ptr,
--                            const int16_t* dequant_ptr,
--                            uint16_t* eob_ptr,
--                            const struct ScanOrder* const scan_order);
--void vpx_quantize_b_32x32_vsx(const tran_low_t* coeff_ptr,
--                              const struct macroblock_plane* const mb_plane,
--                              tran_low_t* qcoeff_ptr,
--                              tran_low_t* dqcoeff_ptr,
--                              const int16_t* dequant_ptr,
--                              uint16_t* eob_ptr,
--                              const struct ScanOrder* const scan_order);
+-void vpx_quantize_b_32x32_c(const tran_low_t *coeff_ptr, const struct macroblock_plane *const mb_plane, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const struct ScanOrder *const scan_order);
+-void vpx_quantize_b_32x32_vsx(const tran_low_t *coeff_ptr, const struct macroblock_plane *const mb_plane, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const struct ScanOrder *const scan_order);
 -#define vpx_quantize_b_32x32 vpx_quantize_b_32x32_vsx
 -
--unsigned int vpx_sad16x16_c(const uint8_t* src_ptr,
--                            int src_stride,
--                            const uint8_t* ref_ptr,
--                            int ref_stride);
--unsigned int vpx_sad16x16_vsx(const uint8_t* src_ptr,
--                              int src_stride,
--                              const uint8_t* ref_ptr,
--                              int ref_stride);
+-unsigned int vpx_sad16x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+-unsigned int vpx_sad16x16_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad16x16 vpx_sad16x16_vsx
 -
--unsigned int vpx_sad16x16_avg_c(const uint8_t* src_ptr,
--                                int src_stride,
--                                const uint8_t* ref_ptr,
--                                int ref_stride,
--                                const uint8_t* second_pred);
--unsigned int vpx_sad16x16_avg_vsx(const uint8_t* src_ptr,
--                                  int src_stride,
--                                  const uint8_t* ref_ptr,
--                                  int ref_stride,
--                                  const uint8_t* second_pred);
+-unsigned int vpx_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+-unsigned int vpx_sad16x16_avg_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
 -#define vpx_sad16x16_avg vpx_sad16x16_avg_vsx
 -
--void vpx_sad16x16x4d_c(const uint8_t* src_ptr,
--                       int src_stride,
--                       const uint8_t* const ref_array[4],
--                       int ref_stride,
--                       uint32_t sad_array[4]);
--void vpx_sad16x16x4d_vsx(const uint8_t* src_ptr,
--                         int src_stride,
--                         const uint8_t* const ref_array[4],
--                         int ref_stride,
--                         uint32_t sad_array[4]);
+-void vpx_sad16x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
+-void vpx_sad16x16x4d_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad16x16x4d vpx_sad16x16x4d_vsx
 -
--unsigned int vpx_sad16x32_c(const uint8_t* src_ptr,
--                            int src_stride,
--                            const uint8_t* ref_ptr,
--                            int ref_stride);
--unsigned int vpx_sad16x32_vsx(const uint8_t* src_ptr,
--                              int src_stride,
--                              const uint8_t* ref_ptr,
--                              int ref_stride);
+-unsigned int vpx_sad16x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+-unsigned int vpx_sad16x32_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad16x32 vpx_sad16x32_vsx
 -
--unsigned int vpx_sad16x32_avg_c(const uint8_t* src_ptr,
--                                int src_stride,
--                                const uint8_t* ref_ptr,
--                                int ref_stride,
--                                const uint8_t* second_pred);
--unsigned int vpx_sad16x32_avg_vsx(const uint8_t* src_ptr,
--                                  int src_stride,
--                                  const uint8_t* ref_ptr,
--                                  int ref_stride,
--                                  const uint8_t* second_pred);
+-unsigned int vpx_sad16x32_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+-unsigned int vpx_sad16x32_avg_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
 -#define vpx_sad16x32_avg vpx_sad16x32_avg_vsx
 -
--void vpx_sad16x32x4d_c(const uint8_t* src_ptr,
--                       int src_stride,
--                       const uint8_t* const ref_array[4],
--                       int ref_stride,
--                       uint32_t sad_array[4]);
--void vpx_sad16x32x4d_vsx(const uint8_t* src_ptr,
--                         int src_stride,
--                         const uint8_t* const ref_array[4],
--                         int ref_stride,
--                         uint32_t sad_array[4]);
+-void vpx_sad16x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
+-void vpx_sad16x32x4d_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad16x32x4d vpx_sad16x32x4d_vsx
 -
--unsigned int vpx_sad16x8_c(const uint8_t* src_ptr,
--                           int src_stride,
--                           const uint8_t* ref_ptr,
--                           int ref_stride);
--unsigned int vpx_sad16x8_vsx(const uint8_t* src_ptr,
--                             int src_stride,
--                             const uint8_t* ref_ptr,
--                             int ref_stride);
+-unsigned int vpx_sad16x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+-unsigned int vpx_sad16x8_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad16x8 vpx_sad16x8_vsx
 -
--unsigned int vpx_sad16x8_avg_c(const uint8_t* src_ptr,
--                               int src_stride,
--                               const uint8_t* ref_ptr,
--                               int ref_stride,
--                               const uint8_t* second_pred);
--unsigned int vpx_sad16x8_avg_vsx(const uint8_t* src_ptr,
--                                 int src_stride,
--                                 const uint8_t* ref_ptr,
--                                 int ref_stride,
--                                 const uint8_t* second_pred);
+-unsigned int vpx_sad16x8_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+-unsigned int vpx_sad16x8_avg_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
 -#define vpx_sad16x8_avg vpx_sad16x8_avg_vsx
 -
--void vpx_sad16x8x4d_c(const uint8_t* src_ptr,
--                      int src_stride,
--                      const uint8_t* const ref_array[4],
--                      int ref_stride,
--                      uint32_t sad_array[4]);
--void vpx_sad16x8x4d_vsx(const uint8_t* src_ptr,
--                        int src_stride,
--                        const uint8_t* const ref_array[4],
--                        int ref_stride,
--                        uint32_t sad_array[4]);
+-void vpx_sad16x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
+-void vpx_sad16x8x4d_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad16x8x4d vpx_sad16x8x4d_vsx
 -
--unsigned int vpx_sad32x16_c(const uint8_t* src_ptr,
--                            int src_stride,
--                            const uint8_t* ref_ptr,
--                            int ref_stride);
--unsigned int vpx_sad32x16_vsx(const uint8_t* src_ptr,
--                              int src_stride,
--                              const uint8_t* ref_ptr,
--                              int ref_stride);
+-unsigned int vpx_sad32x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+-unsigned int vpx_sad32x16_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad32x16 vpx_sad32x16_vsx
 -
--unsigned int vpx_sad32x16_avg_c(const uint8_t* src_ptr,
--                                int src_stride,
--                                const uint8_t* ref_ptr,
--                                int ref_stride,
--                                const uint8_t* second_pred);
--unsigned int vpx_sad32x16_avg_vsx(const uint8_t* src_ptr,
--                                  int src_stride,
--                                  const uint8_t* ref_ptr,
--                                  int ref_stride,
--                                  const uint8_t* second_pred);
+-unsigned int vpx_sad32x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+-unsigned int vpx_sad32x16_avg_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
 -#define vpx_sad32x16_avg vpx_sad32x16_avg_vsx
 -
--void vpx_sad32x16x4d_c(const uint8_t* src_ptr,
--                       int src_stride,
--                       const uint8_t* const ref_array[4],
--                       int ref_stride,
--                       uint32_t sad_array[4]);
--void vpx_sad32x16x4d_vsx(const uint8_t* src_ptr,
--                         int src_stride,
--                         const uint8_t* const ref_array[4],
--                         int ref_stride,
--                         uint32_t sad_array[4]);
+-void vpx_sad32x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
+-void vpx_sad32x16x4d_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad32x16x4d vpx_sad32x16x4d_vsx
 -
--unsigned int vpx_sad32x32_c(const uint8_t* src_ptr,
--                            int src_stride,
--                            const uint8_t* ref_ptr,
--                            int ref_stride);
--unsigned int vpx_sad32x32_vsx(const uint8_t* src_ptr,
--                              int src_stride,
--                              const uint8_t* ref_ptr,
--                              int ref_stride);
+-unsigned int vpx_sad32x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+-unsigned int vpx_sad32x32_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad32x32 vpx_sad32x32_vsx
 -
--unsigned int vpx_sad32x32_avg_c(const uint8_t* src_ptr,
--                                int src_stride,
--                                const uint8_t* ref_ptr,
--                                int ref_stride,
--                                const uint8_t* second_pred);
--unsigned int vpx_sad32x32_avg_vsx(const uint8_t* src_ptr,
--                                  int src_stride,
--                                  const uint8_t* ref_ptr,
--                                  int ref_stride,
--                                  const uint8_t* second_pred);
+-unsigned int vpx_sad32x32_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+-unsigned int vpx_sad32x32_avg_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
 -#define vpx_sad32x32_avg vpx_sad32x32_avg_vsx
 -
--void vpx_sad32x32x4d_c(const uint8_t* src_ptr,
--                       int src_stride,
--                       const uint8_t* const ref_array[4],
--                       int ref_stride,
--                       uint32_t sad_array[4]);
--void vpx_sad32x32x4d_vsx(const uint8_t* src_ptr,
--                         int src_stride,
--                         const uint8_t* const ref_array[4],
--                         int ref_stride,
--                         uint32_t sad_array[4]);
+-void vpx_sad32x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
+-void vpx_sad32x32x4d_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad32x32x4d vpx_sad32x32x4d_vsx
 -
--unsigned int vpx_sad32x64_c(const uint8_t* src_ptr,
--                            int src_stride,
--                            const uint8_t* ref_ptr,
--                            int ref_stride);
--unsigned int vpx_sad32x64_vsx(const uint8_t* src_ptr,
--                              int src_stride,
--                              const uint8_t* ref_ptr,
--                              int ref_stride);
+-unsigned int vpx_sad32x64_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+-unsigned int vpx_sad32x64_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad32x64 vpx_sad32x64_vsx
 -
--unsigned int vpx_sad32x64_avg_c(const uint8_t* src_ptr,
--                                int src_stride,
--                                const uint8_t* ref_ptr,
--                                int ref_stride,
--                                const uint8_t* second_pred);
--unsigned int vpx_sad32x64_avg_vsx(const uint8_t* src_ptr,
--                                  int src_stride,
--                                  const uint8_t* ref_ptr,
--                                  int ref_stride,
--                                  const uint8_t* second_pred);
+-unsigned int vpx_sad32x64_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+-unsigned int vpx_sad32x64_avg_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
 -#define vpx_sad32x64_avg vpx_sad32x64_avg_vsx
 -
--void vpx_sad32x64x4d_c(const uint8_t* src_ptr,
--                       int src_stride,
--                       const uint8_t* const ref_array[4],
--                       int ref_stride,
--                       uint32_t sad_array[4]);
--void vpx_sad32x64x4d_vsx(const uint8_t* src_ptr,
--                         int src_stride,
--                         const uint8_t* const ref_array[4],
--                         int ref_stride,
--                         uint32_t sad_array[4]);
+-void vpx_sad32x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
+-void vpx_sad32x64x4d_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad32x64x4d vpx_sad32x64x4d_vsx
 -
--unsigned int vpx_sad4x4_c(const uint8_t* src_ptr,
--                          int src_stride,
--                          const uint8_t* ref_ptr,
--                          int ref_stride);
+-unsigned int vpx_sad4x4_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad4x4 vpx_sad4x4_c
 -
--unsigned int vpx_sad4x4_avg_c(const uint8_t* src_ptr,
--                              int src_stride,
--                              const uint8_t* ref_ptr,
--                              int ref_stride,
--                              const uint8_t* second_pred);
+-unsigned int vpx_sad4x4_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
 -#define vpx_sad4x4_avg vpx_sad4x4_avg_c
 -
--void vpx_sad4x4x4d_c(const uint8_t* src_ptr,
--                     int src_stride,
--                     const uint8_t* const ref_array[4],
--                     int ref_stride,
--                     uint32_t sad_array[4]);
+-void vpx_sad4x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad4x4x4d vpx_sad4x4x4d_c
 -
--unsigned int vpx_sad4x8_c(const uint8_t* src_ptr,
--                          int src_stride,
--                          const uint8_t* ref_ptr,
--                          int ref_stride);
+-unsigned int vpx_sad4x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad4x8 vpx_sad4x8_c
 -
--unsigned int vpx_sad4x8_avg_c(const uint8_t* src_ptr,
--                              int src_stride,
--                              const uint8_t* ref_ptr,
--                              int ref_stride,
--                              const uint8_t* second_pred);
+-unsigned int vpx_sad4x8_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
 -#define vpx_sad4x8_avg vpx_sad4x8_avg_c
 -
--void vpx_sad4x8x4d_c(const uint8_t* src_ptr,
--                     int src_stride,
--                     const uint8_t* const ref_array[4],
--                     int ref_stride,
--                     uint32_t sad_array[4]);
+-void vpx_sad4x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad4x8x4d vpx_sad4x8x4d_c
 -
--unsigned int vpx_sad64x32_c(const uint8_t* src_ptr,
--                            int src_stride,
--                            const uint8_t* ref_ptr,
--                            int ref_stride);
--unsigned int vpx_sad64x32_vsx(const uint8_t* src_ptr,
--                              int src_stride,
--                              const uint8_t* ref_ptr,
--                              int ref_stride);
+-unsigned int vpx_sad64x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+-unsigned int vpx_sad64x32_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad64x32 vpx_sad64x32_vsx
 -
--unsigned int vpx_sad64x32_avg_c(const uint8_t* src_ptr,
--                                int src_stride,
--                                const uint8_t* ref_ptr,
--                                int ref_stride,
--                                const uint8_t* second_pred);
--unsigned int vpx_sad64x32_avg_vsx(const uint8_t* src_ptr,
--                                  int src_stride,
--                                  const uint8_t* ref_ptr,
--                                  int ref_stride,
--                                  const uint8_t* second_pred);
+-unsigned int vpx_sad64x32_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+-unsigned int vpx_sad64x32_avg_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
 -#define vpx_sad64x32_avg vpx_sad64x32_avg_vsx
 -
--void vpx_sad64x32x4d_c(const uint8_t* src_ptr,
--                       int src_stride,
--                       const uint8_t* const ref_array[4],
--                       int ref_stride,
--                       uint32_t sad_array[4]);
--void vpx_sad64x32x4d_vsx(const uint8_t* src_ptr,
--                         int src_stride,
--                         const uint8_t* const ref_array[4],
--                         int ref_stride,
--                         uint32_t sad_array[4]);
+-void vpx_sad64x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
+-void vpx_sad64x32x4d_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad64x32x4d vpx_sad64x32x4d_vsx
 -
--unsigned int vpx_sad64x64_c(const uint8_t* src_ptr,
--                            int src_stride,
--                            const uint8_t* ref_ptr,
--                            int ref_stride);
--unsigned int vpx_sad64x64_vsx(const uint8_t* src_ptr,
--                              int src_stride,
--                              const uint8_t* ref_ptr,
--                              int ref_stride);
+-unsigned int vpx_sad64x64_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+-unsigned int vpx_sad64x64_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad64x64 vpx_sad64x64_vsx
 -
--unsigned int vpx_sad64x64_avg_c(const uint8_t* src_ptr,
--                                int src_stride,
--                                const uint8_t* ref_ptr,
--                                int ref_stride,
--                                const uint8_t* second_pred);
--unsigned int vpx_sad64x64_avg_vsx(const uint8_t* src_ptr,
--                                  int src_stride,
--                                  const uint8_t* ref_ptr,
--                                  int ref_stride,
--                                  const uint8_t* second_pred);
+-unsigned int vpx_sad64x64_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
+-unsigned int vpx_sad64x64_avg_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
 -#define vpx_sad64x64_avg vpx_sad64x64_avg_vsx
 -
--void vpx_sad64x64x4d_c(const uint8_t* src_ptr,
--                       int src_stride,
--                       const uint8_t* const ref_array[4],
--                       int ref_stride,
--                       uint32_t sad_array[4]);
--void vpx_sad64x64x4d_vsx(const uint8_t* src_ptr,
--                         int src_stride,
--                         const uint8_t* const ref_array[4],
--                         int ref_stride,
--                         uint32_t sad_array[4]);
+-void vpx_sad64x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
+-void vpx_sad64x64x4d_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad64x64x4d vpx_sad64x64x4d_vsx
 -
--unsigned int vpx_sad8x16_c(const uint8_t* src_ptr,
--                           int src_stride,
--                           const uint8_t* ref_ptr,
--                           int ref_stride);
--unsigned int vpx_sad8x16_vsx(const uint8_t* src_ptr,
--                             int src_stride,
--                             const uint8_t* ref_ptr,
--                             int ref_stride);
+-unsigned int vpx_sad8x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+-unsigned int vpx_sad8x16_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad8x16 vpx_sad8x16_vsx
 -
--unsigned int vpx_sad8x16_avg_c(const uint8_t* src_ptr,
--                               int src_stride,
--                               const uint8_t* ref_ptr,
--                               int ref_stride,
--                               const uint8_t* second_pred);
+-unsigned int vpx_sad8x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
 -#define vpx_sad8x16_avg vpx_sad8x16_avg_c
 -
--void vpx_sad8x16x4d_c(const uint8_t* src_ptr,
--                      int src_stride,
--                      const uint8_t* const ref_array[4],
--                      int ref_stride,
--                      uint32_t sad_array[4]);
+-void vpx_sad8x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad8x16x4d vpx_sad8x16x4d_c
 -
--unsigned int vpx_sad8x4_c(const uint8_t* src_ptr,
--                          int src_stride,
--                          const uint8_t* ref_ptr,
--                          int ref_stride);
--unsigned int vpx_sad8x4_vsx(const uint8_t* src_ptr,
--                            int src_stride,
--                            const uint8_t* ref_ptr,
--                            int ref_stride);
+-unsigned int vpx_sad8x4_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+-unsigned int vpx_sad8x4_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad8x4 vpx_sad8x4_vsx
 -
--unsigned int vpx_sad8x4_avg_c(const uint8_t* src_ptr,
--                              int src_stride,
--                              const uint8_t* ref_ptr,
--                              int ref_stride,
--                              const uint8_t* second_pred);
+-unsigned int vpx_sad8x4_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
 -#define vpx_sad8x4_avg vpx_sad8x4_avg_c
 -
--void vpx_sad8x4x4d_c(const uint8_t* src_ptr,
--                     int src_stride,
--                     const uint8_t* const ref_array[4],
--                     int ref_stride,
--                     uint32_t sad_array[4]);
+-void vpx_sad8x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad8x4x4d vpx_sad8x4x4d_c
 -
--unsigned int vpx_sad8x8_c(const uint8_t* src_ptr,
--                          int src_stride,
--                          const uint8_t* ref_ptr,
--                          int ref_stride);
--unsigned int vpx_sad8x8_vsx(const uint8_t* src_ptr,
--                            int src_stride,
--                            const uint8_t* ref_ptr,
--                            int ref_stride);
+-unsigned int vpx_sad8x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
+-unsigned int vpx_sad8x8_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad8x8 vpx_sad8x8_vsx
 -
--unsigned int vpx_sad8x8_avg_c(const uint8_t* src_ptr,
--                              int src_stride,
--                              const uint8_t* ref_ptr,
--                              int ref_stride,
--                              const uint8_t* second_pred);
+-unsigned int vpx_sad8x8_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
 -#define vpx_sad8x8_avg vpx_sad8x8_avg_c
 -
--void vpx_sad8x8x4d_c(const uint8_t* src_ptr,
--                     int src_stride,
--                     const uint8_t* const ref_array[4],
--                     int ref_stride,
--                     uint32_t sad_array[4]);
+-void vpx_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad8x8x4d vpx_sad8x8x4d_c
 -
--unsigned int vpx_sad_skip_16x16_c(const uint8_t* src_ptr,
--                                  int src_stride,
--                                  const uint8_t* ref_ptr,
--                                  int ref_stride);
+-unsigned int vpx_sad_skip_16x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad_skip_16x16 vpx_sad_skip_16x16_c
 -
--void vpx_sad_skip_16x16x4d_c(const uint8_t* src_ptr,
--                             int src_stride,
--                             const uint8_t* const ref_array[4],
--                             int ref_stride,
--                             uint32_t sad_array[4]);
+-void vpx_sad_skip_16x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad_skip_16x16x4d vpx_sad_skip_16x16x4d_c
 -
--unsigned int vpx_sad_skip_16x32_c(const uint8_t* src_ptr,
--                                  int src_stride,
--                                  const uint8_t* ref_ptr,
--                                  int ref_stride);
+-unsigned int vpx_sad_skip_16x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad_skip_16x32 vpx_sad_skip_16x32_c
 -
--void vpx_sad_skip_16x32x4d_c(const uint8_t* src_ptr,
--                             int src_stride,
--                             const uint8_t* const ref_array[4],
--                             int ref_stride,
--                             uint32_t sad_array[4]);
+-void vpx_sad_skip_16x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad_skip_16x32x4d vpx_sad_skip_16x32x4d_c
 -
--unsigned int vpx_sad_skip_16x8_c(const uint8_t* src_ptr,
--                                 int src_stride,
--                                 const uint8_t* ref_ptr,
--                                 int ref_stride);
+-unsigned int vpx_sad_skip_16x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad_skip_16x8 vpx_sad_skip_16x8_c
 -
--void vpx_sad_skip_16x8x4d_c(const uint8_t* src_ptr,
--                            int src_stride,
--                            const uint8_t* const ref_array[4],
--                            int ref_stride,
--                            uint32_t sad_array[4]);
+-void vpx_sad_skip_16x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad_skip_16x8x4d vpx_sad_skip_16x8x4d_c
 -
--unsigned int vpx_sad_skip_32x16_c(const uint8_t* src_ptr,
--                                  int src_stride,
--                                  const uint8_t* ref_ptr,
--                                  int ref_stride);
+-unsigned int vpx_sad_skip_32x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad_skip_32x16 vpx_sad_skip_32x16_c
 -
--void vpx_sad_skip_32x16x4d_c(const uint8_t* src_ptr,
--                             int src_stride,
--                             const uint8_t* const ref_array[4],
--                             int ref_stride,
--                             uint32_t sad_array[4]);
+-void vpx_sad_skip_32x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad_skip_32x16x4d vpx_sad_skip_32x16x4d_c
 -
--unsigned int vpx_sad_skip_32x32_c(const uint8_t* src_ptr,
--                                  int src_stride,
--                                  const uint8_t* ref_ptr,
--                                  int ref_stride);
+-unsigned int vpx_sad_skip_32x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad_skip_32x32 vpx_sad_skip_32x32_c
 -
--void vpx_sad_skip_32x32x4d_c(const uint8_t* src_ptr,
--                             int src_stride,
--                             const uint8_t* const ref_array[4],
--                             int ref_stride,
--                             uint32_t sad_array[4]);
+-void vpx_sad_skip_32x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad_skip_32x32x4d vpx_sad_skip_32x32x4d_c
 -
--unsigned int vpx_sad_skip_32x64_c(const uint8_t* src_ptr,
--                                  int src_stride,
--                                  const uint8_t* ref_ptr,
--                                  int ref_stride);
+-unsigned int vpx_sad_skip_32x64_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad_skip_32x64 vpx_sad_skip_32x64_c
 -
--void vpx_sad_skip_32x64x4d_c(const uint8_t* src_ptr,
--                             int src_stride,
--                             const uint8_t* const ref_array[4],
--                             int ref_stride,
--                             uint32_t sad_array[4]);
+-void vpx_sad_skip_32x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad_skip_32x64x4d vpx_sad_skip_32x64x4d_c
 -
--unsigned int vpx_sad_skip_4x4_c(const uint8_t* src_ptr,
--                                int src_stride,
--                                const uint8_t* ref_ptr,
--                                int ref_stride);
+-unsigned int vpx_sad_skip_4x4_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad_skip_4x4 vpx_sad_skip_4x4_c
 -
--void vpx_sad_skip_4x4x4d_c(const uint8_t* src_ptr,
--                           int src_stride,
--                           const uint8_t* const ref_array[4],
--                           int ref_stride,
--                           uint32_t sad_array[4]);
+-void vpx_sad_skip_4x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad_skip_4x4x4d vpx_sad_skip_4x4x4d_c
 -
--unsigned int vpx_sad_skip_4x8_c(const uint8_t* src_ptr,
--                                int src_stride,
--                                const uint8_t* ref_ptr,
--                                int ref_stride);
+-unsigned int vpx_sad_skip_4x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad_skip_4x8 vpx_sad_skip_4x8_c
 -
--void vpx_sad_skip_4x8x4d_c(const uint8_t* src_ptr,
--                           int src_stride,
--                           const uint8_t* const ref_array[4],
--                           int ref_stride,
--                           uint32_t sad_array[4]);
+-void vpx_sad_skip_4x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad_skip_4x8x4d vpx_sad_skip_4x8x4d_c
 -
--unsigned int vpx_sad_skip_64x32_c(const uint8_t* src_ptr,
--                                  int src_stride,
--                                  const uint8_t* ref_ptr,
--                                  int ref_stride);
+-unsigned int vpx_sad_skip_64x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad_skip_64x32 vpx_sad_skip_64x32_c
 -
--void vpx_sad_skip_64x32x4d_c(const uint8_t* src_ptr,
--                             int src_stride,
--                             const uint8_t* const ref_array[4],
--                             int ref_stride,
--                             uint32_t sad_array[4]);
+-void vpx_sad_skip_64x32x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad_skip_64x32x4d vpx_sad_skip_64x32x4d_c
 -
--unsigned int vpx_sad_skip_64x64_c(const uint8_t* src_ptr,
--                                  int src_stride,
--                                  const uint8_t* ref_ptr,
--                                  int ref_stride);
+-unsigned int vpx_sad_skip_64x64_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad_skip_64x64 vpx_sad_skip_64x64_c
 -
--void vpx_sad_skip_64x64x4d_c(const uint8_t* src_ptr,
--                             int src_stride,
--                             const uint8_t* const ref_array[4],
--                             int ref_stride,
--                             uint32_t sad_array[4]);
+-void vpx_sad_skip_64x64x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad_skip_64x64x4d vpx_sad_skip_64x64x4d_c
 -
--unsigned int vpx_sad_skip_8x16_c(const uint8_t* src_ptr,
--                                 int src_stride,
--                                 const uint8_t* ref_ptr,
--                                 int ref_stride);
+-unsigned int vpx_sad_skip_8x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad_skip_8x16 vpx_sad_skip_8x16_c
 -
--void vpx_sad_skip_8x16x4d_c(const uint8_t* src_ptr,
--                            int src_stride,
--                            const uint8_t* const ref_array[4],
--                            int ref_stride,
--                            uint32_t sad_array[4]);
+-void vpx_sad_skip_8x16x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad_skip_8x16x4d vpx_sad_skip_8x16x4d_c
 -
--unsigned int vpx_sad_skip_8x4_c(const uint8_t* src_ptr,
--                                int src_stride,
--                                const uint8_t* ref_ptr,
--                                int ref_stride);
+-unsigned int vpx_sad_skip_8x4_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad_skip_8x4 vpx_sad_skip_8x4_c
 -
--void vpx_sad_skip_8x4x4d_c(const uint8_t* src_ptr,
--                           int src_stride,
--                           const uint8_t* const ref_array[4],
--                           int ref_stride,
--                           uint32_t sad_array[4]);
+-void vpx_sad_skip_8x4x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad_skip_8x4x4d vpx_sad_skip_8x4x4d_c
 -
--unsigned int vpx_sad_skip_8x8_c(const uint8_t* src_ptr,
--                                int src_stride,
--                                const uint8_t* ref_ptr,
--                                int ref_stride);
+-unsigned int vpx_sad_skip_8x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 -#define vpx_sad_skip_8x8 vpx_sad_skip_8x8_c
 -
--void vpx_sad_skip_8x8x4d_c(const uint8_t* src_ptr,
--                           int src_stride,
--                           const uint8_t* const ref_array[4],
--                           int ref_stride,
--                           uint32_t sad_array[4]);
+-void vpx_sad_skip_8x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_t *const ref_array[4], int ref_stride, uint32_t sad_array[4]);
 -#define vpx_sad_skip_8x8x4d vpx_sad_skip_8x8x4d_c
 -
--int vpx_satd_c(const int16_t* coeff, int length);
+-int vpx_satd_c(const int16_t *coeff, int length);
 -#define vpx_satd vpx_satd_c
 -
--void vpx_scaled_2d_c(const uint8_t* src,
--                     ptrdiff_t src_stride,
--                     uint8_t* dst,
--                     ptrdiff_t dst_stride,
--                     const InterpKernel* filter,
--                     int x0_q4,
--                     int x_step_q4,
--                     int y0_q4,
--                     int y_step_q4,
--                     int w,
--                     int h);
+-void vpx_scaled_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
 -#define vpx_scaled_2d vpx_scaled_2d_c
 -
--void vpx_scaled_avg_2d_c(const uint8_t* src,
--                         ptrdiff_t src_stride,
--                         uint8_t* dst,
--                         ptrdiff_t dst_stride,
--                         const InterpKernel* filter,
--                         int x0_q4,
--                         int x_step_q4,
--                         int y0_q4,
--                         int y_step_q4,
--                         int w,
--                         int h);
+-void vpx_scaled_avg_2d_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
 -#define vpx_scaled_avg_2d vpx_scaled_avg_2d_c
 -
--void vpx_scaled_avg_horiz_c(const uint8_t* src,
--                            ptrdiff_t src_stride,
--                            uint8_t* dst,
--                            ptrdiff_t dst_stride,
--                            const InterpKernel* filter,
--                            int x0_q4,
--                            int x_step_q4,
--                            int y0_q4,
--                            int y_step_q4,
--                            int w,
--                            int h);
+-void vpx_scaled_avg_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
 -#define vpx_scaled_avg_horiz vpx_scaled_avg_horiz_c
 -
--void vpx_scaled_avg_vert_c(const uint8_t* src,
--                           ptrdiff_t src_stride,
--                           uint8_t* dst,
--                           ptrdiff_t dst_stride,
--                           const InterpKernel* filter,
--                           int x0_q4,
--                           int x_step_q4,
--                           int y0_q4,
--                           int y_step_q4,
--                           int w,
--                           int h);
+-void vpx_scaled_avg_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
 -#define vpx_scaled_avg_vert vpx_scaled_avg_vert_c
 -
--void vpx_scaled_horiz_c(const uint8_t* src,
--                        ptrdiff_t src_stride,
--                        uint8_t* dst,
--                        ptrdiff_t dst_stride,
--                        const InterpKernel* filter,
--                        int x0_q4,
--                        int x_step_q4,
--                        int y0_q4,
--                        int y_step_q4,
--                        int w,
--                        int h);
+-void vpx_scaled_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
 -#define vpx_scaled_horiz vpx_scaled_horiz_c
 -
--void vpx_scaled_vert_c(const uint8_t* src,
--                       ptrdiff_t src_stride,
--                       uint8_t* dst,
--                       ptrdiff_t dst_stride,
--                       const InterpKernel* filter,
--                       int x0_q4,
--                       int x_step_q4,
--                       int y0_q4,
--                       int y_step_q4,
--                       int w,
--                       int h);
+-void vpx_scaled_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, int x_step_q4, int y0_q4, int y_step_q4, int w, int h);
 -#define vpx_scaled_vert vpx_scaled_vert_c
 -
--int64_t vpx_sse_c(const uint8_t* src,
--                  int src_stride,
--                  const uint8_t* ref,
--                  int ref_stride,
--                  int width,
--                  int height);
+-int64_t vpx_sse_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, int width, int height);
 -#define vpx_sse vpx_sse_c
 -
--uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t* src_ptr,
--                                           int src_stride,
--                                           int x_offset,
--                                           int y_offset,
--                                           const uint8_t* ref_ptr,
--                                           int ref_stride,
--                                           uint32_t* sse,
--                                           const uint8_t* second_pred);
+-uint32_t vpx_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
 -#define vpx_sub_pixel_avg_variance16x16 vpx_sub_pixel_avg_variance16x16_c
 -
--uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t* src_ptr,
--                                           int src_stride,
--                                           int x_offset,
--                                           int y_offset,
--                                           const uint8_t* ref_ptr,
--                                           int ref_stride,
--                                           uint32_t* sse,
--                                           const uint8_t* second_pred);
+-uint32_t vpx_sub_pixel_avg_variance16x32_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
 -#define vpx_sub_pixel_avg_variance16x32 vpx_sub_pixel_avg_variance16x32_c
 -
--uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t* src_ptr,
--                                          int src_stride,
--                                          int x_offset,
--                                          int y_offset,
--                                          const uint8_t* ref_ptr,
--                                          int ref_stride,
--                                          uint32_t* sse,
--                                          const uint8_t* second_pred);
+-uint32_t vpx_sub_pixel_avg_variance16x8_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
 -#define vpx_sub_pixel_avg_variance16x8 vpx_sub_pixel_avg_variance16x8_c
 -
--uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t* src_ptr,
--                                           int src_stride,
--                                           int x_offset,
--                                           int y_offset,
--                                           const uint8_t* ref_ptr,
--                                           int ref_stride,
--                                           uint32_t* sse,
--                                           const uint8_t* second_pred);
+-uint32_t vpx_sub_pixel_avg_variance32x16_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
 -#define vpx_sub_pixel_avg_variance32x16 vpx_sub_pixel_avg_variance32x16_c
 -
--uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t* src_ptr,
--                                           int src_stride,
--                                           int x_offset,
--                                           int y_offset,
--                                           const uint8_t* ref_ptr,
--                                           int ref_stride,
--                                           uint32_t* sse,
--                                           const uint8_t* second_pred);
+-uint32_t vpx_sub_pixel_avg_variance32x32_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
 -#define vpx_sub_pixel_avg_variance32x32 vpx_sub_pixel_avg_variance32x32_c
 -
--uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t* src_ptr,
--                                           int src_stride,
--                                           int x_offset,
--                                           int y_offset,
--                                           const uint8_t* ref_ptr,
--                                           int ref_stride,
--                                           uint32_t* sse,
--                                           const uint8_t* second_pred);
+-uint32_t vpx_sub_pixel_avg_variance32x64_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
 -#define vpx_sub_pixel_avg_variance32x64 vpx_sub_pixel_avg_variance32x64_c
 -
--uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t* src_ptr,
--                                         int src_stride,
--                                         int x_offset,
--                                         int y_offset,
--                                         const uint8_t* ref_ptr,
--                                         int ref_stride,
--                                         uint32_t* sse,
--                                         const uint8_t* second_pred);
+-uint32_t vpx_sub_pixel_avg_variance4x4_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
 -#define vpx_sub_pixel_avg_variance4x4 vpx_sub_pixel_avg_variance4x4_c
 -
--uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t* src_ptr,
--                                         int src_stride,
--                                         int x_offset,
--                                         int y_offset,
--                                         const uint8_t* ref_ptr,
--                                         int ref_stride,
--                                         uint32_t* sse,
--                                         const uint8_t* second_pred);
+-uint32_t vpx_sub_pixel_avg_variance4x8_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
 -#define vpx_sub_pixel_avg_variance4x8 vpx_sub_pixel_avg_variance4x8_c
 -
--uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t* src_ptr,
--                                           int src_stride,
--                                           int x_offset,
--                                           int y_offset,
--                                           const uint8_t* ref_ptr,
--                                           int ref_stride,
--                                           uint32_t* sse,
--                                           const uint8_t* second_pred);
+-uint32_t vpx_sub_pixel_avg_variance64x32_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
 -#define vpx_sub_pixel_avg_variance64x32 vpx_sub_pixel_avg_variance64x32_c
 -
--uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t* src_ptr,
--                                           int src_stride,
--                                           int x_offset,
--                                           int y_offset,
--                                           const uint8_t* ref_ptr,
--                                           int ref_stride,
--                                           uint32_t* sse,
--                                           const uint8_t* second_pred);
+-uint32_t vpx_sub_pixel_avg_variance64x64_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
 -#define vpx_sub_pixel_avg_variance64x64 vpx_sub_pixel_avg_variance64x64_c
 -
--uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t* src_ptr,
--                                          int src_stride,
--                                          int x_offset,
--                                          int y_offset,
--                                          const uint8_t* ref_ptr,
--                                          int ref_stride,
--                                          uint32_t* sse,
--                                          const uint8_t* second_pred);
+-uint32_t vpx_sub_pixel_avg_variance8x16_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
 -#define vpx_sub_pixel_avg_variance8x16 vpx_sub_pixel_avg_variance8x16_c
 -
--uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t* src_ptr,
--                                         int src_stride,
--                                         int x_offset,
--                                         int y_offset,
--                                         const uint8_t* ref_ptr,
--                                         int ref_stride,
--                                         uint32_t* sse,
--                                         const uint8_t* second_pred);
+-uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
 -#define vpx_sub_pixel_avg_variance8x4 vpx_sub_pixel_avg_variance8x4_c
 -
--uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t* src_ptr,
--                                         int src_stride,
--                                         int x_offset,
--                                         int y_offset,
--                                         const uint8_t* ref_ptr,
--                                         int ref_stride,
--                                         uint32_t* sse,
--                                         const uint8_t* second_pred);
+-uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
 -#define vpx_sub_pixel_avg_variance8x8 vpx_sub_pixel_avg_variance8x8_c
 -
--uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t* src_ptr,
--                                       int src_stride,
--                                       int x_offset,
--                                       int y_offset,
--                                       const uint8_t* ref_ptr,
--                                       int ref_stride,
--                                       uint32_t* sse);
+-uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
 -#define vpx_sub_pixel_variance16x16 vpx_sub_pixel_variance16x16_c
 -
--uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t* src_ptr,
--                                       int src_stride,
--                                       int x_offset,
--                                       int y_offset,
--                                       const uint8_t* ref_ptr,
--                                       int ref_stride,
--                                       uint32_t* sse);
+-uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
 -#define vpx_sub_pixel_variance16x32 vpx_sub_pixel_variance16x32_c
 -
--uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t* src_ptr,
--                                      int src_stride,
--                                      int x_offset,
--                                      int y_offset,
--                                      const uint8_t* ref_ptr,
--                                      int ref_stride,
--                                      uint32_t* sse);
+-uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
 -#define vpx_sub_pixel_variance16x8 vpx_sub_pixel_variance16x8_c
 -
--uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t* src_ptr,
--                                       int src_stride,
--                                       int x_offset,
--                                       int y_offset,
--                                       const uint8_t* ref_ptr,
--                                       int ref_stride,
--                                       uint32_t* sse);
+-uint32_t vpx_sub_pixel_variance32x16_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
 -#define vpx_sub_pixel_variance32x16 vpx_sub_pixel_variance32x16_c
 -
--uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t* src_ptr,
--                                       int src_stride,
--                                       int x_offset,
--                                       int y_offset,
--                                       const uint8_t* ref_ptr,
--                                       int ref_stride,
--                                       uint32_t* sse);
+-uint32_t vpx_sub_pixel_variance32x32_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
 -#define vpx_sub_pixel_variance32x32 vpx_sub_pixel_variance32x32_c
 -
--uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t* src_ptr,
--                                       int src_stride,
--                                       int x_offset,
--                                       int y_offset,
--                                       const uint8_t* ref_ptr,
--                                       int ref_stride,
--                                       uint32_t* sse);
+-uint32_t vpx_sub_pixel_variance32x64_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
 -#define vpx_sub_pixel_variance32x64 vpx_sub_pixel_variance32x64_c
 -
--uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t* src_ptr,
--                                     int src_stride,
--                                     int x_offset,
--                                     int y_offset,
--                                     const uint8_t* ref_ptr,
--                                     int ref_stride,
--                                     uint32_t* sse);
+-uint32_t vpx_sub_pixel_variance4x4_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
 -#define vpx_sub_pixel_variance4x4 vpx_sub_pixel_variance4x4_c
 -
--uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t* src_ptr,
--                                     int src_stride,
--                                     int x_offset,
--                                     int y_offset,
--                                     const uint8_t* ref_ptr,
--                                     int ref_stride,
--                                     uint32_t* sse);
+-uint32_t vpx_sub_pixel_variance4x8_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
 -#define vpx_sub_pixel_variance4x8 vpx_sub_pixel_variance4x8_c
 -
--uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t* src_ptr,
--                                       int src_stride,
--                                       int x_offset,
--                                       int y_offset,
--                                       const uint8_t* ref_ptr,
--                                       int ref_stride,
--                                       uint32_t* sse);
+-uint32_t vpx_sub_pixel_variance64x32_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
 -#define vpx_sub_pixel_variance64x32 vpx_sub_pixel_variance64x32_c
 -
--uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t* src_ptr,
--                                       int src_stride,
--                                       int x_offset,
--                                       int y_offset,
--                                       const uint8_t* ref_ptr,
--                                       int ref_stride,
--                                       uint32_t* sse);
+-uint32_t vpx_sub_pixel_variance64x64_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
 -#define vpx_sub_pixel_variance64x64 vpx_sub_pixel_variance64x64_c
 -
--uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t* src_ptr,
--                                      int src_stride,
--                                      int x_offset,
--                                      int y_offset,
--                                      const uint8_t* ref_ptr,
--                                      int ref_stride,
--                                      uint32_t* sse);
+-uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
 -#define vpx_sub_pixel_variance8x16 vpx_sub_pixel_variance8x16_c
 -
--uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t* src_ptr,
--                                     int src_stride,
--                                     int x_offset,
--                                     int y_offset,
--                                     const uint8_t* ref_ptr,
--                                     int ref_stride,
--                                     uint32_t* sse);
+-uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
 -#define vpx_sub_pixel_variance8x4 vpx_sub_pixel_variance8x4_c
 -
--uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t* src_ptr,
--                                     int src_stride,
--                                     int x_offset,
--                                     int y_offset,
--                                     const uint8_t* ref_ptr,
--                                     int ref_stride,
--                                     uint32_t* sse);
+-uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int src_stride, int x_offset, int y_offset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
 -#define vpx_sub_pixel_variance8x8 vpx_sub_pixel_variance8x8_c
 -
--void vpx_subtract_block_c(int rows,
--                          int cols,
--                          int16_t* diff_ptr,
--                          ptrdiff_t diff_stride,
--                          const uint8_t* src_ptr,
--                          ptrdiff_t src_stride,
--                          const uint8_t* pred_ptr,
--                          ptrdiff_t pred_stride);
--void vpx_subtract_block_vsx(int rows,
--                            int cols,
--                            int16_t* diff_ptr,
--                            ptrdiff_t diff_stride,
--                            const uint8_t* src_ptr,
--                            ptrdiff_t src_stride,
--                            const uint8_t* pred_ptr,
--                            ptrdiff_t pred_stride);
+-void vpx_subtract_block_c(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride);
+-void vpx_subtract_block_vsx(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride);
 -#define vpx_subtract_block vpx_subtract_block_vsx
 -
--uint64_t vpx_sum_squares_2d_i16_c(const int16_t* src, int stride, int size);
+-uint64_t vpx_sum_squares_2d_i16_c(const int16_t *src, int stride, int size);
 -#define vpx_sum_squares_2d_i16 vpx_sum_squares_2d_i16_c
 -
--void vpx_tm_predictor_16x16_c(uint8_t* dst,
--                              ptrdiff_t stride,
--                              const uint8_t* above,
--                              const uint8_t* left);
--void vpx_tm_predictor_16x16_vsx(uint8_t* dst,
--                                ptrdiff_t stride,
--                                const uint8_t* above,
--                                const uint8_t* left);
+-void vpx_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
+-void vpx_tm_predictor_16x16_vsx(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_tm_predictor_16x16 vpx_tm_predictor_16x16_vsx
 -
--void vpx_tm_predictor_32x32_c(uint8_t* dst,
--                              ptrdiff_t stride,
--                              const uint8_t* above,
--                              const uint8_t* left);
--void vpx_tm_predictor_32x32_vsx(uint8_t* dst,
--                                ptrdiff_t stride,
--                                const uint8_t* above,
--                                const uint8_t* left);
+-void vpx_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
+-void vpx_tm_predictor_32x32_vsx(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_tm_predictor_32x32 vpx_tm_predictor_32x32_vsx
 -
--void vpx_tm_predictor_4x4_c(uint8_t* dst,
--                            ptrdiff_t stride,
--                            const uint8_t* above,
--                            const uint8_t* left);
+-void vpx_tm_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_tm_predictor_4x4 vpx_tm_predictor_4x4_c
 -
--void vpx_tm_predictor_8x8_c(uint8_t* dst,
--                            ptrdiff_t stride,
--                            const uint8_t* above,
--                            const uint8_t* left);
+-void vpx_tm_predictor_8x8_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_tm_predictor_8x8 vpx_tm_predictor_8x8_c
 -
--void vpx_v_predictor_16x16_c(uint8_t* dst,
--                             ptrdiff_t stride,
--                             const uint8_t* above,
--                             const uint8_t* left);
--void vpx_v_predictor_16x16_vsx(uint8_t* dst,
--                               ptrdiff_t stride,
--                               const uint8_t* above,
--                               const uint8_t* left);
+-void vpx_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
+-void vpx_v_predictor_16x16_vsx(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_v_predictor_16x16 vpx_v_predictor_16x16_vsx
 -
--void vpx_v_predictor_32x32_c(uint8_t* dst,
--                             ptrdiff_t stride,
--                             const uint8_t* above,
--                             const uint8_t* left);
--void vpx_v_predictor_32x32_vsx(uint8_t* dst,
--                               ptrdiff_t stride,
--                               const uint8_t* above,
--                               const uint8_t* left);
+-void vpx_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
+-void vpx_v_predictor_32x32_vsx(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_v_predictor_32x32 vpx_v_predictor_32x32_vsx
 -
--void vpx_v_predictor_4x4_c(uint8_t* dst,
--                           ptrdiff_t stride,
--                           const uint8_t* above,
--                           const uint8_t* left);
+-void vpx_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_v_predictor_4x4 vpx_v_predictor_4x4_c
 -
--void vpx_v_predictor_8x8_c(uint8_t* dst,
--                           ptrdiff_t stride,
--                           const uint8_t* above,
--                           const uint8_t* left);
+-void vpx_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_v_predictor_8x8 vpx_v_predictor_8x8_c
 -
--unsigned int vpx_variance16x16_c(const uint8_t* src_ptr,
--                                 int src_stride,
--                                 const uint8_t* ref_ptr,
--                                 int ref_stride,
--                                 unsigned int* sse);
--unsigned int vpx_variance16x16_vsx(const uint8_t* src_ptr,
--                                   int src_stride,
--                                   const uint8_t* ref_ptr,
--                                   int ref_stride,
--                                   unsigned int* sse);
+-unsigned int vpx_variance16x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+-unsigned int vpx_variance16x16_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 -#define vpx_variance16x16 vpx_variance16x16_vsx
 -
--unsigned int vpx_variance16x32_c(const uint8_t* src_ptr,
--                                 int src_stride,
--                                 const uint8_t* ref_ptr,
--                                 int ref_stride,
--                                 unsigned int* sse);
--unsigned int vpx_variance16x32_vsx(const uint8_t* src_ptr,
--                                   int src_stride,
--                                   const uint8_t* ref_ptr,
--                                   int ref_stride,
--                                   unsigned int* sse);
+-unsigned int vpx_variance16x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+-unsigned int vpx_variance16x32_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 -#define vpx_variance16x32 vpx_variance16x32_vsx
 -
--unsigned int vpx_variance16x8_c(const uint8_t* src_ptr,
--                                int src_stride,
--                                const uint8_t* ref_ptr,
--                                int ref_stride,
--                                unsigned int* sse);
--unsigned int vpx_variance16x8_vsx(const uint8_t* src_ptr,
--                                  int src_stride,
--                                  const uint8_t* ref_ptr,
--                                  int ref_stride,
--                                  unsigned int* sse);
+-unsigned int vpx_variance16x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+-unsigned int vpx_variance16x8_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 -#define vpx_variance16x8 vpx_variance16x8_vsx
 -
--unsigned int vpx_variance32x16_c(const uint8_t* src_ptr,
--                                 int src_stride,
--                                 const uint8_t* ref_ptr,
--                                 int ref_stride,
--                                 unsigned int* sse);
--unsigned int vpx_variance32x16_vsx(const uint8_t* src_ptr,
--                                   int src_stride,
--                                   const uint8_t* ref_ptr,
--                                   int ref_stride,
--                                   unsigned int* sse);
+-unsigned int vpx_variance32x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+-unsigned int vpx_variance32x16_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 -#define vpx_variance32x16 vpx_variance32x16_vsx
 -
--unsigned int vpx_variance32x32_c(const uint8_t* src_ptr,
--                                 int src_stride,
--                                 const uint8_t* ref_ptr,
--                                 int ref_stride,
--                                 unsigned int* sse);
--unsigned int vpx_variance32x32_vsx(const uint8_t* src_ptr,
--                                   int src_stride,
--                                   const uint8_t* ref_ptr,
--                                   int ref_stride,
--                                   unsigned int* sse);
+-unsigned int vpx_variance32x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+-unsigned int vpx_variance32x32_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 -#define vpx_variance32x32 vpx_variance32x32_vsx
 -
--unsigned int vpx_variance32x64_c(const uint8_t* src_ptr,
--                                 int src_stride,
--                                 const uint8_t* ref_ptr,
--                                 int ref_stride,
--                                 unsigned int* sse);
--unsigned int vpx_variance32x64_vsx(const uint8_t* src_ptr,
--                                   int src_stride,
--                                   const uint8_t* ref_ptr,
--                                   int ref_stride,
--                                   unsigned int* sse);
+-unsigned int vpx_variance32x64_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+-unsigned int vpx_variance32x64_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 -#define vpx_variance32x64 vpx_variance32x64_vsx
 -
--unsigned int vpx_variance4x4_c(const uint8_t* src_ptr,
--                               int src_stride,
--                               const uint8_t* ref_ptr,
--                               int ref_stride,
--                               unsigned int* sse);
--unsigned int vpx_variance4x4_vsx(const uint8_t* src_ptr,
--                                 int src_stride,
--                                 const uint8_t* ref_ptr,
--                                 int ref_stride,
--                                 unsigned int* sse);
+-unsigned int vpx_variance4x4_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+-unsigned int vpx_variance4x4_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 -#define vpx_variance4x4 vpx_variance4x4_vsx
 -
--unsigned int vpx_variance4x8_c(const uint8_t* src_ptr,
--                               int src_stride,
--                               const uint8_t* ref_ptr,
--                               int ref_stride,
--                               unsigned int* sse);
--unsigned int vpx_variance4x8_vsx(const uint8_t* src_ptr,
--                                 int src_stride,
--                                 const uint8_t* ref_ptr,
--                                 int ref_stride,
--                                 unsigned int* sse);
+-unsigned int vpx_variance4x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+-unsigned int vpx_variance4x8_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 -#define vpx_variance4x8 vpx_variance4x8_vsx
 -
--unsigned int vpx_variance64x32_c(const uint8_t* src_ptr,
--                                 int src_stride,
--                                 const uint8_t* ref_ptr,
--                                 int ref_stride,
--                                 unsigned int* sse);
--unsigned int vpx_variance64x32_vsx(const uint8_t* src_ptr,
--                                   int src_stride,
--                                   const uint8_t* ref_ptr,
--                                   int ref_stride,
--                                   unsigned int* sse);
+-unsigned int vpx_variance64x32_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+-unsigned int vpx_variance64x32_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 -#define vpx_variance64x32 vpx_variance64x32_vsx
 -
--unsigned int vpx_variance64x64_c(const uint8_t* src_ptr,
--                                 int src_stride,
--                                 const uint8_t* ref_ptr,
--                                 int ref_stride,
--                                 unsigned int* sse);
--unsigned int vpx_variance64x64_vsx(const uint8_t* src_ptr,
--                                   int src_stride,
--                                   const uint8_t* ref_ptr,
--                                   int ref_stride,
--                                   unsigned int* sse);
+-unsigned int vpx_variance64x64_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+-unsigned int vpx_variance64x64_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 -#define vpx_variance64x64 vpx_variance64x64_vsx
 -
--unsigned int vpx_variance8x16_c(const uint8_t* src_ptr,
--                                int src_stride,
--                                const uint8_t* ref_ptr,
--                                int ref_stride,
--                                unsigned int* sse);
--unsigned int vpx_variance8x16_vsx(const uint8_t* src_ptr,
--                                  int src_stride,
--                                  const uint8_t* ref_ptr,
--                                  int ref_stride,
--                                  unsigned int* sse);
+-unsigned int vpx_variance8x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+-unsigned int vpx_variance8x16_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 -#define vpx_variance8x16 vpx_variance8x16_vsx
 -
--unsigned int vpx_variance8x4_c(const uint8_t* src_ptr,
--                               int src_stride,
--                               const uint8_t* ref_ptr,
--                               int ref_stride,
--                               unsigned int* sse);
--unsigned int vpx_variance8x4_vsx(const uint8_t* src_ptr,
--                                 int src_stride,
--                                 const uint8_t* ref_ptr,
--                                 int ref_stride,
--                                 unsigned int* sse);
+-unsigned int vpx_variance8x4_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+-unsigned int vpx_variance8x4_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 -#define vpx_variance8x4 vpx_variance8x4_vsx
 -
--unsigned int vpx_variance8x8_c(const uint8_t* src_ptr,
--                               int src_stride,
--                               const uint8_t* ref_ptr,
--                               int ref_stride,
--                               unsigned int* sse);
--unsigned int vpx_variance8x8_vsx(const uint8_t* src_ptr,
--                                 int src_stride,
--                                 const uint8_t* ref_ptr,
--                                 int ref_stride,
--                                 unsigned int* sse);
+-unsigned int vpx_variance8x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
+-unsigned int vpx_variance8x8_vsx(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 -#define vpx_variance8x8 vpx_variance8x8_vsx
 -
--void vpx_ve_predictor_4x4_c(uint8_t* dst,
--                            ptrdiff_t stride,
--                            const uint8_t* above,
--                            const uint8_t* left);
+-void vpx_ve_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride, const uint8_t *above, const uint8_t *left);
 -#define vpx_ve_predictor_4x4 vpx_ve_predictor_4x4_c
 -
--int vpx_vector_var_c(const int16_t* ref, const int16_t* src, const int bwl);
+-int vpx_vector_var_c(const int16_t *ref, const int16_t *src, const int bwl);
 -#define vpx_vector_var vpx_vector_var_c
 -
 -void vpx_dsp_rtcd(void);
@@ -2926,9 +1400,10 @@ Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vpx_d
 -
 -#ifdef RTCD_C
 -#include "vpx_ports/ppc.h"
--static void setup_rtcd_internal(void) {
--  int flags = ppc_simd_caps();
--  (void)flags;
+-static void setup_rtcd_internal(void)
+-{
+-    int flags = ppc_simd_caps();
+-    (void)flags;
 -}
 -#endif
 -
@@ -2937,11 +1412,9 @@ Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vpx_d
 -#endif
 -
 -#endif  // VPX_DSP_RTCD_H_
-Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
-===================================================================
---- chromium-136.0.7103.48.orig/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h
-+++ /dev/null
-@@ -1,110 +0,0 @@
+--- chromium-137.0.7151.40/third_party/libvpx/source/config/linux/ppc64/vpx_scale_rtcd.h	2025-05-26 21:02:11.892388814 +0200
++++ /dev/null	2025-05-26 08:38:43.246140177 +0200
+@@ -1,83 +0,0 @@
 -/*
 - *  Copyright (c) 2025 The WebM project authors. All Rights Reserved.
 - *
@@ -2968,71 +1441,43 @@ Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vpx_s
 -extern "C" {
 -#endif
 -
--void vp8_horizontal_line_2_1_scale_c(const unsigned char* source,
--                                     unsigned int source_width,
--                                     unsigned char* dest,
--                                     unsigned int dest_width);
+-void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
 -#define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c
 -
--void vp8_horizontal_line_5_3_scale_c(const unsigned char* source,
--                                     unsigned int source_width,
--                                     unsigned char* dest,
--                                     unsigned int dest_width);
+-void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
 -#define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c
 -
--void vp8_horizontal_line_5_4_scale_c(const unsigned char* source,
--                                     unsigned int source_width,
--                                     unsigned char* dest,
--                                     unsigned int dest_width);
+-void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width);
 -#define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c
 -
--void vp8_vertical_band_2_1_scale_c(unsigned char* source,
--                                   unsigned int src_pitch,
--                                   unsigned char* dest,
--                                   unsigned int dest_pitch,
--                                   unsigned int dest_width);
+-void vp8_vertical_band_2_1_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
 -#define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c
 -
--void vp8_vertical_band_2_1_scale_i_c(unsigned char* source,
--                                     unsigned int src_pitch,
--                                     unsigned char* dest,
--                                     unsigned int dest_pitch,
--                                     unsigned int dest_width);
+-void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
 -#define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c
 -
--void vp8_vertical_band_5_3_scale_c(unsigned char* source,
--                                   unsigned int src_pitch,
--                                   unsigned char* dest,
--                                   unsigned int dest_pitch,
--                                   unsigned int dest_width);
+-void vp8_vertical_band_5_3_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
 -#define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c
 -
--void vp8_vertical_band_5_4_scale_c(unsigned char* source,
--                                   unsigned int src_pitch,
--                                   unsigned char* dest,
--                                   unsigned int dest_pitch,
--                                   unsigned int dest_width);
+-void vp8_vertical_band_5_4_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width);
 -#define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c
 -
--void vp8_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc,
--                           struct yv12_buffer_config* dst_ybc);
+-void vp8_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc);
 -#define vp8_yv12_copy_frame vp8_yv12_copy_frame_c
 -
--void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config* ybf);
+-void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf);
 -#define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c
 -
--void vpx_extend_frame_borders_c(struct yv12_buffer_config* ybf);
+-void vpx_extend_frame_borders_c(struct yv12_buffer_config *ybf);
 -#define vpx_extend_frame_borders vpx_extend_frame_borders_c
 -
--void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config* ybf);
+-void vpx_extend_frame_inner_borders_c(struct yv12_buffer_config *ybf);
 -#define vpx_extend_frame_inner_borders vpx_extend_frame_inner_borders_c
 -
--void vpx_yv12_copy_frame_c(const struct yv12_buffer_config* src_ybc,
--                           struct yv12_buffer_config* dst_ybc);
+-void vpx_yv12_copy_frame_c(const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc);
 -#define vpx_yv12_copy_frame vpx_yv12_copy_frame_c
 -
--void vpx_yv12_copy_y_c(const struct yv12_buffer_config* src_ybc,
--                       struct yv12_buffer_config* dst_ybc);
+-void vpx_yv12_copy_y_c(const struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc);
 -#define vpx_yv12_copy_y vpx_yv12_copy_y_c
 -
 -void vpx_scale_rtcd(void);
@@ -3041,9 +1486,10 @@ Index: chromium-136.0.7103.48/third_party/libvpx/source/config/linux/ppc64/vpx_s
 -
 -#ifdef RTCD_C
 -#include "vpx_ports/ppc.h"
--static void setup_rtcd_internal(void) {
--  int flags = ppc_simd_caps();
--  (void)flags;
+-static void setup_rtcd_internal(void)
+-{
+-    int flags = ppc_simd_caps();
+-    (void)flags;
 -}
 -#endif
 -

diff --git a/chromium-135-add-cfi-suppressions-for-pipewire-functions.patch b/chromium-135-add-cfi-suppressions-for-pipewire-functions.patch
deleted file mode 100644
index d4c8f14..0000000
--- a/chromium-135-add-cfi-suppressions-for-pipewire-functions.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0eebf40b9914bca8fe69bef8eea89522c1a5d4ce Mon Sep 17 00:00:00 2001
-From: Jan Grulich <grulja@gmail.com>
-Date: Tue, 01 Apr 2025 12:23:37 -0700
-Subject: [PATCH] Add more CFI suppressions for inline PipeWire functions
-
-There are now more inline functions with PipeWire 1.4, which are causing
-SIGILL as we hit CFI check.
-
-Bug: chromium:354776214
-Change-Id: I055dd7edcaf3ca190ec7b4cc576ebe97a2baf82f
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6421030
-Reviewed-by: Peter Collingbourne <pcc@chromium.org>
-Reviewed-by: Alexander Cooper <alcooper@chromium.org>
-Commit-Queue: Jan Grulich <grulja@gmail.com>
-Cr-Commit-Position: refs/heads/main@{#1441109}
----
-
-diff --git a/tools/cfi/ignores.txt b/tools/cfi/ignores.txt
-index 9a1180e..0a002bc6 100644
---- a/tools/cfi/ignores.txt
-+++ b/tools/cfi/ignores.txt
-@@ -260,8 +260,16 @@
- src:*third_party/skia/src/ports/SkFontHost_FreeType.cpp
- 
- # WebRTC / PipeWire
--fun:*pw_registry_bind*
-+fun:*pw_core_add_listener*
- fun:*pw_core_get_registry*
-+fun:*pw_core_sync*
-+fun:*pw_node_add_listener*
-+fun:*pw_node_enum_params*
-+fun:*pw_loop_add_event*
-+fun:*pw_loop_signal_event*
-+fun:*pw_registry_add_listener*
-+fun:*pw_registry_bind*
-+fun:*spa_loop_utils*
- 
- ######### Function pointers cast to incorrect type signatures
- 

diff --git a/chromium-135-gperf.patch b/chromium-135-gperf.patch
deleted file mode 100644
index f404371..0000000
--- a/chromium-135-gperf.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b552a86d494c1acf9c3472b8e5f00d90f9d3a704 Mon Sep 17 00:00:00 2001
-From: Daniel Richard G <iskunk@gmail.com>
-Date: Thu, 10 Apr 2025 04:35:40 -0400
-Subject: [PATCH] Don't apply /*FALLTHROUGH*/ edit to gperf 3.2 output
-
-The gperf issue at https://savannah.gnu.org/bugs/index.php?53029
-has been resolved as of the 3.2 release, and not only is the
-/*FALLTHROUGH*/ comment replacement no longer needed, it now
-breaks the build with "error: fallthrough annotation does not
-directly precede switch label". Only do the edit for 3.1.
-
-Bug: None
-Change-Id: I1f12a2a685b62d0dedb4298bc171ab4c94ec6b47
----
-
-diff --git a/third_party/blink/renderer/build/scripts/gperf.py b/third_party/blink/renderer/build/scripts/gperf.py
-index 42630d3..0df5abd 100644
---- a/third_party/blink/renderer/build/scripts/gperf.py
-+++ b/third_party/blink/renderer/build/scripts/gperf.py
-@@ -35,10 +35,11 @@
-         # https://savannah.gnu.org/bugs/index.php?53028
-         gperf_output = re.sub(r'\bregister ', '', gperf_output)
-         # -Wimplicit-fallthrough needs an explicit fallthrough statement,
--        # so replace gperf's /*FALLTHROUGH*/ comment with the statement.
--        # https://savannah.gnu.org/bugs/index.php?53029
--        gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
--                                            '  [[fallthrough]];')
-+        # so replace gperf 3.1's /*FALLTHROUGH*/ comment with the statement.
-+        # https://savannah.gnu.org/bugs/index.php?53029 (fixed in 3.2)
-+        if '/* C++ code produced by gperf version 3.1 */' in gperf_output:
-+            gperf_output = gperf_output.replace('/*FALLTHROUGH*/',
-+                                                '  [[fallthrough]];')
-         # -Wpointer-to-int-cast warns about casting pointers to smaller ints
-         # Replace {(int)(long)&(foo), bar} with
-         # {static_cast<int>(reinterpret_cast<uintptr_t>(&(foo)), bar}

diff --git a/chromium-137-pdfium-png_decoder-build-error.patch b/chromium-137-pdfium-png_decoder-build-error.patch
new file mode 100644
index 0000000..f45c757
--- /dev/null
+++ b/chromium-137-pdfium-png_decoder-build-error.patch
@@ -0,0 +1,14 @@
+diff -up chromium-137.0.7151.15/third_party/pdfium/core/fxcodec/png/png_decoder.cpp.me chromium-137.0.7151.15/third_party/pdfium/core/fxcodec/png/png_decoder.cpp
+--- chromium-137.0.7151.15/third_party/pdfium/core/fxcodec/png/png_decoder.cpp.me	2025-05-10 23:12:58.189339791 +0200
++++ chromium-137.0.7151.15/third_party/pdfium/core/fxcodec/png/png_decoder.cpp	2025-05-10 23:13:54.931224351 +0200
+@@ -52,8 +52,8 @@ void _png_load_bmp_attribute(png_structp
+                              CFX_DIBAttribute* pAttribute) {
+   if (pAttribute) {
+ #if defined(PNG_pHYs_SUPPORTED)
+-    pAttribute->xdpi_ = png_get_x_pixels_per_meter(png_ptr, info_ptr);
+-    pAttribute->ydpi_ = png_get_y_pixels_per_meter(png_ptr, info_ptr);
++    pAttribute->x_dpi_ = png_get_x_pixels_per_meter(png_ptr, info_ptr);
++    pAttribute->y_dpi_ = png_get_y_pixels_per_meter(png_ptr, info_ptr);
+     png_uint_32 res_x, res_y;
+     int unit_type;
+     png_get_pHYs(png_ptr, info_ptr, &res_x, &res_y, &unit_type);

diff --git a/chromium-137-simdutf-7.x-build-error.patch b/chromium-137-simdutf-7.x-build-error.patch
new file mode 100644
index 0000000..5e33d54
--- /dev/null
+++ b/chromium-137-simdutf-7.x-build-error.patch
@@ -0,0 +1,21 @@
+diff -up chromium-137.0.7151.40/v8/src/builtins/builtins-typed-array.cc.simdutf-7.x chromium-137.0.7151.40/v8/src/builtins/builtins-typed-array.cc
+--- chromium-137.0.7151.40/v8/src/builtins/builtins-typed-array.cc.simdutf-7.x	2025-05-21 00:14:25.000000000 +0200
++++ chromium-137.0.7151.40/v8/src/builtins/builtins-typed-array.cc	2025-05-23 23:31:59.961068931 +0200
+@@ -493,7 +493,7 @@ Maybe<simdutf::result> ArrayBufferFromBa
+   std::unique_ptr<char[]> output = std::make_unique<char[]>(output_length);
+   simdutf::result simd_result = simdutf::base64_to_binary_safe(
+       reinterpret_cast<const T>(input_vector), input_length, output.get(),
+-      output_length, alphabet, last_chunk_handling);
++      output_length, alphabet, last_chunk_handling, false);
+ 
+   {
+     AllowGarbageCollection gc;
+@@ -526,7 +526,7 @@ simdutf::result ArrayBufferSetFromBase64
+   simdutf::result simd_result = simdutf::base64_to_binary_safe(
+       reinterpret_cast<const T>(input_vector), input_length,
+       reinterpret_cast<char*>(typed_array->DataPtr()), output_length, alphabet,
+-      last_chunk_handling);
++      last_chunk_handling, false);
+ 
+   return simd_result;
+ }

diff --git a/chromium-137-simdutf-build-error.patch b/chromium-137-simdutf-build-error.patch
new file mode 100644
index 0000000..50441b7
--- /dev/null
+++ b/chromium-137-simdutf-build-error.patch
@@ -0,0 +1,12 @@
+diff -up chromium-137.0.7151.40/v8/src/builtins/builtins-typed-array.cc.me chromium-137.0.7151.40/v8/src/builtins/builtins-typed-array.cc
+--- chromium-137.0.7151.40/v8/src/builtins/builtins-typed-array.cc.me	2025-05-21 00:14:25.000000000 +0200
++++ chromium-137.0.7151.40/v8/src/builtins/builtins-typed-array.cc	2025-05-23 23:31:59.961068931 +0200
+@@ -820,7 +820,7 @@ BUILTIN(Uint8ArrayPrototypeToBase64) {
+ 
+     size_t simd_result_size;
+     if (uint8array->buffer()->is_shared()) {
+-      simd_result_size = simdutf::atomic_binary_to_base64(
++      simd_result_size = simdutf::binary_to_base64(
+           std::bit_cast<const char*>(uint8array->GetBuffer()->backing_store()),
+           length, reinterpret_cast<char*>(output->GetChars(no_gc)), alphabet);
+     } else {

diff --git a/chromium.spec b/chromium.spec
index 1411178..fe3d7ce 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -213,8 +213,6 @@
 %endif
 %if 0%{?fedora}
 %global bundlecrc32c 0
-%endif
-%if 0%{?fedora} && 0%{?fedora} < 43
 %global bundlesimdutf 0
 %endif
 %if 0%{?fedora} || 0%{?rhel} > 9
@@ -259,8 +257,8 @@
 %endif
 
 Name:	chromium
-Version: 136.0.7103.113
-Release: 2%{?dist}
+Version: 137.0.7151.55
+Release: 1%{?dist}
 Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use
 Url: http://www.chromium.org/Home
 License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only)
@@ -292,6 +290,11 @@ Patch91: chromium-108-system-opus.patch
 # patch for Failed NodeJS version check
 Patch92: chromium-136-checkversion-nodejs.patch
 
+# Fix FTBFS
+Patch93: chromium-137-pdfium-png_decoder-build-error.patch
+Patch94: chromium-137-simdutf-build-error.patch
+Patch95: chromium-137-simdutf-7.x-build-error.patch
+
 # system ffmpeg
 # need for old ffmpeg 5.x on epel9
 Patch129: chromium-125-ffmpeg-5.x-reordered_opaque.patch
@@ -459,11 +462,6 @@ Patch511: 0002-Fix-Missing-OPENSSL_NO_ENGINE-Guard.patch
 %endif
 
 # upstream patches
-# https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/4636
-# https://chromium-review.googlesource.com/c/chromium/src/+/6421030
-Patch600: chromium-135-add-cfi-suppressions-for-pipewire-functions.patch
-# https://chromium-review.googlesource.com/c/chromium/src/+/6445471
-Patch601: chromium-135-gperf.patch
 
 # Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
 # http://build.chromium.org/buildbot/official/
@@ -1012,6 +1010,13 @@ Qt6 UI for chromium.
 %endif
 
 %patch -P92 -p1 -b .nodejs-checkversion
+%patch -P93 -p1 -b .pdfium-png_decoder-build-error
+%if ! %{bundlesimdutf}
+%patch -P94 -p1 -b .simdutf-build-error
+%if 0%{?fedora} > 42
+%patch -P95 -p1 -b .simdutf-7.x-build-error
+%endif
+%endif
 
 %if ! %{bundleffmpegfree}
 %if 0%{?rhel} == 9
@@ -1041,12 +1046,11 @@ Qt6 UI for chromium.
 %patch -P306 -p1 -b .el8-ifunc-header
 %endif
 %patch -P307 -p1 -b .el8-atk-compiler-error
-%endif
-%if 0%{?rhel} == 8
 %patch -P308 -p1 -b .unsupport-clang-flags
 %patch -P309 -p1 -b .el8-unsupport-rustc-flags
 %patch -P310 -p1 -b .el8-clang18-build-error
 %patch -P311 -p1 -b .clang18-template
+%patch -P314 -p1 -b .rust-skrifa-build-error
 %ifarch x86_64
 %patch -P317 -p1 -b .xnnpack-clang18-crash-x86_64
 %endif
@@ -1060,10 +1064,6 @@ Qt6 UI for chromium.
 %endif
 %endif
 
-%if 0%{?rhel} == 8
-%patch -P314 -p1 -b .rust-skrifa-build-error
-%endif
-
 %if 0%{?rhel}
 %patch -P315 -p1 -b .rust-libadler2
 %endif
@@ -1153,8 +1153,6 @@ Qt6 UI for chromium.
 %endif
 
 # Upstream patches
-%patch -P600 -p1 -b .add-cfi-suppressions-for-pipewire-functions
-%patch -P601 -p1 -b .gperf-3.2
 
 # Change shebang in all relevant files in this directory and all subdirectories
 # See `man find` for how the `-exec command {} +` syntax works
@@ -1202,7 +1200,11 @@ sed -i 's|/opt/google/chrome-remote-desktop|%{crd_path}|g' remoting/host/setup/d
 
 # bz#2265957, add correct platform
 sed -i "s/Linux x86_64/Linux %{_arch}/" components/embedder_support/user_agent_utils.cc
- 
+
+%if ! %{bundlesimdutf}
+ln -sf %{_includedir}/simdutf.h third_party/simdutf/simdutf.h
+%endif
+
 %build
 
 %if ! %{system_nodejs}
@@ -1787,6 +1789,21 @@ fi
 %endif
 
 %changelog
+* Tue May 27 2025 Than Ngo <than@redhat.com> - 137.0.7151.55-1
+- Update to 137.0.7151.55
+  * CVE-2025-5063: Use after free in Compositing
+  * CVE-2025-5280: Out of bounds write in V8
+  * CVE-2025-5064: Inappropriate implementation in Background Fetch API
+  * CVE-2025-5065: Inappropriate implementation in FileSystemAccess API
+  * CVE-2025-5066: Inappropriate implementation in Messages
+  * CVE-2025-5281: Inappropriate implementation in BFCache
+  * CVE-2025-5283: Use after free in libvpx
+  * CVE-2025-5067: Inappropriate implementation in Tab Strip
+- Fix FTBFS caused by simdutf and pdfium-png_decoder
+- Remove chromium-135-gperf.patch and chromium-135-add-cfi-suppressions-for-pipewire-functions.patch, merged by upstream
+- Refresh ppc64le patches
+- Enable system simdutf for F43
+
 * Tue May 27 2025 Jitka Plesnikova <jplesnik@redhat.com> - 136.0.7103.113-2
 - Rebuilt for flac 1.5.0
 

diff --git a/fix-partition-alloc-compile.patch b/fix-partition-alloc-compile.patch
index c192df4..16f8f33 100644
--- a/fix-partition-alloc-compile.patch
+++ b/fix-partition-alloc-compile.patch
@@ -1,16 +1,15 @@
 kIndex: chromium-114.0.5735.45/base/allocator/partition_allocator/partition_alloc.gni
 ===================================================================
-Index: chromium-128.0.6613.113/base/allocator/partition_allocator/partition_alloc.gni
+Index: chromium-137.0.7151.40/base/allocator/partition_allocator/partition_alloc.gni
 ===================================================================
---- chromium-128.0.6613.113.orig/base/allocator/partition_allocator/partition_alloc.gni
-+++ chromium-128.0.6613.113/base/allocator/partition_allocator/partition_alloc.gni
-@@ -19,7 +19,8 @@ if (is_nacl) {
-   # NaCl targets don't use 64-bit pointers.
+--- chromium-137.0.7151.40.orig/base/allocator/partition_allocator/partition_alloc.gni
++++ chromium-137.0.7151.40/base/allocator/partition_allocator/partition_alloc.gni
+@@ -70,7 +70,7 @@ if (is_nacl) {
    has_64_bit_pointers = false
  } else if (current_cpu == "x64" || current_cpu == "arm64" ||
--           current_cpu == "loong64" || current_cpu == "riscv64") {
-+           current_cpu == "loong64" || current_cpu == "riscv64" ||
-+           current_cpu == "ppc64") {
+            current_cpu == "arm64e" || current_cpu == "loong64" ||
+-           current_cpu == "riscv64") {
++           current_cpu == "riscv64" || current_cpu == "ppc64") {
+   assert(current_cpu != "arm64e" || (is_ios && target_environment == "device"))
    has_64_bit_pointers = true
- } else if (current_cpu == "x86" || current_cpu == "arm") {
-   has_64_bit_pointers = false
+ } else if (current_cpu == "x86" || current_cpu == "arm" ||

diff --git a/skia-vsx-instructions.patch b/skia-vsx-instructions.patch
index e6c7ee4..74268c6 100644
--- a/skia-vsx-instructions.patch
+++ b/skia-vsx-instructions.patch
@@ -1,7 +1,7 @@
-Index: chromium-136.0.7103.48/third_party/skia/BUILD.gn
+Index: chromium-137.0.7151.40/third_party/skia/BUILD.gn
 ===================================================================
---- chromium-136.0.7103.48.orig/third_party/skia/BUILD.gn
-+++ chromium-136.0.7103.48/third_party/skia/BUILD.gn
+--- chromium-137.0.7151.40.orig/third_party/skia/BUILD.gn
++++ chromium-137.0.7151.40/third_party/skia/BUILD.gn
 @@ -193,6 +193,12 @@ opts("lasx") {
    cflags = [ "-mlasx" ]
  }
@@ -15,7 +15,7 @@ Index: chromium-136.0.7103.48/third_party/skia/BUILD.gn
  # Any feature of Skia that requires third-party code should be optional and use this template.
  template("optional") {
    if (invoker.enabled) {
-@@ -1651,6 +1657,7 @@ skia_component("skia") {
+@@ -1648,6 +1654,7 @@ skia_component("skia") {
      ":skx",
      ":typeface_fontations",
      ":vello",
@@ -23,7 +23,7 @@ Index: chromium-136.0.7103.48/third_party/skia/BUILD.gn
      ":webp_decode",
      ":wuffs",
      ":xml",
-@@ -1822,7 +1829,10 @@ skia_static_library("pathkit") {
+@@ -1819,7 +1826,10 @@ skia_static_library("pathkit") {
    public_configs = [ ":skia_public" ]
    configs = skia_library_configs
  
@@ -35,10 +35,10 @@ Index: chromium-136.0.7103.48/third_party/skia/BUILD.gn
  
    sources = []
    sources += skia_pathops_sources
-Index: chromium-136.0.7103.48/third_party/skia/gn/skia/BUILD.gn
+Index: chromium-137.0.7151.40/third_party/skia/gn/skia/BUILD.gn
 ===================================================================
---- chromium-136.0.7103.48.orig/third_party/skia/gn/skia/BUILD.gn
-+++ chromium-136.0.7103.48/third_party/skia/gn/skia/BUILD.gn
+--- chromium-137.0.7151.40.orig/third_party/skia/gn/skia/BUILD.gn
++++ chromium-137.0.7151.40/third_party/skia/gn/skia/BUILD.gn
 @@ -175,6 +175,8 @@ config("default") {
        "-mfpmath=sse",
      ]
@@ -48,11 +48,11 @@ Index: chromium-136.0.7103.48/third_party/skia/gn/skia/BUILD.gn
    } else if (current_cpu == "loong64") {
      cflags += [
        "-mlsx",
-Index: chromium-136.0.7103.48/third_party/skia/include/core/SkTypes.h
+Index: chromium-137.0.7151.40/third_party/skia/include/core/SkTypes.h
 ===================================================================
---- chromium-136.0.7103.48.orig/third_party/skia/include/core/SkTypes.h
-+++ chromium-136.0.7103.48/third_party/skia/include/core/SkTypes.h
-@@ -188,4 +188,43 @@ static constexpr uint32_t SK_InvalidGenI
+--- chromium-137.0.7151.40.orig/third_party/skia/include/core/SkTypes.h
++++ chromium-137.0.7151.40/third_party/skia/include/core/SkTypes.h
+@@ -194,4 +194,43 @@ static constexpr uint32_t SK_InvalidGenI
  */
  static constexpr uint32_t SK_InvalidUniqueID = 0;
  
@@ -96,10 +96,10 @@ Index: chromium-136.0.7103.48/third_party/skia/include/core/SkTypes.h
 +#endif
 +
  #endif
-Index: chromium-136.0.7103.48/third_party/skia/src/base/SkSpinlock.cpp
+Index: chromium-137.0.7151.40/third_party/skia/src/base/SkSpinlock.cpp
 ===================================================================
---- chromium-136.0.7103.48.orig/third_party/skia/src/base/SkSpinlock.cpp
-+++ chromium-136.0.7103.48/third_party/skia/src/base/SkSpinlock.cpp
+--- chromium-137.0.7151.40.orig/third_party/skia/src/base/SkSpinlock.cpp
++++ chromium-137.0.7151.40/third_party/skia/src/base/SkSpinlock.cpp
 @@ -33,7 +33,8 @@
  #endif
  
@@ -110,10 +110,10 @@ Index: chromium-136.0.7103.48/third_party/skia/src/base/SkSpinlock.cpp
      #include <emmintrin.h>
      static void do_pause() { _mm_pause(); }
  #else
-Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkBitmapProcState_opts.h
+Index: chromium-137.0.7151.40/third_party/skia/src/opts/SkBitmapProcState_opts.h
 ===================================================================
---- chromium-136.0.7103.48.orig/third_party/skia/src/opts/SkBitmapProcState_opts.h
-+++ chromium-136.0.7103.48/third_party/skia/src/opts/SkBitmapProcState_opts.h
+--- chromium-137.0.7151.40.orig/third_party/skia/src/opts/SkBitmapProcState_opts.h
++++ chromium-137.0.7151.40/third_party/skia/src/opts/SkBitmapProcState_opts.h
 @@ -21,7 +21,13 @@
  // The rest are scattershot at the moment but I want to get them
  // all migrated to be normal code inside SkBitmapProcState.cpp.
@@ -129,10 +129,10 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkBitmapProcState_opts.h
      #include <immintrin.h>
  #elif defined(SK_ARM_HAS_NEON)
      #include <arm_neon.h>
-Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkBlitRow_opts.h
+Index: chromium-137.0.7151.40/third_party/skia/src/opts/SkBlitRow_opts.h
 ===================================================================
---- chromium-136.0.7103.48.orig/third_party/skia/src/opts/SkBlitRow_opts.h
-+++ chromium-136.0.7103.48/third_party/skia/src/opts/SkBlitRow_opts.h
+--- chromium-137.0.7151.40.orig/third_party/skia/src/opts/SkBlitRow_opts.h
++++ chromium-137.0.7151.40/third_party/skia/src/opts/SkBlitRow_opts.h
 @@ -69,7 +69,7 @@
  #endif
  
@@ -142,10 +142,10 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkBlitRow_opts.h
  
      static inline __m128i SkPMSrcOver_SSE2(const __m128i& src, const __m128i& dst) {
          __m128i scale = _mm_sub_epi32(_mm_set1_epi32(256),
-Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
+Index: chromium-137.0.7151.40/third_party/skia/src/opts/SkRasterPipeline_opts.h
 ===================================================================
---- chromium-136.0.7103.48.orig/third_party/skia/src/opts/SkRasterPipeline_opts.h
-+++ chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
+--- chromium-137.0.7151.40.orig/third_party/skia/src/opts/SkRasterPipeline_opts.h
++++ chromium-137.0.7151.40/third_party/skia/src/opts/SkRasterPipeline_opts.h
 @@ -1,5 +1,6 @@
  /*
   * Copyright 2018 Google Inc.
@@ -171,7 +171,7 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
  #elif defined(SKRP_CPU_LASX)
      #include <lasxintrin.h>
      #include <lsxintrin.h>
-@@ -200,6 +205,184 @@ namespace SK_OPTS_NS {
+@@ -202,6 +207,192 @@ namespace SK_OPTS_NS {
          ptr[3] = a;
      }
  
@@ -238,6 +238,14 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
 +    SI V<T> gather(const T* p, U32 ix) {
 +        return {p[ix[0]], p[ix[1]], p[ix[2]], p[ix[3]]};
 +    }
++    template <typename T>
++    SI V<T> gather_unaligned(const T* ptr, U32 ix) {
++        // This tells the compiler ptr might not be aligned appropriately, so
++        // it generates better assembly.
++        typedef T __attribute__ ((aligned (1))) unaligned_ptr;
++        const unaligned_ptr* uptr = static_cast<const unaligned_ptr*>(ptr);
++        return V<T>{uptr[ix[0]], uptr[ix[1]], uptr[ix[2]], uptr[ix[3]]};
++    }
 +    template <typename V, typename S>
 +    SI void scatter_masked(V src, S* dst, U32 ix, I32 mask) {
 +        V before = gather(dst, ix);
@@ -356,7 +364,7 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
  #elif defined(SKRP_CPU_NEON)
      template <typename T> using V = Vec<4, T>;
      using F   = V<float   >;
-@@ -1389,6 +1572,15 @@ SI F from_half(U16 h) {
+@@ -1427,6 +1618,15 @@ SI F from_half(U16 h) {
  #elif defined(SKRP_CPU_HSW)
      return _mm256_cvtph_ps((__m128i)h);
  
@@ -372,7 +380,7 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
  #else
      // Remember, a half is 1-5-10 (sign-exponent-mantissa) with 15 exponent bias.
      U32 sem = expand(h),
-@@ -1412,6 +1604,16 @@ SI U16 to_half(F f) {
+@@ -1450,6 +1650,16 @@ SI U16 to_half(F f) {
  #elif defined(SKRP_CPU_HSW)
      return (U16)_mm256_cvtps_ph(f, _MM_FROUND_CUR_DIRECTION);
  
@@ -389,7 +397,7 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
  #else
      // Remember, a float is 1-8-23 (sign-exponent-mantissa) with 127 exponent bias.
      U32 sem = sk_bit_cast<U32>(f),
-@@ -1492,7 +1694,7 @@ static constexpr size_t N = sizeof(F) /
+@@ -1530,7 +1740,7 @@ static constexpr size_t N = sizeof(F) /
      // instead of {b,a} on the stack.  Narrow stages work best for __vectorcall.
      #define ABI __vectorcall
      #define SKRP_NARROW_STAGES 1
@@ -398,7 +406,7 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
      // These platforms are ideal for wider stages, and their default ABI is ideal.
      #define ABI
      #define SKRP_NARROW_STAGES 0
-@@ -5501,6 +5703,10 @@ SI F sqrt_(F x) {
+@@ -5539,6 +5749,10 @@ SI F sqrt_(F x) {
      float32x4_t lo,hi;
      split(x, &lo,&hi);
      return join<F>(sqrt(lo), sqrt(hi));
@@ -409,7 +417,7 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
  #elif defined(SKRP_CPU_LASX)
      __m256 lo,hi;
      split(x, &lo,&hi);
-@@ -5532,6 +5738,10 @@ SI F floor_(F x) {
+@@ -5570,6 +5784,10 @@ SI F floor_(F x) {
      __m128 lo,hi;
      split(x, &lo,&hi);
      return join<F>(_mm_floor_ps(lo), _mm_floor_ps(hi));
@@ -420,7 +428,7 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
  #elif defined(SKRP_CPU_LASX)
      __m256 lo,hi;
      split(x, &lo,&hi);
-@@ -5551,6 +5761,7 @@ SI F floor_(F x) {
+@@ -5589,6 +5807,7 @@ SI F floor_(F x) {
  //     (2 * a * b + (1 << 15)) >> 16
  // The result is a number on [-1, 1).
  // Note: on neon this is a saturating multiply while the others are not.
@@ -428,7 +436,7 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
  SI I16 scaled_mult(I16 a, I16 b) {
  #if defined(SKRP_CPU_SKX)
      return (I16)_mm256_mulhrs_epi16((__m256i)a, (__m256i)b);
-@@ -5562,6 +5773,22 @@ SI I16 scaled_mult(I16 a, I16 b) {
+@@ -5600,6 +5819,22 @@ SI I16 scaled_mult(I16 a, I16 b) {
      return vqrdmulhq_s16(a, b);
  #elif defined(SKRP_CPU_NEON)
      return vqrdmulhq_s16(a, b);
@@ -451,7 +459,7 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
  #elif defined(SKRP_CPU_LASX)
      I16 res = __lasx_xvmuh_h(a, b);
      return __lasx_xvslli_h(res, 1);
-@@ -5589,7 +5816,26 @@ SI U16 constrained_add(I16 a, U16 b) {
+@@ -5627,7 +5862,26 @@ SI U16 constrained_add(I16 a, U16 b) {
              SkASSERT(-ib <= ia && ia <= 65535 - ib);
          }
      #endif
@@ -478,7 +486,7 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
  }
  
  SI F fract(F x) { return x - floor_(x); }
-@@ -6606,8 +6852,14 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
+@@ -6683,8 +6937,14 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
      //         2^-8 * v = 2^-9 * (tx*(R - L) + (R + L))
      //                v = 1/2 * (tx*(R - L) + (R + L))
      auto lerpX = [&](U16 left, U16 right) -> U16 {
@@ -493,7 +501,7 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
          // The constrained_add is the most subtle part of lerp. The first term is on the interval
          // [-1, 1), and the second term is on the interval is on the interval [0, 1) because
          // both terms are too high by a factor of 2 which will be handled below. (Both R and L are
-@@ -6619,7 +6871,12 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
+@@ -6696,7 +6956,12 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
          U16 v2  = constrained_add(scaled_mult(tx, width), middle) + 1;
          // Divide by 2 to calculate v and at the same time bring the intermediate value onto the
          // interval [0, 1/2] to set up for the lerpY.
@@ -506,7 +514,7 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
      };
  
      const uint32_t* ptr;
-@@ -6653,9 +6910,15 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
+@@ -6730,9 +6995,15 @@ LOWP_STAGE_GP(bilerp_clamp_8888, const S
          I16 width  = (I16)bottom - (I16)top;
          U16 middle = bottom + top;
          // Add + 0x80 for rounding.
@@ -523,10 +531,10 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkRasterPipeline_opts.h
      };
  
      r = lerpY(topR, bottomR);
-Index: chromium-136.0.7103.48/third_party/skia/src/base/SkVx.h
+Index: chromium-137.0.7151.40/third_party/skia/src/base/SkVx.h
 ===================================================================
---- chromium-136.0.7103.48.orig/third_party/skia/src/base/SkVx.h
-+++ chromium-136.0.7103.48/third_party/skia/src/base/SkVx.h
+--- chromium-137.0.7151.40.orig/third_party/skia/src/base/SkVx.h
++++ chromium-137.0.7151.40/third_party/skia/src/base/SkVx.h
 @@ -41,7 +41,12 @@
  #endif
  
@@ -541,10 +549,10 @@ Index: chromium-136.0.7103.48/third_party/skia/src/base/SkVx.h
          #include <immintrin.h>
      #elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE41
          #include <smmintrin.h>
-Index: chromium-136.0.7103.48/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
+Index: chromium-137.0.7151.40/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
 ===================================================================
---- chromium-136.0.7103.48.orig/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
-+++ chromium-136.0.7103.48/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
+--- chromium-137.0.7151.40.orig/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
++++ chromium-137.0.7151.40/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
 @@ -9,7 +9,7 @@
  #include "src/core/SkBlitMask.h"
  #include "src/core/SkOptsTargets.h"
@@ -554,10 +562,10 @@ Index: chromium-136.0.7103.48/third_party/skia/src/core/SkBlitMask_opts_ssse3.cp
  
  // The order of these includes is important:
  // 1) Select the target CPU architecture by defining SK_OPTS_TARGET and including SkOpts_SetTarget
-Index: chromium-136.0.7103.48/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
+Index: chromium-137.0.7151.40/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
 ===================================================================
---- chromium-136.0.7103.48.orig/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
-+++ chromium-136.0.7103.48/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
+--- chromium-137.0.7151.40.orig/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
++++ chromium-137.0.7151.40/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
 @@ -10,7 +10,7 @@
  #include "src/core/SkOptsTargets.h"
  #include "src/core/SkSwizzlePriv.h"
@@ -567,10 +575,10 @@ Index: chromium-136.0.7103.48/third_party/skia/src/core/SkSwizzler_opts_ssse3.cp
      !defined(SK_ENABLE_OPTIMIZE_SIZE) && \
      SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3
  
-Index: chromium-136.0.7103.48/third_party/skia/src/core/SkBlitMask_opts.cpp
+Index: chromium-137.0.7151.40/third_party/skia/src/core/SkBlitMask_opts.cpp
 ===================================================================
---- chromium-136.0.7103.48.orig/third_party/skia/src/core/SkBlitMask_opts.cpp
-+++ chromium-136.0.7103.48/third_party/skia/src/core/SkBlitMask_opts.cpp
+--- chromium-137.0.7151.40.orig/third_party/skia/src/core/SkBlitMask_opts.cpp
++++ chromium-137.0.7151.40/third_party/skia/src/core/SkBlitMask_opts.cpp
 @@ -25,7 +25,7 @@ namespace SkOpts {
      static bool init() {
      #if defined(SK_ENABLE_OPTIMIZE_SIZE)
@@ -580,10 +588,10 @@ Index: chromium-136.0.7103.48/third_party/skia/src/core/SkBlitMask_opts.cpp
          #if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3
              if (SkCpu::Supports(SkCpu::SSSE3)) { Init_BlitMask_ssse3(); }
          #endif
-Index: chromium-136.0.7103.48/third_party/skia/src/core/SkBitmapProcState_opts.cpp
+Index: chromium-137.0.7151.40/third_party/skia/src/core/SkBitmapProcState_opts.cpp
 ===================================================================
---- chromium-136.0.7103.48.orig/third_party/skia/src/core/SkBitmapProcState_opts.cpp
-+++ chromium-136.0.7103.48/third_party/skia/src/core/SkBitmapProcState_opts.cpp
+--- chromium-137.0.7151.40.orig/third_party/skia/src/core/SkBitmapProcState_opts.cpp
++++ chromium-137.0.7151.40/third_party/skia/src/core/SkBitmapProcState_opts.cpp
 @@ -27,7 +27,7 @@ namespace SkOpts {
      static bool init() {
      #if defined(SK_ENABLE_OPTIMIZE_SIZE)
@@ -593,10 +601,10 @@ Index: chromium-136.0.7103.48/third_party/skia/src/core/SkBitmapProcState_opts.c
          #if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3
              if (SkCpu::Supports(SkCpu::SSSE3)) { Init_BitmapProcState_ssse3(); }
          #endif
-Index: chromium-136.0.7103.48/third_party/skia/src/core/SkCpu.h
+Index: chromium-137.0.7151.40/third_party/skia/src/core/SkCpu.h
 ===================================================================
---- chromium-136.0.7103.48.orig/third_party/skia/src/core/SkCpu.h
-+++ chromium-136.0.7103.48/third_party/skia/src/core/SkCpu.h
+--- chromium-137.0.7151.40.orig/third_party/skia/src/core/SkCpu.h
++++ chromium-137.0.7151.40/third_party/skia/src/core/SkCpu.h
 @@ -60,7 +60,7 @@ inline bool SkCpu::Supports(uint32_t mas
  
      // If we mask in compile-time known lower limits, the compiler can
@@ -606,10 +614,10 @@ Index: chromium-136.0.7103.48/third_party/skia/src/core/SkCpu.h
      #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1
      features |= SSE1;
      #endif
-Index: chromium-136.0.7103.48/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
+Index: chromium-137.0.7151.40/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
 ===================================================================
---- chromium-136.0.7103.48.orig/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
-+++ chromium-136.0.7103.48/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
+--- chromium-137.0.7151.40.orig/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
++++ chromium-137.0.7151.40/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
 @@ -8,7 +8,7 @@
  #include "include/private/base/SkFeatures.h"
  #include "src/core/SkOptsTargets.h"
@@ -619,10 +627,10 @@ Index: chromium-136.0.7103.48/third_party/skia/src/core/SkBitmapProcState_opts_s
  
  // The order of these includes is important:
  // 1) Select the target CPU architecture by defining SK_OPTS_TARGET and including SkOpts_SetTarget
-Index: chromium-136.0.7103.48/third_party/skia/include/private/base/SkFeatures.h
+Index: chromium-137.0.7151.40/third_party/skia/include/private/base/SkFeatures.h
 ===================================================================
---- chromium-136.0.7103.48.orig/third_party/skia/include/private/base/SkFeatures.h
-+++ chromium-136.0.7103.48/third_party/skia/include/private/base/SkFeatures.h
+--- chromium-137.0.7151.40.orig/third_party/skia/include/private/base/SkFeatures.h
++++ chromium-137.0.7151.40/third_party/skia/include/private/base/SkFeatures.h
 @@ -63,6 +63,8 @@
  
  #if defined(__i386) || defined(_M_IX86) ||  defined(__x86_64__) || defined(_M_X64)
@@ -632,10 +640,10 @@ Index: chromium-136.0.7103.48/third_party/skia/include/private/base/SkFeatures.h
  #endif
  
  #if defined(__loongarch__) || defined (__loongarch64)
-Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkSwizzler_opts.inc
+Index: chromium-137.0.7151.40/third_party/skia/src/opts/SkSwizzler_opts.inc
 ===================================================================
---- chromium-136.0.7103.48.orig/third_party/skia/src/opts/SkSwizzler_opts.inc
-+++ chromium-136.0.7103.48/third_party/skia/src/opts/SkSwizzler_opts.inc
+--- chromium-137.0.7151.40.orig/third_party/skia/src/opts/SkSwizzler_opts.inc
++++ chromium-137.0.7151.40/third_party/skia/src/opts/SkSwizzler_opts.inc
 @@ -14,7 +14,10 @@
  #include <cmath>
  #include <utility>
@@ -682,10 +690,10 @@ Index: chromium-136.0.7103.48/third_party/skia/src/opts/SkSwizzler_opts.inc
  #elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1 && (defined(__clang__) || !defined(_MSC_VER))
  // -- SSE -- Harden against timing attacks -- MSVC is not supported.
  using F4 = __m128;
-Index: chromium-136.0.7103.48/third_party/skia/src/core/SkBlitter_ARGB32.cpp
+Index: chromium-137.0.7151.40/third_party/skia/src/core/SkBlitter_ARGB32.cpp
 ===================================================================
---- chromium-136.0.7103.48.orig/third_party/skia/src/core/SkBlitter_ARGB32.cpp
-+++ chromium-136.0.7103.48/third_party/skia/src/core/SkBlitter_ARGB32.cpp
+--- chromium-137.0.7151.40.orig/third_party/skia/src/core/SkBlitter_ARGB32.cpp
++++ chromium-137.0.7151.40/third_party/skia/src/core/SkBlitter_ARGB32.cpp
 @@ -127,6 +127,16 @@ static inline SkPMColor blend_lcd16_opaq
  #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
      #include <emmintrin.h>

diff --git a/sources b/sources
index 9628776..c709c48 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (node-v22.14.0-stripped.tar.gz) = affddb541009c6d378049c2d7845b981335d9e7aa387efcc472e5efb621c345cd58ca69778a394f7e4ebbb5e4b1a115a389838ef1b6458ef5e98f2071b166e15
-SHA512 (chromium-136.0.7103.113-clean.tar.xz) = a9a6d3dcd8d26e06a95e5caef29eee002ed538b04126a69d78600c08ef50d47811e29ad16625686033c10847a632c827d6b19032f90d872041ac00bb8848a908
+SHA512 (chromium-137.0.7151.55-clean.tar.xz) = bbae8eaaadee48edc17aed3400980c5cdd5420ee24a22b38e76d75783ae65b63bca5a4474b47badc741702037852128953bc3e09ecc34ffced528f1b46bb412d

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-07 16:07 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-07 16:07 [rpms/chromium] epel9-next: - Update to 137.0.7151.55 Than Ngo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox