Index | Thread | Search

From:
Rafael Sadowski <rafael@sizeofvoid.org>
Subject:
UPDATE: stellarsolver-2.7
To:
ports@openbsd.org
Cc:
Wen Heping <wenheping2000@hotmail.com>
Date:
Sat, 20 Sep 2025 09:06:44 +0200

Download raw body.

Thread
  • Rafael Sadowski:

    UPDATE: stellarsolver-2.7

Simple update stellarsolver to 2.7. This update also switched to
Qt6 which I need for the KStars 3.7.8 (Qt6) update -- see
different email. Tested with upcoming KStars on amd64. OK?

Cheers Rafael

Index: Makefile
===================================================================
RCS file: /cvs/ports/astro/stellarsolver/Makefile,v
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile	22 Feb 2025 17:00:49 -0000	1.1.1.1
+++ Makefile	20 Sep 2025 06:57:29 -0000
@@ -1,6 +1,6 @@
 COMMENT =	astrometric plate solver
 
-V =		2.5
+V =		2.7
 DISTNAME =	stellarsolver-${V}
 
 CATEGORIES =	astro
@@ -12,19 +12,21 @@ SITES =		${HOMEPAGE}/archive/refs/tags/
 
 MAINTAINER =	Wen Heping <wenheping2000@hotmail.com>
 
-SHARED_LIBS =	stellarsolver             0.0 # 0.0
+SHARED_LIBS +=	stellarsolver6            0.0 # 0.0
 
-WANTLIB +=	${COMPILER_LIBCXX} Qt5Concurrent Qt5Core Qt5Gui Qt5Network
-WANTLIB +=	Qt5Widgets cfitsio gsl gslcblas m wcs
+WANTLIB += ${COMPILER_LIBCXX} GL Qt6Concurrent Qt6Core Qt6Gui
+WANTLIB += Qt6Network Qt6Widgets cfitsio gsl gslcblas m wcs
 
 # GPLv3
 PERMIT_PACKAGE =	Yes
 
 MODULES =	devel/cmake \
-		x11/qt5
+		x11/qt6
 
 LIB_DEPENDS =	astro/wcslib \
 		devel/gsl \
 		math/cfitsio
+
+CONFIGURE_ARGS =	-DUSE_QT5=OFF
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/astro/stellarsolver/distinfo,v
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo	22 Feb 2025 17:00:49 -0000	1.1.1.1
+++ distinfo	20 Sep 2025 06:57:29 -0000
@@ -1,2 +1,2 @@
-SHA256 (stellarsolver-2.5.tar.gz) = U588MSowla/BF64sMRFjD5dKHJnd57C3vr8W7nqGKgc=
-SIZE (stellarsolver-2.5.tar.gz) = 23402988
+SHA256 (stellarsolver-2.7.tar.gz) = Nv9JXzJZILmiO3w/dFOpnI1AXgmE1LJ9p1aGJctsdsk=
+SIZE (stellarsolver-2.7.tar.gz) = 26567114
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/astro/stellarsolver/patches/patch-CMakeLists_txt,v
diff -u -p -u -p -r1.1.1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt	22 Feb 2025 17:00:49 -0000	1.1.1.1
+++ patches/patch-CMakeLists_txt	20 Sep 2025 06:57:29 -0000
@@ -1,7 +1,7 @@
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -58,29 +58,25 @@ if (WIN32)
+@@ -65,29 +65,25 @@ if (WIN32)
  
  else(WIN32)
  
