public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/fcl/
@ 2016-01-19 12:50 Alexis Ballier
  0 siblings, 0 replies; 7+ messages in thread
From: Alexis Ballier @ 2016-01-19 12:50 UTC (permalink / raw
  To: gentoo-commits

commit:     82aecb580395c02c8f5411906452a4f01684165b
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 12:50:19 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 12:50:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82aecb58

sci-libs/fcl: bump to 0.4.0

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 sci-libs/fcl/Manifest                              | 1 +
 sci-libs/fcl/{fcl-9999.ebuild => fcl-0.4.0.ebuild} | 5 -----
 sci-libs/fcl/fcl-9999.ebuild                       | 5 -----
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/sci-libs/fcl/Manifest b/sci-libs/fcl/Manifest
index d77d7e4..05f8612 100644
--- a/sci-libs/fcl/Manifest
+++ b/sci-libs/fcl/Manifest
@@ -1 +1,2 @@
 DIST fcl-0.3.2.tar.gz 5745349 SHA256 cf914f85b32cf8b63879907726df64e50da33f00d538759d789fe10fc5fbc95b SHA512 799c0f698c9d19ebd72c01b4bd51435feda1792462759249446ab968bf3b2b462537ce20135444c3e555da8564d0c93196f3f3448e2a4282afca710b67eaeb6e WHIRLPOOL 4d0694c7a27f117251709368542a5e7ed8ab3ec6e39e0400027f4409bf1b5cad3ff55c14ff529de19137c5dec6a4222799cc3bf0e1081c13105ea6dbc1e17c90
+DIST fcl-0.4.0.tar.gz 5762341 SHA256 1bea2cd5ee6034166d42860a6c5577f807c81f9f54d09dd680fb9bdf58d46747 SHA512 c565b4018a37449ce05b9189a97f2084a68caaa9247968fecdf933d8f5d87ed629d3fcb6ffccf928c4d339be1b70650b78706cc9d4a0c24864da529b25761684 WHIRLPOOL 2463490135ef16f29f608e68e2b2b0d86a7af59b54360275e73dae8d52aea3c7f9013e7a8be794a3fbb1981cf1470fe55866322aed188dd5c4bec0ba96512fa2

diff --git a/sci-libs/fcl/fcl-9999.ebuild b/sci-libs/fcl/fcl-0.4.0.ebuild
similarity index 87%
copy from sci-libs/fcl/fcl-9999.ebuild
copy to sci-libs/fcl/fcl-0.4.0.ebuild
index 227af31..064b54f 100644
--- a/sci-libs/fcl/fcl-9999.ebuild
+++ b/sci-libs/fcl/fcl-0.4.0.ebuild
@@ -34,11 +34,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_prepare() {
-	sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/g' \
-		-i src/CMakeLists.txt || die
-}
-
 src_configure() {
 	local mycmakeargs=(
 		"-DFCL_USE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)"

diff --git a/sci-libs/fcl/fcl-9999.ebuild b/sci-libs/fcl/fcl-9999.ebuild
index 227af31..064b54f 100644
--- a/sci-libs/fcl/fcl-9999.ebuild
+++ b/sci-libs/fcl/fcl-9999.ebuild
@@ -34,11 +34,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_prepare() {
-	sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/g' \
-		-i src/CMakeLists.txt || die
-}
-
 src_configure() {
 	local mycmakeargs=(
 		"-DFCL_USE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)"


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/fcl/
@ 2016-07-22 14:58 Alexis Ballier
  0 siblings, 0 replies; 7+ messages in thread
From: Alexis Ballier @ 2016-07-22 14:58 UTC (permalink / raw
  To: gentoo-commits

commit:     ece64176d2256f3edbd70c33ff8ac63c150909d6
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 14:57:54 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 14:58:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ece64176

sci-libs/fcl: bump to 0.5.0

Package-Manager: portage-2.3.0

 sci-libs/fcl/Manifest         |  1 +
 sci-libs/fcl/fcl-0.5.0.ebuild | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/sci-libs/fcl/Manifest b/sci-libs/fcl/Manifest
index 05f8612..5edf9a8 100644
--- a/sci-libs/fcl/Manifest
+++ b/sci-libs/fcl/Manifest
@@ -1,2 +1,3 @@
 DIST fcl-0.3.2.tar.gz 5745349 SHA256 cf914f85b32cf8b63879907726df64e50da33f00d538759d789fe10fc5fbc95b SHA512 799c0f698c9d19ebd72c01b4bd51435feda1792462759249446ab968bf3b2b462537ce20135444c3e555da8564d0c93196f3f3448e2a4282afca710b67eaeb6e WHIRLPOOL 4d0694c7a27f117251709368542a5e7ed8ab3ec6e39e0400027f4409bf1b5cad3ff55c14ff529de19137c5dec6a4222799cc3bf0e1081c13105ea6dbc1e17c90
 DIST fcl-0.4.0.tar.gz 5762341 SHA256 1bea2cd5ee6034166d42860a6c5577f807c81f9f54d09dd680fb9bdf58d46747 SHA512 c565b4018a37449ce05b9189a97f2084a68caaa9247968fecdf933d8f5d87ed629d3fcb6ffccf928c4d339be1b70650b78706cc9d4a0c24864da529b25761684 WHIRLPOOL 2463490135ef16f29f608e68e2b2b0d86a7af59b54360275e73dae8d52aea3c7f9013e7a8be794a3fbb1981cf1470fe55866322aed188dd5c4bec0ba96512fa2
+DIST fcl-0.5.0.tar.gz 5760425 SHA256 8e6c19720e77024c1fbff5a912d81e8f28004208864607447bc90a31f18fb41a SHA512 8741c664720cb32e368e0139881ce69c29e3ccb9633ddc22f47b89918774dbc19541c68e1dbfd78a91f4c8c226ad4c0e1867b6e62111d4311fe907310fc71794 WHIRLPOOL 6e4cd25f162979d977a7c4d20c58bbe56009bda25b66f38873b40369adc9c228e2298d4cc6693c643d76c0a1b01d7dffe1af7819cdcda60f349f733319e91b8e

diff --git a/sci-libs/fcl/fcl-0.5.0.ebuild b/sci-libs/fcl/fcl-0.5.0.ebuild
new file mode 100644
index 0000000..65a9263
--- /dev/null
+++ b/sci-libs/fcl/fcl-0.5.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/flexible-collision-library/fcl"
+fi
+
+inherit ${SCM} cmake-utils
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm"
+	SRC_URI="https://github.com/flexible-collision-library/fcl/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="The Flexible Collision Library"
+HOMEPAGE="http://gamma.cs.unc.edu/FCL/"
+LICENSE="BSD"
+SLOT="0"
+IUSE="cpu_flags_x86_sse"
+
+RDEPEND="
+	sci-libs/octomap
+	sci-libs/flann
+	dev-libs/boost:=[threads]
+	sci-libs/libccd"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		"-DFCL_USE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)"
+	)
+	cmake-utils_src_configure
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/fcl/
@ 2018-02-28 15:50 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2018-02-28 15:50 UTC (permalink / raw
  To: gentoo-commits

commit:     2c0036af8070b3922487f1ee26f51955066885fe
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 15:30:45 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 15:30:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c0036af

sci-libs/fcl: Drop old

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-libs/fcl/Manifest         |  2 --
 sci-libs/fcl/fcl-0.3.2.ebuild | 46 -------------------------------------------
 sci-libs/fcl/fcl-0.4.0.ebuild | 41 --------------------------------------
 3 files changed, 89 deletions(-)

diff --git a/sci-libs/fcl/Manifest b/sci-libs/fcl/Manifest
index 0aad456a853..fa81dab24cc 100644
--- a/sci-libs/fcl/Manifest
+++ b/sci-libs/fcl/Manifest
@@ -1,3 +1 @@
-DIST fcl-0.3.2.tar.gz 5745349 BLAKE2B a571ceec26889b672366e59c1c5886664725631298afcb3a79f161fb099ed9907942aa97333336fa772e507b762afa5bdd8ad1e890607f2d9f3c92d77e4397df SHA512 799c0f698c9d19ebd72c01b4bd51435feda1792462759249446ab968bf3b2b462537ce20135444c3e555da8564d0c93196f3f3448e2a4282afca710b67eaeb6e
-DIST fcl-0.4.0.tar.gz 5762341 BLAKE2B d6859b300b226362c03692bce1d14524ef554614718917e54c6dbdf2fd5210a1791ad688d914329aff4af0a8ca53dcdb1337f4b13e20389da17c9bf0b2cd51e6 SHA512 c565b4018a37449ce05b9189a97f2084a68caaa9247968fecdf933d8f5d87ed629d3fcb6ffccf928c4d339be1b70650b78706cc9d4a0c24864da529b25761684
 DIST fcl-0.5.0.tar.gz 5760425 BLAKE2B 5eac7ace3801740a6317bcc558199b5791e3e5c4fbd63305e5173597b1ecf647388a92bc894629598f963aacd0dd6f894717ae76b3bf7fc9c62a55d9330caf20 SHA512 8741c664720cb32e368e0139881ce69c29e3ccb9633ddc22f47b89918774dbc19541c68e1dbfd78a91f4c8c226ad4c0e1867b6e62111d4311fe907310fc71794

diff --git a/sci-libs/fcl/fcl-0.3.2.ebuild b/sci-libs/fcl/fcl-0.3.2.ebuild
deleted file mode 100644
index 4d1b793423a..00000000000
--- a/sci-libs/fcl/fcl-0.3.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/flexible-collision-library/fcl"
-fi
-
-inherit ${SCM} cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/flexible-collision-library/fcl/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="The Flexible Collision Library"
-HOMEPAGE="http://gamma.cs.unc.edu/FCL/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="cpu_flags_x86_sse"
-
-RDEPEND="
-	sci-libs/octomap
-	sci-libs/flann
-	dev-libs/boost:=[threads]
-	sci-libs/libccd"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/g' \
-		-i src/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DFCL_USE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)"
-	)
-	cmake-utils_src_configure
-}

diff --git a/sci-libs/fcl/fcl-0.4.0.ebuild b/sci-libs/fcl/fcl-0.4.0.ebuild
deleted file mode 100644
index 6d823b17204..00000000000
--- a/sci-libs/fcl/fcl-0.4.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/flexible-collision-library/fcl"
-fi
-
-inherit ${SCM} cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/flexible-collision-library/fcl/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="The Flexible Collision Library"
-HOMEPAGE="http://gamma.cs.unc.edu/FCL/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="cpu_flags_x86_sse"
-
-RDEPEND="
-	sci-libs/octomap
-	sci-libs/flann
-	dev-libs/boost:=[threads]
-	sci-libs/libccd"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		"-DFCL_USE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)"
-	)
-	cmake-utils_src_configure
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/fcl/
@ 2020-08-21 16:13 Dennis Lamm
  0 siblings, 0 replies; 7+ messages in thread
From: Dennis Lamm @ 2020-08-21 16:13 UTC (permalink / raw
  To: gentoo-commits

commit:     4542551ff511e1d11282c5208f383e19dd944f43
Author:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 08:42:28 2020 +0000
Commit:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Fri Aug 21 16:13:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4542551f

sci-libs/fcl: bump to 0.6.1

Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/16787
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>

 sci-libs/fcl/Manifest         |  1 +
 sci-libs/fcl/fcl-0.6.1.ebuild | 72 +++++++++++++++++++++++++++++++++++++++++++
 sci-libs/fcl/fcl-9999.ebuild  | 65 ++++++++++++++++++++++++++------------
 sci-libs/fcl/metadata.xml     | 11 +++++++
 4 files changed, 129 insertions(+), 20 deletions(-)

diff --git a/sci-libs/fcl/Manifest b/sci-libs/fcl/Manifest
index fa81dab24cc..b180d0a77df 100644
--- a/sci-libs/fcl/Manifest
+++ b/sci-libs/fcl/Manifest
@@ -1 +1,2 @@
 DIST fcl-0.5.0.tar.gz 5760425 BLAKE2B 5eac7ace3801740a6317bcc558199b5791e3e5c4fbd63305e5173597b1ecf647388a92bc894629598f963aacd0dd6f894717ae76b3bf7fc9c62a55d9330caf20 SHA512 8741c664720cb32e368e0139881ce69c29e3ccb9633ddc22f47b89918774dbc19541c68e1dbfd78a91f4c8c226ad4c0e1867b6e62111d4311fe907310fc71794
+DIST fcl-0.6.1.tar.gz 6208928 BLAKE2B 174176b3844b18ada60884f641c49475357b1c25cb58cdfc1c4545d595add58713020ffaf148676dae14eca87397495cc971423f06fd19af5cffac1bde584603 SHA512 9d5382c1f2701f2cc6988b3e3969f44c401ea0eb4fdfc5ae69c27dd5bb59a0f17de82ef49e7dce0e1fd91a133db6f10aef9581ca2e32b919046f72921593ebf4

diff --git a/sci-libs/fcl/fcl-0.6.1.ebuild b/sci-libs/fcl/fcl-0.6.1.ebuild
new file mode 100644
index 00000000000..8c1a80c0eb3
--- /dev/null
+++ b/sci-libs/fcl/fcl-0.6.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/flexible-collision-library/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/flexible-collision-library/fcl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+DESCRIPTION="The Flexible Collision Library"
+HOMEPAGE="http://gamma.cs.unc.edu/FCL/"
+
+LICENSE="BSD"
+SLOT="0/6"
+IUSE="cpu_flags_x86_sse doc +octomap profiling test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-libs/boost:=[threads]
+	sci-libs/flann
+	sci-libs/libccd[double-precision]
+	octomap? ( sci-libs/octomap )
+"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-cpp/gtest )"
+
+BDEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	# Upstream issue:
+	# https://github.com/flexible-collision-library/fcl/issues/485
+	rm "${S}"/test/narrowphase/detail/convexity_based_algorithm/test_gjk_libccd-inl_gjk_doSimplex2.cpp
+	sed -i -e 's/test_gjk_libccd-inl_gjk_doSimplex2.cpp//' "${S}"/test/narrowphase/detail/convexity_based_algorithm/CMakeLists.txt || die could not disable failing test
+
+	sed -i -e "s/include(CompilerSettings)//" "${S}"/CMakeLists.txt || die "failed to remove compiler flags override"
+
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+		-DFCL_COVERALLS=OFF
+		-DFCL_COVERALLS_UPLOAD=OFF
+		-DFCL_ENABLE_PROFILING=$(usex profiling ON OFF)
+		-DFCL_TREAT_WARNINGS_AS_ERRORS=OFF
+		-DFCL_USE_HOST_NATIVE_ARCH=OFF
+		-DFCL_USE_X64_SSE=$(usex cpu_flags_x86_sse ON OFF)
+		-DFCL_WITH_OCTOMAP=$(usex octomap ON OFF)
+	)
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile docs
+}
+
+src_install() {
+	cmake_src_install
+
+	use doc && HTML_DOCS=( "${S}"/doc/doxygen/html )
+	einstalldocs
+}

