nlopt: Update to NLopt 2.9.1

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: nlopt: Update to NLopt 2.9.1
From: Paul Ripke (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Wed, 22 Jan 2025 06:27:12 +0000
Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Wed Jan 22 17:24:30 2025 +1100
Changeset:	17780f66a0a4d9c79a178f955a87de8f84b029da

Modified Files:
	nlopt/COMMIT_MSG
	nlopt/Makefile
	nlopt/PLIST
	nlopt/PLIST.octave
	nlopt/PLIST.python
	nlopt/buildlink3.mk
	nlopt/distinfo
	nlopt/options.mk
Added Files:
	nlopt/PLIST.guile
	nlopt/TODO

Log Message:
nlopt: Update to NLopt 2.9.1

Also fix guile build option.

Changes:

NLopt 2.9.1
  - Fixed PRAXIS box constraints ([#528])

NLopt 2.9.0
  - New NLOPT_LUKSAN cmake option to build without Luksan LGPL code (#568).
  - Dropped unused LD_LBFGS_NOCEDAL enum value.
  - Python 3.13 support (#565).
  - Fixed COBYLA not returning the optimum (#57)
  - Fixed SLSQP returning infeasible optimum (#368)
  - Fixed STOGO not registering new optimum (#504)
  - Various minor bugfixes (#570, #563, #379, #511)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=17780f66a0a4d9c79a178f955a87de8f84b029da

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

diffstat:
 nlopt/COMMIT_MSG    | 14 +++++++++++++-
 nlopt/Makefile      |  2 +-
 nlopt/PLIST         |  2 +-
 nlopt/PLIST.guile   |  3 +++
 nlopt/PLIST.octave  |  1 -
 nlopt/PLIST.python  |  3 ++-
 nlopt/TODO          |  2 ++
 nlopt/buildlink3.mk |  4 ++--
 nlopt/distinfo      |  6 +++---
 nlopt/options.mk    | 30 +++++++++++++++++-------------
 10 files changed, 44 insertions(+), 23 deletions(-)

diffs:
diff --git a/nlopt/COMMIT_MSG b/nlopt/COMMIT_MSG
index e4188086f0..8ce2640589 100644
--- a/nlopt/COMMIT_MSG
+++ b/nlopt/COMMIT_MSG
@@ -1,7 +1,19 @@
-math/nlopt: Update to NLopt 2.8.0
+math/nlopt: Update to NLopt 2.9.1
 
 Changes:
 
+NLopt 2.9.1
+  - Fixed PRAXIS box constraints ([#528])
+
+NLopt 2.9.0
+  - New NLOPT_LUKSAN cmake option to build without Luksan LGPL code (#568).
+  - Dropped unused LD_LBFGS_NOCEDAL enum value.
+  - Python 3.13 support (#565).
+  - Fixed COBYLA not returning the optimum (#57)
+  - Fixed SLSQP returning infeasible optimum (#368)
+  - Fixed STOGO not registering new optimum (#504)
+  - Various minor bugfixes (#570, #563, #379, #511)
+
 NLopt 2.8.0
   - Support C++ functors for objective functions (#457).
   - CCSA/MMA an now use the initial_step parameter to bound their initial
diff --git a/nlopt/Makefile b/nlopt/Makefile
index f0df12c7e5..86b0f891a5 100644
--- a/nlopt/Makefile
+++ b/nlopt/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=		nlopt-2.8.0
+DISTNAME=		nlopt-2.9.1
 CATEGORIES=		math
 MASTER_SITES=		${MASTER_SITE_GITHUB:=stevengj/}
 GITHUB_PROJECT=		nlopt
diff --git a/nlopt/PLIST b/nlopt/PLIST
index 74674512bc..21d99a67e0 100644
--- a/nlopt/PLIST
+++ b/nlopt/PLIST
@@ -7,7 +7,7 @@ lib/cmake/nlopt/NLoptLibraryDepends-release.cmake
 lib/cmake/nlopt/NLoptLibraryDepends.cmake
 lib/libnlopt.so
 lib/libnlopt.so.0
-lib/libnlopt.so.0.12.0
+lib/libnlopt.so.0.13.0
 lib/pkgconfig/nlopt.pc
 man/man3/nlopt.3
 man/man3/nlopt_minimize.3
diff --git a/nlopt/PLIST.guile b/nlopt/PLIST.guile
new file mode 100644
index 0000000000..9788fd1245
--- /dev/null
+++ b/nlopt/PLIST.guile
@@ -0,0 +1,3 @@
+@comment $NetBSD$
+lib/guile/3.0/extensions/nlopt_guile.so
+share/guile/site/3.0/nlopt.scm
diff --git a/nlopt/PLIST.octave b/nlopt/PLIST.octave
index c552cdb343..7318f82afc 100644
--- a/nlopt/PLIST.octave
+++ b/nlopt/PLIST.octave
@@ -26,7 +26,6 @@ share/octave/${OCTAVE_VERSION}/site/m/NLOPT_LD_AUGLAG.m
 share/octave/${OCTAVE_VERSION}/site/m/NLOPT_LD_AUGLAG_EQ.m
 share/octave/${OCTAVE_VERSION}/site/m/NLOPT_LD_CCSAQ.m
 share/octave/${OCTAVE_VERSION}/site/m/NLOPT_LD_LBFGS.m
-share/octave/${OCTAVE_VERSION}/site/m/NLOPT_LD_LBFGS_NOCEDAL.m
 share/octave/${OCTAVE_VERSION}/site/m/NLOPT_LD_MMA.m
 share/octave/${OCTAVE_VERSION}/site/m/NLOPT_LD_SLSQP.m
 share/octave/${OCTAVE_VERSION}/site/m/NLOPT_LD_TNEWTON.m
diff --git a/nlopt/PLIST.python b/nlopt/PLIST.python
index 64e3f0313f..3293a4523f 100644
--- a/nlopt/PLIST.python
+++ b/nlopt/PLIST.python
@@ -1,3 +1,4 @@
 @comment $NetBSD$
-${PYSITELIB}/_nlopt.cpython-${PYTHON_VERSION}.so
+${PYSITELIB}/_nlopt.so
 ${PYSITELIB}/nlopt.py
+${PYSITELIB}/nlopt-2.9.1.dist-info/METADATA
diff --git a/nlopt/TODO b/nlopt/TODO
new file mode 100644
index 0000000000..cfc39ae0e4
--- /dev/null
+++ b/nlopt/TODO
@@ -0,0 +1,2 @@
+Export OCTAVE_VERSION from math/octave/version.mk, and reference from octave
+Makefile and here.
diff --git a/nlopt/buildlink3.mk b/nlopt/buildlink3.mk
index fe089de021..7b8b14c91c 100644
--- a/nlopt/buildlink3.mk
+++ b/nlopt/buildlink3.mk
@@ -5,8 +5,8 @@ BUILDLINK_TREE+=	nlopt
 .if !defined(NLOPT_BUILDLINK3_MK)
 NLOPT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.nlopt+=	nlopt>=2.7.1
-BUILDLINK_ABI_DEPENDS.nlopt+=	nlopt>=2.7.1
+BUILDLINK_API_DEPENDS.nlopt+=	nlopt>=2.9.1
+BUILDLINK_ABI_DEPENDS.nlopt+=	nlopt>=2.9.1
 BUILDLINK_PKGSRCDIR.nlopt?=	../../wip/nlopt
 
 .include "../../mk/bsd.fast.prefs.mk"
diff --git a/nlopt/distinfo b/nlopt/distinfo
index 6a18d4eb32..14624daa21 100644
--- a/nlopt/distinfo
+++ b/nlopt/distinfo
@@ -1,5 +1,5 @@
 $NetBSD$
 
-BLAKE2s (nlopt-2.8.0.tar.gz) = a945dfae2245ffd755f601a6e99745ca816665f4f997b114a2aebb82889d4be5
-SHA512 (nlopt-2.8.0.tar.gz) = cb294caa5532e11ae0d22ed849705920bbae79f712144c840a5ca865ef8e6a15c6c9540c81ced0c3c05b9f44c360d50f74e235e69d893be34b7e1c5599f07c71
-Size (nlopt-2.8.0.tar.gz) = 2050287 bytes
+BLAKE2s (nlopt-2.9.1.tar.gz) = f1b1f536146b8ff7a3a979f85739a4cdace81268cc393d20f2e25fee79fa3764
+SHA512 (nlopt-2.9.1.tar.gz) = 17cf0bea185657f63ac73d5626609cbe06f47e694c134ebf3c0fb04f06a8e35a77c8128eff999b8b98d13b728696f3d33ae0c68831cfc0abb730afc806191123
+Size (nlopt-2.9.1.tar.gz) = 2054775 bytes
diff --git a/nlopt/options.mk b/nlopt/options.mk
index 18fe7a8ba5..1ef51bc0b7 100644
--- a/nlopt/options.mk
+++ b/nlopt/options.mk
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.nlopt
-PKG_SUPPORTED_OPTIONS=		octave python
+PKG_SUPPORTED_OPTIONS=		guile octave python
 PKG_SUGGESTED_OPTIONS=
 
 .include "../../mk/bsd.options.mk"
@@ -12,20 +12,24 @@ CMAKE_CONFIGURE_ARGS+=		-DNLOPT_SWIG:BOOL=TRUE
 CMAKE_CONFIGURE_ARGS+=		-DNLOPT_FORTRAN:BOOL=FALSE	# just builds tests
 CMAKE_CONFIGURE_ARGS+=		-DNLOPT_MATLAB:BOOL=FALSE
 
-# GUILE fails to be found by cmake?
-#.if !empty(PKG_OPTIONS:Mguile)
-#.include "../../lang/guile30/buildlink3.mk"
-#CMAKE_CONFIGURE_ARGS+=		-DNLOPT_GUILE:BOOL=TRUE
-#.else
-#CMAKE_CONFIGURE_ARGS+=		-DNLOPT_GUILE:BOOL=FALSE
-#.endif
+.if !empty(PKG_OPTIONS:Mguile)
+.include "../../lang/guile30/buildlink3.mk"
+# DEPENDS+=			guile30-slib>=3.2.1:../../devel/guile30-slib
+CMAKE_CONFIGURE_ARGS+=		-DCMAKE_PREFIX_PATH=${PREFIX}/guile/3.0
+# CMAKE_INSTALL_RPATH doesn't work, so do it this way.
+LDFLAGS+=			${COMPILER_RPATH_FLAG}${PREFIX}/guile/3.0/lib
+CMAKE_CONFIGURE_ARGS+=		-DNLOPT_GUILE:BOOL=TRUE
+PLIST_SRC+=			PLIST.guile
+.else
+CMAKE_CONFIGURE_ARGS+=		-DNLOPT_GUILE:BOOL=FALSE
+.endif
 
 
 .if !empty(PKG_OPTIONS:Moctave)
 .include "../../math/octave/buildlink3.mk"
 CMAKE_CONFIGURE_ARGS+=		-DNLOPT_OCTAVE:BOOL=TRUE
-PLIST_SRC+=		PLIST.octave
-PLIST_SUBST+=		OCTAVE_VERSION=9.2.0
+PLIST_SRC+=			PLIST.octave
+PLIST_SUBST+=			OCTAVE_VERSION=9.2.0
 .else
 CMAKE_CONFIGURE_ARGS+=		-DNLOPT_OCTAVE:BOOL=FALSE
 .endif
@@ -35,9 +39,9 @@ CMAKE_CONFIGURE_ARGS+=		-DNLOPT_OCTAVE:BOOL=FALSE
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 CMAKE_CONFIGURE_ARGS+=		-DNLOPT_PYTHON:BOOL=TRUE
-PLIST_SRC+=		PLIST.python
-PLIST_SUBST+=		PYSITELIB=${PYSITELIB}
-PLIST_SUBST+=		PYTHON_VERSION=${PYTHON_VERSION}
+PLIST_SRC+=			PLIST.python
+PLIST_SUBST+=			PYSITELIB=${PYSITELIB}
+PLIST_SUBST+=			PYTHON_VERSION=${PYTHON_VERSION}
 .else
 CMAKE_CONFIGURE_ARGS+=		-DNLOPT_PYTHON:BOOL=FALSE
 .endif
Prev by Date: lpjs: Update to 0.0.6.12
Next by Date: prusaslicer: Fix build after devel/atk removal
Previous by Thread: lpjs: Update to 0.0.6.12
Next by Thread: prusaslicer: Fix build after devel/atk removal
Indexes:
Home | Main Index | Thread Index | Old Index