Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 graphics-libs/opencv5/BUILD     |   16 +---------------
 graphics-libs/opencv5/DETAILS   |    2 +-
 graphics-libs/opencv5/HISTORY   |    5 +++++
 graphics-libs/opencv5/PREPARE   |    6 +++---
 graphics-libs/opencv5/PRE_BUILD |    1 -
 5 files changed, 10 insertions(+), 20 deletions(-)

New commits:
commit 7c857d3c359e302ebfe9ac19d4fb511a043d0dd6
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    opencv5: Fix CV_CONTRIB usage

diff --git a/graphics-libs/opencv5/BUILD b/graphics-libs/opencv5/BUILD
index 8dd40b8..a25ffb1 100755
--- a/graphics-libs/opencv5/BUILD
+++ b/graphics-libs/opencv5/BUILD
@@ -3,25 +3,11 @@ OPTS+=" -DENABLE_CCACHE=OFF" &&
 OPTS+=" -DCMAKE_BUILD_TYPE=Release -DBUILD_DOCS=0 -DBUILD_PERF_TESTS=0 \
   -DBUILD_TESTS=0 -Wno-dev" &&
 OPTS+=' -DOPENCV_FORCE_3RDPARTY_BUILD=0' &&
-CONTRIB=''
 
-if [[ $CV_CONTRIB_A_N != none ]];then
-  CONTRIB+="$CV_CONTRIB_A_N"
-fi &&
-if [[ $CV_CONTRIB_O_Z != none ]];then
-  CONTRIB+=" $CV_CONTRIB_O_Z"
-fi
-if [[ $CV_CONTRIB_CUDA != none ]];then
-  CONTRIB+=" $CV_CONTRIB_CUDA"
-fi
-
-
-if [[ $CONTRIB != none ]];then
+if [[ -n $CV_CONTRIB ]];then
  OPTS+=" -DOPENCV_EXTRA_MODULES_PATH=$SOURCE_DIRECTORY/contrib"
 fi &&
 
 OPTS+=" -DIPPROOT=$SOURCE_DIRECTORY/ippicv_lnx" &&
 
-# PCH fails, at least with, with GCC 6.2
-#OPTS+=" -DENABLE_PRECOMPILED_HEADERS=0" &&
 cmake_build
diff --git a/graphics-libs/opencv5/DETAILS b/graphics-libs/opencv5/DETAILS
index 7877bad..e1b15ff 100755
--- a/graphics-libs/opencv5/DETAILS
+++ b/graphics-libs/opencv5/DETAILS
@@ -9,7 +9,7 @@ source $GRIMOIRE/CMAKE_FUNCTIONS
 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
+if [[ -n $CV_CONTRIB ]];then
     
SOURCE2_HASH=sha512:09841f4637f6a51a5e12a5516710e61a3cedd2622455366004cd9e35484a6d03cc9c12de52edae4072dc37af104d7fd9099201effee82c52dd40b8a58c51fdc5
          SOURCE2=opencv_contrib-$VERSION.tar.gz
   SOURCE2_URL[0]=$URL/opencv_contrib/archive/$VERSION.tar.gz
diff --git a/graphics-libs/opencv5/HISTORY b/graphics-libs/opencv5/HISTORY
index f2314e4..57f8b9c 100644
--- a/graphics-libs/opencv5/HISTORY
+++ b/graphics-libs/opencv5/HISTORY
@@ -1,3 +1,8 @@
+2026-09-22 Ismael Luceno <ismael AT sourcemage.org>
+       * DETAILS, BUILD, PRE_BUILD: fixed checking CV_CONTRIB for emptiness;
+       * PREPARE: reset CV_CONTRIB before combining, so reconfiguring does
+         not append to the persisted value.
+
 2026-08-05 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 5.0.0
         spell created, based on opencv4
diff --git a/graphics-libs/opencv5/PREPARE b/graphics-libs/opencv5/PREPARE
index 2d3447d..f8288a8 100755
--- a/graphics-libs/opencv5/PREPARE
+++ b/graphics-libs/opencv5/PREPARE
@@ -16,13 +16,13 @@ config_query_multi CV_CONTRIB_CUDA "Which contributed 
modules CUDA" none \
 # now combine them
 persistent_remove CV_CONTRIB &&
 persistent_add CV_CONTRIB &&
+CV_CONTRIB= &&
 if [[ $CV_CONTRIB_A_N != none ]];then
-  CV_CONTRIB+="$CV_CONTRIB_A_N"
+  CV_CONTRIB+=" $CV_CONTRIB_A_N"
 fi &&
 if [[ $CV_CONTRIB_O_Z != none ]];then
   CV_CONTRIB+=" $CV_CONTRIB_O_Z"
-fi
+fi &&
 if [[ $CV_CONTRIB_CUDA != none ]];then
   CV_CONTRIB+=" $CV_CONTRIB_CUDA"
 fi
-
diff --git a/graphics-libs/opencv5/PRE_BUILD b/graphics-libs/opencv5/PRE_BUILD
index c1c7b74..751cb50 100755
--- a/graphics-libs/opencv5/PRE_BUILD
+++ b/graphics-libs/opencv5/PRE_BUILD
@@ -3,7 +3,6 @@ cd $SOURCE_DIRECTORY &&
 apply_patch_dir patches &&
 unpack_file 3 &&
 ln -s ippiw_lnx/src iw &&
-#if ! list_find "$CV_CONTRIB" none ;then
 if [[ -n "$CV_CONTRIB" ]] ;then
  cd $BUILD_DIRECTORY  &&
  unpack_file 2 &&