Skip to Content.
Sympa Menu

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

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, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (8ecbf64190abea98a4c2004bde5b1ba2461d7d60)
  • Date: Fri, 21 Jun 2024 18:15:07 +0000

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

utils/usbutils/DETAILS | 4 ++--
utils/usbutils/HISTORY | 4 ++++
utils/usbutils/PRE_BUILD | 3 ---
video/v4l-utils/BUILD | 8 ++++----
video/v4l-utils/CONFIGURE | 3 ++-
video/v4l-utils/DEPENDS | 15 +++++++--------
video/v4l-utils/DETAILS | 5 +++--
video/v4l-utils/HISTORY | 6 ++++++
video/v4l-utils/PRE_BUILD | 7 -------
9 files changed, 28 insertions(+), 27 deletions(-)

New commits:
commit 8ecbf64190abea98a4c2004bde5b1ba2461d7d60
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

v4l-utils: => 1.26.1

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

usbutils: => 017

diff --git a/utils/usbutils/DETAILS b/utils/usbutils/DETAILS
index 42295f0..3d04d90 100755
--- a/utils/usbutils/DETAILS
+++ b/utils/usbutils/DETAILS
@@ -1,6 +1,6 @@
SPELL=usbutils
- VERSION=014
-
SOURCE_HASH=sha512:43c9f6ed14f8d01e014ef39a5d50b3b09031c6bda8261e0945b4cb4287c9107104175b386c2adc61dc7f9f476afb30f9a647a6ece6dee26b4133a4f10af72792
+ VERSION=017
+
SOURCE_HASH=sha512:eaebbc82eee4d940898f7a8de95ca49846c7c964e65c3d866b38735f8f3c8ccfed2b3a536bf2ef39a835a40a34c2273ac4d82b1012d0c693d4863cff14870d95
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE2=$SOURCE.sign
SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/usb/usbutils/$SOURCE
diff --git a/utils/usbutils/HISTORY b/utils/usbutils/HISTORY
index e9dfe8f..96f36c2 100644
--- a/utils/usbutils/HISTORY
+++ b/utils/usbutils/HISTORY
@@ -1,3 +1,7 @@
+2024-06-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 017
+ * PRE_BUILD: deleted
+
2021-10-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 014

diff --git a/utils/usbutils/PRE_BUILD b/utils/usbutils/PRE_BUILD
deleted file mode 100755
index c51d7b2..0000000
--- a/utils/usbutils/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-autoreconf -f -i --symlink
diff --git a/video/v4l-utils/BUILD b/video/v4l-utils/BUILD
index c26d5c6..3791dc4 100755
--- a/video/v4l-utils/BUILD
+++ b/video/v4l-utils/BUILD
@@ -1,7 +1,7 @@
-if is_depends_enabled $SPELL qt4; then
- export PKG_CONFIG_PATH=$QT4DIR/lib/pkgconfig &&
- PATH+=":$QT4DIR/bin"
-fi &&
+#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"
diff --git a/video/v4l-utils/CONFIGURE b/video/v4l-utils/CONFIGURE
index 1faa06a..4b67bbc 100755
--- a/video/v4l-utils/CONFIGURE
+++ b/video/v4l-utils/CONFIGURE
@@ -1,2 +1,3 @@
+source $GRIMOIRE/MESON_CONFIGURE
config_query_option V4L_BPF "Enable IR bpf decoders?" y \
- --enable-bpf --disable-bpf
+ bpf=enabled bpf=disabled
diff --git a/video/v4l-utils/DEPENDS b/video/v4l-utils/DEPENDS
index be845d5..c9aee48 100755
--- a/video/v4l-utils/DEPENDS
+++ b/video/v4l-utils/DEPENDS
@@ -1,3 +1,4 @@
+source $GRIMOIRE/MESON_DEPENDS &&
depends -sub CXX gcc &&
depends PKG-CONFIG &&
depends libx11 &&
@@ -9,12 +10,10 @@ case "$HOST" in
depends libuargp
;;
esac &&
-optional_depends GETTEXT '' '--disable-nls' 'NLS support' &&
-optional_depends alsa-lib '' '' 'ALSA support' &&
-optional_depends JPEG '' '--without-jpeg' 'JPEG support' &&
-optional_depends qtbase \
- '--enable-qv4l2 --enable-qvidcap' \
- '--disable-qv4l2 --disable-qvidcap' \
- 'qt5 support' &&
+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 DEVICE-MANAGER '' '' 'UDEV support' &&
-optional_depends sdl2 '' '' 'SDL2 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 49584bf..ff97385 100755
--- a/video/v4l-utils/DETAILS
+++ b/video/v4l-utils/DETAILS
@@ -1,6 +1,7 @@
+source $GRIMOIRE/MESON_FUNCTIONS
SPELL=v4l-utils
- VERSION=1.22.1
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=1.26.1
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=https://linuxtv.org/downloads/$SPELL/$SOURCE
SOURCE2=$SOURCE.asc
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
diff --git a/video/v4l-utils/HISTORY b/video/v4l-utils/HISTORY
index d7252ba..42a51a2 100644
--- a/video/v4l-utils/HISTORY
+++ b/video/v4l-utils/HISTORY
@@ -1,3 +1,9 @@
+2024-06-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.26.1
+ * PRE_BUILD: deleted
+ * *: use meson build
+ * DEPENDS: drop qt4, alsa; add doxygen
+
2022-07-27 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: switch to PKG-CONFIG provider (automated)

diff --git a/video/v4l-utils/PRE_BUILD b/video/v4l-utils/PRE_BUILD
deleted file mode 100755
index 1ee3d1a..0000000
--- a/video/v4l-utils/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-apply_patch_dir patches &&
-case "$HOST" in *-musl)
- sedit '/^mc_nextgen_test_LDADD *=/s/$/ -largp/' contrib/test/Makefile.in
- ;;
-esac


  • [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (8ecbf64190abea98a4c2004bde5b1ba2461d7d60), Treeve Jelbert, 06/21/2024

Archive powered by MHonArc 2.6.24.

Top of Page