summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xgraphics-libs/opencv3/DETAILS13
-rw-r--r--graphics-libs/opencv3/HISTORY1
-rwxr-xr-xgraphics-libs/opencv3/PRE_BUILD2
3 files changed, 7 insertions, 9 deletions
diff --git a/graphics-libs/opencv3/DETAILS b/graphics-libs/opencv3/DETAILS
index 9cd7822e24..da2b9f8048 100755
--- a/graphics-libs/opencv3/DETAILS
+++ b/graphics-libs/opencv3/DETAILS
@@ -1,22 +1,19 @@
SPELL=opencv3
VERSION=3.3.0
-# IPPV=20151201
-# GIT=81a676001ca8075ada498583e4166079e5744668
-# SOURCE_HASH=sha512:14430c6225926e5118daccb57c7276d9f9160c90a034b2c73a09b73ac90ba7ebd3ae78cccffb4a10b58bb0e5e16ebd03bf617030fa74cc67d9d18366bf6b4951
+ IPPV=ippicv_2017u2_lnx_intel64_20170418.tgz
+ GIT=a62e20676a60ee0ad6581e217fe7e4bada3b95db
SOURCE_HASH=sha512:b69923c9809d5533764b5db73db4f0be17f72b6d53643ee773824cfe8a98261d7dc5b4033895693bfd1454bc474c7f6152a5d0023a6f495324dd2b4b4a058e0d
-# SOURCE=${SPELL//3}-$VERSION.zip
SOURCE=${SPELL}-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//3}-${VERSION}
-# SOURCE_URL[0]=https://sourceforge.net/projects/opencvlibrary/files/opencv-unix/$VERSION/$SOURCE
SOURCE_URL[0]=https://github.com/Itseez/opencv/archive/$VERSION.tar.gz
if ! list find "$CV_CONTRIB" none ;then
SOURCE2_HASH=sha512:ebe3dbe6c754c6fbaabbf6b0d2a4209964e625fd68e593f30ce043792740c8c1d4440d7870949b5b33f488fd7e2e05f3752287b7f50dd24c29202e268776520e
SOURCE2=opencv_contrib-$VERSION.tar.gz
SOURCE2_URL[0]=https://github.com/Itseez/opencv_contrib/archive/$VERSION.tar.gz
fi
-# SOURCE3=ippicv_linux_${IPPV}.tgz
-# SOURCE3_HASH=sha512:f42bd9d7171a0ed15fb1e71c8c9acf0146419aea3f64391867171b7a50eb65cb50c9b611283f8308b0b5e979ca6f70b20635484d9b5215b1f3cdad2a755647a0
-# SOURCE3_URL[0]=https://raw.githubusercontent.com/Itseez/opencv_3rdparty/$GIT/ippicv/$SOURCE3
+ SOURCE3=${IPPV}
+ SOURCE3_HASH=sha512:b3fe413facea4cde904a229a5967a9f310c7eb51b695e691cf4277e8d0ae86a5a3d5f64037a695373b4e7e0cef234b77931f91f55196e4380d37b8f5999be686
+ SOURCE3_URL[0]=https://raw.githubusercontent.com/opencv/opencv_3rdparty/$GIT/ippicv/$SOURCE3
TMPFS=off
WEB_SITE=http://opencv.org
diff --git a/graphics-libs/opencv3/HISTORY b/graphics-libs/opencv3/HISTORY
index 9821102a98..8f95fad601 100644
--- a/graphics-libs/opencv3/HISTORY
+++ b/graphics-libs/opencv3/HISTORY
@@ -1,6 +1,7 @@
2017-08-12 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 3.3.0
temporarily disable ippicv usage
+ renable ippicv usage
2016-12-26 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 3.2.0
diff --git a/graphics-libs/opencv3/PRE_BUILD b/graphics-libs/opencv3/PRE_BUILD
index fd0b4666a6..245b9a09d3 100755
--- a/graphics-libs/opencv3/PRE_BUILD
+++ b/graphics-libs/opencv3/PRE_BUILD
@@ -1,6 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-#unpack_file 3 &&
+unpack_file 3 &&
if ! list_find "$CV_CONTRIB" none ;then
cd $BUILD_DIRECTORY &&
unpack_file 2 &&