From 233b631fc46671a52f9c0d7f7924b939004dc4d6 Mon Sep 17 00:00:00 2001 From: Michel Promonet Date: Fri, 7 Oct 2022 17:17:30 +0200 Subject: [PATCH 1/4] Update snapcraft.yaml --- snap/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index c26f9b8..57a67bf 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -38,4 +38,4 @@ v4l2rtspserver: command: v4l2rtspserver -b $SNAP/share/v4l2rtspserver/ -P "$(snapctl get rtsp-port)" "$(snapctl get devices)" daemon: simple - plugs: [network-bind] + plugs: [network-bind, camera, alsa] From 631f43cdcf623036f1fb59a0ae20bf7cae91c89d Mon Sep 17 00:00:00 2001 From: mpromonet Date: Wed, 12 Oct 2022 11:32:16 +0200 Subject: [PATCH 2/4] for #290: allow default value in -M option --- main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.cpp b/main.cpp index a26cf8b..9581258 100755 --- a/main.cpp +++ b/main.cpp @@ -136,7 +136,7 @@ int main(int argc, char** argv) // decode parameters int c = 0; - while ((c = getopt (argc, argv, "v::Q:O:b:" "I:P:p:m::u:M:ct:S::x:" "R:U:" "rwBsf::F:W:H:G:" "A:C:a:" "Vh")) != -1) + while ((c = getopt (argc, argv, "v::Q:O:b:" "I:P:p:m::u:M::ct:S::x:" "R:U:" "rwBsf::F:W:H:G:" "A:C:a:" "Vh")) != -1) { switch (c) { @@ -151,7 +151,7 @@ int main(int argc, char** argv) case 'p': rtspOverHTTPPort = atoi(optarg); break; case 'u': url = optarg; break; case 'm': multicast = true; murl = optarg ? optarg : murl; break; - case 'M': multicast = true; maddr = optarg; break; + case 'M': multicast = true; maddr = optarg ? optarg : maddr; break; case 'c': repeatConfig = false; break; case 't': timeout = atoi(optarg); break; case 'S': hlsSegment = optarg ? atoi(optarg) : defaultHlsSegment; break; From 30a0531776bdb3cec594c42765f27587be68d200 Mon Sep 17 00:00:00 2001 From: Michel Promonet Date: Wed, 12 Oct 2022 14:46:36 +0200 Subject: [PATCH 3/4] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 472a7ec..10ccf7a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake/") # set version based on git find_package(Git) if(GIT_FOUND) - EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty OUTPUT_VARIABLE VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) + EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} -C ${CMAKE_CURRENT_SOURCE_DIR} describe --tags --always --dirty OUTPUT_VARIABLE VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) STRING(REGEX REPLACE "^v(.*)" "\\1" VERSION "${VERSION}") add_definitions("-DVERSION=\"${VERSION}\"") endif() From 081a5501300a4a43938ed656d783df312f5b220e Mon Sep 17 00:00:00 2001 From: mpromonet Date: Wed, 12 Oct 2022 15:18:17 +0200 Subject: [PATCH 4/4] allow to ignore try to link with staticcpp --- CMakeLists.txt | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 10ccf7a..dcce983 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,7 @@ project(v4l2rtspserver) option(COVERAGE "Coverage" OFF) set(ALSA ON CACHE BOOL "use ALSA if available") +set(STATICSTDCPP ON CACHE BOOL "use gcc static lib if available") set(LOG4CPP OFF CACHE BOOL "use log4cpp if available") set(LIVE555URL http://www.live555.com/liveMedia/public/live555-latest.tar.gz CACHE STRING "live555 url") set(LIVE555CFLAGS -DBSD=1 -DSOCKLEN_T=socklen_t -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1 -DALLOW_RTSP_SERVER_PORT_REUSE=1 CACHE STRING "live555 CFGLAGS") @@ -118,14 +119,16 @@ include_directories("libv4l2cpp/inc") target_link_libraries (${PROJECT_NAME} libv4l2cpp) # static link of stdc++ if available -include(CheckCXXCompilerFlag) -CHECK_CXX_COMPILER_FLAG("-static-libgcc" CXX_SUPPORTS_STATIC_LIBGCC) -if (CXX_SUPPORTS_STATIC_LIBGCC) - target_link_libraries (${CMAKE_PROJECT_NAME} -static-libgcc) -endif() -CHECK_CXX_COMPILER_FLAG("-static-libstdc++" CXX_SUPPORTS_STATIC_LIBSTDCPP) -if (CXX_SUPPORTS_STATIC_LIBSTDCPP) - target_link_libraries (${CMAKE_PROJECT_NAME} -static-libstdc++) +if (STATICSTDCPP) + include(CheckCXXCompilerFlag) + CHECK_CXX_COMPILER_FLAG("-static-libgcc" CXX_SUPPORTS_STATIC_LIBGCC) + if (CXX_SUPPORTS_STATIC_LIBGCC) + target_link_libraries (${CMAKE_PROJECT_NAME} -static-libgcc) + endif() + CHECK_CXX_COMPILER_FLAG("-static-libstdc++" CXX_SUPPORTS_STATIC_LIBSTDCPP) + if (CXX_SUPPORTS_STATIC_LIBSTDCPP) + target_link_libraries (${CMAKE_PROJECT_NAME} -static-libstdc++) + endif() endif() #testing