Index: patches/patch-stellarsolver_astrometry_os-features_h
===================================================================
RCS file: patches/patch-stellarsolver_astrometry_os-features_h
diff -N patches/patch-stellarsolver_astrometry_os-features_h
--- patches/patch-stellarsolver_astrometry_os-features_h	22 Feb 2025 17:00:49 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: stellarsolver/astrometry/os-features.h
---- stellarsolver/astrometry/os-features.h.orig
-+++ stellarsolver/astrometry/os-features.h
-@@ -110,7 +110,7 @@
- 
- #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 (qsort_r)(void *base, size_t nmemb, size_t sz,
-              void *userdata,
-              int (*compar)(void *, const void *, const void *));
- #endif
Index: patches/patch-stellarsolver_astrometry_util_os-features-test_c
===================================================================
RCS file: patches/patch-stellarsolver_astrometry_util_os-features-test_c
diff -N patches/patch-stellarsolver_astrometry_util_os-features-test_c
--- patches/patch-stellarsolver_astrometry_util_os-features-test_c	22 Feb 2025 17:00:49 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,76 +0,0 @@
-Index: stellarsolver/astrometry/util/os-features-test.c
---- stellarsolver/astrometry/util/os-features-test.c.orig
-+++ stellarsolver/astrometry/util/os-features-test.c
-@@ -14,7 +14,11 @@ int main() {
- }
- #endif
- 
--#ifdef TEST_QSORT_R
-+#ifdef TEST_BSD_QSORT_R
-+void (qsort_r)(void *base, size_t nmemb, size_t sz,
-+             void *userdata,
-+             int (*compar)(void *, const void *, const void *));
-+
- static int cmp(void* u, const void* a, const void* b) {
-     return 0;
- }
-@@ -22,51 +26,22 @@ int main() {
-     int array;
-     int baton;
-     qsort_r(&array, 1, sizeof(int), &baton, cmp);
--    //printf("#define NEED_QSORT_R 0\n");
-     return 0;
- }
- #endif
- 
--#ifdef TEST_DECLARE_QSORT_R
--// Test whether just declaring qsort_r as we do causes a compile failure.
-+#ifdef TEST_GNU_QSORT_R
-+void (qsort_r)(void *base, size_t nmemb, size_t sz,
-+             int (*compar)(const void *, const void *, void *),
-+             void *userdata);
- 
--void qsort_r(void *base, size_t nmemb, size_t sz,
--             void *userdata,
--             int (*compar)(void *, const void *, const void *));
--
--int main() {
--    //printf("#define NEED_DECLARE_QSORT_R 1\n");
-+static int cmp(const void* a, const void* b, void* u) {
-     return 0;
- }
--#endif
--
--#ifdef TEST_SWAP_QSORT_R
--// Use the result of TEST_DECLARE_QSORT_R and TEST_NEED_QSORT_R, or else
--// this test will fail with a warning about undefined qsort_r
--// Include .c rather than .h because we test with:
--//     gcc -o (exec) os-features-test.c
--// and if NEED_QSORT_R, os-features.c includes qsort_reentrant.c
--#include "os-features-config.h.tmp"
--#define DONT_INCLUDE_OS_FEATURES_CONFIG_H 1
--#include "os-features.c"
--#undef DONT_INCLUDE_OS_FEATURES_CONFIG_H
--// Test whether qsort_r works unswapped. (ie, qsort_r matches the definition of
--// QSORT_R defined in the os-features.h documentation.)
--static int sortfunc(void* thunk, const void* v1, const void* v2) {
--    const int* i1 = v1;
--    const int* i2 = v2;
--    if (*i1 < *i2)
--        return -1;
--    if (*i1 > *i2)
--        return 1;
--    return 0;
--}
- int main() {
--    int array[] = { 4, 17, 88, 34, 12, 12, 17 };
--    int N = sizeof(array)/sizeof(int);
--    int mythunk = 42;
--    qsort_r(array, N, sizeof(int), &mythunk, sortfunc);
--    //printf("#define NEED_SWAP_QSORT_R 0\n");
-+    int array;
-+    int baton;
-+    qsort_r(&array, 1, sizeof(int), cmp, &baton);
-     return 0;
- }
- #endif
Index: patches/patch-stellarsolver_stellarsolver_cpp
===================================================================
RCS file: /cvs/ports/astro/stellarsolver/patches/patch-stellarsolver_stellarsolver_cpp,v
diff -u -p -u -p -r1.1.1.1 patch-stellarsolver_stellarsolver_cpp
--- patches/patch-stellarsolver_stellarsolver_cpp	22 Feb 2025 17:00:49 -0000	1.1.1.1
+++ patches/patch-stellarsolver_stellarsolver_cpp	20 Sep 2025 06:57:29 -0000
@@ -1,7 +1,7 @@
 Index: stellarsolver/stellarsolver.cpp
 --- stellarsolver/stellarsolver.cpp.orig
 +++ stellarsolver/stellarsolver.cpp
-@@ -1009,6 +1009,8 @@ bool StellarSolver::getAvailableRAM(double &availableR
+@@ -1047,6 +1047,8 @@ bool StellarSolver::getAvailableRAM(double &availableR
      memory = p.readAllStandardOutput();
      totalRAM = memory.toLong() * 1024.0; //It is in kB on this system
      p.close();
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/astro/stellarsolver/pkg/PLIST,v
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST	22 Feb 2025 17:00:49 -0000	1.1.1.1
+++ pkg/PLIST	20 Sep 2025 06:57:29 -0000
@@ -68,9 +68,10 @@ include/libstellarsolver/stellarsolver.h
 include/libstellarsolver/structuredefinitions.h
 include/libstellarsolver/version.h
 include/libstellarsolver/wcsdata.h
+lib/cmake/
 lib/cmake/StellarSolver/
 lib/cmake/StellarSolver/StellarSolverConfig${MODCMAKE_BUILD_SUFFIX}
 lib/cmake/StellarSolver/StellarSolverConfig.cmake
 lib/cmake/StellarSolver/StellarSolverConfigVersion.cmake
-@lib lib/libstellarsolver.so.${LIBstellarsolver_VERSION}
+@lib lib/libstellarsolver6.so.${LIBstellarsolver6_VERSION}
 lib/pkgconfig/stellarsolver.pc