diff --git a/sci-libs/fcl/fcl-9999.ebuild b/sci-libs/fcl/fcl-9999.ebuild
index 6d823b17204..fe367b10808 100644
--- a/sci-libs/fcl/fcl-9999.ebuild
+++ b/sci-libs/fcl/fcl-9999.ebuild
@@ -1,41 +1,66 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/flexible-collision-library/fcl"
-fi
-
-inherit ${SCM} cmake-utils
+inherit cmake
 
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/flexible-collision-library/${PN}.git"
+	inherit git-r3
 else
+	SRC_URI="https://github.com/flexible-collision-library/fcl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/flexible-collision-library/fcl/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 DESCRIPTION="The Flexible Collision Library"
 HOMEPAGE="http://gamma.cs.unc.edu/FCL/"
+
 LICENSE="BSD"
-SLOT="0"
-IUSE="cpu_flags_x86_sse"
+SLOT="0/6"
+IUSE="cpu_flags_x86_sse doc +octomap profiling test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
-	sci-libs/octomap
-	sci-libs/flann
+	dev-cpp/eigen:3
 	dev-libs/boost:=[threads]
-	sci-libs/libccd"
+	sci-libs/flann
+	sci-libs/libccd[double-precision]
+	octomap? ( sci-libs/octomap )"
+
 DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-cpp/gtest )"
