CVS commit: pkgsrc/misc/stellarsolver

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun May  3 06:38:33 UTC 2026

Modified Files:
        pkgsrc/misc/stellarsolver: Makefile distinfo
Added Files:
        pkgsrc/misc/stellarsolver/patches:
            patch-stellarsolver_astrometry_include_astrometry_ioutils.h
            patch-stellarsolver_astrometry_include_astrometry_os-features.h
            patch-stellarsolver_astrometry_util_qsort__reentrant.c
Removed Files:
        pkgsrc/misc/stellarsolver/patches: patch-CMakeLists.txt

Log Message:
stellarsolver: fix build on systems with POSIX qsort_r

like NetBSD 11


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/stellarsolver/Makefile \
    pkgsrc/misc/stellarsolver/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/misc/stellarsolver/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/stellarsolver/patches/patch-stellarsolver_astrometry_include_astrometry_ioutils.h \
    pkgsrc/misc/stellarsolver/patches/patch-stellarsolver_astrometry_include_astrometry_os-features.h \
    pkgsrc/misc/stellarsolver/patches/patch-stellarsolver_astrometry_util_qsort__reentrant.c

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

Modified files:

Index: pkgsrc/misc/stellarsolver/Makefile
diff -u pkgsrc/misc/stellarsolver/Makefile:1.1 pkgsrc/misc/stellarsolver/Makefile:1.2
--- pkgsrc/misc/stellarsolver/Makefile:1.1      Tue Feb 17 18:41:01 2026
+++ pkgsrc/misc/stellarsolver/Makefile  Sun May  3 06:38:33 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2026/02/17 18:41:01 markd Exp $
+# $NetBSD: Makefile,v 1.2 2026/05/03 06:38:33 wiz Exp $
 
 DISTNAME=      stellarsolver-2.7
 CATEGORIES=    misc
@@ -23,6 +23,9 @@ SUBST_MESSAGE.bl3=    Fix paths to buildlin
 
 PKGCONFIG_OVERRIDE+=   stellarsolver.pc.cmake
 
