CVS commit: pkgsrc/www/firefox128

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Jan  2 15:55:32 UTC 2026

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

Log Message:
firefox128: backport patch


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/firefox128/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/firefox128/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/firefox128/distinfo
diff -u pkgsrc/www/firefox128/distinfo:1.20 pkgsrc/www/firefox128/distinfo:1.21
--- pkgsrc/www/firefox128/distinfo:1.20 Thu Sep 11 14:42:22 2025
+++ pkgsrc/www/firefox128/distinfo      Fri Jan  2 15:55:32 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2025/09/11 14:42:22 leot Exp $
+$NetBSD: distinfo,v 1.21 2026/01/02 15:55:32 tnn Exp $
 
 BLAKE2s (firefox-128.14.0esr.source.tar.xz) = a3cc3c29528e11e4a25d67ac536bc00bdb09aaaddb21f36586e9a30a1dc412cb
 SHA512 (firefox-128.14.0esr.source.tar.xz) = a3cf267e82b6f5ab8b6497a62b12f85afb78fcaef6b12c43ef79564ce8270d3327a873368ce48fc018e46fef5e07339c07b9a494a5ff6c22a84099f939f6a9de
@@ -26,7 +26,7 @@ SHA1 (patch-js_public_Utility.h) = 0ae3d
 SHA1 (patch-js_src_jit_FlushICache.cpp) = d1e611eaf7d7be22abfac6b39fbcd99df3570e47
 SHA1 (patch-js_src_old-configure.in) = 589e24765615ede2c3c6abfe0b3529c5645193ed
 SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba
-SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a
+SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = 0b6505a1379fd87033e165946118c973c495ce2e
 SHA1 (patch-media_libpng_pngpriv.h) = 8320a1f7534ed5c4914b597bb3d6117d0060318f
 SHA1 (patch-media_libtheora_lib_info.c) = f6dbf536d73859a1ff78304c2e9f6a6f74dac01f
 SHA1 (patch-modules_fdlibm_src_math__private.h) = e20b6c23011d7123cbbd64a500eb8ce8c426620e

Index: pkgsrc/www/firefox128/patches/patch-media_ffvpx_libavutil_arm_bswap.h
diff -u pkgsrc/www/firefox128/patches/patch-media_ffvpx_libavutil_arm_bswap.h:1.1 pkgsrc/www/firefox128/patches/patch-media_ffvpx_libavutil_arm_bswap.h:1.2
--- pkgsrc/www/firefox128/patches/patch-media_ffvpx_libavutil_arm_bswap.h:1.1   Sun Aug 18 15:02:21 2024
+++ pkgsrc/www/firefox128/patches/patch-media_ffvpx_libavutil_arm_bswap.h       Fri Jan  2 15:55:32 2026
@@ -1,10 +1,23 @@
-$NetBSD: patch-media_ffvpx_libavutil_arm_bswap.h,v 1.1 2024/08/18 15:02:21 leot Exp $
+$NetBSD: patch-media_ffvpx_libavutil_arm_bswap.h,v 1.2 2026/01/02 15:55:32 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     2019-10-30 17:35:56.000000000 +0000
+--- media/ffvpx/libavutil/arm/bswap.h.orig     2025-08-11 17:07:22.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
-@@ -64,4 +66,6 @@ static av_always_inline av_const uint32_
+@@ -67,4 +73,6 @@ static av_always_inline av_const uint32_
  
  #endif /* __ARMCC_VERSION */