CVS commit: pkgsrc/graphics/py-matplotlib

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Jun 30 10:18:27 UTC 2026

Modified Files:
        pkgsrc/graphics/py-matplotlib: distinfo
Added Files:
        pkgsrc/graphics/py-matplotlib/patches: patch-src___image__wrapper.cpp

Log Message:
graphics/py-matplotlib: Fix build under NetBSD/amd64 11.99.6 at least

* C function abs() returns int value and it causes fingerprint mismatch
  of std:clamp() C++ function. Use std:abs() for C++ instead.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 pkgsrc/graphics/py-matplotlib/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/py-matplotlib/patches/patch-src___image__wrapper.cpp

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

Modified files:

Index: pkgsrc/graphics/py-matplotlib/distinfo
diff -u pkgsrc/graphics/py-matplotlib/distinfo:1.76 pkgsrc/graphics/py-matplotlib/distinfo:1.77
--- pkgsrc/graphics/py-matplotlib/distinfo:1.76 Mon Jun 29 11:25:19 2026
+++ pkgsrc/graphics/py-matplotlib/distinfo      Tue Jun 30 10:18:27 2026
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.76 2026/06/29 11:25:19 adam Exp $
+$NetBSD: distinfo,v 1.77 2026/06/30 10:18:27 ryoon Exp $
 
 BLAKE2s (matplotlib-3.11.0.tar.gz) = 66d4c21017a5a941bb3bdf7262b36dde530a150dfdd6e4f7dfdb6ca12423c8e9
 SHA512 (matplotlib-3.11.0.tar.gz) = 129dc761ca38b368d9981b9e079ca853ed07c2bd7c9c991f504ad5f1fab4f709c5281b7853c5d90c07952c9ef8bc598500618c88bdb0db21c259d7a43fa616b8
 Size (matplotlib-3.11.0.tar.gz) = 33251176 bytes
+SHA1 (patch-src___image__wrapper.cpp) = 68f30c9c50a914219362fa421c0e479a79b31716
 SHA1 (patch-src_meson.build) = 93a4e88c2e8ea1b8643630896857b41c939e7888

Added files:

Index: pkgsrc/graphics/py-matplotlib/patches/patch-src___image__wrapper.cpp
diff -u /dev/null pkgsrc/graphics/py-matplotlib/patches/patch-src___image__wrapper.cpp:1.1
--- /dev/null   Tue Jun 30 10:18:27 2026
+++ pkgsrc/graphics/py-matplotlib/patches/patch-src___image__wrapper.cpp        Tue Jun 30 10:18:27 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-src___image__wrapper.cpp,v 1.1 2026/06/30 10:18:27 ryoon Exp $
+
+* Fix fingerprint mismatch for std::clamp().
+  abs() returns int, not double.
+
+--- src/_image_wrapper.cpp.orig        2026-06-30 09:58:33.168256719 +0000
++++ src/_image_wrapper.cpp
+@@ -266,7 +266,7 @@ calculate_rms_and_diff(py::array_t<unsigned char> expe
+ 
+                 if (k != 3) { // Hard-code a fully solid alpha channel by omitting it.
+                     diff(i, j, k) = static_cast<unsigned char>(std::clamp(
+-                        abs(pixel_diff) * 10, // Expand differences in luminance domain.
++                        std::abs(pixel_diff) * 10, // Expand differences in luminance domain.
+                         0.0, 255.0));
+                 }
+             }