From 6063876616af6d03f5c2a1b11a8e1648c3be2d3e Mon Sep 17 00:00:00 2001
From: Khem Raj <khem.raj@oss.qualcomm.com>
Date: Sun, 27 Sep 2026 08:18:11 -0700
Subject: [PATCH] v4l2rtspserver: upgrade 0.3.8 -> 0.3.13

- live555 is now found via pkg-config (see the live555 change adding
  live555.pc); without it CMake would download live555 at configure time.
- Disable CMake's Git lookup: it runs "git submodule update --init" and
  "git describe" from the build directory, which can act on an unrelated
  repository enclosing TMPDIR. Pass the version through
  V4L2RTSPSERVER_VERSION instead.
- Add openssl to DEPENDS, it is linked directly.
- Drop S, the default now matches.
- Turn the automagic ALSA and systemd detection into PACKAGECONFIGs
  defaulting to DISTRO_FEATURES, and make log4cpp a PACKAGECONFIG too.
  log4cpp was in DEPENDS but never used, since upstream only links it
  with -DLOG4CPP=ON; it is now enabled by default.
- Register the new systemd unit, but leave it disabled: it streams
  /dev/video0 to the network, so images should opt in.

License-Update: License file renamed to Unlicense.txt; its only change is the unlicense.org URL switching to https.

AI-Generated: Uses Claude Code
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
 .../v4l2apps/v4l2rtspserver_0.3.13.bb         | 23 +++++++++++++++++++
 .../v4l2apps/v4l2rtspserver_0.3.8.bb          | 12 ----------
 2 files changed, 23 insertions(+), 12 deletions(-)
 create mode 100644 meta-oe/recipes-multimedia/v4l2apps/v4l2rtspserver_0.3.13.bb
 delete mode 100644 meta-oe/recipes-multimedia/v4l2apps/v4l2rtspserver_0.3.8.bb

diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l2rtspserver_0.3.13.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l2rtspserver_0.3.13.bb
new file mode 100644
index 0000000000..93e0d62878
--- /dev/null
+++ b/meta-oe/recipes-multimedia/v4l2apps/v4l2rtspserver_0.3.13.bb
@@ -0,0 +1,23 @@
+SUMMARY = "V4L2rtsp streaming server"
+LICENSE = "Unlicense"
+LIC_FILES_CHKSUM = "file://Unlicense.txt;md5=d88e9e08385d2a17052dac348bde4bc1"
+
+SRC_URI = "gitsm://github.com/mpromonet/v4l2rtspserver.git;branch=master;protocol=https;tag=v${PV}"
+SRCREV = "fafc8cbd1c93bf0f7453efa8b7718c68941fd5eb"
+
+inherit pkgconfig cmake systemd
+
+DEPENDS += "live555 openssl"
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa systemd', d)} log4cpp"
+PACKAGECONFIG[alsa] = "-DALSA=ON,-DALSA=OFF,alsa-lib"
+PACKAGECONFIG[log4cpp] = "-DLOG4CPP=ON,-DLOG4CPP=OFF,log4cpp"
+PACKAGECONFIG[systemd] = "-DSYSTEMD=ON,-DSYSTEMD=OFF,systemd"
+
+# Keep CMake from running "git describe", Hand it the version instead.
+EXTRA_OECMAKE += "-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON"
+export V4L2RTSPSERVER_VERSION = "${PV}"
+
+SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'v4l2rtspserver.service', '', d)}"
+# The unit streams /dev/video0 to the network; let the image opt in.
+SYSTEMD_AUTO_ENABLE = "disable"
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l2rtspserver_0.3.8.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l2rtspserver_0.3.8.bb
deleted file mode 100644
index 1a15a0cd0b..0000000000
--- a/meta-oe/recipes-multimedia/v4l2apps/v4l2rtspserver_0.3.8.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-SUMMARY = "V4L2rtsp streaming server"
-LICENSE = "Unlicense"
-LIC_FILES_CHKSUM = "file://UNLICENSE;md5=911690f51af322440237a253d695d19f"
-
-SRC_URI = "gitsm://github.com/mpromonet/v4l2rtspserver.git;branch=master;protocol=https"
-SRCREV = "b12cf350dc573ab0ff9d1b51a21daf3c218b614e"
-
-S = "${WORKDIR}/git"
-
-inherit pkgconfig cmake
-
-DEPENDS += "live555 log4cpp"