CVS commit: pkgsrc/www/firefox140

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Jan  2 14:27:02 UTC 2026

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

Log Message:
firefox140: backport patch


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/firefox140/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/firefox140/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/firefox140/distinfo
diff -u pkgsrc/www/firefox140/distinfo:1.5 pkgsrc/www/firefox140/distinfo:1.6
--- pkgsrc/www/firefox140/distinfo:1.5  Wed Dec 24 02:11:49 2025
+++ pkgsrc/www/firefox140/distinfo      Fri Jan  2 14:27:02 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2025/12/24 02:11:49 gutteridge Exp $
+$NetBSD: distinfo,v 1.6 2026/01/02 14:27:02 tnn Exp $
 
 BLAKE2s (firefox-140.6.0esr.source.tar.xz) = 7a8bd60f08fdd421ac94fa13ff776eff21cba8f432d85a60fce3a2c0c57066d6
 SHA512 (firefox-140.6.0esr.source.tar.xz) = ed66657bd4b2d94791892261d7c0c0d950b4f630d12ab28a777d93393427451a9aa125e5a01ee15f2ac0ff378d0be074a08583dcffd35609112ba4e6f9ada798
@@ -25,7 +25,7 @@ SHA1 (patch-js_public_Utility.h) = bb546
 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-modules_fdlibm_src_math__private.h) = e20b6c23011d7123cbbd64a500eb8ce8c426620e
 SHA1 (patch-netwerk_protocol_http_nsHttpHandler.cpp) = 67493b4635041d21ff9fbfda80b3197fed542a26

Index: pkgsrc/www/firefox140/patches/patch-media_ffvpx_libavutil_arm_bswap.h
diff -u pkgsrc/www/firefox140/patches/patch-media_ffvpx_libavutil_arm_bswap.h:1.1 pkgsrc/www/firefox140/patches/patch-media_ffvpx_libavutil_arm_bswap.h:1.2
--- pkgsrc/www/firefox140/patches/patch-media_ffvpx_libavutil_arm_bswap.h:1.1   Sun Oct 19 11:56:56 2025
+++ pkgsrc/www/firefox140/patches/patch-media_ffvpx_libavutil_arm_bswap.h       Fri Jan  2 14:27:02 2026
@@ -1,10 +1,23 @@
-$NetBSD: patch-media_ffvpx_libavutil_arm_bswap.h,v 1.1 2025/10/19 11:56:56 leot Exp $
+$NetBSD: patch-media_ffvpx_libavutil_arm_bswap.h,v 1.2 2026/01/02 14:27:02 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 */