From: Michel Promonet <michel.promonet@free.fr>
Date: Sat, 3 Aug 2024 21:44:54 +0000 (+0200)
Subject: v4l2rtspserver: update to v0.3.11 and enable sound
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=db4ab96064458422df6f30b7ee8d2b24209fcaea;p=feed%2Fpackages.git

v4l2rtspserver: update to v0.3.11 and enable sound

Signed-off-by: Michel Promonet <michel.promonet@free.fr>
---

diff --git a/multimedia/v4l2rtspserver/Makefile b/multimedia/v4l2rtspserver/Makefile
index 59c0c5ff9f..e0239de16c 100644
--- a/multimedia/v4l2rtspserver/Makefile
+++ b/multimedia/v4l2rtspserver/Makefile
@@ -7,19 +7,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v4l2rtspserver
-PKG_VERSION:=0.3.10
-PKG_RELEASE:=9
+PKG_VERSION:=0.3.11
+PKG_RELEASE:=10
 
 #cannot use codeload as this uses submodules
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/mpromonet/v4l2rtspserver
 PKG_SOURCE_VERSION:=v$(PKG_VERSION)
-PKG_MIRROR_HASH:=34bb8f34adfe72572abe3496f144ee3075ebd25180878e0131b783d881ceea62
+PKG_MIRROR_HASH:=3f205fa879a9bc7c6aa0785214badb7d4f4724ef914d172c426e64f18bc5de27
 
 PKG_BUILD_FLAGS:=gc-sections lto
 
-LIVE555_VERSION:=2023.01.19
-LIVE555_HASH:=a7c64913f7f7007c5fdc29ea811e3ca781f262271b3e42afdd4bc1041d86fa99
+LIVE555_VERSION:=2024.08.01
+LIVE555_HASH:=839ab7437d01e629f8094ea1ec8c7a7bb504c7deed9edfc9e17ac34f9a1a193f
 LIVE555_FILE:=live.$(LIVE555_VERSION).tar.gz
 
 PKG_MAINTAINER:=Roger Dammit <rogerdammit@gmail.com>
@@ -33,7 +33,7 @@ define Package/v4l2rtspserver
 	SECTION:=multimedia
 	CATEGORY:=Multimedia
 	TITLE:=v4l2rtspserver
-	DEPENDS:=+libstdcpp
+	DEPENDS:=+libstdcpp +alsa-lib
 	URL:=https://github.com/mpromonet/v4l2rtspserver
 endef
 
@@ -54,7 +54,6 @@ endef
 TARGET_LDFLAGS += -Wl,--as-needed
 
 CMAKE_OPTIONS += \
-	-DALSA=OFF \
 	-DSTATICSTDCPP=OFF \
 	-DWITH_SSL=OFF \
 	-DLIVE555CFLAGS="SOCKLEN_T=socklen_t;_LARGEFILE_SOURCE=1;_FILE_OFFSET_BITS=64;LOCALE_NOT_USED;NO_SSTREAM=1;ALLOW_RTSP_SERVER_PORT_REUSE=1;NO_STD_LIB=1;VERSION=\"$(PKG_VERSION)\""
diff --git a/multimedia/v4l2rtspserver/patches/001_live555_sprintf_format.patch b/multimedia/v4l2rtspserver/patches/001_live555_sprintf_format.patch
deleted file mode 100644
index a79e4d55d3..0000000000
--- a/multimedia/v4l2rtspserver/patches/001_live555_sprintf_format.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Michel Promonet <michel.promonet@free.fr>
-Subject: [PATCH] Fix crash formating time_t as long (it is a long long)
-Signed-off-by: Michel Promonet <michel.promonet@free.fr>
-
----
---- a/live/liveMedia/ServerMediaSession.cpp
-+++ b/live/liveMedia/ServerMediaSession.cpp
-@@ -272,7 +272,7 @@ char* ServerMediaSession::generateSDPDes
- 
-     char const* const sdpPrefixFmt =
-       "v=0\r\n"
--      "o=- %ld%06ld %d IN %s %s\r\n"
-+      "o=- %lld%06lld %d IN %s %s\r\n"
-       "s=%s\r\n"
-       "i=%s\r\n"
-       "t=0 0\r\n"
-@@ -300,7 +300,7 @@ char* ServerMediaSession::generateSDPDes
- 
-     // Generate the SDP prefix (session-level lines):
-     snprintf(sdp, sdpLength, sdpPrefixFmt,
--	     fCreationTime.tv_sec, fCreationTime.tv_usec, // o= <session id>
-+	     (long long)fCreationTime.tv_sec, (long long)fCreationTime.tv_usec, // o= <session id>
- 	     1, // o= <version> // (needs to change if params are modified)
- 	     addressFamily == AF_INET ? "IP4" : "IP6", // o= <address family>
- 	     ipAddressStr.val(), // o= <address>