summaryrefslogtreecommitdiff
path: root/sci-libs/ViSP
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-09-30 11:19:18 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-09-30 11:19:18 +0100
commit62f67115b5c46134c34f88f4b1cbdacc19384c0a (patch)
tree0a76b14de203a4c23040e5665e39df8de9867745 /sci-libs/ViSP
parent265dbe5dbc14c199299496c6db8fce3f76647015 (diff)
gentoo resync : 30.09.2018
Diffstat (limited to 'sci-libs/ViSP')
-rw-r--r--sci-libs/ViSP/Manifest6
-rw-r--r--sci-libs/ViSP/ViSP-3.0.1-r1.ebuild (renamed from sci-libs/ViSP/ViSP-3.0.1.ebuild)11
-rw-r--r--sci-libs/ViSP/ViSP-3.1.0-r1.ebuild (renamed from sci-libs/ViSP/ViSP-3.1.0.ebuild)13
-rw-r--r--sci-libs/ViSP/metadata.xml1
4 files changed, 13 insertions, 18 deletions
diff --git a/sci-libs/ViSP/Manifest b/sci-libs/ViSP/Manifest
index 15bcca38ef2a..6f6b25938556 100644
--- a/sci-libs/ViSP/Manifest
+++ b/sci-libs/ViSP/Manifest
@@ -2,6 +2,6 @@ AUX ViSP-3.0.0-ffmpeg3.patch 4291 BLAKE2B 2948a7e4cad247da78187a15198fbc5e804caa
AUX ViSP-3.0.1-opencv.patch 403 BLAKE2B 0bc3da5cd6e73cdd47dac7b525f4f3fbe6e683aa79f9185a3e92cecaf36fdc30c018fe93d1e9f7ac69890b7807e16663e21e65025184b950a8f384c1ec2748d8 SHA512 3a6a84ac6ad2bce4fdf7228b4a296589239c2b4b019b3ad8e4654af71b00eca6102444f38c32604013ec62d60d067deb2902ea8cffffff6d97e0762602a013f4
DIST visp-3.0.1.tar.gz 26029005 BLAKE2B d8881b0dd56b38f5db88e33f13e7dfa29b0a64fa1aebc5160384db2c7124d3a0ab2f0a5b3ba0255cbe209b578a3cdeb4420dc138a063248f945e9a73e041f21d SHA512 558e9acbd7ac5ef2193dca026062b75e0a30a7efbcae7d1e7d392b0855e643ee96ab9f60c19465f6bfa861374e30d9e91faf2f860e0442fa48ea5ea384b4e3fa
DIST visp-3.1.0.tar.gz 38743434 BLAKE2B 294eaaf95c7ff7a8ade8bdf2146018856b081a9c461aca68eedb6fb096d253e537f41ad9a81687cba7a9e42a34b5a3fe2d1a705917a1c96f47e1e3e708f20cc3 SHA512 b7d56d3286e3610ff0db4f4c3a51f953825578532a9c518f7654142a644f466343660901632487fb513b0f6a6503d3716d56e733830b4d52daf5839bc1cfbdb5
-EBUILD ViSP-3.0.1.ebuild 3015 BLAKE2B 05eb7ce8f21b8d947580cf02ed9687db50803cb44a663c299936f2e1254f573ac354d9ed6d8038179dfa41de1c856f132537a174a818575275ef88faa67a5641 SHA512 c7e88b8d8758d140cf0f80e95ec78bd04308f2983a23504c5f8af82fa0cb4f54b34420d4e1796d2dcbdf319a0b84682188359b43c2a847d426347221b9bd8cf2
-EBUILD ViSP-3.1.0.ebuild 2883 BLAKE2B 36ed6f92bf7fa75338c6aa14ab20e585de6f55949a2e3bbb129fa364140aac058cc07022deb773a17dc3c0e5cf49e2cdf11337fb881a0bf14a385291c22eddad SHA512 d786fcd4ec5c1636f18bcba3d39532a4a59caaef824e0e28ea870dc0fcc972088593465a1dc5f4bde51548c798bf0224c7ced376c1c2b65949d05642c2caeac7
-MISC metadata.xml 1393 BLAKE2B f891f74d6a7a334f7ee024f188c70ee031b391bbbebe4f67ff45efa6fe5def3eff0515a769a312e691e8acfda5e3633daa11ed1c590f43110a0ab1a190f39473 SHA512 c66184a7997d1682047605e6773a341f3f8503b765c36aa6931ac13eda2a78b866cf2db3c8ca68eabca206235b4c4bea534e176bd07cd9f5dcad3d9e67583d5e
+EBUILD ViSP-3.0.1-r1.ebuild 2999 BLAKE2B e5415f5a699aa20037e770f28155be8fef622f30201fa123a6cac27cbd134d1d796e35e971c6c5450ca0154f224dca0f78b78ca7f4f5cecb07c9f3144f8c423b SHA512 ee12ae28a8b83180978bf88b611ad83484ef6061b22252e5d4e0f0109c92b6a8620d3f8e314d41e1aeff700e2d0134c82fbc132db17163f74cc65dd74401a09d
+EBUILD ViSP-3.1.0-r1.ebuild 2864 BLAKE2B 7d9752251c1af6604544b14692352920765653d6022dfebd4eed381243df320d08da3f8539e4cdffdac387e16df4da1e409e5b80f28c086527614810efee3045 SHA512 a1b09523d092e39270210adeb0099b389cc3dc49b2cef86c7a9879bc02315b6c10a7df6d778a6955a3e4bff553ab1cb5751fb4f8b70533d83061bf0677013317
+MISC metadata.xml 1316 BLAKE2B 0ef658cebd419a44479f24feefd44103fca5a6538cd2f4ba82ac3a12f20fbe4d079551b35587d1616969d7908cb347cf94cc33d27a2a5e327e4b369be30dfaf3 SHA512 738ff67d41b80f336be750cc0e534196bd2055dac9e00a183c097bbe94febb686340db1fd683f3c17cf2dacb68d123e84d6730025d9a46153918aa5b316daf9b
diff --git a/sci-libs/ViSP/ViSP-3.0.1.ebuild b/sci-libs/ViSP/ViSP-3.0.1-r1.ebuild
index 35fbfb4321bf..871d521bc384 100644
--- a/sci-libs/ViSP/ViSP-3.0.1.ebuild
+++ b/sci-libs/ViSP/ViSP-3.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -14,7 +14,7 @@ SLOT="0/3"
KEYWORDS="~amd64 ~arm"
IUSE="
+coin demos +dmtx doc examples ffmpeg gsl ieee1394 jpeg lapack motif ogre
- ois opencv png test tutorials usb v4l X xml +zbar zlib
+ opencv png test tutorials usb v4l X xml +zbar zlib
cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
"
@@ -27,7 +27,7 @@ RDEPEND="
jpeg? ( virtual/jpeg:0 )
lapack? ( virtual/lapack )
motif? ( media-libs/SoXt )
- ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] )
+ ogre? ( dev-games/ogre[ois(+)] dev-libs/boost:=[threads] )
opencv? ( media-libs/opencv:= )
png? ( media-libs/libpng:0= )
usb? ( virtual/libusb:1 )
@@ -38,15 +38,14 @@ RDEPEND="
zlib? ( sys-libs/zlib )
"
DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz )
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="
ffmpeg? ( opencv )
- ois? ( ogre )
motif? ( coin )
"
@@ -69,7 +68,7 @@ src_configure() {
"-DUSE_PNG=$(usex png ON OFF)"
"-DUSE_LIBUSB_1=$(usex usb ON OFF)"
"-DUSE_OGRE=$(usex ogre ON OFF)"
- "-DUSE_OIS=$(usex ois ON OFF)"
+ "-DUSE_OIS=$(usex ogre ON OFF)"
"-DUSE_OPENCV=$(usex opencv ON OFF)"
"-DUSE_SOQT=OFF"
"-DUSE_SOXT=$(usex motif ON OFF)"
diff --git a/sci-libs/ViSP/ViSP-3.1.0.ebuild b/sci-libs/ViSP/ViSP-3.1.0-r1.ebuild
index 354edc0a62bd..86886b818ec3 100644
--- a/sci-libs/ViSP/ViSP-3.1.0.ebuild
+++ b/sci-libs/ViSP/ViSP-3.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0/3.1"
KEYWORDS="~amd64 ~arm"
IUSE="
+coin demos +dmtx doc examples gsl ieee1394 jpeg lapack motif ogre
- ois opencv png test tutorials usb v4l X xml +zbar zlib
+ opencv png test tutorials usb v4l X xml +zbar zlib
cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
"
@@ -26,7 +26,7 @@ RDEPEND="
jpeg? ( virtual/jpeg:0 )
lapack? ( virtual/lapack )
motif? ( media-libs/SoXt )
- ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] )
+ ogre? ( dev-games/ogre[ois(+)] dev-libs/boost:=[threads] )
opencv? ( media-libs/opencv:= )
png? ( media-libs/libpng:0= )
usb? ( virtual/libusb:1 )
@@ -37,16 +37,13 @@ RDEPEND="
zlib? ( sys-libs/zlib )
"
DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz )
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="
- ois? ( ogre )
- motif? ( coin )
-"
+REQUIRED_USE="motif? ( coin )"
S="${WORKDIR}/visp-${PV}"
PATCHES=( "${FILESDIR}/${PN}-3.0.1-opencv.patch" )
@@ -66,7 +63,7 @@ src_configure() {
"-DUSE_PNG=$(usex png ON OFF)"
"-DUSE_LIBUSB_1=$(usex usb ON OFF)"
"-DUSE_OGRE=$(usex ogre ON OFF)"
- "-DUSE_OIS=$(usex ois ON OFF)"
+ "-DUSE_OIS=$(usex ogre ON OFF)"
"-DUSE_OPENCV=$(usex opencv ON OFF)"
"-DUSE_SOQT=OFF"
"-DUSE_SOXT=$(usex motif ON OFF)"
diff --git a/sci-libs/ViSP/metadata.xml b/sci-libs/ViSP/metadata.xml
index 772241db04d7..95a2f3243339 100644
--- a/sci-libs/ViSP/metadata.xml
+++ b/sci-libs/ViSP/metadata.xml
@@ -10,7 +10,6 @@
<flag name="dmtx">Enables barcode data matrix support.</flag>
<flag name="demos">Installs demo programs.</flag>
<flag name="ogre">Enables <pkg>dev-games/ogre</pkg> support.</flag>
- <flag name="ois">Enables <pkg>dev-games/ois</pkg> support via ogre.</flag>
<flag name="opencv">Enables <pkg>media-libs/opencv</pkg> support.</flag>
<flag name="tutorials">Installs tutorials.</flag>
<flag name="zbar">Enables barcodes reading.</flag>