+
+BDEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_configure() {
+	sed -i -e "s/include(CompilerSettings)//" "${S}"/CMakeLists.txt || die "failed to remove compiler flags override"
+
 	local mycmakeargs=(
-		"-DFCL_USE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)"
+		-DBUILD_TESTING=$(usex test ON OFF)
+		-DFCL_COVERALLS=OFF
+		-DFCL_COVERALLS_UPLOAD=OFF
+		-DFCL_ENABLE_PROFILING=$(usex profiling ON OFF)
+		-DFCL_TREAT_WARNINGS_AS_ERRORS=OFF
+		-DFCL_USE_HOST_NATIVE_ARCH=OFF
+		-DFCL_USE_X64_SSE=$(usex cpu_flags_x86_sse ON OFF)
+		-DFCL_WITH_OCTOMAP=$(usex octomap ON OFF)
 	)
-	cmake-utils_src_configure
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile docs
+}
+
+src_install() {
+	cmake_src_install
+
+	use doc && HTML_DOCS=( "${S}"/doc/doxygen/html )
+	einstalldocs
 }

diff --git a/sci-libs/fcl/metadata.xml b/sci-libs/fcl/metadata.xml
index fbedec0d5c1..35079633a42 100644
--- a/sci-libs/fcl/metadata.xml
+++ b/sci-libs/fcl/metadata.xml
@@ -5,7 +5,18 @@
 		<email>aballier@gentoo.org</email>
 		<name>Alexis Ballier</name>
 	</maintainer>
