Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (87ee5d9e9894a36b05af1ee8c0e7b8fe85362924)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <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 Ismael Luceno (87ee5d9e9894a36b05af1ee8c0e7b8fe85362924)
  • Date: Fri, 27 Dec 2024 20:19:08 +0000

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

audio-players/cdparanoia/HISTORY
| 5
audio-players/cdparanoia/PRE_BUILD
| 18 -
audio-players/cdparanoia/patches/0001-Fix-werror-format-security.patch
| 32 ++
devel/doxygen/BUILD
| 5
devel/doxygen/DETAILS
| 4
devel/doxygen/HISTORY
| 6
devel/doxygen/PRE_BUILD
| 3
devel/doxygen/patches/0001-Adjust-to-libfmt-11-changes.patch
| 117 ++++++++++
utils/xcur2png/DETAILS
| 1
utils/xcur2png/HISTORY
| 6
utils/xcur2png/PRE_BUILD
| 3
utils/xcur2png/patches/0001-Fix-warnings.patch
| 62 +++++
utils/xcur2png/patches/0001-fix-wrong-math.patch
| 29 ++
video/v4l-utils/BUILD
| 4
video/v4l-utils/CONFIGURE
| 5
video/v4l-utils/DEPENDS
| 4
video/v4l-utils/DETAILS
| 1
video/v4l-utils/HISTORY
| 8
video/v4l-utils/PRE_BUILD
| 3
video/v4l-utils/patches/0001-v4l2-tracer-Define-_LARGEFILE64_SOURCE.patch
| 28 ++
video/v4l-utils/patches/0002-qv4l2-Use-fcntl.h-instead-of-sys-fcntl.h.patch
| 27 ++
video/v4l-utils/patches/0003-meson-Add-support-for-libexecinfo.patch
| 67 +++++
22 files changed, 417 insertions(+), 21 deletions(-)

New commits:
commit 87ee5d9e9894a36b05af1ee8c0e7b8fe85362924
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

cdparanoia: Fix missing inclusion of <stdint.h>

Also, apply the portability changes unconditionally.

commit b38c7562864eadb16d3e16797bcc8ed01d8a5c09
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

cdparanoia: Fix fprintf usage

commit b56f77b146bb1ae1aa0f21bf36c7f52c5a8a95a0
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

v4l-utils: Fix build against musl

commit 20b00d4679690fe7f87c31f1a61aa70569a9521b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

doxygen 1.12.0

commit ec838ed9c7272cc264e4341328a89e08be6d28e6
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

xcur2png: Add fixes

- Fix build with GCC 14
- Fix color calculation bug.

diff --git a/audio-players/cdparanoia/HISTORY
b/audio-players/cdparanoia/HISTORY
index 3c4c49c..492ea4a 100644
--- a/audio-players/cdparanoia/HISTORY
+++ b/audio-players/cdparanoia/HISTORY
@@ -1,3 +1,8 @@
+2024-12-27 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, patches/0001-Fix-werror-format-security.patch:
+ fixed fprintf usage.
+ fixed missing inclusion of <stdint.h>.
+
2024-02-24 Treeve Jelbert <treeve AT sourcemage.org>
* PRE_BUILD: always apply patch
* DETAILS: PATCHLEVEL++
diff --git a/audio-players/cdparanoia/PRE_BUILD
b/audio-players/cdparanoia/PRE_BUILD
index 8c2c33c..066cc27 100755
--- a/audio-players/cdparanoia/PRE_BUILD
+++ b/audio-players/cdparanoia/PRE_BUILD
@@ -1,12 +1,14 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&
bunzip2 -c $SPELL_DIRECTORY/gcc43-private.patch.bz2 | patch -fp1 &&

