diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-02-13 21:41:11 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-02-13 21:41:11 +0000 |
| commit | c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch) | |
| tree | c44943ee0563a3fa957716de909fed683117fcb9 /media-libs/qhull | |
| parent | 69051588e2f955485fe5d45d45e616bc60a2de57 (diff) | |
gentoo (valentine's day) resync : 14.02.2021
Diffstat (limited to 'media-libs/qhull')
| -rw-r--r-- | media-libs/qhull/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/qhull/files/qhull-2020.2-deprecated-pkgconfig.patch | 8 | ||||
| -rw-r--r-- | media-libs/qhull/qhull-2020.2-r3.ebuild (renamed from media-libs/qhull/qhull-2020.2-r2.ebuild) | 26 |
3 files changed, 31 insertions, 6 deletions
diff --git a/media-libs/qhull/Manifest b/media-libs/qhull/Manifest index 139d9b28499f..55b81c8b3ef1 100644 --- a/media-libs/qhull/Manifest +++ b/media-libs/qhull/Manifest @@ -1,6 +1,7 @@ AUX qhull-2012.1-64bit.patch 1509 BLAKE2B d5f50bfb5229109f13ac88f46eff36d130830339c43265981b00a8e5defaf3229cd50870e379e13a2726312efd8a15e99a2683c3b3a9b1eb9bf1503b7f6b1fbe SHA512 e23c7bb4d6fb64a77647980e045b36df4f596eb64a32b27d7d6462cb2f5f7a35e0fa9985e885ed58222ec1741b2a2d1806bba155f1042bd470dcd5c721ac48c5 +AUX qhull-2020.2-deprecated-pkgconfig.patch 473 BLAKE2B 5fbc2b1b9a4cd5a6c5cff46484b943b36de2f327c051b9badc32c952373b7f250eb751b46c8884e1dcd1c23b4bd2c50e4d5b1af7129ee477e1e75aab55d1f7be SHA512 a688943f6e0210ef170cfe9a8b3f186460bd2654c30cd0b0ca30b71f3245189be76dfa3648fcb9cbfe8daee27e11bec23a7a6016abf0213f0ce418f1fb3c5654 DIST qhull-2015.2.tar.gz 1010153 BLAKE2B 854d1897ad5a92b2e13f6b2304d707b21023a47d60fcc7065b487c24dad06fa016536311e224155b879ad699c046f15991a840f5f04283ffdeef8a68dfbf7c15 SHA512 a544f88b5fbabc592fdc4c5533ba58a8f856e018b85128f43d0532a1143123ceb0d5ca9ae1d27722efa5d08092c017bf7715c157d1019f447e6746f23f02dcd4 DIST qhull-2020.2.tar.gz 1307213 BLAKE2B db11d4b83124da3ceed95e1eb81c280ac55c871c83acd4c371f9716b57a1777105891a073282789c7a80b5d74e85164996fbe4f2140c8371bca5926eab4adbc2 SHA512 88f50c2a968f56deec61772490617cc877b0ca2d804954ade08297b9bab826076db6b960d6f1feb21c6851e5328cb11c6dd565666517fa78a3d65b901848ff36 EBUILD qhull-2015.2.ebuild 1021 BLAKE2B c123f9b2fbf062da2aedd57bda3610dd13a48d772944082a5f56dcb2b9337ddc9a824587240ee52e237d990182ffa7a1d255534ee7c1e692ddecae5001e8c3c0 SHA512 bb1fae2412eb9359ae384019ab0388b951f0a3cd97ae9e7520a219fe41c417828edc30f2d8fb519b10e994f5ed199eb6d94dee89db65207274302351cb9af8de -EBUILD qhull-2020.2-r2.ebuild 993 BLAKE2B 4ed1de690460bd343503f1086b5e624f61a882d839d4f9dcd114bb74032e464dbbbbee150ed0759807bdd6eca8f264faef9efc85115bf727527400ad5948fe34 SHA512 8c20dc26b55b436409857a2d992d432de5045917171c72ef0659104a274db78c32407ee4362596f38d9e8fa1e6889f599ed3bbf01f697c2bbde4b81858d7e0eb +EBUILD qhull-2020.2-r3.ebuild 1494 BLAKE2B 9c5e2a9725f73662bf65582703e287a730a2fa297a4e09a1805b8edcdf0f06e3830f24d31c8e9771c3dbd07672a2103c76e2bc43d5003c8cb5735de5b628c6e2 SHA512 fc8e794675a2c5c513956ef39e60747f996f4f7018f82962e7434f1df45cc29e3a5c243aa5dfa8306110a7aef948a71bd0cb056cbe20e83944ba872ba2ee709a MISC metadata.xml 1094 BLAKE2B 9667f9f89fc9717129401070888401f0db493c01e4fe73eb8168efae9c1c2d7f1a7aa234fe72f3beea7feb385dc920418a6affe4d99679736cc6a1aef212e4eb SHA512 b1e13904fe69b4535806a871cdda79fadbf294c30654fe119e7e3be0ed481dc926a9dfaffd75c2849e3eb91ebad671a6b7eca293b40a249c8ccbee6264cfdaf9 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 000000000000..c83a807e2888 --- /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 index 1c60a003a251..59f96d53709c 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 } |