gentoo resync : 30.05.2020

3 files changed, 102 insertions, 1 deletions

diff --git a/sci-libs/ViSP/Manifest b/sci-libs/ViSP/Manifest
index 1da545c35903..4bf2c1a60e63 100644
--- a/sci-libs/ViSP/Manifest
+++ b/sci-libs/ViSP/Manifest
@@ -1,5 +1,7 @@
 AUX ViSP-3.0.1-opencv.patch 403 BLAKE2B 0bc3da5cd6e73cdd47dac7b525f4f3fbe6e683aa79f9185a3e92cecaf36fdc30c018fe93d1e9f7ac69890b7807e16663e21e65025184b950a8f384c1ec2748d8 SHA512 3a6a84ac6ad2bce4fdf7228b4a296589239c2b4b019b3ad8e4654af71b00eca6102444f38c32604013ec62d60d067deb2902ea8cffffff6d97e0762602a013f4
 AUX ViSP-3.2.0-ocv.patch 1065 BLAKE2B 830cecf11df2d9c5c909ab5e2b5e7430e953355feeea77e40b77d53f24d2f1799a529c8dfda061ca6a276a1e150d10fee475f63e798511ce0296e8fde1fd75a8 SHA512 35fbb672da815fd404bd483800bf3f27b4f62d41b1173b10292a964d23129f4ec8afd530f8de913500214633a425a1a7567341b6da317b9e74720cf9414f3eff
 DIST visp-3.2.0.tar.gz 52737424 BLAKE2B 78b733183a62541f5d5af22a376ac52ba2377753fa53be62858611b27d961fad286923c11f624c4fe0f561d8dbc5367e2ac01e6bc11a2a19068167ef52198307 SHA512 b4ad21e5063327d91d4ebda268cf4a4dc2ceffbe39d6af0dd6bfeb94d1150884d37fc4ea4295f640135fc2ba758afd29b9090755561ef05249fe2cbc5680dcce
+DIST visp-3.3.0.tar.gz 60822186 BLAKE2B 559698af352b4eac227ab2cdb8d66be31c04d2e2ac2d30ce07cef5022501162211ff9bfc9ed4970ac8b825321b8fc34241a6ca7a29b3d78fb70fa79ac429f7ab SHA512 f96b017353240e63059ef1e514a64198b6a50b95b5a08405c16e99589fd2110071e2d558921a674e538f9cdea07fde8e653ca630e3c12c38bf91f7a83057afe2
 EBUILD ViSP-3.2.0-r2.ebuild 2881 BLAKE2B 2706c612162b35e58f66c1e00cd343c1fb528be29b196cc9a0477462294a5447bc8ae512f5776bd438b237057beda14bcdc244a2f14fefb54b268dc5724cf04a SHA512 c192fafa044c0910a1f338422acf8fa0cd1c8433c4899085503118621e617a014e206f57f01125e82ade34b95b7133e22c554de76b2cbcc9dfa621d242bacb2d