-if spell_ok musl; then
- sedit 's!maybe_os in$!& linux-musl*|\\!' configure.sub &&
- sed -E -i 's/u_(int[13][26]_t)/u\1/g' \
- interface/interface.c \
- interface/scsi_interface.c \
- interface/utils.h \
- utils.h
-fi
+sedit 's!maybe_os in$!& linux-musl*|\\!' configure.sub &&
+
+# Fix non-standard types
+sed -E -i '1i#include <stdint.h>' utils.h &&
+sed -E -i 's/u_(int[13][26]_t)/u\1/g' \
+ interface/interface.c \
+ interface/scsi_interface.c \
+ interface/utils.h \
+ utils.h
diff --git
a/audio-players/cdparanoia/patches/0001-Fix-werror-format-security.patch
b/audio-players/cdparanoia/patches/0001-Fix-werror-format-security.patch
new file mode 100644
index 0000000..576b1dc
--- /dev/null
+++ b/audio-players/cdparanoia/patches/0001-Fix-werror-format-security.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: psykose <alice AT ayaya.dev>
+Date: Wed, 19 Apr 2023 18:45:01 +0000
+Subject: [PATCH] Fix werror=format-security
+
+Upstream-Status: Unknown
+Origin: Alpine Linux
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ main.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/main.c b/main.c
+index 664acac..d568fb1 100644
+--- a/main.c
++++ b/main.c
+@@ -588,10 +588,10 @@ static void callback(long inpos, int function){
+ buffer[aheadposition+19]='>';
+ }
+
+- fprintf(stderr,buffer);
++ fprintf(stderr, "%s", buffer);
+
+ if (logfile != NULL && function==-1) {
+- fprintf(logfile,buffer+1);
++ fprintf(logfile, "%s", buffer+1);
+ fprintf(logfile,"\n\n");
+ fflush(logfile);
+ }
+--
+Fixed up by sm-checkpatch 0.1
+
diff --git a/devel/doxygen/BUILD b/devel/doxygen/BUILD
index 9ce13f6..b621581 100755
--- a/devel/doxygen/BUILD
+++ b/devel/doxygen/BUILD
@@ -1,5 +1,6 @@
-OPTS="$ENGLISH_ONLY $OPTS"
-if is_depends_enabled $SPELL qt6base;then
+OPTS+=" $ENGLISH_ONLY" &&
+OPTS+=' -DGIT_EXECUTABLE=/bin/false' && # Don't try to use Git during build
+if is_depends_enabled $SPELL qt6base; then
PATH="$QT6DIR/bin/:$PATH"
fi &&
if is_depends_enabled $SPELL fmt;then
diff --git a/devel/doxygen/DETAILS b/devel/doxygen/DETAILS
index 915a84a..470f7f1 100755
--- a/devel/doxygen/DETAILS
+++ b/devel/doxygen/DETAILS
@@ -1,6 +1,6 @@
SPELL=doxygen
- VERSION=1.11.0
-
SOURCE_HASH=sha512:54f4a15e459d1d9cc3b4f021b5264191146bd8e0e780b57c4c31f4f9dcbfc7fe7a9db58e8cda4c6df1b4b354dd432dac0b3089fd547afe7cbe313771b2c6aaa4
+ VERSION=1.12.0
+
SOURCE_HASH=sha512:e407e29c5e232e1f8dca291dd2d00b1dd400be709400225339408fad2cd758563b69f290cbd7c0efeb76b1335c4672fb1d6d580b9e6ed570708cf9b7d78951b1
SOURCE=$SPELL-$VERSION.src.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://doxygen.nl/files/$SOURCE
diff --git a/devel/doxygen/HISTORY b/devel/doxygen/HISTORY
index 4114ff2..24b1e35 100644
--- a/devel/doxygen/HISTORY
+++ b/devel/doxygen/HISTORY
@@ -1,3 +1,9 @@
+2024-12-27 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.12.0
+ * BUILD: avoid using git
+ * PRE_BUILD, patches/0001-Adjust-to-libfmt-11-changes.patch:
+ fixed build against fmt 11
+
2024-10-04 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: drop unused ghostscript

