Merge pull request #8248 from neheb/v4

v4l2rtspserver: Update to 0.1.3

multimedia/v4l2rtspserver/Makefile

@@ -7,21 +7,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v4l2rtspserver
-PKG_VERSION:=0.1.1
+PKG_VERSION:=0.1.3
 PKG_RELEASE:=1
 
 #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:=3e3c106b41562be010ba2132903ebf9cdc75a2caceca468b10e2cd0d2939e940
+PKG_MIRROR_HASH:=73499d0db515ae0d66c6d2a73c9c474ca35007aaf17451da01e793d972eab35a
 
 PKG_MAINTAINER:=Roger Dammit <rogerdammit@gmail.com>
 PKG_LICENSE:=Unlicense
 PKG_LICENSE_FILES:=LICENSE
 
-LIVE555_VERSION:=2018.12.14
-LIVE555_HASH:=8dc31f76909602c3c07c8f876237e6ab7ac674d00f1bb065eda20e719f772a47
+LIVE555_VERSION:=2019.02.03
+LIVE555_HASH:=1c938d91553eff224c7a860f8f38b3256028704b474a3fc6bcf2eddc42268710
 LIVE555_FILE:=live.$(LIVE555_VERSION).tar.gz
 
 PKG_BUILD_PARALLEL:=1

multimedia/v4l2rtspserver/patches/010-Add-a-few-missing-headers.patch

@@ -1,39 +0,0 @@
-From 9977cc5a4b35809bed04be543cf38e32d8f175c5 Mon Sep 17 00:00:00 2001
-From: Rosen Penev <rosenp@gmail.com>
-Date: Sat, 15 Dec 2018 15:02:34 -0800
-Subject: [PATCH] Add a few missing headers
-
-Helps to compile with alternative c++ libraries.
----
- inc/DeviceSource.h     | 2 ++
- inc/MemoryBufferSink.h | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/inc/DeviceSource.h b/inc/DeviceSource.h
-index 7d4aa18..0e2f996 100755
---- a/inc/DeviceSource.h
-+++ b/inc/DeviceSource.h
-@@ -18,6 +18,8 @@
- #include <iostream>
- #include <iomanip>
- 
-+#include <pthread.h>
-+
- // live555
- #include <liveMedia.hh>
- 
-diff --git a/inc/MemoryBufferSink.h b/inc/MemoryBufferSink.h
-index 97e1db1..fc6de20 100644
---- a/inc/MemoryBufferSink.h
-+++ b/inc/MemoryBufferSink.h
-@@ -12,6 +12,7 @@
- #pragma once
- 
- #include <map>
-+#include <string>
- 
- #include "MediaSink.hh"
- 
--- 
-2.20.1
-

multimedia/v4l2rtspserver/patches/020-replace-std-stoi-with-atoi.patch

@@ -1,25 +0,0 @@
-From 6e569797c0691d7fb2ba72952f81806d0477ca03 Mon Sep 17 00:00:00 2001
-From: Michel Promonet <michel.promonet@free.fr>
-Date: Tue, 11 Dec 2018 08:25:35 +0100
-Subject: [PATCH] replace std::stoi with atoi
-
----
- src/ServerMediaSubsession.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ServerMediaSubsession.cpp b/src/ServerMediaSubsession.cpp
-index c90555e..9ac9a76 100755
---- a/src/ServerMediaSubsession.cpp
-+++ b/src/ServerMediaSubsession.cpp
-@@ -99,7 +99,7 @@ RTPSink*  BaseServerMediaSubsession::createSink(UsageEnvironment& env, Groupsock
- 		getline(is, sampleRate, '/');	
- 		std::string channels("2");
- 		getline(is, channels);	
--		videoSink = SimpleRTPSink::createNew(env, rtpGroupsock,rtpPayloadTypeIfDynamic, std::stoi(sampleRate), "audio", "L16", std::stoi(channels), True, False); 
-+		videoSink = SimpleRTPSink::createNew(env, rtpGroupsock,rtpPayloadTypeIfDynamic, atoi(sampleRate), "audio", "L16", atoi(channels), True, False); 
- 	}
- 	return videoSink;
- }
--- 
-2.20.1
-

multimedia/v4l2rtspserver/patches/030-fix-build.patch

@@ -1,25 +0,0 @@
-From be6dc4592e91841cfe593d88bfe8a8f068671c74 Mon Sep 17 00:00:00 2001
-From: Michel Promonet <michel.promonet@free.fr>
-Date: Tue, 11 Dec 2018 08:34:14 +0100
-Subject: [PATCH] fix build
-
----
- src/ServerMediaSubsession.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ServerMediaSubsession.cpp b/src/ServerMediaSubsession.cpp
-index 9ac9a76..a8b0bb3 100755
---- a/src/ServerMediaSubsession.cpp
-+++ b/src/ServerMediaSubsession.cpp
-@@ -99,7 +99,7 @@ RTPSink*  BaseServerMediaSubsession::createSink(UsageEnvironment& env, Groupsock
- 		getline(is, sampleRate, '/');	
- 		std::string channels("2");
- 		getline(is, channels);	
--		videoSink = SimpleRTPSink::createNew(env, rtpGroupsock,rtpPayloadTypeIfDynamic, atoi(sampleRate), "audio", "L16", atoi(channels), True, False); 
-+		videoSink = SimpleRTPSink::createNew(env, rtpGroupsock,rtpPayloadTypeIfDynamic, atoi(sampleRate.c_str()), "audio", "L16", atoi(channels.c_str()), True, False); 
- 	}
- 	return videoSink;
- }
--- 
-2.20.1
-