CVS commit: pkgsrc/graphics/qt6-qtquick3d

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Feb  1 19:36:37 UTC 2023

Modified Files:
        pkgsrc/graphics/qt6-qtquick3d: distinfo
Added Files:
        pkgsrc/graphics/qt6-qtquick3d/patches:
            patch-src_quick3dparticles_qquick3dparticleemitter.cpp

Log Message:
qt6-qtquick3d: fix build on NetBSD-current


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/qt6-qtquick3d/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/qt6-qtquick3d/patches/patch-src_quick3dparticles_qquick3dparticleemitter.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/qt6-qtquick3d/distinfo
diff -u pkgsrc/graphics/qt6-qtquick3d/distinfo:1.1 pkgsrc/graphics/qt6-qtquick3d/distinfo:1.2
--- pkgsrc/graphics/qt6-qtquick3d/distinfo:1.1  Fri Nov 25 20:58:55 2022
+++ pkgsrc/graphics/qt6-qtquick3d/distinfo      Wed Feb  1 19:36:37 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2022/11/25 20:58:55 nros Exp $
+$NetBSD: distinfo,v 1.2 2023/02/01 19:36:37 wiz Exp $
 
 BLAKE2s (qtquick3d-everywhere-src-6.4.1.tar.xz) = 8a561e8d9d7f5fe12afa1747c236ad3ded027992e36694c8e1f04b6b841d1017
 SHA512 (qtquick3d-everywhere-src-6.4.1.tar.xz) = c62226eb1744c0213a901fcf4b56cb3cfa27c5b25881b8f068dbf8e0ed0846e7775e768fe97fe0dfe1ce3d3d4815700b2f3d75d6626d2ac3db1a6328995e454d
 Size (qtquick3d-everywhere-src-6.4.1.tar.xz) = 42793736 bytes
+SHA1 (patch-src_quick3dparticles_qquick3dparticleemitter.cpp) = 0ccaf87867d22d9a7ba34767e1f0cac7c28249cb

Added files:

Index: pkgsrc/graphics/qt6-qtquick3d/patches/patch-src_quick3dparticles_qquick3dparticleemitter.cpp
diff -u /dev/null pkgsrc/graphics/qt6-qtquick3d/patches/patch-src_quick3dparticles_qquick3dparticleemitter.cpp:1.1
--- /dev/null   Wed Feb  1 19:36:37 2023
+++ pkgsrc/graphics/qt6-qtquick3d/patches/patch-src_quick3dparticles_qquick3dparticleemitter.cpp        Wed Feb  1 19:36:37 2023
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_quick3dparticles_qquick3dparticleemitter.cpp,v 1.1 2023/02/01 19:36:37 wiz Exp $
+
+Fix
+qquick3dparticleemitter.cpp:723:84: error: no matching function for call to 'min(float, __gnu_cxx::__enable_if<true, double>::__type)'
+
+--- src/quick3dparticles/qquick3dparticleemitter.cpp.orig      2022-11-08 19:27:13.000000000 +0000
++++ src/quick3dparticles/qquick3dparticleemitter.cpp
+@@ -716,11 +716,11 @@ void QQuick3DParticleEmitter::emitPartic
+         // max value 127*127 = 16129 degrees/second
+         float sign;
+         sign = rotVelX < 0.0f ? -1.0f : 1.0f;
+-        rotVelX = std::max(-127.0f, std::min(127.0f, sign * std::sqrt(abs(rotVelX))));
++        rotVelX = std::max(-127.0f, std::min<float>(127.0f, sign * std::sqrt(abs(rotVelX))));
+         sign = rotVelY < 0.0f ? -1.0f : 1.0f;
+-        rotVelY = std::max(-127.0f, std::min(127.0f, sign * std::sqrt(abs(rotVelY))));
++        rotVelY = std::max(-127.0f, std::min<float>(127.0f, sign * std::sqrt(abs(rotVelY))));
+         sign = rotVelZ < 0.0f ? -1.0f : 1.0f;
+-        rotVelZ = std::max(-127.0f, std::min(127.0f, sign * std::sqrt(abs(rotVelZ))));
++        rotVelZ = std::max(-127.0f, std::min<float>(127.0f, sign * std::sqrt(abs(rotVelZ))));
+         d->startRotationVelocity = { qint8(rotVelX), qint8(rotVelY), qint8(rotVelZ) };
+     }
+