sci-libs/ViSP: remove old

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

5 files changed, 0 insertions, 264 deletions

diff --git a/sci-libs/ViSP/Manifest b/sci-libs/ViSP/Manifest
index 0d946b21997..317397c0487 100644
--- a/sci-libs/ViSP/Manifest
+++ b/sci-libs/ViSP/Manifest
@@ -1,2 +1 @@
-DIST ViSP-2.10.0.tar.gz 20745399 SHA256 1c8a37cadd0012526be9ceaa182eb21fb0d45aac622a1f0f2d255225e85797aa SHA512 485bad6aea1dddf51c1edd162e22f5f00205947b67b57843207902ea3b97b683828031338282861be495d66cc79bde3a7af09c075aa9c6b783652d5d3bd4f9ef WHIRLPOOL d3d7e29076231fd581346f7de37ef49afed22f48198673d08268b1a298121d8a9bd8a9bc6e34cf2a5655cf45575599b09c5cb56e78961340122ca6f95ee275e3
 DIST visp-3.0.0.tar.gz 22938301 SHA256 cac5c79b00ca9bc2eeaeacffdc6e3c6f88ee101ec16f729ad3058d37092bf05f SHA512 4ba522731ffbbb55082dc9e0cfecb6bd42ad0abff88d95bd7d33f233a9159139ddef032e087a03b261c8ee2d6bc0cf4807819a27fae11ea91ec0482038acecdc WHIRLPOOL ded182caea33af0393e2e545808f03626aaf9a5929a11781953518722a5b8fbeca9d24dafd55d789ab9a71c6005eb0491c80d76285434c61f7d67f9fac9751ed
