CVS commit: pkgsrc/www/firefox

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Jan  1 16:14:38 UTC 2026

Modified Files:
        pkgsrc/www/firefox: distinfo
        pkgsrc/www/firefox/patches: patch-media_ffvpx_libavutil_arm_bswap.h

Log Message:
firefox: fix build on NetBSD/aarch64


To generate a diff of this commit:
cvs rdiff -u -r1.573 -r1.574 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/www/firefox/patches/patch-media_ffvpx_libavutil_arm_bswap.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.573 pkgsrc/www/firefox/distinfo:1.574
--- pkgsrc/www/firefox/distinfo:1.573   Wed Dec 24 15:26:40 2025
+++ pkgsrc/www/firefox/distinfo Thu Jan  1 16:14:38 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.573 2025/12/24 15:26:40 ryoon Exp $
+$NetBSD: distinfo,v 1.574 2026/01/01 16:14:38 tnn Exp $
 
 BLAKE2s (firefox-146.0.1.source.tar.xz) = 97e4144e54e4f520b637ccd6a3634b8e18c1a2c0ec169482e2e066c586861b2e
 SHA512 (firefox-146.0.1.source.tar.xz) = ae95b86e483febf8dfec8347748dd9048ed7d7f845250e07aa8048e2b351da61f6f3c5f83bb0d0c72e1a75ec61b60e59bbe69639f0f33532910ff8bf5ca07394
@@ -29,7 +29,7 @@ SHA1 (patch-js_src_editline_editline.c) 
 SHA1 (patch-js_src_jit_FlushICache.cpp) = f5d1fcb391c36a29fb71a78dbf731ee6a1cb17b6
 SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba
 SHA1 (patch-js_src_vm_TypedArrayObject-inl.h) = e7913c8d4b2b05b67040baa64dae62d6ba40390e
-SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = 019677e249e744baea857ca17ef69d977f43b3a4
+SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = ae89120862442275d6b14446c5a63b0ef570124f
 SHA1 (patch-media_libpng_pngpriv.h) = 8320a1f7534ed5c4914b597bb3d6117d0060318f
 SHA1 (patch-memory_build_mozjemalloc__types.h) = af87ef935653cb845a6b702af2f5645a6ada27db
 SHA1 (patch-modules_fdlibm_src_math__private.h) = e20b6c23011d7123cbbd64a500eb8ce8c426620e

Index: pkgsrc/www/firefox/patches/patch-media_ffvpx_libavutil_arm_bswap.h
diff -u pkgsrc/www/firefox/patches/patch-media_ffvpx_libavutil_arm_bswap.h:1.2 pkgsrc/www/firefox/patches/patch-media_ffvpx_libavutil_arm_bswap.h:1.3
--- pkgsrc/www/firefox/patches/patch-media_ffvpx_libavutil_arm_bswap.h:1.2      Wed Apr 30 03:10:40 2025
+++ pkgsrc/www/firefox/patches/patch-media_ffvpx_libavutil_arm_bswap.h  Thu Jan  1 16:14:38 2026
@@ -1,10 +1,23 @@
-$NetBSD: patch-media_ffvpx_libavutil_arm_bswap.h,v 1.2 2025/04/30 03:10:40 ryoon Exp $
+$NetBSD: patch-media_ffvpx_libavutil_arm_bswap.h,v 1.3 2026/01/01 16:14:38 tnn Exp $
 
-Fix NetBSD aarch64 build.
+avutil/arm/bswap.h is preferred over the system's <arm/bswap.h> due to
+Firefox's include path order. This breaks <stdlib.h> and others, so
+make sure to pull in the system header when this happens.
 
---- media/ffvpx/libavutil/arm/bswap.h.orig     2025-02-21 13:24:25.000000000 +0000
+--- media/ffvpx/libavutil/arm/bswap.h.orig     2025-12-17 16:38:49.000000000 +0000
 +++ media/ffvpx/libavutil/arm/bswap.h
-@@ -23,6 +23,8 @@
+@@ -16,6 +16,10 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
++#if defined(__NetBSD__)
++#include "/usr/include/arm/bswap.h"
++#endif
++
+ #ifndef AVUTIL_ARM_BSWAP_H
+ #define AVUTIL_ARM_BSWAP_H
+ 
+@@ -23,6 +27,8 @@
  #include "config.h"
  #include "libavutil/attributes.h"
  
@@ -13,7 +26,7 @@ Fix NetBSD aarch64 build.
  #ifdef __ARMCC_VERSION
  
  #if HAVE_ARMV6
-@@ -47,4 +49,6 @@ static av_always_inline av_const unsigne
+@@ -47,4 +53,6 @@ static av_always_inline av_const unsigne
  #endif
  #endif /* __ARMCC_VERSION */