+post-install:
+       ${RM} ${DESTDIR}${PREFIX}/include/libstellarsolver/astrometry/*.orig
+
 .include "../../devel/cmake/build.mk"
 
 .include "../../devel/cfitsio/buildlink3.mk"
Index: pkgsrc/misc/stellarsolver/distinfo
diff -u pkgsrc/misc/stellarsolver/distinfo:1.1 pkgsrc/misc/stellarsolver/distinfo:1.2
--- pkgsrc/misc/stellarsolver/distinfo:1.1      Tue Feb 17 18:41:01 2026
+++ pkgsrc/misc/stellarsolver/distinfo  Sun May  3 06:38:33 2026
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.1 2026/02/17 18:41:01 markd Exp $
+$NetBSD: distinfo,v 1.2 2026/05/03 06:38:33 wiz Exp $
 
 BLAKE2s (stellarsolver-2.7.tar.gz) = 2b4d743efadc981ce36252aa559a21a7512996328a504aef716981a73c3b225f
 SHA512 (stellarsolver-2.7.tar.gz) = f666023bcc4e5c83d5a88224ebe524a490852d7b2aab89a52f596aa891f965367a6057997592eab50035f55565e330cf0a48074d2bf339fbaa78afdf56fda876
 Size (stellarsolver-2.7.tar.gz) = 26567114 bytes
-SHA1 (patch-CMakeLists.txt) = cf2dd1980448d3211521f048b38c2d96d4cd9f5d
+SHA1 (patch-stellarsolver_astrometry_include_astrometry_ioutils.h) = 834383d80b02ab0933ff9b094dbdc5d4fe1b911c
+SHA1 (patch-stellarsolver_astrometry_include_astrometry_os-features.h) = c73c2c1af8056f1631c7d73ab530c455c8daee63
+SHA1 (patch-stellarsolver_astrometry_util_qsort__reentrant.c) = 384937d128c05dad288e0cc9cc8e6f09bbc1bdad
 SHA1 (patch-stellarsolver_stellarsolver.cpp) = cafdf1a6f83d314b372ae624acddc4d0b3159abb

Added files:

Index: pkgsrc/misc/stellarsolver/patches/patch-stellarsolver_astrometry_include_astrometry_ioutils.h
diff -u /dev/null pkgsrc/misc/stellarsolver/patches/patch-stellarsolver_astrometry_include_astrometry_ioutils.h:1.1
--- /dev/null   Sun May  3 06:38:33 2026
+++ pkgsrc/misc/stellarsolver/patches/patch-stellarsolver_astrometry_include_astrometry_ioutils.h       Sun May  3 06:38:33 2026
@@ -0,0 +1,26 @@
+$NetBSD: patch-stellarsolver_astrometry_include_astrometry_ioutils.h,v 1.1 2026/05/03 06:38:33 wiz Exp $
+
+https://github.com/rlancaste/stellarsolver/issues/150
+
+--- stellarsolver/astrometry/include/astrometry/ioutils.h.orig 2025-05-25 04:36:42.000000000 +0000
++++ stellarsolver/astrometry/include/astrometry/ioutils.h
+@@ -28,17 +28,12 @@ char* dirname(const char* path);
+ #include "astrometry/an-bool.h"
+ #include "astrometry/bl.h"
+ #include "astrometry/keywords.h"
++#include "astrometry/os-features.h"
+ 
+ extern uint32_t ENDIAN_DETECTOR;
+ 
+ void QSORT_R(void* base, size_t nmembers, size_t member_size,
+-             void* token, int (*compar)(void *, const void *, const void *));
+-
+-/**
+-   You should define the "comparison" function like this:
+-   static int QSORT_COMPARISON_FUNCTION(my_comparison, void* token, const void* v1, const void* v2) {
+- */
+-#define QSORT_COMPARISON_FUNCTION(func, thunk, v1, v2) func(thunk, v1, v2)
++             void* token, QSORT_COMPARISON_FUNCTION(int (*compar), void *, const void *, const void *));
+ 
+ int copy_file(const char* infn, const char* outfn);
+ 
Index: pkgsrc/misc/stellarsolver/patches/patch-stellarsolver_astrometry_include_astrometry_os-features.h
diff -u /dev/null pkgsrc/misc/stellarsolver/patches/patch-stellarsolver_astrometry_include_astrometry_os-features.h:1.1
--- /dev/null   Sun May  3 06:38:33 2026
+++ pkgsrc/misc/stellarsolver/patches/patch-stellarsolver_astrometry_include_astrometry_os-features.h   Sun May  3 06:38:33 2026
@@ -0,0 +1,29 @@
+$NetBSD: patch-stellarsolver_astrometry_include_astrometry_os-features.h,v 1.1 2026/05/03 06:38:33 wiz Exp $
+
+https://github.com/rlancaste/stellarsolver/issues/150
+
+--- stellarsolver/astrometry/include/astrometry/os-features.h.orig     2025-05-25 04:36:42.000000000 +0000
++++ stellarsolver/astrometry/include/astrometry/os-features.h
+@@ -108,22 +108,8 @@
+    -Ubuntu 8.10
+ */
+ 
+-#if NEED_DECLARE_QSORT_R
+-//// NOTE: this declaration must match os-features-test.c .
+-void qsort_r(void *base, size_t nmemb, size_t sz,
+-             void *userdata,
+-             int (*compar)(void *, const void *, const void *));
+-#endif
+-
+-#if NEED_SWAP_QSORT_R
+ #define QSORT_R(a,b,c,d,e) qsort_r(a,b,c,e,d)
+ #define QSORT_COMPARISON_FUNCTION(func, thunk, v1, v2) func(v1, v2, thunk)
+-
+-#else
+-#define QSORT_R qsort_r
+-#define QSORT_COMPARISON_FUNCTION(func, thunk, v1, v2) func(thunk, v1, v2)
+-
+-#endif
+ 
+ // As suggested in http://gcc.gnu.org/onlinedocs/gcc-4.3.0/gcc/Function-Names.html
+ #if __STDC_VERSION__ < 199901L
Index: pkgsrc/misc/stellarsolver/patches/patch-stellarsolver_astrometry_util_qsort__reentrant.c
diff -u /dev/null pkgsrc/misc/stellarsolver/patches/patch-stellarsolver_astrometry_util_qsort__reentrant.c:1.1
--- /dev/null   Sun May  3 06:38:33 2026
+++ pkgsrc/misc/stellarsolver/patches/patch-stellarsolver_astrometry_util_qsort__reentrant.c    Sun May  3 06:38:33 2026
@@ -0,0 +1,23 @@
+$NetBSD: patch-stellarsolver_astrometry_util_qsort__reentrant.c,v 1.1 2026/05/03 06:38:33 wiz Exp $
+
+https://github.com/rlancaste/stellarsolver/issues/150
+
+--- stellarsolver/astrometry/util/qsort_reentrant.c.orig       2025-05-25 04:36:42.000000000 +0000
++++ stellarsolver/astrometry/util/qsort_reentrant.c
+@@ -34,14 +34,14 @@
+ # include <sys/cdefs.h>
+ #endif
+ //__FBSDID("$FreeBSD: src/sys/libkern/qsort.c,v 1.15 2004/07/15 23:58:23 glebius Exp $");
++#include "astrometry/os-features.h"
+ 
+-
+ // Astrometry.net: we lightly modified this file:
+ // - renamed qsort_r to QSORT_R to avoid clashes with system version
+ // - removed the preprocessor magic that support re-entrant and non-
+ //   functions in the same source code.
+ 
+-typedef int             cmp_t(void *, const void *, const void *);
++typedef int             QSORT_COMPARISON_FUNCTION(cmp_t, void *, const void *, const void *);
+ 
+ static __inline char    *med3(char *, char *, char *, cmp_t *, void *);
+ static __inline void     swapfunc(char *, char *, int, int);