-MISC metadata.xml 1316 BLAKE2B 0ef658cebd419a44479f24feefd44103fca5a6538cd2f4ba82ac3a12f20fbe4d079551b35587d1616969d7908cb347cf94cc33d27a2a5e327e4b369be30dfaf3 SHA512 738ff67d41b80f336be750cc0e534196bd2055dac9e00a183c097bbe94febb686340db1fd683f3c17cf2dacb68d123e84d6730025d9a46153918aa5b316daf9b
+EBUILD ViSP-3.3.0.ebuild 2876 BLAKE2B 6b9fc1ae7a19ca7f8b656f983b0e32eb05511d467c896243caac1fb8360ed0b78c1f3d24b679e4e7a64fc9e8d7061eeb2c32d4c7c71ed19ba9f5933d68f18b98 SHA512 b69177ce259c6bab5ffd1e3433347f25d7eef866e77627a357e33e08cf9b20c0043947fe022e11e2166468934353f2eb58b6365d101a2be2ad416dfbf9f030a8
+MISC metadata.xml 1383 BLAKE2B 0bc8f34d0babc7ca62c664babe0422443b0819e9c63bc850705c1de9d81b428b650ae19ddc0ae50bae28344f23058ff08247c1a0504e73c3bc419d972d3dcb27 SHA512 f562e0b6d262bd5de4f6e6f3eb5496ad9e8b4b4089a209e3614c5f0c3c531b4076d7a2af7b1317fa4fe9473a8241db1b44d343e2ca051e798c6948a86036562a
diff --git a/sci-libs/ViSP/ViSP-3.3.0.ebuild b/sci-libs/ViSP/ViSP-3.3.0.ebuild
new file mode 100644
index 000000000000..35b2a248ef5d
--- /dev/null
+++ b/sci-libs/ViSP/ViSP-3.3.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Visual Servoing Platform: visual tracking and visual servoing library"
+HOMEPAGE="http://www.irisa.fr/lagadic/visp/visp.html"
+SRC_URI="http://gforge.inria.fr/frs/download.php/latestfile/475/visp-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/3.3"
+KEYWORDS="~amd64 ~arm"
+IUSE="
+	+coin demos +dmtx doc examples gsl ieee1394 jpeg motif ogre
+	opencv pcl png test tutorials usb v4l X xml +zbar zlib
+	cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	coin? ( >=media-libs/coin-4 virtual/opengl )
+	dmtx? ( media-libs/libdmtx )
+	gsl? ( sci-libs/gsl )
+	ieee1394? ( media-libs/libdc1394 )
+	jpeg? ( virtual/jpeg:0 )
+	motif? ( media-libs/SoXt )
+	ogre? ( dev-games/ogre[ois(+)] dev-libs/boost:=[threads] )
+	opencv? ( media-libs/opencv:=[contribdnn(+)] )
+	pcl? ( sci-libs/pcl:= )
+	png? ( media-libs/libpng:0= )
+	usb? ( virtual/libusb:1 )
+	v4l? ( media-libs/libv4l )
+	X? ( x11-libs/libX11 )
+	xml? ( dev-libs/libxml2 )
+	zbar? ( media-gfx/zbar )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	v4l? ( virtual/os-headers )"
+RDEPEND="${RDEPEND}
+	demos? ( sci-misc/ViSP-images )"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( sci-misc/ViSP-images )
+	doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz )"
+REQUIRED_USE="motif? ( coin )"
+
+S="${WORKDIR}/visp-${PV}"
+PATCHES=( "${FILESDIR}/${PN}-3.2.0-ocv.patch" "${FILESDIR}/${PN}-3.0.1-opencv.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
+		"-DBUILD_TESTS=$(usex test ON OFF)"
+		"-DBUILD_DEMOS=$(usex demos ON OFF)"
+		"-DBUILD_TUTORIALS=$(usex tutorials ON OFF)"
+		"-DUSE_COIN3D=$(usex coin ON OFF)"
+		"-DUSE_DC1394=$(usex ieee1394 ON OFF)"
+		"-DUSE_DMTX=$(usex dmtx ON OFF)"
+		"-DUSE_GSL=$(usex gsl ON OFF)"
+		"-DUSE_JPEG=$(usex jpeg ON OFF)"
+		"-DUSE_PNG=$(usex png ON OFF)"
+		"-DUSE_LIBUSB_1=$(usex usb ON OFF)"
+		"-DUSE_OGRE=$(usex ogre ON OFF)"
+		"-DUSE_OIS=$(usex ogre ON OFF)"
+		"-DUSE_OPENCV=$(usex opencv ON OFF)"
+		"-DUSE_PCL=$(usex pcl ON OFF)"
+		"-DUSE_SOQT=OFF"
+		"-DUSE_SOXT=$(usex motif ON OFF)"
+		"-DUSE_V4L2=$(usex v4l ON OFF)"
+		"-DUSE_X11=$(usex X ON OFF)"
+		"-DUSE_XML2=$(usex xml ON OFF)"
+		"-DUSE_ZBAR=$(usex zbar ON OFF)"
+		"-DUSE_ZLIB=$(usex zlib ON OFF)"
+		"-DCOIN3D_INCLUDE_DIR=${EPREFIX:-${SYSROOT}}/usr/include/Coin4"
+		"-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)"
+		"-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)"
+		"-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile visp_doc
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use tutorials ; then
+		dodoc -r tutorial
+		docompress -x /usr/share/doc/${PF}/tutorial
+	fi
+	cd "${BUILD_DIR}"
+	use doc && dodoc -r doc/html
+}
diff --git a/sci-libs/ViSP/metadata.xml b/sci-libs/ViSP/metadata.xml
index 95a2f3243339..15ed30656d81 100644
--- a/sci-libs/ViSP/metadata.xml
+++ b/sci-libs/ViSP/metadata.xml
@@ -11,6 +11,7 @@
 		<flag name="demos">Installs demo programs.</flag>
 		<flag name="ogre">Enables <pkg>dev-games/ogre</pkg> support.</flag>
 		<flag name="opencv">Enables <pkg>media-libs/opencv</pkg> support.</flag>
+		<flag name="pcl">Enables <pkg>sci-libs/pcl</pkg> support.</flag>
 		<flag name="tutorials">Installs tutorials.</flag>
 		<flag name="zbar">Enables barcodes reading.</flag>
 	</use>