+	<longdescription>
+		FCL is a library for performing three types of proximity queries on a pair of geometric models composed of triangles.
+	</longdescription>
+	<use>
+		<flag name="octomap">OctoMap library support</flag>
+		<flag name="profiling">Enable profiling</flag>
+	</use>
+	<slots>
+		<subslots>Soname version number of fcl</subslots>
+	</slots>
 	<upstream>
+		<bugs-to>https://github.com/lexible-collision-library/fcl/issues</bugs-to>
 		<remote-id type="github">flexible-collision-library/fcl</remote-id>
 	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/fcl/
@ 2021-06-18 19:18 David Seifert
  0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2021-06-18 19:18 UTC (permalink / raw
  To: gentoo-commits

commit:     48414c56681ed0545aeb595ce7eb9e1733e230ab
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 18 19:17:38 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jun 18 19:17:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48414c56

sci-libs/fcl: Depend on dev-libs/boost:=[threads(+)]

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-libs/fcl/{fcl-0.5.0.ebuild => fcl-0.5.0-r1.ebuild} | 4 ++--
 sci-libs/fcl/{fcl-0.6.1.ebuild => fcl-0.6.1-r1.ebuild} | 6 +++---
 sci-libs/fcl/fcl-9999.ebuild                           | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sci-libs/fcl/fcl-0.5.0.ebuild b/sci-libs/fcl/fcl-0.5.0-r1.ebuild
similarity index 94%
rename from sci-libs/fcl/fcl-0.5.0.ebuild
rename to sci-libs/fcl/fcl-0.5.0-r1.ebuild
index 746c037a13c..ed568a3218b 100644
--- a/sci-libs/fcl/fcl-0.5.0.ebuild
+++ b/sci-libs/fcl/fcl-0.5.0-r1.ebuild
@@ -25,9 +25,9 @@ SLOT="0"
 IUSE="cpu_flags_x86_sse"
 
 RDEPEND="
-	sci-libs/octomap
+	sci-libs/octomap:=
 	sci-libs/flann
-	dev-libs/boost:=[threads]
+	dev-libs/boost:=[threads(+)]
 	sci-libs/libccd"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"

diff --git a/sci-libs/fcl/fcl-0.6.1.ebuild b/sci-libs/fcl/fcl-0.6.1-r1.ebuild
similarity index 94%
rename from sci-libs/fcl/fcl-0.6.1.ebuild
rename to sci-libs/fcl/fcl-0.6.1-r1.ebuild
index 8c1a80c0eb3..5302b1fe59d 100644
--- a/sci-libs/fcl/fcl-0.6.1.ebuild
+++ b/sci-libs/fcl/fcl-0.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,10 +23,10 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-cpp/eigen:3
-	dev-libs/boost:=[threads]
+	dev-libs/boost:=[threads(+)]
 	sci-libs/flann
 	sci-libs/libccd[double-precision]
-	octomap? ( sci-libs/octomap )
+	octomap? ( sci-libs/octomap:= )
 "
 
 DEPEND="${RDEPEND}

diff --git a/sci-libs/fcl/fcl-9999.ebuild b/sci-libs/fcl/fcl-9999.ebuild
index fe367b10808..6d8c46a0c5c 100644
--- a/sci-libs/fcl/fcl-9999.ebuild
+++ b/sci-libs/fcl/fcl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,10 +23,10 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-cpp/eigen:3
-	dev-libs/boost:=[threads]
+	dev-libs/boost:=[threads(+)]
 	sci-libs/flann
 	sci-libs/libccd[double-precision]
-	octomap? ( sci-libs/octomap )"
+	octomap? ( sci-libs/octomap:= )"
 
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/fcl/
@ 2021-11-30 13:30 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2021-11-30 13:30 UTC (permalink / raw
  To: gentoo-commits

commit:     7897bd0985beb36330f57999f8ce0b51349f2cdc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 30 12:12:49 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 30 13:29:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7897bd09

sci-libs/fcl: Drop 0.5.0-r1

Bug: https://bugs.gentoo.org/770589
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-libs/fcl/Manifest            |  1 -
 sci-libs/fcl/fcl-0.5.0-r1.ebuild | 40 ----------------------------------------
 2 files changed, 41 deletions(-)

diff --git a/sci-libs/fcl/Manifest b/sci-libs/fcl/Manifest
index b180d0a77df9..0cc2d261b2a3 100644
--- a/sci-libs/fcl/Manifest
+++ b/sci-libs/fcl/Manifest
@@ -1,2 +1 @@
-DIST fcl-0.5.0.tar.gz 5760425 BLAKE2B 5eac7ace3801740a6317bcc558199b5791e3e5c4fbd63305e5173597b1ecf647388a92bc894629598f963aacd0dd6f894717ae76b3bf7fc9c62a55d9330caf20 SHA512 8741c664720cb32e368e0139881ce69c29e3ccb9633ddc22f47b89918774dbc19541c68e1dbfd78a91f4c8c226ad4c0e1867b6e62111d4311fe907310fc71794
 DIST fcl-0.6.1.tar.gz 6208928 BLAKE2B 174176b3844b18ada60884f641c49475357b1c25cb58cdfc1c4545d595add58713020ffaf148676dae14eca87397495cc971423f06fd19af5cffac1bde584603 SHA512 9d5382c1f2701f2cc6988b3e3969f44c401ea0eb4fdfc5ae69c27dd5bb59a0f17de82ef49e7dce0e1fd91a133db6f10aef9581ca2e32b919046f72921593ebf4

diff --git a/sci-libs/fcl/fcl-0.5.0-r1.ebuild b/sci-libs/fcl/fcl-0.5.0-r1.ebuild
deleted file mode 100644
index ed568a3218b8..000000000000
--- a/sci-libs/fcl/fcl-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/flexible-collision-library/fcl"
-fi
-
-inherit ${SCM} cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/flexible-collision-library/fcl/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="The Flexible Collision Library"
-HOMEPAGE="http://gamma.cs.unc.edu/FCL/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="cpu_flags_x86_sse"
-
-RDEPEND="
-	sci-libs/octomap:=
-	sci-libs/flann
-	dev-libs/boost:=[threads(+)]
-	sci-libs/libccd"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		"-DFCL_USE_SSE=$(usex cpu_flags_x86_sse TRUE FALSE)"
-	)
-	cmake-utils_src_configure
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/fcl/
@ 2022-09-04 12:23 David Seifert
  0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2022-09-04 12:23 UTC (permalink / raw
  To: gentoo-commits

commit:     600a89e8ebb47322fcf00cb18e58636e5e632c3b
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  4 12:22:34 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Sep  4 12:22:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=600a89e8

sci-libs/fcl: remove boost[threads(+)] usedep

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-libs/fcl/fcl-0.6.1-r1.ebuild | 4 ++--
 sci-libs/fcl/fcl-9999.ebuild     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-libs/fcl/fcl-0.6.1-r1.ebuild b/sci-libs/fcl/fcl-0.6.1-r1.ebuild
index 5302b1fe59d9..3ec5f3be81fc 100644
--- a/sci-libs/fcl/fcl-0.6.1-r1.ebuild
+++ b/sci-libs/fcl/fcl-0.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-cpp/eigen:3
-	dev-libs/boost:=[threads(+)]
+	dev-libs/boost:=
 	sci-libs/flann
 	sci-libs/libccd[double-precision]
 	octomap? ( sci-libs/octomap:= )

diff --git a/sci-libs/fcl/fcl-9999.ebuild b/sci-libs/fcl/fcl-9999.ebuild
index 6d8c46a0c5cd..a948d33b7591 100644
--- a/sci-libs/fcl/fcl-9999.ebuild
+++ b/sci-libs/fcl/fcl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-cpp/eigen:3
-	dev-libs/boost:=[threads(+)]
+	dev-libs/boost:=
 	sci-libs/flann
 	sci-libs/libccd[double-precision]
 	octomap? ( sci-libs/octomap:= )"


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-09-04 12:23 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-04 12:23 [gentoo-commits] repo/gentoo:master commit in: sci-libs/fcl/ David Seifert
  -- strict thread matches above, loose matches on Subject: below --
2021-11-30 13:30 Andreas Sturmlechner
2021-06-18 19:18 David Seifert
2020-08-21 16:13 Dennis Lamm
2018-02-28 15:50 Andreas Sturmlechner
2016-07-22 14:58 Alexis Ballier
2016-01-19 12:50 Alexis Ballier

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox