diff options
Diffstat (limited to 'media-libs/qhull')
| -rw-r--r-- | media-libs/qhull/Manifest | 7 | ||||
| -rw-r--r-- | media-libs/qhull/files/qhull-2020.2.8.1_alpha4-update-version-alpha3.patch | 55 | ||||
| -rw-r--r-- | media-libs/qhull/metadata.xml | 3 | ||||
| -rw-r--r-- | media-libs/qhull/qhull-2020.2-r3.ebuild | 6 | ||||
| -rw-r--r-- | media-libs/qhull/qhull-2020.2.8.1_alpha4.ebuild | 77 |
5 files changed, 143 insertions, 5 deletions
diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest index bf24a042995b..be52d4dba736 100644 --- a/media-libs/qhull/Manifest +++ b/media-libs/qhull/Manifest @@ -1,4 +1,7 @@ AUX qhull-2020.2-deprecated-pkgconfig.patch 473 BLAKE2B 5fbc2b1b9a4cd5a6c5cff46484b943b36de2f327c051b9badc32c952373b7f250eb751b46c8884e1dcd1c23b4bd2c50e4d5b1af7129ee477e1e75aab55d1f7be SHA512 a688943f6e0210ef170cfe9a8b3f186460bd2654c30cd0b0ca30b71f3245189be76dfa3648fcb9cbfe8daee27e11bec23a7a6016abf0213f0ce418f1fb3c5654 +AUX qhull-2020.2.8.1_alpha4-update-version-alpha3.patch 2469 BLAKE2B 03b3695a3114b6130f1f1b74b6ab20bbf5ce5bca289cd9448fa5e948ba512e7624d0df06d8ab3a88caae304418eb47f3b4095449ac30b187aac8d3b1be118e30 SHA512 f13e7d4c6b9e63151cd2025758d1c9b0525615fa5ba47c82df10feddd74fe2169e517abb92e5822e2bdebd3cbbb158e30c7f3ea20079a497e5b41c33459d2377 DIST qhull-2020.2.tar.gz 1307213 BLAKE2B db11d4b83124da3ceed95e1eb81c280ac55c871c83acd4c371f9716b57a1777105891a073282789c7a80b5d74e85164996fbe4f2140c8371bca5926eab4adbc2 SHA512 88f50c2a968f56deec61772490617cc877b0ca2d804954ade08297b9bab826076db6b960d6f1feb21c6851e5328cb11c6dd565666517fa78a3d65b901848ff36 -EBUILD qhull-2020.2-r3.ebuild 1570 BLAKE2B ea7f7eb4ecc13e73309f9b6e1cc72e511cef1bce8765efff83baaddca075c7e8b3782937f26619c4e723989209d906c8c21d23cecbb52f77633f8453cc8ed0ab SHA512 e44d6276533ba22871270010c11f692f6cfe40d8760d9d84c462cd87361c169a57e1edda8fc2293583e39dcd3b4ba24532c2fd500f252daa3c24cae3693ab69b -MISC metadata.xml 1095 BLAKE2B 49dc96f8c6bf1b318b263cdc5f9d8e981cbed127dcf4c0dd485d98676665127c89600db3f6e177463529db183d95c117e31210c2270e19dcecc62d4d380fbe6a SHA512 a220f6870bf5d73f761b9b97ec51285c37ec77d5917aacc73cb43719f378c6045b27e772f12336e353238ffbcf3e30a7fe7b6f9c8b5d934b0a385a0d33712d51 +DIST qhull-8.1_alpha4.tar.gz 1310396 BLAKE2B 40cc44440e5ce5a02a227c5674624858d312295a77e00eab53af299b25a8d26a83711fa79959f0e2458cb389844b1c12b95fcdf289ffe8a4c15bb284d9e2452c SHA512 96f2c395e7259f7698f54a7d6c0e0101a8d5d2fc739de3634aa320890cd77cad716305ddf5802c7032b3e9b0b3ef18cd4ecc27ebb6a9a1ad0b308ddf6a0ceacb +EBUILD qhull-2020.2-r3.ebuild 1579 BLAKE2B cb534534333bb53eafc9c15e5645206ed4506e723233f494df9f8baa7b0fcc274682619e27a18cabee1b5811d01272151b1fb10ef1ce003222a46ab0d5b70340 SHA512 0b2a5aa98388e58056d20db76c0b18a5bd14cd3cfc84fb4c4ddfa8d00e643e53e90f09f27a74f817e03f7556ed550ac8c23c0f957953c77c34828ce3eb48adf4 +EBUILD qhull-2020.2.8.1_alpha4.ebuild 1920 BLAKE2B b0f99e4019c53a6d80dee62cca9ed9ef90e12c5928bfc1fa60b5c5c74eac322160cbedc0447ebebbeb9bce889c4321f7738a7ee29be7231843b4230332a7ca24 SHA512 9a594d366c4b75139d303d587a02f00366eedcc40d7a1bb775c5d32cec9cc1a4a6b7a1fa7028764d2ea18d1cb85319b5688ae40771aa0b766a4a52a8bbf343b3 +MISC metadata.xml 1157 BLAKE2B 5985f0c62f9b6df079502539814814adbe6a12d8e3e49f383ee2c9af64ea61bab893e64bec1ee6bbc61b93830e69712683cbebd36ba1032e3599244784566bcb SHA512 b0bc63590dab379285e53dc45ea3c9107b93342e0308b716898ffa4fe3aa431b3bc7f2bee80e769064e9941a520ac320754594ead95bb8b57efd944267a1fa87 diff --git a/media-libs/qhull/files/qhull-2020.2.8.1_alpha4-update-version-alpha3.patch b/media-libs/qhull/files/qhull-2020.2.8.1_alpha4-update-version-alpha3.patch new file mode 100644 index 000000000000..0d649bcb27ee --- /dev/null +++ b/media-libs/qhull/files/qhull-2020.2.8.1_alpha4-update-version-alpha3.patch @@ -0,0 +1,55 @@ +From de434688d500204b979c0bcc6703a9cfb589c9a9 Mon Sep 17 00:00:00 2001 +From: Paul Zander <negril.nx@gmail.com> +Date: Tue, 8 Apr 2025 17:48:40 +0200 +Subject: [PATCH] update version alpha3 + +Signed-off-by: Paul Zander <negril.nx@gmail.com> + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bd556a0..1690b96 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -74,8 +74,8 @@ project(qhull) + # Define qhull_VERSION in README.txt, Announce.txt, qh-get.htm, CMakeLists.txt + # qhull-zip.sh (twice), qhull-wiki.md, qhull-news.htm, File_id.diz, index.htm + # qhull-warn.pri (VERSION), qhull-exports.def (VERSION), qhull_p-exports.def, qhull_r-exports.def +-set(qhull_VERSION2 "2020.2 2023/01/02") # not used, See global.c, global_r.c, rbox.c, rbox_r.c +-set(qhull_VERSION "8.1-alpha3") # Advance every release ++set(qhull_VERSION2 "2020.2 2024/07/22") # not used, See global.c, global_r.c, rbox.c, rbox_r.c ++set(qhull_VERSION "8.1-alpha4") # Advance every release + + # SOVERSION -- qhull 2003 = empty, 2009 = 5, 2010-2012 = 6, 2015-2019 = 7, 2020 = 8.0 + # Increase SOVERSION if ABI breaks (abi-compliance-checker) +diff --git a/src/libqhull/global.c b/src/libqhull/global.c +index a3ded46..fef32f4 100644 +--- a/src/libqhull/global.c ++++ b/src/libqhull/global.c +@@ -47,8 +47,8 @@ qhT qh_qh; /* all global variables. + recompile user_eg.c, rbox.c, libqhull.c, qconvex.c, qdelaun.c qvoronoi.c, qhalf.c, testqset.c + */ + +-const char qh_version[]= "2020.2 2023/01/02"; +-const char qh_version2[]= "qhull 8.1-alpha3 (2020.2 2023/01/02)"; ++const char qh_version[]= "2020.2 2024/07/22"; ++const char qh_version2[]= "qhull 8.1-alpha4 (2020.2 2024/07/22)"; + + /*-<a href="qh-globa.htm#TOC" + >-------------------------------</a><a name="appendprint">-</a> +diff --git a/src/libqhull_r/global_r.c b/src/libqhull_r/global_r.c +index 3a5c7c7..889585a 100644 +--- a/src/libqhull_r/global_r.c ++++ b/src/libqhull_r/global_r.c +@@ -39,8 +39,8 @@ + recompile user_eg_r.c, rbox_r.c, libqhull_r.c, qconvex_r.c, qdelaun_r.c qvoronoi_r.c, qhalf_r.c, testqset_r.c + */ + +-const char qh_version[]= "2020.2.r 2023/01/02"; +-const char qh_version2[]= "qhull_r 8.1-alpha3 (2020.2.r 2023/01/02)"; ++const char qh_version[]= "2020.2.r 2024/07/22"; ++const char qh_version2[]= "qhull_r 8.1-alpha4 (2020.2.r 2024/07/22)"; + + /*-<a href="qh-globa_r.htm#TOC" + >-------------------------------</a><a name="appendprint">-</a> +-- +2.49.0 + diff --git a/media-libs/qhull/metadata.xml b/media-libs/qhull/metadata.xml index 9d2dbef1b22d..4df0f33aebb3 100644 --- a/media-libs/qhull/metadata.xml +++ b/media-libs/qhull/metadata.xml @@ -21,4 +21,7 @@ <bugs-to>https://github.com/qhull/qhull/issues</bugs-to> <remote-id type="github">qhull/qhull</remote-id> </upstream> + <use> + <flag name="tools">Build applications</flag> + </use> </pkgmetadata> diff --git a/media-libs/qhull/qhull-2020.2-r3.ebuild b/media-libs/qhull/qhull-2020.2-r3.ebuild index 3461992646dd..de63f451771b 100644 --- a/media-libs/qhull/qhull-2020.2-r3.ebuild +++ b/media-libs/qhull/qhull-2020.2-r3.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake +inherit cmake multilib DESCRIPTION="Geometry library" HOMEPAGE="http://www.qhull.org" SRC_URI="https://github.com/qhull/qhull/archive/${PV}.tar.gz -> ${P}.tar.gz" -SLOT="0/8" LICENSE="BSD" +SLOT="0/8" KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos" IUSE="doc static-libs" diff --git a/media-libs/qhull/qhull-2020.2.8.1_alpha4.ebuild b/media-libs/qhull/qhull-2020.2.8.1_alpha4.ebuild new file mode 100644 index 000000000000..0e82b669ed30 --- /dev/null +++ b/media-libs/qhull/qhull-2020.2.8.1_alpha4.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Geometry library" +HOMEPAGE="http://www.qhull.org" +MY_PV="$(ver_cut 3-)" +SRC_URI="https://github.com/qhull/qhull/archive/v${MY_PV/_/.}.tar.gz -> ${PN}-${MY_PV}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV//_/.}" + +LICENSE="BSD" +SLOT="0/$(ver_cut 1-2 "${MY_PV}")" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos" +IUSE="doc static-libs tools test" +RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( tools )" + +DOCS=( + Announce.txt + File_id.diz + README.txt + REGISTER.txt +) + +PATCHES=( + "${FILESDIR}/${PN}-2020.2-deprecated-pkgconfig.patch" + "${FILESDIR}/${PF}-update-version-alpha3.patch" # version string wasn't bumped in in alpha4 +) + +src_prepare() { + if ! use doc ; then + sed -i \ + -e '/^install(DIRECTORY html/d' \ + -e '/^[[:blank:]]*index.htm/d' \ + CMakeLists.txt || die + fi + + sed -i \ + -e "s@lib/pkgconfig@$(get_libdir)/pkgconfig@" \ + -e "s@lib/cmake/Qhull@$(get_libdir)/cmake/Qhull@" \ + CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + # cmake-4 workaround + local -x CMAKE_POLICY_VERSION_MINIMUM="${CMAKE_POLICY_VERSION_MINIMUM:-3.10}" + + local mycmakeargs=( + -DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${PF}" + -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" + -DLINK_APPS_SHARED="yes" + + -DBUILD_APPLICATIONS="$(usex tools)" + -DBUILD_STATIC_LIBS="$(usex static-libs)" + -DQHULL_ENABLE_TESTING="$(usex test)" + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + # fix double prefix in pc files + sed -i "/^libdir/s@/.*@/$(get_libdir)@" "${ED}/usr/$(get_libdir)/pkgconfig/"*.pc || die + + rm "${ED}/usr/$(get_libdir)/pkgconfig/qhull.pc" || die + + if ! use static-libs; then + rm "${ED}/usr/$(get_libdir)/pkgconfig/qhull"{static,static_r,cpp}.pc || die + fi +} |