summaryrefslogtreecommitdiffstats
path: root/graphics-libs
diff options
context:
space:
mode:
authorTreeve Jelbert2021-10-12 17:47:57 +0200
committerTreeve Jelbert2021-10-12 18:58:14 +0200
commitd1ecd73cd6ef97fed91caf848a658a3f70e8fcf1 (patch)
treec930dcec52d8d9cbdaaa6f6548e182f24be22497 /graphics-libs
parent5806108f1007dcad996f6442ed867b42702ce21d (diff)
opencv4: => 4.5.4
Diffstat (limited to 'graphics-libs')
-rwxr-xr-xgraphics-libs/opencv4/BUILD1
-rwxr-xr-xgraphics-libs/opencv4/DEPENDS4
-rwxr-xr-xgraphics-libs/opencv4/DETAILS7
-rw-r--r--graphics-libs/opencv4/HISTORY5
4 files changed, 12 insertions, 5 deletions
diff --git a/graphics-libs/opencv4/BUILD b/graphics-libs/opencv4/BUILD
index 0f9b1b9126..fcdd13c0c7 100755
--- a/graphics-libs/opencv4/BUILD
+++ b/graphics-libs/opencv4/BUILD
@@ -1,4 +1,5 @@
CXXFLAGS=-D__STDC_CONSTANT_MACROS &&
+OPTS+=" -DENABLE_CCACHE=OFF" &&
OPTS+=" -DCMAKE_BUILD_TYPE=Release -DBUILD_DOCS=0 -DBUILD_PERF_TESTS=0 \
-DBUILD_TESTS=0 -Wno-dev" &&
if [[ $CV_CONTRIB != none ]];then
diff --git a/graphics-libs/opencv4/DEPENDS b/graphics-libs/opencv4/DEPENDS
index 1affccddcc..406f1bc720 100755
--- a/graphics-libs/opencv4/DEPENDS
+++ b/graphics-libs/opencv4/DEPENDS
@@ -1,4 +1,4 @@
-source $GRIMOIRE/CMAKE_CONFIGURE &&
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends -sub CXX gcc &&
depends pkgconfig &&
depends bzip2 &&
@@ -21,7 +21,7 @@ optional_depends xine-lib '-DWITH_XINE=1' '-DWITH_XINE=0' 'Xine support'
optional_depends libucil '-DWITH_UNICAP=1' '-DWITH_UNICAP=0' 'video capture support' &&
optional_depends libraw1394 '-DWITH_1394=1' '-DWITH_1394=0' 'Firewire support' &&
optional_depends gtk+3 '-DWITH_GTK=1' '-DWITH_GTK=0' 'Gtk gui support' &&
-optional_depends qtbase '-DWITH_QT=1' '-DWITH_QT=0' 'Qt5 gui support' &&
+optional_depends qtbase '-DWITH_QT=5' '-DWITH_QT=0' 'Qt5 gui support' &&
optional_depends EIGEN '-DWITH_EIGEN=1' '-DWITH_EIGEN=0' 'Eigen2/3 matrix support' &&
optional_depends openexr '-DWITH_OPENEXR=1' '-DWITH_OPENEXR=0' 'ILM support' &&
optional_depends libwebp '-DWITH_WEBP=1' '-DWITH_WEBP=0' 'WebP support' &&
diff --git a/graphics-libs/opencv4/DETAILS b/graphics-libs/opencv4/DETAILS
index 59bfdf0b8a..9ee887269e 100755
--- a/graphics-libs/opencv4/DETAILS
+++ b/graphics-libs/opencv4/DETAILS
@@ -1,6 +1,7 @@
+source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=opencv4
- VERSION=4.5.1
- SOURCE_HASH=sha512:d74ae3bc340639cbc8b5db41a1fec710acabf8ec828dd28ce3bacf7029d1afd23aeaf47a2273a42995de285daa8aef33a7f90d5c57ef096e2cb872e0845e92b0
+ VERSION=4.5.4
+ SOURCE_HASH=sha512:39a7af95bc30d427c6df5e5d481469ab1ceea7878a93ae5c119991333e877a88d0a644e17dc6bd316e64b2840e48411a97f1b2397a8000719c5cec32751fa954
IPPV=ippicv_2020_lnx_intel64_20191018_general.tgz
GIT=a56b6ac6f030c312b2dce17430eef13aed9af274
SOURCE=${SPELL}-$VERSION.tar.gz
@@ -8,7 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL%?}-${VERSION}
URL=https://github.com/opencv
SOURCE_URL[0]=$URL/opencv/archive/$VERSION.tar.gz
if ! list_find "$CV_CONTRIB" none ;then
- SOURCE2_HASH=sha512:1ebb9fec53b74039ffa2dc9f00899ab83af615f01156c0454ea7c53161256b6c9fd4548387fbfd197182c2d03db4de8c7170e2877b4648ce92531f821e81fdd7
+ SOURCE2_HASH=sha512:a48d4b5d764170814d9027fdf50f61bb4a24f0b5a547dded79d06b948f86443f14734efc7bbb708b3870781cafc6bc9e3092d35dac34a81da2bf1740d5f93ff9
SOURCE2=opencv_contrib-$VERSION.tar.gz
SOURCE2_URL[0]=$URL/opencv_contrib/archive/$VERSION.tar.gz
fi
diff --git a/graphics-libs/opencv4/HISTORY b/graphics-libs/opencv4/HISTORY
index ae6b037ed4..c36e4f77e6 100644
--- a/graphics-libs/opencv4/HISTORY
+++ b/graphics-libs/opencv4/HISTORY
@@ -1,3 +1,8 @@
+2021-10-12 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 4.5.4
+ * DEPENDS: fix typo
+ * BUILD: force disable internal ccache
+
2021-01-04 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 4.5.1