Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (73a821462dab36deb52f48d0fc05beecdc2b8344)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (73a821462dab36deb52f48d0fc05beecdc2b8344)
  • Date: Sun, 13 Dec 2020 10:31:39 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

graphics-libs/opencv4/BUILD | 7 +------
graphics-libs/opencv4/DEPENDS | 3 ++-
graphics-libs/opencv4/HISTORY | 5 +++++
3 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 73a821462dab36deb52f48d0fc05beecdc2b8344
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

tweak opencv4

diff --git a/graphics-libs/opencv4/BUILD b/graphics-libs/opencv4/BUILD
index 7470e85..0f9b1b9 100755
--- a/graphics-libs/opencv4/BUILD
+++ b/graphics-libs/opencv4/BUILD
@@ -9,9 +9,4 @@ OPTS+=" -DIPPROOT=$SOURCE_DIRECTORY/ippicv_lnx" &&

# PCH fails, at least with, with GCC 6.2
#OPTS+=" -DENABLE_PRECOMPILED_HEADERS=0" &&
-
-if is_depends_enabled $SPELL qtbase;then
- qt5_cmake_build
-else
- cmake_build
-fi
+cmake_build
diff --git a/graphics-libs/opencv4/DEPENDS b/graphics-libs/opencv4/DEPENDS
index 170e901..1affccd 100755
--- a/graphics-libs/opencv4/DEPENDS
+++ b/graphics-libs/opencv4/DEPENDS
@@ -15,7 +15,8 @@ optional_depends numpy '' '' 'Numerical python
support' &&
if is_depends_enabled $SPELL numpy;then
depends PYTHON
fi &&
-optional_depends tbb '-DWITH_TBB=1' '-DWITH_TBB=0' 'parallel
processing support' &&
+#optional_depends tbb '-DWITH_TBB=1' '-DWITH_TBB=0' 'parallel
processing support' &&
+optional_depends protobuf -DWITH_PROTOBUF={on,off} 'use system protobuf'
&&
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' &&
diff --git a/graphics-libs/opencv4/HISTORY b/graphics-libs/opencv4/HISTORY
index 4b66f7d..1c1cbb8 100644
--- a/graphics-libs/opencv4/HISTORY
+++ b/graphics-libs/opencv4/HISTORY
@@ -1,3 +1,8 @@
+2020-12-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add protobuf
+ temporarily disable tbb, 2021.1.1 not compatible
+ * BUILD: simplify
+
2020-10-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.5.0




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (73a821462dab36deb52f48d0fc05beecdc2b8344), Treeve Jelbert, 12/13/2020

Archive powered by MHonArc 2.6.24.

Top of Page