git: fed81400666d - main - math/osqp: Update 0.6.2 → 0.6.3
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 27 May 2023 14:59:15 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=fed81400666d4b8eec58fa2982d16b033772496a
commit fed81400666d4b8eec58fa2982d16b033772496a
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-05-27 14:24:13 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-05-27 14:59:12 +0000
math/osqp: Update 0.6.2 → 0.6.3
Reported by: portscout
---
math/osqp/Makefile | 8 +++---
math/osqp/distinfo | 6 ++---
math/osqp/files/patch-CMakeLists.txt | 48 +++++++++++++++++++++++++-----------
math/osqp/pkg-plist | 1 +
4 files changed, 42 insertions(+), 21 deletions(-)
diff --git a/math/osqp/Makefile b/math/osqp/Makefile
index 92ceb52139ef..6e9029284440 100644
--- a/math/osqp/Makefile
+++ b/math/osqp/Makefile
@@ -1,6 +1,6 @@
PORTNAME= osqp
DISTVERSIONPREFIX= v
-DISTVERSION= 0.6.2
+DISTVERSION= 0.6.3
CATEGORIES= math
MAINTAINER= yuri@FreeBSD.org
@@ -10,12 +10,14 @@ WWW= https://osqp.org/
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= cmake
+USES= cmake:testing # 4 tests fail, see https://github.com/osqp/osqp/issues/532
+USE_LDCONFIG= yes
+
USE_GITHUB= yes
GH_ACCOUNT= oxfordcontrol
GH_TUPLE= oxfordcontrol:qdldl:7ab0fca:q/lin_sys/direct/qdldl/qdldl_sources
-USE_LDCONFIG= yes
CMAKE_OFF= BUILD_STATIC_LIBS BUILD_EXAMPLES UNITTESTS
+CMAKE_TESTING_ON= UNITTESTS
.include <bsd.port.mk>
diff --git a/math/osqp/distinfo b/math/osqp/distinfo
index a9b6bf965275..78c521b13d2f 100644
--- a/math/osqp/distinfo
+++ b/math/osqp/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1609974993
-SHA256 (oxfordcontrol-osqp-v0.6.2_GH0.tar.gz) = d973c33c3164caa381ed7387375347a46f7522523350a4e51989479b9d3b59c7
-SIZE (oxfordcontrol-osqp-v0.6.2_GH0.tar.gz) = 938313
+TIMESTAMP = 1685182878
+SHA256 (oxfordcontrol-osqp-v0.6.3_GH0.tar.gz) = a6b4148019001f87489c27232e2bdbac37c94f38fa37c1b4ee11eaa5654756d2
+SIZE (oxfordcontrol-osqp-v0.6.3_GH0.tar.gz) = 3302536
SHA256 (oxfordcontrol-qdldl-7ab0fca_GH0.tar.gz) = 9d02ed1a10ad2e8df4de3eb70469be4f9b896a8f93a9323065af625b08cd3645
SIZE (oxfordcontrol-qdldl-7ab0fca_GH0.tar.gz) = 22930
diff --git a/math/osqp/files/patch-CMakeLists.txt b/math/osqp/files/patch-CMakeLists.txt
index 2e8e818ee246..85e0b950bff2 100644
--- a/math/osqp/files/patch-CMakeLists.txt
+++ b/math/osqp/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2018-09-26 17:51:55 UTC
+--- CMakeLists.txt.orig 2023-05-25 14:48:50 UTC
+++ CMakeLists.txt
-@@ -296,28 +296,32 @@ endif (R_LANG)
+@@ -272,28 +272,32 @@ endif (R_LANG)
add_subdirectory(lin_sys)
# Static library
@@ -8,21 +8,21 @@
-# Give same name to static library output
-set_target_properties(osqpstatic PROPERTIES OUTPUT_NAME osqp)
+if (BUILD_STATIC_LIBS)
-+ add_library (osqpstatic STATIC ${osqp_src} ${osqp_headers} ${linsys_solvers})
++ add_library (osqp STATIC ${osqp_src} ${osqp_headers} ${linsys_solvers})
+ # Give same name to static library output
-+ set_target_properties(osqpstatic PROPERTIES OUTPUT_NAME osqp)
++ set_target_properties(osqp PROPERTIES OUTPUT_NAME osqp)
-# Include directories for linear system solvers
-target_include_directories(osqpstatic PRIVATE ${linsys_solvers_includes})
+ # Include directories for linear system solvers
-+ target_include_directories(osqpstatic PRIVATE ${linsys_solvers_includes})
++ target_include_directories(osqp PRIVATE ${linsys_solvers_includes})
-# Declare include directories for the cmake exported target
-target_include_directories(osqpstatic
- PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}/osqp>")
+ # Declare include directories for the cmake exported target
-+ target_include_directories(osqpstatic
++ target_include_directories(osqp
+ PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
+ "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}/osqp>")
+endif()
@@ -38,7 +38,7 @@
- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+if (BUILD_STATIC_LIBS)
-+ install(TARGETS osqpstatic
++ install(TARGETS osqp
+ EXPORT ${PROJECT_NAME}
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
@@ -47,7 +47,16 @@
# Install Headers
-@@ -355,8 +359,10 @@ if (NOT PYTHON AND NOT MATLAB AND NOT R_
+@@ -304,7 +308,7 @@ install(FILES ${osqp_headers} DESTINATION "${CMAKE_INS
+
+
+ if (MATLAB)
+-target_link_libraries (osqpstatic ${Matlab_LIBRARIES})
++target_link_libraries (osqp ${Matlab_LIBRARIES})
+ endif (MATLAB)
+
+ # If we are building Python/Matlab/R interface:
+@@ -331,8 +335,10 @@ if (NOT PYTHON AND NOT MATLAB AND NOT R_LANG AND NOT E
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
# Create demo executable (linked to static library)
@@ -58,14 +67,23 @@
+ target_link_libraries (osqp_demo osqp)
+ endif()
- endif (NOT PYTHON AND NOT MATLAB AND NOT R_LANG)
+ endif (NOT PYTHON AND NOT MATLAB AND NOT R_LANG AND NOT EMBEDDED)
+
+@@ -431,7 +437,7 @@ if (UNITTESTS)
+ CXX_STANDARD_REQUIRED YES
+ CXX_EXTENSIONS NO
+ )
+- target_link_libraries (osqp_tester osqpstatic ${CMAKE_DL_LIBS})
++ target_link_libraries (osqp_tester osqp ${CMAKE_DL_LIBS})
-@@ -449,7 +455,7 @@ if (UNITTESTS)
- ${PROJECT_SOURCE_DIR}/tests/minunit.h
- ${test_headers}
- ${codegen_test_headers})
-- target_link_libraries (osqp_tester osqpstatic)
-+ target_link_libraries (osqp_tester osqp)
+ # Add custom memory target
+ add_executable(osqp_tester_custom_memory
+@@ -443,7 +449,7 @@ if (UNITTESTS)
+ ${PROJECT_SOURCE_DIR}/tests/custom_memory/custom_memory.c
+ ${PROJECT_SOURCE_DIR}/tests/custom_memory/custom_memory.h
+ )
+- target_link_libraries (osqp_tester_custom_memory osqpstatic ${CMAKE_DL_LIBS})
++ target_link_libraries (osqp_tester_custom_memory osqp ${CMAKE_DL_LIBS})
# Add testing
include(CTest)
diff --git a/math/osqp/pkg-plist b/math/osqp/pkg-plist
index 0fee0749c6d3..19bf8f761e7a 100644
--- a/math/osqp/pkg-plist
+++ b/math/osqp/pkg-plist
@@ -13,6 +13,7 @@ include/osqp/proj.h
include/osqp/scaling.h
include/osqp/types.h
include/osqp/util.h
+include/osqp/version.h
include/qdldl/qdldl.h
include/qdldl/qdldl_types.h
lib/cmake/osqp/osqp-config.cmake