From: Michel Promonet <michel.promonet@free.fr>
Date: Mon, 6 May 2024 16:21:21 +0000 (+0200)
Subject: v4l2rtspserver: update to v0.3.10
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=274e39e909760be25f6dc077c055c29e6469b0e8;p=feed%2Fpackages.git

v4l2rtspserver: update to v0.3.10

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

diff --git a/multimedia/v4l2rtspserver/Makefile b/multimedia/v4l2rtspserver/Makefile
index 463475bacb..59c0c5ff9f 100644
--- a/multimedia/v4l2rtspserver/Makefile
+++ b/multimedia/v4l2rtspserver/Makefile
@@ -7,19 +7,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v4l2rtspserver
-PKG_VERSION:=0.3.7
-PKG_RELEASE:=8
+PKG_VERSION:=0.3.10
+PKG_RELEASE:=9
 
 #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:=bd677579653df07feb979ea00890657807bacadda5fb60c1827f6b99a6dd766a
+PKG_MIRROR_HASH:=34bb8f34adfe72572abe3496f144ee3075ebd25180878e0131b783d881ceea62
 
 PKG_BUILD_FLAGS:=gc-sections lto
 
-LIVE555_VERSION:=2022.10.01
-LIVE555_HASH:=429de73061e3fc6901c4d2f0b7562ae3f6233060ca4b5e182fe555d065cbdd45
+LIVE555_VERSION:=2023.01.19
+LIVE555_HASH:=a7c64913f7f7007c5fdc29ea811e3ca781f262271b3e42afdd4bc1041d86fa99
 LIVE555_FILE:=live.$(LIVE555_VERSION).tar.gz
 
 PKG_MAINTAINER:=Roger Dammit <rogerdammit@gmail.com>
@@ -56,7 +56,9 @@ TARGET_LDFLAGS += -Wl,--as-needed
 CMAKE_OPTIONS += \
 	-DALSA=OFF \
 	-DSTATICSTDCPP=OFF \
-	-DLIVE555CFLAGS=" -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DLOCALE_NOT_USED -DNO_SSTREAM=1 -DALLOW_RTSP_SERVER_PORT_REUSE=1 -DNO_OPENSSL"
+	-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)\""
+
 
 define Build/Prepare
 	# download live555
diff --git a/multimedia/v4l2rtspserver/patches/001_live555_sprintf_format b/multimedia/v4l2rtspserver/patches/001_live555_sprintf_format
deleted file mode 100644
index a79e4d55d3..0000000000
--- a/multimedia/v4l2rtspserver/patches/001_live555_sprintf_format
+++ /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>
diff --git a/multimedia/v4l2rtspserver/patches/001_live555_sprintf_format.patch b/multimedia/v4l2rtspserver/patches/001_live555_sprintf_format.patch
new file mode 100644
index 0000000000..a79e4d55d3
--- /dev/null
+++ b/multimedia/v4l2rtspserver/patches/001_live555_sprintf_format.patch
@@ -0,0 +1,25 @@
+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>