pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/www/firefox



Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu Nov  5 03:16:51 UTC 2026

Modified Files:
        pkgsrc/www/firefox: distinfo
Added Files:
        pkgsrc/www/firefox/patches:
            patch-third__party_llama.cpp_ggml_src_ggml-cpu_ops.cpp

Log Message:
firefox: fix debug builds with recent GCC versions


To generate a diff of this commit:
cvs rdiff -u -r1.598 -r1.599 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox/patches/patch-third__party_llama.cpp_ggml_src_ggml-cpu_ops.cpp

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.598 pkgsrc/www/firefox/distinfo:1.599
--- pkgsrc/www/firefox/distinfo:1.598   Tue Nov  3 16:46:29 2026
+++ pkgsrc/www/firefox/distinfo Thu Nov  5 03:16:51 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.598 2026/11/03 16:46:29 ryoon Exp $
+$NetBSD: distinfo,v 1.599 2026/11/05 03:16:51 gutteridge Exp $
 
 BLAKE2s (firefox-159.0.1.source.tar.xz) = f720bec1d79e3d1e406faa90dbfdf1bb5902908aacabd2fdd26a911ab86b2d55
 SHA512 (firefox-159.0.1.source.tar.xz) = e7375c0c18361b22fa1d2e6fd5f6a4ff20b22e7090a64bf32d7ef79edb0a649983439b8e6e80106fe51bb96699bdd3096c921fe198d1b460193a66d6d8f227a4
