1 |
commit: 6e876aef72e6e8afde5e4d06394aa3fc4081973c |
2 |
Author: Justin Bronder <jsbronder <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 4 14:04:50 2019 +0000 |
4 |
Commit: Justin Bronder <jsbronder <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 4 14:20:51 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e876aef |
7 |
|
8 |
dev-python/simplecv: remove |
9 |
|
10 |
No upstream commits for 5 years, last release in 2012. |
11 |
|
12 |
Signed-off-by: Justin Bronder <jsbronder <AT> gentoo.org> |
13 |
|
14 |
dev-python/simplecv/Manifest | 1 - |
15 |
.../files/new-support-for-opencv-2.4.3-added.patch | 111 --------------------- |
16 |
.../simplecv/files/remove-failing-test.patch | 57 ----------- |
17 |
dev-python/simplecv/metadata.xml | 13 --- |
18 |
dev-python/simplecv/simplecv-1.3.ebuild | 50 ---------- |
19 |
5 files changed, 232 deletions(-) |
20 |
|
21 |
diff --git a/dev-python/simplecv/Manifest b/dev-python/simplecv/Manifest |
22 |
deleted file mode 100644 |
23 |
index d265ff74343..00000000000 |
24 |
--- a/dev-python/simplecv/Manifest |
25 |
+++ /dev/null |
26 |
@@ -1 +0,0 @@ |
27 |
-DIST simplecv-1.3.tar.gz 42860284 BLAKE2B c94e484d8ff23fb4d2f2832aad9fdf10a2015e9ca9245d51a9c959273b8c003736f8ade34e04e3a400027cb512b1d228466a57e9d03bce106dab0b568d8205bc SHA512 47fa3c0bb41057ae17323aeb68711ef4716c4fe6607162218477af9070a1b1a03a7300f38b2c2a5c54ff69b916267504aeeac7c3108d6a45045a1469a93005b8 |
28 |
|
29 |
diff --git a/dev-python/simplecv/files/new-support-for-opencv-2.4.3-added.patch b/dev-python/simplecv/files/new-support-for-opencv-2.4.3-added.patch |
30 |
deleted file mode 100644 |
31 |
index 58f8639ea06..00000000000 |
32 |
--- a/dev-python/simplecv/files/new-support-for-opencv-2.4.3-added.patch |
33 |
+++ /dev/null |
34 |
@@ -1,111 +0,0 @@ |
35 |
-From 164d39c1be66eb35b02fb7c30f65b5929c9e407d Mon Sep 17 00:00:00 2001 |
36 |
-From: Vijay Mahantesh SM <vijay@vijay.(none)> |
37 |
-Date: Sat, 8 Dec 2012 01:55:24 +0530 |
38 |
-Subject: [PATCH] new support for opencv 2.4.3 added |
39 |
- |
40 |
---- |
41 |
- SimpleCV/ImageClass.py | 52 ++++++++++++++++++++++++++++++++------------------ |
42 |
- 1 file changed, 33 insertions(+), 19 deletions(-) |
43 |
- |
44 |
-diff --git a/SimpleCV/ImageClass.py b/SimpleCV/ImageClass.py |
45 |
-index a545b50..6fab39a 100644 |
46 |
---- a/SimpleCV/ImageClass.py |
47 |
-+++ b/SimpleCV/ImageClass.py |
48 |
-@@ -7610,11 +7610,12 @@ class Image: |
49 |
- new_version = 0 |
50 |
- #For OpenCV versions till 2.4.0, cv2.__versions__ are of the form "$Rev: 4557 $" |
51 |
- if not ver.startswith('$Rev:'): |
52 |
-- if int(ver.replace('.','0'))>=20400 : |
53 |
-- new_version = 1 |
54 |
-- if int(ver.replace('.','0'))>=20402 : |
55 |
-- new_version = 2 |
56 |
-- |
57 |
-+ if int(ver.replace('.','0'))>=20400: |
58 |
-+ new_version = 1 |
59 |
-+ if int(ver.replace('.','0'))>=20402: |
60 |
-+ new_version = 2 |
61 |
-+ if int(ver.replace('.','0'))>=20403: |
62 |
-+ new_version = 3 |
63 |
- except: |
64 |
- logger.warning("Can't run Keypoints without OpenCV >= 2.3.0") |
65 |
- return |
66 |
-@@ -7622,11 +7623,11 @@ class Image: |
67 |
- if( forceReset ): |
68 |
- self._mKeyPoints = None |
69 |
- self._mKPDescriptors = None |
70 |
-- |
71 |
-- if( self._mKeyPoints is None or self._mKPFlavor != flavor ): |
72 |
-+ |
73 |
-+ if( not(self._mKeyPoints) or self._mKPFlavor != flavor ): |
74 |
- if ( new_version == 0): |
75 |
- if( flavor == "SURF" ): |
76 |
-- surfer = cv2.SURF(thresh,_extended=highQuality,_upright=1) |
77 |
-+ surfer = cv2.SURF(thresh,_extended=highQuality,_upright=1) |
78 |
- self._mKeyPoints,self._mKPDescriptors = surfer.detect(self.getGrayNumpy(),None,False) |
79 |
- if( len(self._mKPDescriptors) == 0 ): |
80 |
- return None, None |
81 |
-@@ -7659,10 +7660,9 @@ class Image: |
82 |
- self._mKPDescriptors = None |
83 |
- self._mKPFlavor = "STAR" |
84 |
- del starer |
85 |
-- |
86 |
-- |
87 |
-- elif( new_version == 2 and flavor in ["SURF", "FAST"] ): |
88 |
-- if( flavor == "SURF" ): |
89 |
-+ |
90 |
-+ elif( new_version >= 2 and flavor in ["SURF", "FAST"] ): |
91 |
-+ if( flavor == "SURF" and new_version==2): |
92 |
- surfer = cv2.SURF(hessianThreshold=thresh,extended=highQuality,upright=1) |
93 |
- #mask = self.getGrayNumpy() |
94 |
- #mask.fill(255) |
95 |
-@@ -7678,6 +7678,20 @@ class Image: |
96 |
- self._mKPFlavor = "SURF" |
97 |
- del surfer |
98 |
- |
99 |
-+ if( flavor == "SURF" and new_version==3): |
100 |
-+ surfer = cv2.SURF(hessianThreshold=thresh,extended=highQuality,upright=1) |
101 |
-+ self._mKeyPoints,self._mKPDescriptors = surfer.detectAndCompute(self.getGrayNumpy(),None,useProvidedKeypoints = False) |
102 |
-+ if( len(self._mKPDescriptors) == 0 ): |
103 |
-+ return None, None |
104 |
-+ |
105 |
-+ if( highQuality == 1 ): |
106 |
-+ self._mKPDescriptors = self._mKPDescriptors.reshape((-1,128)) |
107 |
-+ else: |
108 |
-+ self._mKPDescriptors = self._mKPDescriptors.reshape((-1,64)) |
109 |
-+ |
110 |
-+ self._mKPFlavor = "SURF" |
111 |
-+ del surfer |
112 |
-+ |
113 |
- elif( flavor == "FAST" ): |
114 |
- faster = cv2.FastFeatureDetector(threshold=int(thresh),nonmaxSuppression=True) |
115 |
- self._mKeyPoints = faster.detect(self.getGrayNumpy()) |
116 |
-@@ -7693,19 +7707,19 @@ class Image: |
117 |
- if( len(self._mKPDescriptors) == 0 ): |
118 |
- return None, None |
119 |
- self._mKPFlavor = flavor |
120 |
-- del FeatureDetector |
121 |
-+ del FeatureDetector |
122 |
- |
123 |
- elif( new_version >= 1 and flavor in ["FAST", "STAR", "MSER", "Dense"] ): |
124 |
- FeatureDetector = cv2.FeatureDetector_create(flavor) |
125 |
- self._mKeyPoints = FeatureDetector.detect(self.getGrayNumpy()) |
126 |
- self._mKPDescriptors = None |
127 |
- self._mKPFlavor = flavor |
128 |
-- del FeatureDetector |
129 |
-- |
130 |
-- else: |
131 |
-- logger.warning("ImageClass.Keypoints: I don't know the method you want to use") |
132 |
-- return None, None |
133 |
-- |
134 |
-+ del FeatureDetector |
135 |
-+ |
136 |
-+ else: |
137 |
-+ logger.warning("ImageClass.Keypoints: I don't know the method you want to use") |
138 |
-+ return None, None |
139 |
-+ |
140 |
- return self._mKeyPoints,self._mKPDescriptors |
141 |
- |
142 |
- def _getFLANNMatches(self,sd,td): |
143 |
--- |
144 |
-1.8.1.5 |
145 |
- |
146 |
|
147 |
diff --git a/dev-python/simplecv/files/remove-failing-test.patch b/dev-python/simplecv/files/remove-failing-test.patch |
148 |
deleted file mode 100644 |
149 |
index 7ee326df02a..00000000000 |
150 |
--- a/dev-python/simplecv/files/remove-failing-test.patch |
151 |
+++ /dev/null |
152 |
@@ -1,57 +0,0 @@ |
153 |
-From d8abe3346d7aa2b192d384476d5f2c89ca9c70e9 Mon Sep 17 00:00:00 2001 |
154 |
-From: Justin Bronder <jsbronder@×××××.com> |
155 |
-Date: Fri, 14 Jun 2013 20:35:11 -0400 |
156 |
-Subject: [PATCH] remove failing test |
157 |
- |
158 |
-According to the docs, the UserWarning that is raised should not be an |
159 |
-issue. Ignore the failure during testings. |
160 |
---- |
161 |
- SimpleCV/tests/tests.py | 32 -------------------------------- |
162 |
- 1 file changed, 32 deletions(-) |
163 |
- |
164 |
-diff --git a/SimpleCV/tests/tests.py b/SimpleCV/tests/tests.py |
165 |
-index 94f4fc7..ce442e3 100644 |
166 |
---- a/SimpleCV/tests/tests.py |
167 |
-+++ b/SimpleCV/tests/tests.py |
168 |
-@@ -1731,38 +1731,6 @@ def test_movement_feature(): |
169 |
- |
170 |
- pass |
171 |
- |
172 |
--def test_keypoint_extraction(): |
173 |
-- try: |
174 |
-- import cv2 |
175 |
-- except: |
176 |
-- pass |
177 |
-- return |
178 |
-- |
179 |
-- img1 = Image("../sampleimages/KeypointTemplate2.png") |
180 |
-- img2 = Image("../sampleimages/KeypointTemplate2.png") |
181 |
-- img3 = Image("../sampleimages/KeypointTemplate2.png") |
182 |
-- |
183 |
-- kp1 = img1.findKeypoints() |
184 |
-- kp2 = img2.findKeypoints(highQuality=True) |
185 |
-- kp3 = img3.findKeypoints(flavor="STAR") |
186 |
-- kp1.draw() |
187 |
-- kp2.draw() |
188 |
-- kp3.draw() |
189 |
-- #TODO: Fix FAST binding |
190 |
-- #~ kp4 = img.findKeypoints(flavor="FAST",min_quality=10) |
191 |
-- if( len(kp1)==190 and |
192 |
-- len(kp2)==190 and |
193 |
-- len(kp3)==37 |
194 |
-- #~ and len(kp4)==521 |
195 |
-- ): |
196 |
-- pass |
197 |
-- else: |
198 |
-- assert False |
199 |
-- results = [img1,img2,img3] |
200 |
-- name_stem = "test_keypoint_extraction" |
201 |
-- perform_diff(results,name_stem,tolerance=3.0) |
202 |
-- |
203 |
-- |
204 |
- def test_keypoint_match(): |
205 |
- try: |
206 |
- import cv2 |
207 |
--- |
208 |
-1.8.1.5 |
209 |
- |
210 |
|
211 |
diff --git a/dev-python/simplecv/metadata.xml b/dev-python/simplecv/metadata.xml |
212 |
deleted file mode 100644 |
213 |
index b317bb249d8..00000000000 |
214 |
--- a/dev-python/simplecv/metadata.xml |
215 |
+++ /dev/null |
216 |
@@ -1,13 +0,0 @@ |
217 |
-<?xml version="1.0" encoding="UTF-8"?> |
218 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
219 |
-<pkgmetadata> |
220 |
- <maintainer type="person"> |
221 |
- <email>jsbronder@g.o</email> |
222 |
- </maintainer> |
223 |
- <use> |
224 |
- <flag name="shell">Enable the iPython SimpleCV shell</flag> |
225 |
- </use> |
226 |
- <upstream> |
227 |
- <remote-id type="github">sightmachine/SimpleCV</remote-id> |
228 |
- </upstream> |
229 |
-</pkgmetadata> |
230 |
|
231 |
diff --git a/dev-python/simplecv/simplecv-1.3.ebuild b/dev-python/simplecv/simplecv-1.3.ebuild |
232 |
deleted file mode 100644 |
233 |
index 146b07ce85c..00000000000 |
234 |
--- a/dev-python/simplecv/simplecv-1.3.ebuild |
235 |
+++ /dev/null |
236 |
@@ -1,50 +0,0 @@ |
237 |
-# Copyright 1999-2014 Gentoo Foundation |
238 |
-# Distributed under the terms of the GNU General Public License v2 |
239 |
- |
240 |
-EAPI=5 |
241 |
- |
242 |
-DISTUTILS_SINGLE_IMPL=1 |
243 |
-PYTHON_COMPAT=( python2_7 ) |
244 |
- |
245 |
-inherit distutils-r1 vcs-snapshot |
246 |
- |
247 |
-MY_PN=SimpleCV |
248 |
- |
249 |
-DESCRIPTION="Python interface to several powerful open source computer vision libraries" |
250 |
-HOMEPAGE="http://simplecv.org/" |
251 |
-SRC_URI="https://github.com/sightmachine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
252 |
- |
253 |
-LICENSE="BSD" |
254 |
-SLOT="0" |
255 |
-KEYWORDS="~amd64 ~x86" |
256 |
-IUSE="shell test" |
257 |
- |
258 |
-DEPEND=" |
259 |
- test? ( dev-python/nose[${PYTHON_USEDEP}] )" |
260 |
- |
261 |
-RDEPEND=" |
262 |
- >=media-libs/opencv-2.4.8[python,${PYTHON_USEDEP}] |
263 |
- dev-python/numpy[${PYTHON_USEDEP}] |
264 |
- sci-libs/scipy[${PYTHON_USEDEP}] |
265 |
- dev-python/pillow[${PYTHON_USEDEP}] |
266 |
- dev-python/pygame[${PYTHON_USEDEP}] |
267 |
- shell? ( dev-python/ipython[${PYTHON_USEDEP}] )" |
268 |
- |
269 |
-# 1. FeatureDetector being called with the wrong number of arguments |
270 |
-# 2. Remove test that according to docs shouldn't be an issue |
271 |
-PATCHES=( |
272 |
- "${FILESDIR}"/new-support-for-opencv-2.4.3-added.patch |
273 |
- "${FILESDIR}"/remove-failing-test.patch |
274 |
-) |
275 |
- |
276 |
-src_test() { |
277 |
- cd "${S}/SimpleCV/tests" |
278 |
- nosetests tests.py || die "tests failed" |
279 |
-} |
280 |
- |
281 |
-src_install() { |
282 |
- distutils-r1_src_install |
283 |
- if ! use shell; then |
284 |
- rm -rf "${D}"/usr/bin |
285 |
- fi |
286 |
-} |