From f1af93971b7490792d8541bc790e0d8c6d787059 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 6 Sep 2019 10:28:05 +0100 Subject: gentoo resync : 06.08.2019 --- sci-libs/ViSP/Manifest | 3 + sci-libs/ViSP/ViSP-3.2.0-r2.ebuild | 98 ++++++++++++++++++++++++++++++++ sci-libs/ViSP/files/ViSP-3.2.0-ocv.patch | 18 ++++++ 3 files changed, 119 insertions(+) create mode 100644 sci-libs/ViSP/ViSP-3.2.0-r2.ebuild create mode 100644 sci-libs/ViSP/files/ViSP-3.2.0-ocv.patch (limited to 'sci-libs/ViSP') diff --git a/sci-libs/ViSP/Manifest b/sci-libs/ViSP/Manifest index 6f6b25938556..4ac836209949 100644 --- a/sci-libs/ViSP/Manifest +++ b/sci-libs/ViSP/Manifest @@ -1,7 +1,10 @@ AUX ViSP-3.0.0-ffmpeg3.patch 4291 BLAKE2B 2948a7e4cad247da78187a15198fbc5e804caab7ead381219113cd48ccc71c9b59832f315ca784d8bfd3b6d2d2b27ce918341dbbab88c2f66d0749e20cbaa63c SHA512 fed1699ccaba5baa67e0fde19abc5ae828c51c88bf761a9d6784b8ad858230cca7e11bfbc1fb7661bca0a666c49ff9915e0a771909bf42493229165d1131b3a9 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.0.1.tar.gz 26029005 BLAKE2B d8881b0dd56b38f5db88e33f13e7dfa29b0a64fa1aebc5160384db2c7124d3a0ab2f0a5b3ba0255cbe209b578a3cdeb4420dc138a063248f945e9a73e041f21d SHA512 558e9acbd7ac5ef2193dca026062b75e0a30a7efbcae7d1e7d392b0855e643ee96ab9f60c19465f6bfa861374e30d9e91faf2f860e0442fa48ea5ea384b4e3fa DIST visp-3.1.0.tar.gz 38743434 BLAKE2B 294eaaf95c7ff7a8ade8bdf2146018856b081a9c461aca68eedb6fb096d253e537f41ad9a81687cba7a9e42a34b5a3fe2d1a705917a1c96f47e1e3e708f20cc3 SHA512 b7d56d3286e3610ff0db4f4c3a51f953825578532a9c518f7654142a644f466343660901632487fb513b0f6a6503d3716d56e733830b4d52daf5839bc1cfbdb5 +DIST visp-3.2.0.tar.gz 52737424 BLAKE2B 78b733183a62541f5d5af22a376ac52ba2377753fa53be62858611b27d961fad286923c11f624c4fe0f561d8dbc5367e2ac01e6bc11a2a19068167ef52198307 SHA512 b4ad21e5063327d91d4ebda268cf4a4dc2ceffbe39d6af0dd6bfeb94d1150884d37fc4ea4295f640135fc2ba758afd29b9090755561ef05249fe2cbc5680dcce EBUILD ViSP-3.0.1-r1.ebuild 2999 BLAKE2B e5415f5a699aa20037e770f28155be8fef622f30201fa123a6cac27cbd134d1d796e35e971c6c5450ca0154f224dca0f78b78ca7f4f5cecb07c9f3144f8c423b SHA512 ee12ae28a8b83180978bf88b611ad83484ef6061b22252e5d4e0f0109c92b6a8620d3f8e314d41e1aeff700e2d0134c82fbc132db17163f74cc65dd74401a09d EBUILD ViSP-3.1.0-r1.ebuild 2864 BLAKE2B 7d9752251c1af6604544b14692352920765653d6022dfebd4eed381243df320d08da3f8539e4cdffdac387e16df4da1e409e5b80f28c086527614810efee3045 SHA512 a1b09523d092e39270210adeb0099b389cc3dc49b2cef86c7a9879bc02315b6c10a7df6d778a6955a3e4bff553ab1cb5751fb4f8b70533d83061bf0677013317 +EBUILD ViSP-3.2.0-r2.ebuild 2897 BLAKE2B e02dae9d88455de806338a8bd70e9e8f75e1405bfcab8b3d74689ed63bb613eca976b9ff074a5f37bb274f2c6bb63e84d6c11e20d494728a2002c0317064fb37 SHA512 52088222b4786e7d6d702abad38d2b1eae569ec8d130cfb02492d1b82eb3c20c52a5106e0b9e5276bc75ef8ec88d6edd8d007c1953ed6c5b6df0ff93b72c5aba MISC metadata.xml 1316 BLAKE2B 0ef658cebd419a44479f24feefd44103fca5a6538cd2f4ba82ac3a12f20fbe4d079551b35587d1616969d7908cb347cf94cc33d27a2a5e327e4b369be30dfaf3 SHA512 738ff67d41b80f336be750cc0e534196bd2055dac9e00a183c097bbe94febb686340db1fd683f3c17cf2dacb68d123e84d6730025d9a46153918aa5b316daf9b diff --git a/sci-libs/ViSP/ViSP-3.2.0-r2.ebuild b/sci-libs/ViSP/ViSP-3.2.0-r2.ebuild new file mode 100644 index 000000000000..c9cba774d8e7 --- /dev/null +++ b/sci-libs/ViSP/ViSP-3.2.0-r2.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +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.2" +KEYWORDS="~amd64 ~arm" +IUSE=" + +coin demos +dmtx doc examples gsl ieee1394 jpeg lapack motif ogre + opencv png test tutorials usb v4l X xml +zbar zlib + cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 +" + +RDEPEND=" + coin? ( media-libs/coin virtual/opengl ) + dmtx? ( media-libs/libdmtx ) + gsl? ( sci-libs/gsl ) + ieee1394? ( media-libs/libdc1394 ) + jpeg? ( virtual/jpeg:0 ) + lapack? ( virtual/lapack ) + motif? ( media-libs/SoXt ) + ogre? ( dev-games/ogre[ois(+)] dev-libs/boost:=[threads] ) + opencv? ( media-libs/opencv:= ) + 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} + virtual/pkgconfig + doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz ) + test? ( sci-misc/ViSP-images ) + v4l? ( virtual/os-headers )" +RDEPEND="${RDEPEND} + demos? ( sci-misc/ViSP-images )" +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_LAPACK=$(usex lapack 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_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/coin" + "-DSOQT_INCLUDE_DIR=${EPREFIX:-${SYSROOT}}/usr/include/coin" + "-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 + cd "${BUILD_DIR}" + use doc && emake 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 && dohtml -r doc/html/* +} diff --git a/sci-libs/ViSP/files/ViSP-3.2.0-ocv.patch b/sci-libs/ViSP/files/ViSP-3.2.0-ocv.patch new file mode 100644 index 000000000000..56347c58f968 --- /dev/null +++ b/sci-libs/ViSP/files/ViSP-3.2.0-ocv.patch @@ -0,0 +1,18 @@ +Index: visp-3.2.0/CMakeLists.txt +=================================================================== +--- visp-3.2.0.orig/CMakeLists.txt ++++ visp-3.2.0/CMakeLists.txt +@@ -574,12 +574,7 @@ if(USE_CXX11 AND NOT USE_PTHREAD) + endif() + endif() + VP_OPTION(USE_XML2 XML2 "" "Include xml support" "" ON IF NOT WINRT) +-if(CMAKE_TOOLCHAIN_FILE) +- # Find opencv2.framework for ios and naoqi +- VP_OPTION(USE_OPENCV "MyOpenCV" QUIET "Include OpenCV support" "OpenCV_DIR;OpenCV_FOUND;OPENCV_FOUND" ON) +-else() +- VP_OPTION(USE_OPENCV "OpenCV;MyOpenCV" QUIET "Include OpenCV support" "OpenCV_DIR;OpenCV_FOUND;OPENCV_FOUND" ON) +-endif() ++VP_OPTION(USE_OPENCV "OpenCV;MyOpenCV" QUIET "Include OpenCV support" "OpenCV_DIR;OpenCV_FOUND;OPENCV_FOUND" ON) + VP_OPTION(USE_ZLIB "ZLIB;MyZLIB" "" "Include zlib support" "" ON IF NOT WINRT AND NOT IOS) + VP_OPTION(USE_X11 X11 "" "Include X11 support" "" ON IF NOT WINRT AND NOT IOS) + # The native FindGTK2.cmake doesn't consider libgobject-2.0 that is -- cgit v1.2.3