git: ef46005abafc - main - www/*chromium: unbreak build on arm64 by fixing a bad merge

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Robert Nagy <rnagy_at_FreeBSD.org>
Date: Sun, 22 Mar 2026 16:24:36 UTC
The branch main has been updated by rnagy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ef46005abafcd664e7183553a128e373e676ba1f

commit ef46005abafcd664e7183553a128e373e676ba1f
Author:     Robert Nagy <rnagy@FreeBSD.org>
AuthorDate: 2026-03-22 16:24:02 +0000
Commit:     Robert Nagy <rnagy@FreeBSD.org>
CommitDate: 2026-03-22 16:24:32 +0000

    www/*chromium: unbreak build on arm64 by fixing a bad merge
---
 ...party_libaom_source_config_linux_arm64-cpu-detect_config_av1__rtcd.h | 2 +-
 ...party_libaom_source_config_linux_arm64-cpu-detect_config_av1__rtcd.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/chromium/files/patch-third__party_libaom_source_config_linux_arm64-cpu-detect_config_av1__rtcd.h b/www/chromium/files/patch-third__party_libaom_source_config_linux_arm64-cpu-detect_config_av1__rtcd.h
index 42bdbbbfeca2..499a1d9941d2 100644
--- a/www/chromium/files/patch-third__party_libaom_source_config_linux_arm64-cpu-detect_config_av1__rtcd.h
+++ b/www/chromium/files/patch-third__party_libaom_source_config_linux_arm64-cpu-detect_config_av1__rtcd.h
@@ -4,7 +4,7 @@
  
  void av1_dist_wtd_convolve_y_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_y, const int subpel_y_qn, ConvolveParams *conv_params);
  void av1_dist_wtd_convolve_y_neon(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_y, const int subpel_y_qn, ConvolveParams *conv_params);
-++#if (VERSION_PACKED > 199937)
++#if (VERSION_PACKED > 199937)
  void av1_dist_wtd_convolve_y_neon_dotprod(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_y, const int subpel_y_qn, ConvolveParams *conv_params);
  void av1_dist_wtd_convolve_y_neon_i8mm(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_y, const int subpel_y_qn, ConvolveParams *conv_params);
 +#endif
diff --git a/www/ungoogled-chromium/files/patch-third__party_libaom_source_config_linux_arm64-cpu-detect_config_av1__rtcd.h b/www/ungoogled-chromium/files/patch-third__party_libaom_source_config_linux_arm64-cpu-detect_config_av1__rtcd.h
index 0989b41db74e..333538ef9b92 100644
--- a/www/ungoogled-chromium/files/patch-third__party_libaom_source_config_linux_arm64-cpu-detect_config_av1__rtcd.h
+++ b/www/ungoogled-chromium/files/patch-third__party_libaom_source_config_linux_arm64-cpu-detect_config_av1__rtcd.h
@@ -4,7 +4,7 @@
  
  void av1_dist_wtd_convolve_y_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_y, const int subpel_y_qn, ConvolveParams *conv_params);
  void av1_dist_wtd_convolve_y_neon(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_y, const int subpel_y_qn, ConvolveParams *conv_params);
-++#if (VERSION_PACKED > 199937)
++#if (VERSION_PACKED > 199937)
  void av1_dist_wtd_convolve_y_neon_dotprod(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_y, const int subpel_y_qn, ConvolveParams *conv_params);
  void av1_dist_wtd_convolve_y_neon_i8mm(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams *filter_params_y, const int subpel_y_qn, ConvolveParams *conv_params);
 +#endif