diff --git a/devel/doxygen/PRE_BUILD b/devel/doxygen/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/devel/doxygen/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git a/devel/doxygen/patches/0001-Adjust-to-libfmt-11-changes.patch
b/devel/doxygen/patches/0001-Adjust-to-libfmt-11-changes.patch
new file mode 100644
index 0000000..3a38929
--- /dev/null
+++ b/devel/doxygen/patches/0001-Adjust-to-libfmt-11-changes.patch
@@ -0,0 +1,117 @@
+From 567aca983f70b01103271e431bc71a13ac79213c Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona AT protonmail.com>
+Date: Fri, 9 Aug 2024 03:00:05 +0300
+Subject: [PATCH] Adjust to libfmt-11 changes
+
+Bug: https://bugs.gentoo.org/937599
+See-Also:
https://github.com/fmtlib/fmt/commit/d70729215fba1d54862e407b626abf86ddf409bf
+Signed-off-by: Alfred Wingate <parona AT protonmail.com>
+Upstream-Status: Backport
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ src/trace.h | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/src/trace.h b/src/trace.h
+index 13a816650d7..8062e0b19ef 100644
+--- a/src/trace.h
++++ b/src/trace.h
+@@ -156,7 +156,7 @@ namespace fmt { template<typename T> struct formatter
{}; }
+ //! adds support for formatting QCString
+ template<> struct fmt::formatter<QCString> : formatter<std::string>
+ {
+- auto format(const QCString &c, format_context& ctx) {
++ auto format(const QCString &c, format_context& ctx) const {
+ return formatter<std::string>::format(c.str(), ctx);
+ }
+ };
+@@ -164,7 +164,7 @@ template<> struct fmt::formatter<QCString> :
formatter<std::string>
+ //! adds support for formatting Protected
+ template<> struct fmt::formatter<Protection> : formatter<std::string>
+ {
+- auto format(Protection prot, format_context& ctx) {
++ auto format(Protection prot, format_context& ctx) const {
+ std::string result="Unknown";
+ switch (prot)
+ {
+@@ -180,7 +180,7 @@ template<> struct fmt::formatter<Protection> :
formatter<std::string>
+ //! adds support for formatting Specifier
+ template<> struct fmt::formatter<Specifier> : formatter<std::string>
+ {
+- auto format(Specifier spec, format_context& ctx) {
++ auto format(Specifier spec, format_context& ctx) const {
+ std::string result="Unknown";
+ switch (spec)
+ {
+@@ -195,7 +195,7 @@ template<> struct fmt::formatter<Specifier> :
formatter<std::string>
+ //! adds support for formatting MethodTypes
+ template<> struct fmt::formatter<MethodTypes> : formatter<std::string>
+ {
+- auto format(MethodTypes mtype, format_context& ctx) {
++ auto format(MethodTypes mtype, format_context& ctx) const {
+ std::string result="Unknown";
+ switch (mtype)
+ {
+@@ -213,7 +213,7 @@ template<> struct fmt::formatter<MethodTypes> :
formatter<std::string>
+ //! adds support for formatting RelatesType
+ template<> struct fmt::formatter<RelatesType> : formatter<std::string>
+ {
+- auto format(RelatesType type, format_context& ctx) {
++ auto format(RelatesType type, format_context& ctx) const {
+ std::string result="Unknown";
+ switch (type)
+ {
+@@ -228,7 +228,7 @@ template<> struct fmt::formatter<RelatesType> :
formatter<std::string>
+ //! adds support for formatting RelationShip
+ template<> struct fmt::formatter<Relationship> : formatter<std::string>
+ {
+- auto format(Relationship relation, format_context& ctx) {
++ auto format(Relationship relation, format_context& ctx) const {
+ std::string result="Unknown";
+ switch (relation)
+ {
+@@ -243,7 +243,7 @@ template<> struct fmt::formatter<Relationship> :
formatter<std::string>
+ //! adds support for formatting SrcLangExt
+ template<> struct fmt::formatter<SrcLangExt> : formatter<std::string>
+ {
+- auto format(SrcLangExt lang, format_context& ctx) {
++ auto format(SrcLangExt lang, format_context& ctx) const {
+ std::string result="Unknown";
+ switch (lang)
+ {
+@@ -273,7 +273,7 @@ template<> struct fmt::formatter<SrcLangExt> :
formatter<std::string>
+ //! adds support for formatting MemberType
+ template<> struct fmt::formatter<MemberType> : formatter<std::string>
+ {
+- auto format(MemberType mtype, format_context& ctx) {
++ auto format(MemberType mtype, format_context& ctx) const {
+ std::string result="Unknown";
+ switch (mtype)
+ {
+@@ -301,7 +301,7 @@ template<> struct fmt::formatter<MemberType> :
formatter<std::string>
+ //! adds support for formatting TypeSpecifier
+ template<> struct fmt::formatter<TypeSpecifier> : formatter<std::string>
+ {
+- auto format(TypeSpecifier type, format_context& ctx) {
++ auto format(TypeSpecifier type, format_context& ctx) const {
+ return formatter<std::string>::format(type.to_string(),ctx);
+ }
+ };
+@@ -309,7 +309,7 @@ template<> struct fmt::formatter<TypeSpecifier> :
formatter<std::string>
+ //! adds support for formatting EntryType
+ template<> struct fmt::formatter<EntryType> : formatter<std::string>
+ {
+- auto format(EntryType type, format_context& ctx) {
++ auto format(EntryType type, format_context& ctx) const {
+ return formatter<std::string>::format(type.to_string(),ctx);
+ }
+ };
+@@ -317,7 +317,7 @@ template<> struct fmt::formatter<EntryType> :
formatter<std::string>
+ //! adds support for formatting MemberListType
+ template<> struct fmt::formatter<MemberListType> : formatter<std::string>
+ {
+- auto format(MemberListType type, format_context& ctx) {
++ auto format(MemberListType type, format_context& ctx) const {
+ return formatter<std::string>::format(type.to_string(),ctx);
+ }
+ };
diff --git a/utils/xcur2png/DETAILS b/utils/xcur2png/DETAILS
index 76cd476..3eae0d8 100755
--- a/utils/xcur2png/DETAILS
+++ b/utils/xcur2png/DETAILS
@@ -1,5 +1,6 @@
SPELL=xcur2png
VERSION=0.7.1
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=https://github.com/eworm-de/${SPELL}/releases/download/${VERSION}/${SOURCE}
diff --git a/utils/xcur2png/HISTORY b/utils/xcur2png/HISTORY
index 066e853..4a35b63 100644
--- a/utils/xcur2png/HISTORY
+++ b/utils/xcur2png/HISTORY
@@ -1,3 +1,7 @@
+2024-12-27 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD, patches/0001-Fix-warnings.patch,
+ patches/0001-fix-wrong-math.patch: added fixes
+
2023-07-05 Conner Clere <xenanthropy AT sourcemage.org>
* DEPENDS, DETAILS: ver 0.7.1, new spell
-
diff --git a/utils/xcur2png/PRE_BUILD b/utils/xcur2png/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/utils/xcur2png/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git a/utils/xcur2png/patches/0001-Fix-warnings.patch
b/utils/xcur2png/patches/0001-Fix-warnings.patch
new file mode 100644
index 0000000..7e86d1b
--- /dev/null
+++ b/utils/xcur2png/patches/0001-Fix-warnings.patch
@@ -0,0 +1,62 @@
+From 79d11bfdde29c8b8854dcaa585ffa2607c9e6abd Mon Sep 17 00:00:00 2001
+From: Fred Brennan <copypaste AT kittens.ph>
+Date: Mon, 14 Nov 2022 06:37:52 -0500
+Subject: [PATCH] Fix warnings
+
+Fix -Wimplicit-int errors with GCC 14:
+
+ xcur2png.c: In function 'saveConfAndPNGs':
+ xcur2png.c:674:10: error: type defaults to 'int' in declaration of
'dry_run' [-Wimplicit-int]
+ 674 | extern dry_run;
+ | ^~~~~~~
+
+Upstream-Status: Submitted [https://github.com/eworm-de/xcur2png/pull/2]
+[ismael AT sourcemage.org: Improved commit message]
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ xcur2png.c | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/xcur2png.c b/xcur2png.c
+index 8723a10..00ff7cb 100644
+--- a/xcur2png.c
++++ b/xcur2png.c
+@@ -19,6 +19,7 @@
+ #include <config.h>
+
+ #define _ATFILE_SOURCE
++#include <stdbool.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -38,8 +39,8 @@
+
+ #define PROGRESS_SHARPS 50 /* total number of progress sharps */
+
+-int quiet = 0; /* 1: output is quiet, 0: not quiet */
+-int dry_run = 0; /* 1:don't output PNGs and conf is output to stdout. */
++bool quiet = 0; /* 1: output is quiet, 0: not quiet */
++bool dry_run = 0; /* 1:don't output PNGs and conf is output to stdout. */
+
+ #define VERBOSE_PRINT(...) \
+ if (!quiet) { fprintf (stderr, __VA_ARGS__); }
+@@ -92,8 +93,8 @@ void parseOptions (int argc, char* argv[], char** confp,
+ int ret;
+ extern char *optarg;
+ extern int optind;
+- extern int quiet;
+- extern int dry_run;
++ extern bool quiet;
++ extern bool dry_run;
+ const struct option longopts[] =
+ {
+ {"version", no_argument, NULL, 'V'},
+@@ -671,7 +672,7 @@ int saveConfAndPNGs (const XcursorImages* xcIs, const
char* xcurFilePart, int su
+ int ret;
+ int count = 0;
+ char pngName[PATH_MAX] = {0};
+- extern dry_run;
++ extern bool dry_run;
+
+ //Write comment on config-file.
+ fprintf (conffp,"#size\txhot\tyhot\tPath to PNG image\tdelay\n");
diff --git a/utils/xcur2png/patches/0001-fix-wrong-math.patch
b/utils/xcur2png/patches/0001-fix-wrong-math.patch
new file mode 100644
index 0000000..cca9a95
--- /dev/null
+++ b/utils/xcur2png/patches/0001-fix-wrong-math.patch
@@ -0,0 +1,29 @@
+From cda8f7af382f5c5f1e9a395eb03e2b819770d499 Mon Sep 17 00:00:00 2001
+From: Yuji Saeki <44311901+YujiSaeki AT users.noreply.github.com>
+Date: Mon, 1 Jun 2020 22:32:16 +0200
+Subject: [PATCH 1/1] fix wrong math
+
+Signed-off-by: Christian Hesse <mail AT eworm.de>
+Upstream-Status: Submitted [https://github.com/eworm-de/xcur2png/issues/1]
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ xcur2png.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/xcur2png.c b/xcur2png.c
+index 8723a10..f7dd95d 100644
+--- a/xcur2png.c
++++ b/xcur2png.c
+@@ -586,9 +586,9 @@ int writePngFileFromXcur (const XcursorDim width, const
XcursorDim height,
+ unsigned int red = (pixels[i]>>16) & 0xff;
+ unsigned int green = (pixels[i]>>8) & 0xff;
+ unsigned int blue = pixels[i] & 0xff;
+- red = (div (red * 256, alpha).quot) & 0xff;
+- green = (div (green * 256, alpha).quot) & 0xff;
+- blue = (div (blue * 256, alpha).quot) & 0xff;
++ red = (div (red * 255, alpha).quot) & 0xff;
++ green = (div (green * 255, alpha).quot) & 0xff;
++ blue = (div (blue * 255, alpha).quot) & 0xff;
+ pix[i] = (alpha << 24) + (red << 16) + (green << 8) + blue;
+ }
+
diff --git a/video/v4l-utils/BUILD b/video/v4l-utils/BUILD
index b99ee93..3e5a995 100755
--- a/video/v4l-utils/BUILD
+++ b/video/v4l-utils/BUILD
@@ -2,10 +2,6 @@ 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/CONFIGURE b/video/v4l-utils/CONFIGURE
index 4b67bbc..2536b45 100755
--- a/video/v4l-utils/CONFIGURE
+++ b/video/v4l-utils/CONFIGURE
@@ -1,3 +1,2 @@
-source $GRIMOIRE/MESON_CONFIGURE
- config_query_option V4L_BPF "Enable IR bpf decoders?" y \
- bpf=enabled bpf=disabled
+persistent_remove V4L_BPF &&
+. "$GRIMOIRE"/MESON_CONFIGURE
diff --git a/video/v4l-utils/DEPENDS b/video/v4l-utils/DEPENDS
index 389f0ce..5705d7a 100755
--- a/video/v4l-utils/DEPENDS
+++ b/video/v4l-utils/DEPENDS
@@ -1,4 +1,4 @@
-source $GRIMOIRE/MESON_DEPENDS &&
+. "$GRIMOIRE"/MESON_DEPENDS &&
depends -sub CXX gcc &&
depends PKG-CONFIG &&
depends libx11 &&
@@ -7,6 +7,7 @@ depends glu &&
depends LIBELF &&
case "$HOST" in
*-musl)
+ depends libexecinfo &&
depends libuargp
;;
esac &&
@@ -21,4 +22,5 @@ else
fi &&
optional_depends DEVICE-MANAGER '' '' 'UDEV support' &&
optional_depends sdl2 '' '' 'SDL2 support' &&
+optional_depends libbpf bpf=enabled bpf=disabled 'BPF 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 e60ac18..a909d5b 100755
--- a/video/v4l-utils/DETAILS
+++ b/video/v4l-utils/DETAILS
@@ -1,6 +1,7 @@
source $GRIMOIRE/MESON_FUNCTIONS
SPELL=v4l-utils
VERSION=1.28.1
+ PATCHLEVEL=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 cff027e..06b2f20 100644
--- a/video/v4l-utils/HISTORY
+++ b/video/v4l-utils/HISTORY
@@ -1,3 +1,11 @@
+2024-12-27 Ismael Luceno <ismael AT sourcemage.org>
+ * CONFIGURE, DEPENDS: added libbpf dep
+ * PRE_BUILD,
patches/0001-v4l2-tracer-Define-_LARGEFILE64_SOURCE.patch,
+ patches/0002-qv4l2-Use-fcntl.h-instead-of-sys-fcntl.h.patch,
+ patches/0003-meson-Add-support-for-libexecinfo.patch:
+ fixed build against musl
+ * DETAILS: PATCHLEVEL++
+
2024-09-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.28.1
* DEPENDS BUILD: add qt6 support
diff --git a/video/v4l-utils/PRE_BUILD b/video/v4l-utils/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/video/v4l-utils/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git
a/video/v4l-utils/patches/0001-v4l2-tracer-Define-_LARGEFILE64_SOURCE.patch
b/video/v4l-utils/patches/0001-v4l2-tracer-Define-_LARGEFILE64_SOURCE.patch
new file mode 100644
index 0000000..def2254
--- /dev/null
+++
b/video/v4l-utils/patches/0001-v4l2-tracer-Define-_LARGEFILE64_SOURCE.patch
@@ -0,0 +1,28 @@
+From b348ae0d898acabb2d7f5e44bed1861161e00053 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Fri, 27 Dec 2024 16:44:12 +0100
+Subject: [PATCH 1/3] v4l2-tracer: Define _LARGEFILE64_SOURCE
+
+Needed to expose mmap64 and open64 (required by musl).
+
+Upstream-Status: Pending
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ utils/v4l2-tracer/retrace.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/utils/v4l2-tracer/retrace.cpp b/utils/v4l2-tracer/retrace.cpp
+index 010936c0155b..c068f97d46fd 100644
+--- a/utils/v4l2-tracer/retrace.cpp
++++ b/utils/v4l2-tracer/retrace.cpp
+@@ -3,6 +3,7 @@
+ * Copyright 2022 Collabora Ltd.
+ */
+
++#define _LARGEFILE64_SOURCE
+ #include "retrace.h"
+
+ extern struct retrace_context ctx_retrace;
+--
+2.47.1
+
diff --git
a/video/v4l-utils/patches/0002-qv4l2-Use-fcntl.h-instead-of-sys-fcntl.h.patch
b/video/v4l-utils/patches/0002-qv4l2-Use-fcntl.h-instead-of-sys-fcntl.h.patch
new file mode 100644
index 0000000..d465cf4
--- /dev/null
+++
b/video/v4l-utils/patches/0002-qv4l2-Use-fcntl.h-instead-of-sys-fcntl.h.patch
@@ -0,0 +1,27 @@
+From 68274f94f687fce197e0b59125774e9523b8cc7f Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Fri, 27 Dec 2024 16:50:59 +0100
+Subject: [PATCH 2/3] qv4l2: Use <fcntl.h> instead of <sys/fcntl.h>
+
+Upstream-Status: Pending
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ utils/qv4l2/raw2sliced.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/qv4l2/raw2sliced.cpp b/utils/qv4l2/raw2sliced.cpp
+index 0c4e6b698358..f3c4f9a899fc 100644
+--- a/utils/qv4l2/raw2sliced.cpp
++++ b/utils/qv4l2/raw2sliced.cpp
+@@ -5,7 +5,7 @@
+ #include <string.h>
+ #include <assert.h>
+ #include <unistd.h>
+-#include <sys/fcntl.h>
++#include <fcntl.h>
+
+ #include "raw2sliced.h"
+
+--
+2.47.1
+
diff --git
a/video/v4l-utils/patches/0003-meson-Add-support-for-libexecinfo.patch
b/video/v4l-utils/patches/0003-meson-Add-support-for-libexecinfo.patch
new file mode 100644
index 0000000..09439d8
--- /dev/null
+++ b/video/v4l-utils/patches/0003-meson-Add-support-for-libexecinfo.patch
@@ -0,0 +1,67 @@
+From 207ac0cdacb806cf572f3abc9fb36227d054373c Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Date: Fri, 27 Dec 2024 17:10:57 +0100
+Subject: [PATCH 3/3] meson: Add support for libexecinfo
+
+Upstream-Status: Pending
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ lib/libdvbv5/meson.build | 1 +
+ meson.build | 3 ++-
+ utils/dvb/meson.build | 2 +-
+ utils/media-ctl/meson.build | 1 +
+ 4 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/lib/libdvbv5/meson.build b/lib/libdvbv5/meson.build
+index 8f5929fcad40..d440719d28f7 100644
+--- a/lib/libdvbv5/meson.build
++++ b/lib/libdvbv5/meson.build
+@@ -129,6 +129,7 @@ libdvbv5_deps = [
+ dep_librt,
+ dep_libudev,
+ dep_threads,
++ dep_libexecinfo,
+ ]
+
+ libdvbv5_c_args = [
+diff --git a/meson.build b/meson.build
+index aad8a794f7da..415236deb685 100644
+--- a/meson.build
++++ b/meson.build
+@@ -157,7 +157,8 @@ if cc.has_header('sys/klog.h')
+ conf.set('HAVE_SYS_KLOG_H', 1)
+ endif
+
+-if cc.has_header_symbol('execinfo.h', 'backtrace')
++dep_libexecinfo = dependency('libexecinfo', required: false)
++if dep_libexecinfo.found() or cc.has_header_symbol('execinfo.h',
'backtrace')
+ conf.set('HAVE_BACKTRACE', 1)
+ endif
+
+diff --git a/utils/dvb/meson.build b/utils/dvb/meson.build
+index 762028bd0a67..0fce41510436 100644
+--- a/utils/dvb/meson.build
++++ b/utils/dvb/meson.build
+@@ -66,6 +66,6 @@ dvbv5_daemon_c_args = [
+ dvbv5_daemon = executable('dvbv5-daemon',
+ dvbv5_daemon_sources,
+ install : true,
+- dependencies : dvb_common_deps,
++ dependencies : [dvb_common_deps, dep_libexecinfo],
+ c_args : dvbv5_daemon_c_args,
+ include_directories : v4l2_utils_incdir)
+diff --git a/utils/media-ctl/meson.build b/utils/media-ctl/meson.build
+index 3a7b0c9add4a..b913d8889423 100644
+--- a/utils/media-ctl/meson.build
++++ b/utils/media-ctl/meson.build
+@@ -5,6 +5,7 @@ libmediactl_sources = files(
+
+ libmediactl_deps = [
+ dep_libudev,
++ dep_libexecinfo
+ ]
+
+ libmediactl = static_library('mediactl',
+--
+2.47.1
+


  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (87ee5d9e9894a36b05af1ee8c0e7b8fe85362924), Ismael Luceno, 12/27/2024

Archive powered by MHonArc 2.6.24.

Top of Page