diff --git a/sci-libs/ViSP/ViSP-2.10.0-r1.ebuild b/sci-libs/ViSP/ViSP-2.10.0-r1.ebuild
deleted file mode 100644
index 20247c423bb..00000000000
--- a/sci-libs/ViSP/ViSP-2.10.0-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE="
-	+coin demos +dmtx doc examples ffmpeg gsl ieee1394 jpeg lapack motif ogre
-	ois opencv png qt4 test tutorials usb v4l X xml +zbar zlib
-"
-
-RDEPEND="
-	coin? ( media-libs/coin virtual/opengl )
-	dmtx? ( media-libs/libdmtx )
-	ffmpeg? ( virtual/ffmpeg )
-	gsl? ( sci-libs/gsl )
-	ieee1394? ( media-libs/libdc1394 )
-	jpeg? ( virtual/jpeg:0 )
-	lapack? ( virtual/lapack )
-	!qt4? ( motif? ( media-libs/SoXt ) )
-	ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] )
-	opencv? ( media-libs/opencv qt4? ( media-libs/opencv[-qt5(-)] ) )
-	png? ( media-libs/libpng:0= )
-	qt4? ( media-libs/SoQt dev-qt/qtgui:4 )
-	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}
-	doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz )
-	virtual/pkgconfig
-	test? ( sci-misc/ViSP-images )
-	v4l? ( virtual/os-headers )"
-RDEPEND="${RDEPEND}
-	demos? ( sci-misc/ViSP-images )"
-REQUIRED_USE="
-	ffmpeg? ( opencv )
-	ois? ( ogre )
-	qt4? ( coin )
-	motif? ( coin )
-"
-PATCHES=(
-	"${FILESDIR}/opencv.patch"
-	"${FILESDIR}/opencv3.patch"
-	"${FILESDIR}/ffmpeg.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_COIN=$(usex coin ON OFF)"
-		"-DUSE_DC1394=$(usex ieee1394 ON OFF)"
-		"-DUSE_DMTX=$(usex dmtx ON OFF)"
-		"-DUSE_FFMPEG=$(usex ffmpeg ON OFF)"
-		"-DUSE_GSL=$(usex gsl ON OFF)"
-		"-DUSE_LAPACK=$(usex lapack ON OFF)"
-		"-DUSE_LIBJPEG=$(usex jpeg ON OFF)"
-		"-DUSE_LIBPNG=$(usex png ON OFF)"
-		"-DUSE_LIBUSB_1=$(usex usb ON OFF)"
-		"-DUSE_OGRE=$(usex ogre ON OFF)"
-		"-DUSE_OIS=$(usex ois ON OFF)"
-		"-DUSE_OPENCV=$(usex opencv ON OFF)"
-		"-DUSE_SOQT=$(usex qt4 ON OFF)"
-		"-DUSE_SOXT=$(usex motif "$(usex qt4 OFF 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"
-	)
-	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/ffmpeg.patch b/sci-libs/ViSP/files/ffmpeg.patch
deleted file mode 100644
index 5c81d050509..00000000000
--- a/sci-libs/ViSP/files/ffmpeg.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Index: ViSP-2.10.0/src/video/vpFFMPEG.cpp
-===================================================================
---- ViSP-2.10.0.orig/src/video/vpFFMPEG.cpp
-+++ ViSP-2.10.0/src/video/vpFFMPEG.cpp
-@@ -184,7 +184,7 @@ bool vpFFMPEG::openStream(const char *fi
-       if (pFrameRGB == NULL)
-         return false;
-       
--      numBytes = avpicture_get_size (PIX_FMT_RGB24,pCodecCtx->width,pCodecCtx->height);
-+      numBytes = avpicture_get_size (AV_PIX_FMT_RGB24,pCodecCtx->width,pCodecCtx->height);
-     }
-     
-     else if (color_type == vpFFMPEG::GRAY_SCALED)
-@@ -198,7 +198,7 @@ bool vpFFMPEG::openStream(const char *fi
-       if (pFrameGRAY == NULL)
-         return false;
-       
--      numBytes = avpicture_get_size (PIX_FMT_GRAY8,pCodecCtx->width,pCodecCtx->height);
-+      numBytes = avpicture_get_size (AV_PIX_FMT_GRAY8,pCodecCtx->width,pCodecCtx->height);
-     }  
- 
-     /*
-@@ -215,10 +215,10 @@ bool vpFFMPEG::openStream(const char *fi
-   }
-   
-   if (color_type == vpFFMPEG::COLORED)
--    avpicture_fill((AVPicture *)pFrameRGB, buffer, PIX_FMT_RGB24, pCodecCtx->width, pCodecCtx->height);
-+    avpicture_fill((AVPicture *)pFrameRGB, buffer, AV_PIX_FMT_RGB24, pCodecCtx->width, pCodecCtx->height);
-   
-   else if (color_type == vpFFMPEG::GRAY_SCALED)
--    avpicture_fill((AVPicture *)pFrameGRAY, buffer, PIX_FMT_GRAY8, pCodecCtx->width, pCodecCtx->height);
-+    avpicture_fill((AVPicture *)pFrameGRAY, buffer, AV_PIX_FMT_GRAY8, pCodecCtx->width, pCodecCtx->height);
-   
-   streamWasOpen = true;
- 
-@@ -235,10 +235,10 @@ bool vpFFMPEG::openStream(const char *fi
- bool vpFFMPEG::initStream()
- {
-   if (color_type == vpFFMPEG::COLORED)
--    img_convert_ctx= sws_getContext(pCodecCtx->width, pCodecCtx->height, pCodecCtx->pix_fmt, pCodecCtx->width,pCodecCtx->height,PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
-+    img_convert_ctx= sws_getContext(pCodecCtx->width, pCodecCtx->height, pCodecCtx->pix_fmt, pCodecCtx->width,pCodecCtx->height,AV_PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
-   
-   else if (color_type == vpFFMPEG::GRAY_SCALED)
--    img_convert_ctx= sws_getContext(pCodecCtx->width, pCodecCtx->height, pCodecCtx->pix_fmt, pCodecCtx->width,pCodecCtx->height,PIX_FMT_GRAY8, SWS_BICUBIC, NULL, NULL, NULL);
-+    img_convert_ctx= sws_getContext(pCodecCtx->width, pCodecCtx->height, pCodecCtx->pix_fmt, pCodecCtx->width,pCodecCtx->height,AV_PIX_FMT_GRAY8, SWS_BICUBIC, NULL, NULL, NULL);
- 
-   int ret = av_seek_frame(pFormatCtx, (int)videoStream, 0, AVSEEK_FLAG_ANY) ;
-   if (ret < 0 )
-@@ -707,7 +707,7 @@ bool vpFFMPEG::openEncoder(const char *f
-   pCodecCtx->time_base.den = framerate_encoder;
-   pCodecCtx->gop_size = 10; /* emit one intra frame every ten frames */
-   pCodecCtx->max_b_frames=1;
--  pCodecCtx->pix_fmt = PIX_FMT_YUV420P;
-+  pCodecCtx->pix_fmt = AV_PIX_FMT_YUV420P;
- 
-   /* open it */
- #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53,35,0) // libavcodec 53.35.0
-@@ -730,15 +730,15 @@ bool vpFFMPEG::openEncoder(const char *f
-   outbuf_size = 100000;
-   outbuf = new uint8_t[outbuf_size];
- 
--  numBytes = avpicture_get_size (PIX_FMT_YUV420P,pCodecCtx->width,pCodecCtx->height);
-+  numBytes = avpicture_get_size (AV_PIX_FMT_YUV420P,pCodecCtx->width,pCodecCtx->height);
-   picture_buf = new uint8_t[numBytes];
--  avpicture_fill((AVPicture *)pFrame, picture_buf, PIX_FMT_YUV420P, pCodecCtx->width, pCodecCtx->height);
-+  avpicture_fill((AVPicture *)pFrame, picture_buf, AV_PIX_FMT_YUV420P, pCodecCtx->width, pCodecCtx->height);
- 
--  numBytes = avpicture_get_size (PIX_FMT_RGB24,pCodecCtx->width,pCodecCtx->height);
-+  numBytes = avpicture_get_size (AV_PIX_FMT_RGB24,pCodecCtx->width,pCodecCtx->height);
-   buffer = new uint8_t[numBytes];
--  avpicture_fill((AVPicture *)pFrameRGB, buffer, PIX_FMT_RGB24, pCodecCtx->width, pCodecCtx->height);
-+  avpicture_fill((AVPicture *)pFrameRGB, buffer, AV_PIX_FMT_RGB24, pCodecCtx->width, pCodecCtx->height);
- 
--  img_convert_ctx= sws_getContext(pCodecCtx->width, pCodecCtx->height, PIX_FMT_RGB24, pCodecCtx->width,pCodecCtx->height,PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL);
-+  img_convert_ctx= sws_getContext(pCodecCtx->width, pCodecCtx->height, AV_PIX_FMT_RGB24, pCodecCtx->width,pCodecCtx->height,AV_PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL);
-   
-   encoderWasOpened = true;
- 
diff --git a/sci-libs/ViSP/files/opencv.patch b/sci-libs/ViSP/files/opencv.patch
deleted file mode 100644
index c8cafe0a5c9..00000000000
--- a/sci-libs/ViSP/files/opencv.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ViSP-2.10.0/CMakeLists.txt
-===================================================================
---- ViSP-2.10.0.orig/CMakeLists.txt
-+++ ViSP-2.10.0/CMakeLists.txt
-@@ -1450,7 +1450,7 @@ if(USE_OPENCV)
-       list(APPEND VISP_EXTERN_LIBRARIES ${OpenCV_LIBS})

-     endif()

-     list(APPEND VISP_EXTERN_INCLUDE_DIRS ${OpenCV_INCLUDE_DIRS})

--    #LIST(APPEND VISP_EXTERN_LIBRARIES ${OpenCV_LIBS})

-+    LIST(APPEND VISP_EXTERN_LIBRARIES ${OpenCV_LIBRARIES})

-     #MESSAGE("OpenCV_INCLUDE_DIRS = ${OpenCV_INCLUDE_DIRS}")

-     #MESSAGE("OpenCV_LIBS = ${OpenCV_LIBS}")

-     #MESSAGE("OpenCV_LIB_DIR = ${OpenCV_LIB_DIR}")

diff --git a/sci-libs/ViSP/files/opencv3.patch b/sci-libs/ViSP/files/opencv3.patch
deleted file mode 100644
index 8f7f9ee269c..00000000000
--- a/sci-libs/ViSP/files/opencv3.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Index: ViSP-2.10.0/src/key-point/vpKeyPoint.h
-===================================================================
---- ViSP-2.10.0.orig/src/key-point/vpKeyPoint.h
-+++ ViSP-2.10.0/src/key-point/vpKeyPoint.h
-@@ -494,6 +494,7 @@ public:
-     initDetector(detectorName);
-   }
- 
-+#if (VISP_HAVE_OPENCV_VERSION >= 0x020400 && VISP_HAVE_OPENCV_VERSION < 0x030000)
-   /*!
-     Template function to set to a \p parameterName a value for a specific detector named by his \p detectorName.
- 
-@@ -507,6 +508,7 @@ public:
-       m_detectors[detectorName]->set(parameterName, value);
-     }
-   }
-+#endif
- 
-   /*!
-      Set and initialize a list of detectors denominated by their names \p detectorNames.
-@@ -532,6 +534,7 @@ public:
-     initExtractor(extractorName);
-   }
- 
-+#if (VISP_HAVE_OPENCV_VERSION >= 0x020400 && VISP_HAVE_OPENCV_VERSION < 0x030000)
-   /*!
-     Template function to set to a \p parameterName a value for a specific extractor named by his \p extractorName.
- 
-@@ -545,6 +548,7 @@ public:
-       m_extractors[extractorName]->set(parameterName, value);
-     }
-   }
-+#endif
- 
-   /*!
-      Set and initialize a list of extractors denominated by their names \p extractorNames.
-@@ -700,7 +704,7 @@ public:
-     m_useAffineDetection = useAffine;
-   }
- 
--#if (VISP_HAVE_OPENCV_VERSION >= 0x020400)
-+#if (VISP_HAVE_OPENCV_VERSION >= 0x020400 && VISP_HAVE_OPENCV_VERSION < 0x030000)
-   /*!
-     Set if cross check method must be used to eliminate some false matches with a brute-force matching method.
- 
-Index: ViSP-2.10.0/src/key-point/vpKeyPoint.cpp
-===================================================================
---- ViSP-2.10.0.orig/src/key-point/vpKeyPoint.cpp
-+++ ViSP-2.10.0/src/key-point/vpKeyPoint.cpp
-@@ -868,7 +868,7 @@ void vpKeyPoint::detect(const vpImage<un
-                       (int) rectangle.getBottom());
-     cv::rectangle(mask, leftTop, rightBottom, cv::Scalar(255), CV_FILLED);
-   } else {
--    mask = cv::Mat::ones(matImg.rows, matImg.cols, CV_8U);
-+    mask = cv::Mat::ones(matImg.rows, matImg.cols, CV_8U) * 255;
-   }
- 
-   detect(matImg, keyPoints, elapsedTime, mask);
-@@ -1544,7 +1544,7 @@ void vpKeyPoint::initExtractors(const st
- void vpKeyPoint::initMatcher(const std::string &matcherName) {
-   m_matcher = cv::DescriptorMatcher::create(matcherName);
- 
--#if (VISP_HAVE_OPENCV_VERSION >= 0x020400)
-+#if (VISP_HAVE_OPENCV_VERSION >= 0x020400 && VISP_HAVE_OPENCV_VERSION < 0x030000)
-   if(m_matcher != NULL && !m_useKnn && matcherName == "BruteForce") {
-     m_matcher->set("crossCheck", m_useBruteForceCrossCheck);
-   }