Skip to Content.
Sympa Menu

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

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 (04fece80170adfed84f446a722d76cec760e4ea6)
  • Date: Thu, 15 Feb 2018 18:49:32 +0000

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

graphics-libs/opencv3/DEPENDS | 3 +--
graphics-libs/opencv3/HISTORY | 5 +++++
graphics-libs/opencv3/PREPARE | 2 +-
graphics-libs/opencv3/PRE_SUB_DEPENDS | 8 ++++++++
graphics-libs/opencv3/SUB_DEPENDS | 8 ++++++++
kde5-apps/digikam/DEPENDS | 2 +-
kde5-apps/digikam/HISTORY | 3 +++
7 files changed, 27 insertions(+), 4 deletions(-)

New commits:
commit 04fece80170adfed84f446a722d76cec760e4ea6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

digikam - improve opencv3 depends

commit bb5ac853ee10b09f8528899d46fb3ee7ccecfb0c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

opencv3 - support subdepends

commit 6c45c134692e8c9af29953fc6219c8957e6ceec9
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

opencv3 - more options

diff --git a/graphics-libs/opencv3/DEPENDS b/graphics-libs/opencv3/DEPENDS
index ff18183..ad09e12 100755
--- a/graphics-libs/opencv3/DEPENDS
+++ b/graphics-libs/opencv3/DEPENDS
@@ -1,5 +1,4 @@
-
-depends cmake &&
+source $GRIMOIRE/CMAKE_CONFIGURE &&
depends -sub CXX gcc &&
depends pkgconfig &&
depends bzip2 &&
diff --git a/graphics-libs/opencv3/HISTORY b/graphics-libs/opencv3/HISTORY
index d599716..adba66e 100644
--- a/graphics-libs/opencv3/HISTORY
+++ b/graphics-libs/opencv3/HISTORY
@@ -1,3 +1,8 @@
+2018-02-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: acutially use ninja
+ * PREPARE: add tracking moudel, neede by face module
+ * PRE_SUB_DEPENDS SUB_DEPENDS: added, used by digikam
+
2018-01-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.4.0

diff --git a/graphics-libs/opencv3/PREPARE b/graphics-libs/opencv3/PREPARE
index 400f339..589f03a 100755
--- a/graphics-libs/opencv3/PREPARE
+++ b/graphics-libs/opencv3/PREPARE
@@ -1,2 +1,2 @@
source $GRIMOIRE/config_query_multi.function
-config_query_multi CV_CONTRIB "Which contributed modules" none face ximgproc
xobjdetect xphoto
+config_query_multi CV_CONTRIB "Which contributed modules" none face plot
tracking ximgproc xobjdetect xphoto
diff --git a/graphics-libs/opencv3/PRE_SUB_DEPENDS
b/graphics-libs/opencv3/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..dc0a269
--- /dev/null
+++ b/graphics-libs/opencv3/PRE_SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+ FACE) list_find "$CV_CONTRIB" "face" &&
+ list_find "$CV_CONTRIB" "plot" &&
+ list_find "$CV_CONTRIB" "tracking" &&
+ return 0;;
+ *) echo "Eek, unknown subdependency requested!"; return 1;;
+esac
+return 1
diff --git a/graphics-libs/opencv3/SUB_DEPENDS
b/graphics-libs/opencv3/SUB_DEPENDS
new file mode 100755
index 0000000..3251d0e
--- /dev/null
+++ b/graphics-libs/opencv3/SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+ FACE) echo "facial recognition requested - forcing it" &&
+ list_add CV_CONTRIB "face" &&
+ list_add CV_CONTRIB "plot" &&
+ list_add CV_CONTRIB "tracking"
+ ;;
+ *) echo unknown sub-depends!!! ; return 1 ;;
+esac
diff --git a/kde5-apps/digikam/DEPENDS b/kde5-apps/digikam/DEPENDS
index 858a7a8..bf2631f 100755
--- a/kde5-apps/digikam/DEPENDS
+++ b/kde5-apps/digikam/DEPENDS
@@ -20,7 +20,7 @@ depends lcms2 &&
depends libpgf &&
depends libpng &&
depends libx11 &&
-depends OPENCV &&
+depends -sub FACE OPENCV &&
depends pkgconfig &&
depends sqlite &&
depends tiff &&
diff --git a/kde5-apps/digikam/HISTORY b/kde5-apps/digikam/HISTORY
index 01310ef..493ed1f 100644
--- a/kde5-apps/digikam/HISTORY
+++ b/kde5-apps/digikam/HISTORY
@@ -1,3 +1,6 @@
+2018-02-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: -sub FACE opencv3
+
2018-02-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.8.0




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (04fece80170adfed84f446a722d76cec760e4ea6), Treeve Jelbert, 02/15/2018

Archive powered by MHonArc 2.6.24.

Top of Page