* [gentoo-commits] repo/gentoo:master commit in: media-libs/qhull/, media-libs/qhull/files/
@ 2018-07-16 22:26 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-07-16 22:26 UTC (permalink / raw
To: gentoo-commits
commit: f6ce89541c522298b585d8096b4d0cd8b744f15e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 16 21:16:55 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 16 22:25:56 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6ce8954
media-libs/qhull: Drop old, EAPI5--
Package-Manager: Portage-2.3.43, Repoman-2.3.10
media-libs/qhull/Manifest | 1 -
.../qhull/files/qhull-2012.1-format-security.patch | 16 -------
media-libs/qhull/qhull-2012.1-r4.ebuild | 52 ----------------------
3 files changed, 69 deletions(-)
diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
index db5f8317167..92eb25e0562 100644
--- a/media-libs/qhull/Manifest
+++ b/media-libs/qhull/Manifest
@@ -1,2 +1 @@
-DIST qhull-2012.1-src.tgz 716665 BLAKE2B b704b87ac36be3d22ab45bce1ec3bf06ed0a3786f6294e6d07af3ead6e313c947a601edccdc03c96512daaf9dead147c024d8c0963c8f3d6125c3c99b41dbfc5 SHA512 e35ea2cb73ef32b23b64a6594a8b5ea22ed8e2ea7535cfd72dca44331602368dfcb681600a0d2b090e80e67e6be7b32272244b9083d4805f2fbcf5897eb73240
DIST qhull-2015.2.tar.gz 1010153 BLAKE2B 854d1897ad5a92b2e13f6b2304d707b21023a47d60fcc7065b487c24dad06fa016536311e224155b879ad699c046f15991a840f5f04283ffdeef8a68dfbf7c15 SHA512 a544f88b5fbabc592fdc4c5533ba58a8f856e018b85128f43d0532a1143123ceb0d5ca9ae1d27722efa5d08092c017bf7715c157d1019f447e6746f23f02dcd4
diff --git a/media-libs/qhull/files/qhull-2012.1-format-security.patch b/media-libs/qhull/files/qhull-2012.1-format-security.patch
deleted file mode 100644
index 14bce2baa75..00000000000
--- a/media-libs/qhull/files/qhull-2012.1-format-security.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- src/libqhull/io.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libqhull/io.c b/src/libqhull/io.c
-index 09a0079..2bd066e 100644
---- a/src/libqhull/io.c
-+++ b/src/libqhull/io.c
-@@ -2238,7 +2238,7 @@ void qh_printfacet3math(FILE *fp, facetT *facet, qh_PRINT format, int notfirst)
- qh_memfree(point, qh normal_size);
- qh_settempfree(&points);
- qh_settempfree(&vertices);
-- qh_fprintf(fp, 9110, endfmt);
-+ fprintf(fp, "%s", endfmt);
- } /* printfacet3math */
-
-
diff --git a/media-libs/qhull/qhull-2012.1-r4.ebuild b/media-libs/qhull/qhull-2012.1-r4.ebuild
deleted file mode 100644
index 64bfebe065b..00000000000
--- a/media-libs/qhull/qhull-2012.1-r4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils flag-o-matic
-
-MY_P="${PN}${PV}"
-
-DESCRIPTION="Geometry library"
-HOMEPAGE="http://www.qhull.org/"
-SRC_URI="${HOMEPAGE}/download/${P}-src.tgz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc static-libs"
-
-DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )
-
-PATCHES=(
- "${FILESDIR}"/${P}-64bit.patch
- "${FILESDIR}"/${P}-format-security.patch
- )
-
-src_configure() {
- append-flags -fno-strict-aliasing
- mycmakeargs+=(
- -DLIB_INSTALL_DIR="${EPREFIX}"/usr/$(get_libdir)
- -DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}/html
- )
- cmake-utils_src_configure
-}
-
-pkg_preinst() {
- # See https://bugs.gentoo.org/show_bug.cgi?id=435006
- # If qhull-2010 is installed we need to remove its include dir so
- # that it can be replaced with a symlink in this version.
- rm -rf "${EROOT}"usr/include/qhull || die
-}
-
-src_install() {
- cmake-utils_src_install
- # compatibility with previous installs
- dosym libqhull /usr/include/qhull
- if ! use doc; then
- rm -rf "${ED}"/usr/share/doc/${PF}/html || die
- fi
- if ! use static-libs; then
- rm -f "${ED}"/usr/$(get_libdir)/lib*.a || die
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/qhull/, media-libs/qhull/files/
@ 2021-02-05 2:06 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-02-05 2:06 UTC (permalink / raw
To: gentoo-commits
commit: 02bc620cff189e56e3363a93d22a729e23387720
Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Fri Jan 8 20:55:59 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 5 02:06:42 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02bc620c
media-libs/qhull: re-add static-libs + various fixes
CMakeLists.txt claims some libraries are intended to be static-only
and so weren't installed.
Shared:
- libqhull.so (deprecated, but needed by matplotlib)
- libqhull_r.so
Static-only:
- libqhullcpp.a (needed by at least prusaslicer)
- libqhullstatic.a
- libqhullstatic_r.a
Also:
- install missing deprecated qhull.pc
- install cmake/pc files in right libdir
- fix double prefix in pc files
Bug: https://bugs.gentoo.org/764338
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/qhull-2020.2-deprecated-pkgconfig.patch | 8 +++++++
...ull-2020.2-r2.ebuild => qhull-2020.2-r3.ebuild} | 26 +++++++++++++++++-----
2 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/media-libs/qhull/files/qhull-2020.2-deprecated-pkgconfig.patch b/media-libs/qhull/files/qhull-2020.2-deprecated-pkgconfig.patch
new file mode 100644
index 00000000000..c83a807e288
--- /dev/null
+++ b/media-libs/qhull/files/qhull-2020.2-deprecated-pkgconfig.patch
@@ -0,0 +1,8 @@
+--- a/CMakeLists.txt 2020-09-03 22:33:16.000000000 -0400
++++ b/CMakeLists.txt 2021-01-08 14:38:26.299273173 -0500
+@@ -731,4 +731,5 @@
+ set(PkgConfigLocation lib/pkgconfig)
+ foreach(pkgconfig IN ITEMS "${qhull_SHAREDR};Qhull reentrant shared library"
++ "${qhull_SHARED};Qhull deprecated shared library"
+ "${qhull_STATIC};Qhull static library"
+ "${qhull_STATICR};Qhull reentrant static library"
diff --git a/media-libs/qhull/qhull-2020.2-r2.ebuild b/media-libs/qhull/qhull-2020.2-r3.ebuild
similarity index 57%
rename from media-libs/qhull/qhull-2020.2-r2.ebuild
rename to media-libs/qhull/qhull-2020.2-r3.ebuild
index 1c60a003a25..59f96d53709 100644
--- a/media-libs/qhull/qhull-2020.2-r2.ebuild
+++ b/media-libs/qhull/qhull-2020.2-r3.ebuild
@@ -12,10 +12,14 @@ SRC_URI="https://github.com/qhull/qhull/archive/${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0/8"
LICENSE="BSD"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc"
+IUSE="doc static-libs"
DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )
+PATCHES=(
+ "${FILESDIR}/${PN}-2020.2-deprecated-pkgconfig.patch"
+)
+
src_prepare() {
if ! use doc ; then
sed -i \
@@ -24,14 +28,19 @@ src_prepare() {
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() {
local mycmakeargs=(
- -DBUILD_STATIC_LIBS=OFF
+ -DBUILD_STATIC_LIBS=$(usex static-libs)
-DLINK_APPS_SHARED=ON
- -DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+ -DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${PF}"
-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
)
@@ -39,11 +48,18 @@ src_configure() {
}
src_compile() {
- cmake_src_compile
- cmake_src_compile libqhull
+ cmake_src_compile all libqhull
}
src_install() {
cmake_src_install
dolib.so "${BUILD_DIR}"/libqhull.so*
+
+ # fix double prefix in pc files
+ sed -i "/^libdir/s@/.*@/$(get_libdir)@" "${ED}/usr/$(get_libdir)/pkgconfig/"*.pc || die
+
+ if ! use static-libs; then
+ rm "${ED}/usr/$(get_libdir)/pkgconfig/qhull"{static,static_r,cpp}.pc || die
+ rm -r "${ED}/usr/include/libqhullcpp" || die
+ fi
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/qhull/, media-libs/qhull/files/
@ 2025-09-30 20:22 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2025-09-30 20:22 UTC (permalink / raw
To: gentoo-commits
commit: 113d0aa51f79322cdfec812dc1df48e1837c3936
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Tue Sep 30 12:16:24 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 30 20:22:10 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=113d0aa5
media-libs/qhull: add 2020.2.8.1_alpha6
Bug: https://bugs.gentoo.org/953015
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/qhull/Manifest | 1 +
...l-2020.2.8.1_alpha6-update-version-alpha3.patch | 55 ++++++++++++++++
media-libs/qhull/qhull-2020.2.8.1_alpha6.ebuild | 75 ++++++++++++++++++++++
3 files changed, 131 insertions(+)
diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
index 62bc98974dae..861719666432 100644
--- a/media-libs/qhull/Manifest
+++ b/media-libs/qhull/Manifest
@@ -1,2 +1,3 @@
DIST qhull-2020.2.tar.gz 1307213 BLAKE2B db11d4b83124da3ceed95e1eb81c280ac55c871c83acd4c371f9716b57a1777105891a073282789c7a80b5d74e85164996fbe4f2140c8371bca5926eab4adbc2 SHA512 88f50c2a968f56deec61772490617cc877b0ca2d804954ade08297b9bab826076db6b960d6f1feb21c6851e5328cb11c6dd565666517fa78a3d65b901848ff36
DIST qhull-8.1_alpha4.tar.gz 1310396 BLAKE2B 40cc44440e5ce5a02a227c5674624858d312295a77e00eab53af299b25a8d26a83711fa79959f0e2458cb389844b1c12b95fcdf289ffe8a4c15bb284d9e2452c SHA512 96f2c395e7259f7698f54a7d6c0e0101a8d5d2fc739de3634aa320890cd77cad716305ddf5802c7032b3e9b0b3ef18cd4ecc27ebb6a9a1ad0b308ddf6a0ceacb
+DIST qhull-8.1_alpha6.tar.gz 1311804 BLAKE2B 8aee59b510bdbf620c99c44585696007392134aafb8e357fa5d0748aba5e09a4bbde63f31d7b9357505edd9ce1bc44bab2e472b8eb7449598528e9f2cdb0f53d SHA512 66131b46d24ba726bba28f55a9f45fd2c8166f018846d91111da4465c9940bf11b27c331e4a063e5bfe49f0606df04310bc31fb00461dafcd0c581accdc2aa4b
diff --git a/media-libs/qhull/files/qhull-2020.2.8.1_alpha6-update-version-alpha3.patch b/media-libs/qhull/files/qhull-2020.2.8.1_alpha6-update-version-alpha3.patch
new file mode 100644
index 000000000000..73d90fbbf097
--- /dev/null
+++ b/media-libs/qhull/files/qhull-2020.2.8.1_alpha6-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 2025/09/07") # not used, See global.c, global_r.c, rbox.c, rbox_r.c
++set(qhull_VERSION "8.1-alpha6") # 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 2025/09/07";
++const char qh_version2[]= "qhull 8.1-alpha6 (2020.2 2025/09/07)";
+
+ /*-<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 2025/09/07";
++const char qh_version2[]= "qhull_r 8.1-alpha6 (2020.2.r 2025/09/07)";
+
+ /*-<a href="qh-globa_r.htm#TOC"
+ >-------------------------------</a><a name="appendprint">-</a>
+--
+2.49.0
+
diff --git a/media-libs/qhull/qhull-2020.2.8.1_alpha6.ebuild b/media-libs/qhull/qhull-2020.2.8.1_alpha6.ebuild
new file mode 100644
index 000000000000..5f7521db6c58
--- /dev/null
+++ b/media-libs/qhull/qhull-2020.2.8.1_alpha6.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake dot-a
+
+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
+)
+
+src_prepare() {
+ if ! use doc ; then
+ sed -i \
+ -e '/^install(DIRECTORY html/d' \
+ -e '/^[[:blank:]]*index.htm/d' \
+ CMakeLists.txt || die
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ use static-libs && lto-guarantee-fat
+
+ local mycmakeargs=(
+ # NOTE undo CMakeLists.txt: "Define shared library for reentrant qhull (installed)" as it yields broken RPATH
+ -DCMAKE_INSTALL_NAME_DIR="${EPREFIX}/usr/$(get_libdir)"
+ -DCMAKE_INSTALL_RPATH="${EPREFIX}/usr/$(get_libdir)"
+ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH="no"
+ -DCMAKE_BUILD_WITH_INSTALL_RPATH="yes"
+
+ -DBUILD_APPLICATIONS="$(usex tools)"
+ -DBUILD_STATIC_LIBS="$(usex static-libs)"
+ -DQHULL_ENABLE_TESTING="$(usex test)"
+ -DLINK_APPS_SHARED="yes"
+ # -DLINK_APPS_SHARED="$(usex !static-libs)"
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ 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
+ else
+ strip-lto-bytecode "${ED}/usr/$(get_libdir)/libqhull"{static,static_r,cpp}.a
+ fi
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/qhull/, media-libs/qhull/files/
@ 2025-10-20 18:34 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2025-10-20 18:34 UTC (permalink / raw
To: gentoo-commits
commit: 07b9d9307760ac40657dc1453fe8d89a697d3898
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 20 15:58:10 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 20 18:34:34 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07b9d930
media-libs/qhull: drop 2020.2-r3, 2020.2.8.1_alpha4
Bug: https://bugs.gentoo.org/963618
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/qhull/Manifest | 2 -
...l-2020.2.8.1_alpha4-update-version-alpha3.patch | 55 ----------------
media-libs/qhull/qhull-2020.2-r3.ebuild | 65 ------------------
media-libs/qhull/qhull-2020.2.8.1_alpha4.ebuild | 77 ----------------------
4 files changed, 199 deletions(-)
diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest
index 861719666432..34eca3947a23 100644
--- a/media-libs/qhull/Manifest
+++ b/media-libs/qhull/Manifest
@@ -1,3 +1 @@
-DIST qhull-2020.2.tar.gz 1307213 BLAKE2B db11d4b83124da3ceed95e1eb81c280ac55c871c83acd4c371f9716b57a1777105891a073282789c7a80b5d74e85164996fbe4f2140c8371bca5926eab4adbc2 SHA512 88f50c2a968f56deec61772490617cc877b0ca2d804954ade08297b9bab826076db6b960d6f1feb21c6851e5328cb11c6dd565666517fa78a3d65b901848ff36
-DIST qhull-8.1_alpha4.tar.gz 1310396 BLAKE2B 40cc44440e5ce5a02a227c5674624858d312295a77e00eab53af299b25a8d26a83711fa79959f0e2458cb389844b1c12b95fcdf289ffe8a4c15bb284d9e2452c SHA512 96f2c395e7259f7698f54a7d6c0e0101a8d5d2fc739de3634aa320890cd77cad716305ddf5802c7032b3e9b0b3ef18cd4ecc27ebb6a9a1ad0b308ddf6a0ceacb
DIST qhull-8.1_alpha6.tar.gz 1311804 BLAKE2B 8aee59b510bdbf620c99c44585696007392134aafb8e357fa5d0748aba5e09a4bbde63f31d7b9357505edd9ce1bc44bab2e472b8eb7449598528e9f2cdb0f53d SHA512 66131b46d24ba726bba28f55a9f45fd2c8166f018846d91111da4465c9940bf11b27c331e4a063e5bfe49f0606df04310bc31fb00461dafcd0c581accdc2aa4b
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
deleted file mode 100644
index 0d649bcb27ee..000000000000
--- a/media-libs/qhull/files/qhull-2020.2.8.1_alpha4-update-version-alpha3.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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/qhull-2020.2-r3.ebuild b/media-libs/qhull/qhull-2020.2-r3.ebuild
deleted file mode 100644
index 5917691beb99..000000000000
--- a/media-libs/qhull/qhull-2020.2-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-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"
-
-DOCS=( Announce.txt File_id.diz README.txt REGISTER.txt )
-
-PATCHES=(
- "${FILESDIR}/${PN}-2020.2-deprecated-pkgconfig.patch"
-)
-
-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() {
- local mycmakeargs=(
- -DBUILD_STATIC_LIBS=$(usex static-libs)
- -DLINK_APPS_SHARED=ON
- -DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${PF}"
- -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
- )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile all libqhull
-}
-
-src_install() {
- cmake_src_install
- dolib.so "${BUILD_DIR}"/libqhull{$(get_libname),$(get_libname "*")}
-
- # fix double prefix in pc files
- sed -i "/^libdir/s@/.*@/$(get_libdir)@" "${ED}/usr/$(get_libdir)/pkgconfig/"*.pc || die
-
- if ! use static-libs; then
- rm "${ED}/usr/$(get_libdir)/pkgconfig/qhull"{static,static_r,cpp}.pc || die
- rm -r "${ED}/usr/include/libqhullcpp" || die
- fi
-}
diff --git a/media-libs/qhull/qhull-2020.2.8.1_alpha4.ebuild b/media-libs/qhull/qhull-2020.2.8.1_alpha4.ebuild
deleted file mode 100644
index 0e82b669ed30..000000000000
--- a/media-libs/qhull/qhull-2020.2.8.1_alpha4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-10-20 18:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-16 22:26 [gentoo-commits] repo/gentoo:master commit in: media-libs/qhull/, media-libs/qhull/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-02-05 2:06 Sam James
2025-09-30 20:22 Sam James
2025-10-20 18:34 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox