[packages/qhull] - updated to 2020.2 (8.0.2); new sonames
qboosh
qboosh at pld-linux.org
Tue Aug 4 17:54:34 CEST 2026
commit 12f79189744e8702ab62b9908f1abfa9f8977c34
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Aug 4 17:54:28 2026 +0200
- updated to 2020.2 (8.0.2); new sonames
qhull-cmake.patch | 250 ++++++++++++++++++++++++++++++++++++------------------
qhull.spec | 54 +++++++-----
2 files changed, 202 insertions(+), 102 deletions(-)
---
diff --git a/qhull.spec b/qhull.spec
index 396aa5e..a68e3e5 100644
--- a/qhull.spec
+++ b/qhull.spec
@@ -1,15 +1,15 @@
Summary: Qhull - convex hulls, triangulations and related computations
Summary(pl.UTF-8): Qhull - obliczanie powłok wypukłych, triangulacji i powiązanych rzeczy
Name: qhull
-Version: 2019.1
-Release: 3
+Version: 2020.2
+Release: 1
License: distributable (see COPYING.txt)
Group: Libraries
-Source0: http://www.qhull.org/download/%{name}-2019-src-7.3.2.tgz
-# Source0-md5: 53c04f9c89b491b17b10c7ea1eaa4cc8
+Source0: http://www.qhull.org/download/%{name}-2020-src-8.0.2.tgz
+# Source0-md5: 295f7332269a38279478f555cc185296
Patch0: %{name}-cmake.patch
URL: http://www.qhull.org/
-BuildRequires: cmake >= 2.6
+BuildRequires: cmake >= 3.0
BuildRequires: libstdc++-devel
BuildRequires: rpmbuild(macros) >= 1.603
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -92,6 +92,18 @@ Static QhullCPP library.
%description c++-static -l pl.UTF-8
Statyczna biblioteka QhullCPP.
+%package apidocs
+Summary: API documentation for Qhull libraries
+Summary(pl.UTF-8): Dokumentacja API bibliotek Qhull
+Group: Documentation
+BuildArch: noarch
+
+%description apidocs
+API documentation for Qhull libraries.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API bibliotek Qhull.
+
%prep
%setup -q
%patch -P0 -p1
@@ -100,8 +112,8 @@ Statyczna biblioteka QhullCPP.
install -d build-cmake
cd build-cmake
%cmake .. \
- -DLIB_INSTALL_DIR=%{_libdir} \
- -DMAN_INSTALL_DIR=%{_mandir}/man1
+ -DLIB_INSTALL_DIR:PATH=%{_lib} \
+ -DMAN_INSTALL_DIR:PATH=%{_mandir}/man1
%{__make}
%install
@@ -130,40 +142,42 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/qhull
%attr(755,root,root) %{_bindir}/qvoronoi
%attr(755,root,root) %{_bindir}/rbox
-%attr(755,root,root) %{_libdir}/libqhull.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libqhull.so.7
-%attr(755,root,root) %{_libdir}/libqhull_p.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libqhull_p.so.7
-%attr(755,root,root) %{_libdir}/libqhull_r.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libqhull_r.so.7
+%{_libdir}/libqhull_r.so.*.*.*
+%ghost %{_libdir}/libqhull_r.so.8.0
%{_mandir}/man1/qhull.1*
%{_mandir}/man1/rbox.1*
%files devel
%defattr(644,root,root,755)
-%doc html/*.{htm,gif,jpg}
-%attr(755,root,root) %{_libdir}/libqhull.so
-%attr(755,root,root) %{_libdir}/libqhull_p.so
-%attr(755,root,root) %{_libdir}/libqhull_r.so
+%{_libdir}/libqhull_r.so
%{_includedir}/libqhull
%{_includedir}/libqhull_r
+%{_pkgconfigdir}/qhull_r.pc
%{_libdir}/cmake/Qhull
%files static
%defattr(644,root,root,755)
%{_libdir}/libqhullstatic.a
%{_libdir}/libqhullstatic_r.a
+%{_pkgconfigdir}/qhullstatic.pc
+%{_pkgconfigdir}/qhullstatic_r.pc
%files c++
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libqhullcpp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libqhullcpp.so.7
+%{_libdir}/libqhullcpp.so.*.*.*
+%ghost %{_libdir}/libqhullcpp.so.8.0
%files c++-devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libqhullcpp.so
+%{_libdir}/libqhullcpp.so
%{_includedir}/libqhullcpp
+%{_pkgconfigdir}/qhullcpp.pc
%files c++-static
%defattr(644,root,root,755)
%{_libdir}/libqhullcppstatic.a
+%{_pkgconfigdir}/qhullcppstatic.pc
+
+%files apidocs
+%defattr(644,root,root,755)
+%doc html/*.{htm,gif,jpg}
diff --git a/qhull-cmake.patch b/qhull-cmake.patch
index 901a7cb..249c93c 100644
--- a/qhull-cmake.patch
+++ b/qhull-cmake.patch
@@ -1,34 +1,27 @@
---- qhull-2015.2/CMakeLists.txt.orig 2016-01-19 01:21:32.000000000 +0100
-+++ qhull-2015.2/CMakeLists.txt 2016-03-06 20:39:15.762583423 +0100
-@@ -331,14 +331,16 @@
- include_directories(${CMAKE_SOURCE_DIR}/src)
-
- if(CMAKE_BUILD_TYPE MATCHES "[dD]ebug")
-- set(qhull_CPP qhullcpp_d)
-+ set(qhull_CPP_SHARED qhullcpp_d)
-+ set(qhull_CPP_STATIC qhullcppstatic_d)
- set(qhull_SHARED qhull_d)
- set(qhull_SHAREDP qhull_pd)
- set(qhull_SHAREDR qhull_rd)
- set(qhull_STATIC qhullstatic_d)
- set(qhull_STATICR qhullstatic_rd)
- else()
-- set(qhull_CPP qhullcpp)
-+ set(qhull_CPP_SHARED qhullcpp)
-+ set(qhull_CPP_STATIC qhullcppstatic)
- set(qhull_SHARED libqhull) # Temporarily avoid name conflict with qhull executable
- set(qhull_SHAREDP qhull_p)
- set(qhull_SHAREDR qhull_r)
-@@ -348,7 +350,7 @@
+--- qhull-2020.2/CMakeLists.txt.orig 2020-09-04 03:23:31.000000000 +0200
++++ qhull-2020.2/CMakeLists.txt 2022-09-11 18:18:44.140841857 +0200
+@@ -335,7 +335,8 @@ set(
+
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
+
+-set(qhull_CPP qhullcpp)
++set(qhull_CPP_SHARED qhullcpp)
++set(qhull_CPP_STATIC qhullcppstatic)
+ set(qhull_STATIC qhullstatic)
+ set(qhull_STATICR qhullstatic_r)
+ set(qhull_SHAREDR qhull_r)
+@@ -343,8 +344,8 @@ set(qhull_SHARED libqhull) # Temporaril
+ set(qhull_SHAREDP qhull_p) # libqhull and qhull_p are deprecated, use qhull_r instead
+
+ set(qhull_TARGETS_APPLICATIONS qhull rbox qconvex qdelaunay qvoronoi qhalf)
+-set(qhull_TARGETS_STATIC ${qhull_CPP} ${qhull_STATIC} ${qhull_STATICR})
+-set(qhull_TARGETS_SHARED ${qhull_SHAREDR})
++set(qhull_TARGETS_STATIC ${qhull_CPP_STATIC} ${qhull_STATIC} ${qhull_STATICR})
++set(qhull_TARGETS_SHARED ${qhull_SHAREDR} ${qhull_CPP_SHARED})
set(
- qhull_TARGETS_INSTALL
-- ${qhull_CPP} ${qhull_STATIC} ${qhull_STATICR} ${qhull_SHAREDR}
-+ ${qhull_CPP_SHARED} ${qhull_CPP_STATIC} ${qhull_STATIC} ${qhull_STATICR} ${qhull_SHAREDR}
- qhull rbox qconvex qdelaunay qvoronoi qhalf
- ${qhull_SHARED} ${qhull_SHAREDP} # Deprecated, use qhull_r instead
- )
-@@ -401,15 +403,6 @@
+ qhull_TARGETS_TEST # Unused
+@@ -396,15 +397,6 @@ set_target_properties(${qhull_SHARED} PR
if(UNIX)
target_link_libraries(${qhull_SHARED} m)
@@ -44,7 +37,7 @@
endif(UNIX)
# ---------------------------------------
-@@ -426,17 +419,13 @@
+@@ -424,17 +416,13 @@ set_target_properties(${qhull_SHAREDP} P
if(UNIX)
target_link_libraries(${qhull_SHAREDP} m)
@@ -62,79 +55,162 @@
+add_library(${qhull_CPP_SHARED} SHARED ${libqhullcpp_SOURCES})
+set_target_properties(${qhull_CPP_SHARED} PROPERTIES
+ SOVERSION ${qhull_SOVERSION} VERSION ${qhull_VERSION})
-+target_link_libraries(${qhull_CPP_SHARED} ${qhull_SHARED})
++target_link_libraries(${qhull_CPP_SHARED} ${qhull_SHAREDR})
+
# ---------------------------------------
# Define static libraries qhullstatic (non-reentrant) and qhullstatic_r (reentrant)
# ---------------------------------------
-@@ -459,8 +448,8 @@
- # Do not create libqhullcpp as a shared library. Qhull C++ classes may change layout and size.
+@@ -461,10 +449,10 @@ endif(UNIX)
+ # Qhull C programs use setjmp/longjmp for error handling.
# ---------------------------------------
-add_library(${qhull_CPP} STATIC ${libqhullcpp_SOURCES})
-set_target_properties(${qhull_CPP} PROPERTIES
+add_library(${qhull_CPP_STATIC} STATIC ${libqhullcpp_SOURCES})
+set_target_properties(${qhull_CPP_STATIC} PROPERTIES
- VERSION ${qhull_VERSION})
+ VERSION ${qhull_VERSION}
+- OUTPUT_NAME "${qhull_CPP}$<$<CONFIG:Debug>:_d>"
++ OUTPUT_NAME "${qhull_CPP_STATIC}$<$<CONFIG:Debug>:_d>"
+ POSITION_INDEPENDENT_CODE "TRUE")
# ---------------------------------------
-@@ -477,22 +466,22 @@
- set(qhalf_SOURCES src/qhalf/qhalf.c)
-
- add_executable(qhull ${qhull_SOURCES})
--target_link_libraries(qhull ${qhull_STATICR})
-+target_link_libraries(qhull ${qhull_STATICR} m)
-
- add_executable(rbox ${rbox_SOURCES})
--target_link_libraries(rbox ${qhull_STATIC})
-+target_link_libraries(rbox ${qhull_STATIC} m)
+@@ -474,12 +462,13 @@ set_target_properties(${qhull_CPP} PROPE
+ if(NOT ${BUILD_STATIC_LIBS})
+ set_target_properties(${qhull_STATIC} PROPERTIES EXCLUDE_FROM_ALL TRUE)
+ set_target_properties(${qhull_STATICR} PROPERTIES EXCLUDE_FROM_ALL TRUE)
+- set_target_properties(${qhull_CPP} PROPERTIES EXCLUDE_FROM_ALL TRUE)
++ set_target_properties(${qhull_CPP_STATIC} PROPERTIES EXCLUDE_FROM_ALL TRUE)
+ endif()
+ if(NOT ${BUILD_SHARED_LIBS})
+ set_target_properties(${qhull_SHARED} PROPERTIES EXCLUDE_FROM_ALL TRUE)
+ set_target_properties(${qhull_SHAREDR} PROPERTIES EXCLUDE_FROM_ALL TRUE)
+ set_target_properties(${qhull_SHAREDP} PROPERTIES EXCLUDE_FROM_ALL TRUE)
++ set_target_properties(${qhull_CPP_SHARED} PROPERTIES EXCLUDE_FROM_ALL TRUE)
+ endif()
- add_executable(qconvex ${qconvex_SOURCES})
--target_link_libraries(qconvex ${qhull_STATIC})
-+target_link_libraries(qconvex ${qhull_STATIC} m)
-
- add_executable(qdelaunay ${qdelaunay_SOURCES})
--target_link_libraries(qdelaunay ${qhull_STATIC})
-+target_link_libraries(qdelaunay ${qhull_STATIC} m)
-
- add_executable(qvoronoi ${qvoronoi_SOURCES})
--target_link_libraries(qvoronoi ${qhull_STATIC})
-+target_link_libraries(qvoronoi ${qhull_STATIC} m)
-
- add_executable(qhalf ${qhalf_SOURCES})
--target_link_libraries(qhalf ${qhull_STATIC})
-+target_link_libraries(qhalf ${qhull_STATIC} m)
+ # ---------------------------------------
+@@ -520,32 +509,32 @@ endif()
+
+ if(${LINK_APPS_SHARED})
+ add_executable(qconvex src/qconvex/qconvex_r.c)
+- target_link_libraries(qconvex ${qhull_SHAREDR})
++ target_link_libraries(qconvex ${qhull_SHAREDR} m)
+ set_target_properties(qconvex PROPERTIES
+ COMPILE_DEFINITIONS "${qconvex_DEFINES}")
+
+ add_executable(qdelaunay src/qdelaunay/qdelaun_r.c)
+- target_link_libraries(qdelaunay ${qhull_SHAREDR})
++ target_link_libraries(qdelaunay ${qhull_SHAREDR} m)
+ set_target_properties(qdelaunay PROPERTIES
+ COMPILE_DEFINITIONS "${qdelaunay_DEFINES}")
+
+ add_executable(qhalf src/qhalf/qhalf_r.c)
+- target_link_libraries(qhalf ${qhull_SHAREDR})
++ target_link_libraries(qhalf ${qhull_SHAREDR} m)
+ set_target_properties(qhalf PROPERTIES
+ COMPILE_DEFINITIONS "${qhalf_DEFINES}")
+
+ add_executable(qhull src/qhull/unix_r.c)
+- target_link_libraries(qhull ${qhull_SHAREDR})
++ target_link_libraries(qhull ${qhull_SHAREDR} m)
+ set_target_properties(qhull PROPERTIES
+ COMPILE_DEFINITIONS "${qhull_DEFINES}")
+
+ add_executable(qvoronoi src/qvoronoi/qvoronoi_r.c)
+- target_link_libraries(qvoronoi ${qhull_SHAREDR})
++ target_link_libraries(qvoronoi ${qhull_SHAREDR} m)
+ set_target_properties(qvoronoi PROPERTIES
+ COMPILE_DEFINITIONS "${qvoronoi_DEFINES}")
+
+ add_executable(rbox src/rbox/rbox_r.c)
+- target_link_libraries(rbox ${qhull_SHAREDR})
++ target_link_libraries(rbox ${qhull_SHAREDR} m)
+ set_target_properties(rbox PROPERTIES
+ COMPILE_DEFINITIONS "${rbox_DEFINES}")
+ else()
+@@ -554,22 +543,22 @@ else()
+ endif()
+
+ add_executable(qconvex src/qconvex/qconvex.c)
+- target_link_libraries(qconvex ${qhull_STATIC})
++ target_link_libraries(qconvex ${qhull_STATIC} m)
+
+ add_executable(qdelaunay src/qdelaunay/qdelaun.c)
+- target_link_libraries(qdelaunay ${qhull_STATIC})
++ target_link_libraries(qdelaunay ${qhull_STATIC} m)
+
+ add_executable(qhalf src/qhalf/qhalf.c)
+- target_link_libraries(qhalf ${qhull_STATIC})
++ target_link_libraries(qhalf ${qhull_STATIC} m)
+
+ add_executable(qhull src/qhull/unix_r.c)
+- target_link_libraries(qhull ${qhull_STATICR})
++ target_link_libraries(qhull ${qhull_STATICR} m)
+
+ add_executable(qvoronoi src/qvoronoi/qvoronoi.c)
+- target_link_libraries(qvoronoi ${qhull_STATIC})
++ target_link_libraries(qvoronoi ${qhull_STATIC} m)
+
+ add_executable(rbox src/rbox/rbox.c)
+- target_link_libraries(rbox ${qhull_STATIC})
++ target_link_libraries(rbox ${qhull_STATIC} m)
+ endif()
+
+ # #@# 20
+@@ -588,11 +577,11 @@ add_executable(testqset_r ${testqsetr_SO
+ add_executable(user_eg src/user_eg/user_eg_r.c)
+
+ if(${BUILD_SHARED_LIBS})
+- target_link_libraries(user_eg ${qhull_SHAREDR})
++ target_link_libraries(user_eg ${qhull_SHAREDR} m)
+ set_target_properties(user_eg PROPERTIES
+ COMPILE_DEFINITIONS "${user_eg_DEFINES}")
+ else()
+- target_link_libraries(user_eg ${qhull_STATICR})
++ target_link_libraries(user_eg ${qhull_STATICR} m)
+ endif()
# ---------------------------------------
- # Define options for linking to qhull_SHAREDR or qhull_SHARED
-@@ -527,7 +516,7 @@
+@@ -602,9 +591,9 @@ endif()
+ add_executable(user_eg2 src/user_eg2/user_eg2_r.c)
- add_executable(user_eg ${user_eg_SOURCES})
- # user_eg may be linked to qhull_STATICR if user_eg_DEFINES is removed
--target_link_libraries(user_eg ${qhull_SHAREDR})
-+target_link_libraries(user_eg ${qhull_SHAREDR} m)
- set_target_properties(user_eg PROPERTIES
- COMPILE_DEFINITIONS "${user_eg_DEFINES}")
+ if(${BUILD_STATIC_LIBS})
+- target_link_libraries(user_eg2 ${qhull_STATICR})
++ target_link_libraries(user_eg2 ${qhull_STATICR} m)
+ else()
+- target_link_libraries(user_eg2 ${qhull_SHAREDR})
++ target_link_libraries(user_eg2 ${qhull_SHAREDR} m)
+ set_target_properties(user_eg2 PROPERTIES
+ COMPILE_DEFINITIONS "${user_eg2_DEFINES}")
+ endif()
+@@ -619,7 +608,7 @@ endif()
+ if(${BUILD_STATIC_LIBS})
+ add_executable(user_eg3 src/user_eg3/user_eg3_r.cpp)
+ # qhull_STATICR must be last, otherwise qh_fprintf,etc. are not loaded from qhull_CPP
+- target_link_libraries(user_eg3 ${qhull_CPP} ${qhull_STATICR})
++ target_link_libraries(user_eg3 ${qhull_CPP_STATIC} ${qhull_STATICR} m)
+ endif()
-@@ -539,7 +528,7 @@
+ # ---------------------------------------
+@@ -628,7 +617,7 @@ endif()
+ # ---------------------------------------
- add_executable(user_eg2 ${user_eg2_SOURCES})
- # user_eg2 may be linked to qhull_SHAREDR if user_eg2_DEFINES is added
--target_link_libraries(user_eg2 ${qhull_STATICR})
-+target_link_libraries(user_eg2 ${qhull_STATICR} m)
+ add_executable(qhullp EXCLUDE_FROM_ALL src/qhull/unix.c)
+-target_link_libraries(qhullp ${qhull_SHAREDP})
++target_link_libraries(qhullp ${qhull_SHAREDP} m)
+ set_target_properties(qhullp PROPERTIES
+ COMPILE_DEFINITIONS "${qhullp_DEFINES}")
+@@ -638,7 +627,7 @@ set_target_properties(qhullp PROPERTIES
# ---------------------------------------
- # Define user_eg3 linked to qhullstatic_r and qhullcpp static library
-@@ -552,7 +541,7 @@
- add_executable(user_eg3 ${user_eg3_SOURCES})
- # qhull_STATICR must be last, otherwise qh_fprintf,etc. are not loaded from qhull_CPP
- # user_eg3 may be linked to qhull_SHAREDR if user_eg3_DEFINES is added
--target_link_libraries(user_eg3 ${qhull_CPP} ${qhull_STATICR})
-+target_link_libraries(user_eg3 ${qhull_CPP_STATIC} ${qhull_STATICR} m)
- # ---------------------------------------
- # qhullp is qhull/unix.c linked to deprecated qh_QHpointer libqhull_p
-@@ -630,7 +630,7 @@
+ add_executable(user_egp EXCLUDE_FROM_ALL src/user_eg/user_eg.c)
+-target_link_libraries(user_egp ${qhull_SHAREDP})
++target_link_libraries(user_egp ${qhull_SHAREDP} m)
+ set_target_properties(user_egp PROPERTIES
+ COMPILE_DEFINITIONS "${user_egp_DEFINES}")
+
+@@ -709,7 +698,7 @@ configure_file(${PROJECT_SOURCE_DIR}/bui
@ONLY
)
@@ -143,3 +219,13 @@
install(EXPORT QhullTargets
FILE
QhullTargets.cmake
+@@ -732,7 +721,8 @@ set(PkgConfigLocation lib/pkgconfig)
+ foreach(pkgconfig IN ITEMS "${qhull_SHAREDR};Qhull reentrant shared library"
+ "${qhull_STATIC};Qhull static library"
+ "${qhull_STATICR};Qhull reentrant static library"
+- "${qhull_CPP};Qhull C++ library")
++ "${qhull_CPP_SHARED};Qhull C++ shared library"
++ "${qhull_CPP_STATIC};Qhull C++ static library")
+ list(GET pkgconfig 0 LIBRARY_NAME)
+ if(LIBRARY_NAME STREQUAL "libqhull")
+ set(LIBRARY_NAME "qhull")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qhull.git/commitdiff/12f79189744e8702ab62b9908f1abfa9f8977c34
More information about the pld-cvs-commit
mailing list