@@ -63,6 +63,7 @@ SHA1 (patch-third__party_libwebrtc_modul
 SHA1 (patch-third__party_libwebrtc_rtc__base_memory__usage.cc) = a831145ba15b30d30c6e6e216b574d416253ed4a
 SHA1 (patch-third__party_libwebrtc_rtc__base_physical__socket__server.cc) = 6909c4da9e7b3785252e5bce9be0ff47ebb87e01
 SHA1 (patch-third__party_libwebrtc_rtc__base_platform__thread__types.cc) = 8ae75100775037347008d168eedc151e0e993b0f
+SHA1 (patch-third__party_llama.cpp_ggml_src_ggml-cpu_ops.cpp) = a4b62d60f56c5fa7e886f53f251bc10275ba1923
 SHA1 (patch-third__party_python_dlmanager_check.py) = 69054522d8ced8cb47e65e5a8b1a87ed5ce6708e
 SHA1 (patch-third__party_rust_mtu_src_bindings_netbsd.rs) = dc28ab3a4b6a5bee76ea6fd2485e34b9d6f1b195
 SHA1 (patch-third__party_sqlite3_ext_moz.build) = 4d94ea324617a20b3524016dd02fb717e518ece1

Added files:

Index: pkgsrc/www/firefox/patches/patch-third__party_llama.cpp_ggml_src_ggml-cpu_ops.cpp
diff -u /dev/null pkgsrc/www/firefox/patches/patch-third__party_llama.cpp_ggml_src_ggml-cpu_ops.cpp:1.1
--- /dev/null   Thu Nov  5 03:16:51 2026
+++ pkgsrc/www/firefox/patches/patch-third__party_llama.cpp_ggml_src_ggml-cpu_ops.cpp   Thu Nov  5 03:16:51 2026
@@ -0,0 +1,323 @@
+$NetBSD: patch-third__party_llama.cpp_ggml_src_ggml-cpu_ops.cpp,v 1.1 2026/11/05 03:16:51 gutteridge Exp $
+
+Fix builds with recent GCC.
+
+--- third_party/llama.cpp/ggml/src/ggml-cpu/ops.cpp.orig       2026-11-02 17:55:38.000000000 +0000
++++ third_party/llama.cpp/ggml/src/ggml-cpu/ops.cpp
+@@ -2137,8 +2137,8 @@ static void ggml_compute_forward_gelu_f32(
+         for (int k = 0; k < nc; k++) {
+             const float x = ((float *) ((char *) dst->data + i3*nb3 + i2*nb2 + i1*(dst->nb[1])))[k];
+             GGML_UNUSED(x);
+-            assert(!isnan(x));
+-            assert(!isinf(x));
++            assert(!std::isnan(x));
++            assert(!std::isinf(x));
+         }
+ #endif // NDEBUG
+     }
+@@ -2185,8 +2185,8 @@ static void ggml_compute_forward_gelu_f16(
+             const ggml_fp16_t x = ((ggml_fp16_t *) ((char *) dst->data + i3*nb3 + i2*nb2 + i1*( dst->nb[1])))[k];
+             const float v = GGML_CPU_FP16_TO_FP32(x);
+             GGML_UNUSED(v);
+-            assert(!isnan(v));
+-            assert(!isinf(v));
++            assert(!std::isnan(v));
++            assert(!std::isinf(v));
+         }
+ #endif // NDEBUG
+     }
+@@ -2367,8 +2367,8 @@ static void ggml_compute_forward_gelu_erf_f32(
+         for (int k = 0; k < nc; k++) {
+             const float x = ((float *) ((char *) dst->data + i3*nb3 + i2*nb2 + i1*(dst->nb[1])))[k];
+             GGML_UNUSED(x);
+-            assert(!isnan(x));
+-            assert(!isinf(x));
++            assert(!std::isnan(x));
++            assert(!std::isinf(x));
+         }
+ #endif // NDEBUG
+     }
+@@ -2415,8 +2415,8 @@ static void ggml_compute_forward_gelu_erf_f16(
+             const ggml_fp16_t x = ((ggml_fp16_t *) ((char *) dst->data + i3*nb3 + i2*nb2 + i1*( dst->nb[1])))[k];
+             const float v = GGML_CPU_FP16_TO_FP32(x);
+             GGML_UNUSED(v);
+-            assert(!isnan(v));
+-            assert(!isinf(v));
++            assert(!std::isnan(v));
++            assert(!std::isinf(v));
+         }
+ #endif // NDEBUG
+     }
+@@ -2486,8 +2486,8 @@ static void ggml_compute_forward_gelu_quick_f32(
+         for (int k = 0; k < nc; k++) {
+             const float x = ((float *) ((char *) dst->data + i3*nb3 + i2*nb2 + i1*(dst->nb[1])))[k];
+             GGML_UNUSED(x);
+-            assert(!isnan(x));
+-            assert(!isinf(x));
++            assert(!std::isnan(x));
++            assert(!std::isinf(x));
+         }
+ #endif // NDEBUG
+     }
+@@ -2534,8 +2534,8 @@ static void ggml_compute_forward_gelu_quick_f16(
+             const ggml_fp16_t x = ((ggml_fp16_t *) ((char *) dst->data + i3*nb3 + i2*nb2 + i1*( dst->nb[1])))[k];
+             const float v = GGML_CPU_FP16_TO_FP32(x);
+             GGML_UNUSED(v);
+-            assert(!isnan(v));
+-            assert(!isinf(v));
++            assert(!std::isnan(v));
++            assert(!std::isinf(v));
+         }
+ #endif // NDEBUG
+     }
+@@ -2605,8 +2605,8 @@ static void ggml_compute_forward_silu_f32(
+         for (int k = 0; k < nc; k++) {
+             const float x = ((float *) ((char *) dst->data + i3*nb3 + i2*nb2 + i1*(dst->nb[1])))[k];
+             GGML_UNUSED(x);
+-            assert(!isnan(x));
+-            assert(!isinf(x));
++            assert(!std::isnan(x));
++            assert(!std::isinf(x));
+         }
+ #endif // NDEBUG
+     }
+@@ -2653,8 +2653,8 @@ static void ggml_compute_forward_silu_f16(
+             const ggml_fp16_t x = ((ggml_fp16_t *) ((char *) dst->data + i3*nb3 + i2*nb2 + i1*( dst->nb[1])))[k];
+             const float v = GGML_CPU_FP16_TO_FP32(x);
+             GGML_UNUSED(v);
+-            assert(!isnan(v));
+-            assert(!isinf(v));
++            assert(!std::isnan(v));
++            assert(!std::isinf(v));
+         }
+ #endif // NDEBUG
+     }
+@@ -2803,8 +2803,8 @@ static void ggml_compute_forward_silu_back_f32(
+         for (int k = 0; k < nc; k++) {
+             const float x = ((float *) ((char *) dst->data + i1*( dst->nb[1])))[k];
+             GGML_UNUSED(x);
+-            assert(!isnan(x));
+-            assert(!isinf(x));
++            assert(!std::isnan(x));
++            assert(!std::isinf(x));
+         }
+ #endif // NDEBUG
+     }
+@@ -2847,8 +2847,8 @@ static void ggml_compute_forward_silu_back_f16(
+             const float x = ((ggml_fp16_t *) ((char *) dst->data + i1*( dst->nb[1])))[k];
+             const float v = GGML_CPU_FP16_TO_FP32(x);
+             GGML_UNUSED(v);
+-            assert(!isnan(v));
+-            assert(!isinf(v));
++            assert(!std::isnan(v));
++            assert(!std::isinf(v));
+         }
+ #endif // NDEBUG
+     }
+@@ -2930,8 +2930,8 @@ static void ggml_compute_forward_reglu_f32(
+         for (int k = 0; k < nc; k++) {
+             const float x = ((float *) ((char *) dst->data + i1*( dst->nb[1])))[k];
+             GGML_UNUSED(x);
+-            assert(!isnan(x));
+-            assert(!isinf(x));
++            assert(!std::isnan(x));
++            assert(!std::isinf(x));
+         }
+ #endif // NDEBUG
+     }
+@@ -2990,8 +2990,8 @@ static void ggml_compute_forward_reglu_f16(
+             const ggml_fp16_t x = ((ggml_fp16_t *) ((char *) dst->data + i1*( dst->nb[1])))[k];
+             const float v = GGML_FP16_TO_FP32(x);
+             GGML_UNUSED(v);
+-            assert(!isnan(v));
+-            assert(!isinf(v));
++            assert(!std::isnan(v));
++            assert(!std::isinf(v));
+         }
+ #endif // NDEBUG
+     }
+@@ -3073,8 +3073,8 @@ static void ggml_compute_forward_geglu_f32(
+         for (int k = 0; k < nc; k++) {
+             const float x = ((float *) ((char *) dst->data + i1*( dst->nb[1])))[k];
+             GGML_UNUSED(x);
+-            assert(!isnan(x));
+-            assert(!isinf(x));
++            assert(!std::isnan(x));
++            assert(!std::isinf(x));
+         }
+ #endif // NDEBUG
+     }
+@@ -3133,8 +3133,8 @@ static void ggml_compute_forward_geglu_f16(
+             const ggml_fp16_t x = ((ggml_fp16_t *) ((char *) dst->data + i1*( dst->nb[1])))[k];
+             const float v = GGML_FP16_TO_FP32(x);
+             GGML_UNUSED(v);
+-            assert(!isnan(v));
+-            assert(!isinf(v));
++            assert(!std::isnan(v));
++            assert(!std::isinf(v));
+         }
+ #endif // NDEBUG
+     }
+@@ -3216,8 +3216,8 @@ static void ggml_compute_forward_swiglu_f32(
+         for (int k = 0; k < nc; k++) {
+             const float x = ((float *) ((char *) dst->data + i1*( dst->nb[1])))[k];
+             GGML_UNUSED(x);
+-            assert(!isnan(x));
+-            assert(!isinf(x));
++            assert(!std::isnan(x));
++            assert(!std::isinf(x));
+         }
+ #endif // NDEBUG
+     }
+@@ -3276,8 +3276,8 @@ static void ggml_compute_forward_swiglu_f16(
+             const ggml_fp16_t x = ((ggml_fp16_t *) ((char *) dst->data + i1*( dst->nb[1])))[k];
+             const float v = GGML_FP16_TO_FP32(x);
+             GGML_UNUSED(v);
+-            assert(!isnan(v));
+-            assert(!isinf(v));
++            assert(!std::isnan(v));
++            assert(!std::isinf(v));
+         }
+ #endif // NDEBUG
+     }
+@@ -3367,8 +3367,8 @@ static void ggml_compute_forward_swiglu_oai_f32(
+         for (int k = 0; k < nc; k++) {
+             const float x = dst_p[k];
+             GGML_UNUSED(x);
+-            assert(!isnan(x));
+-            assert(!isinf(x));
++            assert(!std::isnan(x));
++            assert(!std::isinf(x));
+         }
+ #endif // NDEBUG
+     }
+@@ -3446,8 +3446,8 @@ static void ggml_compute_forward_geglu_erf_f32(
+         for (int k = 0; k < nc; k++) {
+             const float x = ((float *) ((char *) dst->data + i1*( dst->nb[1])))[k];
+             GGML_UNUSED(x);
+-            assert(!isnan(x));
+-            assert(!isinf(x));
++            assert(!std::isnan(x));
++            assert(!std::isinf(x));
+         }
+ #endif // NDEBUG
+     }
+@@ -3506,8 +3506,8 @@ static void ggml_compute_forward_geglu_erf_f16(
+             const ggml_fp16_t x = ((ggml_fp16_t *) ((char *) dst->data + i1*( dst->nb[1])))[k];
+             const float v = GGML_FP16_TO_FP32(x);
+             GGML_UNUSED(v);
+-            assert(!isnan(v));
+-            assert(!isinf(v));
++            assert(!std::isnan(v));
++            assert(!std::isinf(v));
+         }
+ #endif // NDEBUG
+     }
+@@ -3589,8 +3589,8 @@ static void ggml_compute_forward_geglu_quick_f32(
+         for (int k = 0; k < nc; k++) {
+             const float x = ((float *) ((char *) dst->data + i1*( dst->nb[1])))[k];
+             GGML_UNUSED(x);
+-            assert(!isnan(x));
+-            assert(!isinf(x));
++            assert(!std::isnan(x));
++            assert(!std::isinf(x));
+         }
+ #endif // NDEBUG
+     }
+@@ -3649,8 +3649,8 @@ static void ggml_compute_forward_geglu_quick_f16(
+             const ggml_fp16_t x = ((ggml_fp16_t *) ((char *) dst->data + i1*( dst->nb[1])))[k];
+             const float v = GGML_FP16_TO_FP32(x);
+             GGML_UNUSED(v);
+-            assert(!isnan(v));
+-            assert(!isinf(v));
++            assert(!std::isnan(v));
++            assert(!std::isinf(v));
+         }
+ #endif // NDEBUG
+     }
+@@ -5393,7 +5393,7 @@ static void ggml_compute_forward_soft_max_f32(
+ #ifndef NDEBUG
+                 for (int i = 0; i < ne00; ++i) {
+                     //printf("p[%d] = %f\n", i, p[i]);
+-                    assert(!isnan(wp[i]));
++                    assert(!std::isnan(wp[i]));
+                 }
+ #endif // NDEBUG
+ 
+@@ -5417,8 +5417,8 @@ static void ggml_compute_forward_soft_max_f32(
+ 
+ #ifndef NDEBUG
+                 for (int i = 0; i < ne00; ++i) {
+-                    assert(!isnan(dp[i]));
+-                    assert(!isinf(dp[i]));
++                    assert(!std::isnan(dp[i]));
++                    assert(!std::isinf(dp[i]));
+                 }
+ #endif // NDEBUG
+             }
+@@ -5491,8 +5491,8 @@ static void ggml_compute_forward_soft_max_ext_back_f32
+ #ifndef NDEBUG
+         for (int i = 0; i < nc; ++i) {
+             //printf("p[%d] = %f\n", i, p[i]);
+-            assert(!isnan(dy[i]));
+-            assert(!isnan(y[i]));
++            assert(!std::isnan(dy[i]));
++            assert(!std::isnan(y[i]));
+         }
+ #endif // NDEBUG
+         // Jii = yi - yi*yi
+@@ -5524,8 +5524,8 @@ static void ggml_compute_forward_soft_max_ext_back_f32
+ 
+ #ifndef NDEBUG
+         for (int i = 0; i < nc; ++i) {
+-            assert(!isnan(dx[i]));
+-            assert(!isinf(dx[i]));
++            assert(!std::isnan(dx[i]));
++            assert(!std::isinf(dx[i]));
+         }
+ #endif // NDEBUG
+     }
+@@ -11114,8 +11114,8 @@ static void ggml_compute_forward_cross_entropy_loss_f3
+ #ifndef NDEBUG
+         for (int64_t i = 0; i < nc; ++i) {
+             //printf("p[%d] = %f\n", i, p[i]);
+-            assert(!isnan(s0[i]));
+-            assert(!isnan(s1[i]));
++            assert(!std::isnan(s0[i]));
++            assert(!std::isnan(s1[i]));
+         }
+ #endif // NDEBUG
+ 
+@@ -11133,8 +11133,8 @@ static void ggml_compute_forward_cross_entropy_loss_f3
+ 
+ #ifndef NDEBUG
+         for (int64_t i = 0; i < nc; ++i) {
+-            assert(!isnan(st[i]));
+-            assert(!isinf(st[i]));
++            assert(!std::isnan(st[i]));
++            assert(!std::isinf(st[i]));
+         }
+ #endif // NDEBUG
+     }
+@@ -11206,8 +11206,8 @@ static void ggml_compute_forward_cross_entropy_loss_ba
+ #ifndef NDEBUG
+         for (int64_t i = 0; i < nc; ++i) {
+             //printf("p[%d] = %f\n", i, p[i]);
+-            assert(!isnan(s0[i]));
+-            assert(!isnan(s1[i]));
++            assert(!std::isnan(s0[i]));
++            assert(!std::isnan(s1[i]));
+         }
+ #endif // NDEBUG
+ 
+@@ -11224,8 +11224,8 @@ static void ggml_compute_forward_cross_entropy_loss_ba
+ 
+ #ifndef NDEBUG
+         for (int64_t i = 0; i < nc; ++i) {
+-            assert(!isnan(ds0[i]));
+-            assert(!isinf(ds0[i]));
++            assert(!std::isnan(ds0[i]));
++            assert(!std::isinf(ds0[i]));
+         }
+ #endif // NDEBUG
+     }



Home | Main Index | Thread Index | Old Index