Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

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

 video/v4l-utils/BUILD   |   14 +++++++-------
 video/v4l-utils/DEPENDS |    7 ++++++-
 video/v4l-utils/DETAILS |    2 +-
 video/v4l-utils/HISTORY |    4 ++++
 4 files changed, 18 insertions(+), 9 deletions(-)

New commits:
commit 68a9eb0eced709bf20d208e786a8674523dbf0b0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    v4l-utils - add qt6 support

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

    v4l-utils: => 1.28.1

diff --git a/video/v4l-utils/BUILD b/video/v4l-utils/BUILD
index 3791dc4..b99ee93 100755
--- a/video/v4l-utils/BUILD
+++ b/video/v4l-utils/BUILD
@@ -1,11 +1,11 @@
-#if is_depends_enabled $SPELL qt6base; then
-#  export PKG_CONFIG_PATH=$QT6DIR/lib/pkgconfig &&
-#  PATH+=":$QT6DIR/bin"
-#fi  &&
-if is_depends_enabled $SPELL qtbase; then
-  export PKG_CONFIG_PATH=$QT5DIR/lib/pkgconfig &&
-  PATH+=":$QT5DIR/bin"
+if is_depends_enabled $SPELL qt6base; then
+  export PKG_CONFIG_PATH=$QT6DIR/lib/pkgconfig &&
+  PATH+=":$QT6DIR/bin"
 fi  &&
+#if is_depends_enabled $SPELL qtbase; then
+#  export PKG_CONFIG_PATH=$QT5DIR/lib/pkgconfig &&
+#  PATH+=":$QT5DIR/bin"
+#fi  &&
 
 OPTS+=" $V4L_BPF" &&
 
diff --git a/video/v4l-utils/DEPENDS b/video/v4l-utils/DEPENDS
index c9aee48..389f0ce 100755
--- a/video/v4l-utils/DEPENDS
+++ b/video/v4l-utils/DEPENDS
@@ -13,7 +13,12 @@ esac &&
 optional_depends GETTEXT   '' '' 'NLS support' &&
 #optional_depends alsa-lib '' '' 'ALSA support' &&
 optional_depends JPEG    jpeg=enabled  jpeg=disabled  'JPEG support' &&
-optional_depends qtbase  qv4l2=enabled qv4l2=disabled 'qt5 support' &&
+optional_depends qt6base qvidcap=enabled qvidcap=disabled 'qt6 support' &&
+if is_depends_enabled $SPELL qt6base;then
+  depends qt5compat
+else
+  optional_depends qtbase  qv4l2=enabled qv4l2=disabled 'qt5 support'
+fi &&
 optional_depends DEVICE-MANAGER '' '' 'UDEV support' &&
 optional_depends sdl2    '' '' 'SDL2 support' &&
 optional_depends doxygen doxygen-doc-enabled doxygen-doc=disabled 'build 
docs'
diff --git a/video/v4l-utils/DETAILS b/video/v4l-utils/DETAILS
index ff97385..e60ac18 100755
--- a/video/v4l-utils/DETAILS
+++ b/video/v4l-utils/DETAILS
@@ -1,6 +1,6 @@
 source  $GRIMOIRE/MESON_FUNCTIONS
            SPELL=v4l-utils
-         VERSION=1.26.1
+         VERSION=1.28.1
           SOURCE=$SPELL-$VERSION.tar.xz
    SOURCE_URL[0]=https://linuxtv.org/downloads/$SPELL/$SOURCE
          SOURCE2=$SOURCE.asc
diff --git a/video/v4l-utils/HISTORY b/video/v4l-utils/HISTORY
index 42a51a2..cff027e 100644
--- a/video/v4l-utils/HISTORY
+++ b/video/v4l-utils/HISTORY
@@ -1,3 +1,7 @@
+2024-09-01 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.28.1
+       * DEPENDS BUILD: add qt6 support
+
 2024-06-21 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.26.1
        * PRE_BUILD: deleted