Merge branch 'master' of github.com:mpromonet/v4l2rtspserver

.github/workflows/ccpp.yml

@@ -26,4 +26,10 @@ jobs:
     - uses: actions/upload-artifact@v3
       with:
         name: ${{ env.artifactPath }}
-        path: ${{ env.artifactPath }}    
+        path: ${{ env.artifactPath }}    
+
+    - name: Release
+      uses: softprops/action-gh-release@v1
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        files: ${{ env.artifactPath }}

.github/workflows/cross.yml

@@ -51,4 +51,10 @@ jobs:
     - uses: actions/upload-artifact@v3
       with:
         name: ${{ env.artifactPath }}
-        path: ${{ env.artifactPath }}   
+        path: ${{ env.artifactPath }}   
+
+    - name: Release
+      uses: softprops/action-gh-release@v1
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        files: ${{ env.artifactPath }}

CMakeLists.txt

@@ -8,6 +8,9 @@ set(ALSA ON CACHE BOOL "use ALSA 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")
+if(NOT CMAKE_BUILD_TYPE)
+     set (CMAKE_BUILD_TYPE "Release")
+endif()
 
 set(CMAKE_CXX_STANDARD 11)
 
@@ -61,14 +64,14 @@ find_package(OpenSSL QUIET)
 MESSAGE("OpenSSL_FOUND = ${OpenSSL_FOUND}")
 
 # live555
-find_package(LiveMedia)
-find_package(UsageEnvironment)
-find_package(BasicUsageEnvironment)
-find_package(GroupSock)
+find_package(libliveMedia)
+find_package(libUsageEnvironment)
+find_package(libBasicUsageEnvironment)
+find_package(libgroupsock)
 if (LIBLIVEMEDIA_FOUND AND LIBBASICUSAGEENVIRONMENT_FOUND AND LIBUSAGEENVIRONMENT_FOUND AND LIBGROUPSOCK_FOUND)
     message(STATUS "live555 loaded")
     set(LIVEINCLUDE ${LIBLIVEMEDIA_INCLUDE_DIR} ${LIBBASICUSAGEENVIRONMENT_INCLUDE_DIR} ${LIBUSAGEENVIRONMENT_INCLUDE_DIR} ${LIBGROUPSOCK_INCLUDE_DIR})
-    target_link_libraries (${PROJECT_NAME} ${LIBLIVEMEDIA_LIBRARY} ${LIBUSAGEENVIRONMENT_LIBRARY} ${LIBBASICUSAGEENVIRONMENT_LIBRARY} ${LIBGROUPSOCK_LIBRARY}) 
+    SET(LIVE_LIBRARIES ${LIBLIVEMEDIA_LIBRARY} ${LIBUSAGEENVIRONMENT_LIBRARY} ${LIBBASICUSAGEENVIRONMENT_LIBRARY} ${LIBGROUPSOCK_LIBRARY}) 
     SET(CPACK_DEBIAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDS}livemedia-utils,)
 else()
     set(LIVE ${CMAKE_BINARY_DIR}/live)
@@ -91,7 +94,7 @@ endif()
 aux_source_directory(src LIBV4L2RTSP_SRC_FILES)
 add_library (libv4l2rtspserver STATIC ${LIVESOURCE} ${LIBV4L2RTSP_SRC_FILES})	
 target_include_directories(libv4l2rtspserver PUBLIC inc ${LIVEINCLUDE})
-target_link_libraries (${PROJECT_NAME} libv4l2rtspserver) 
+target_link_libraries (${PROJECT_NAME} libv4l2rtspserver ${LIVE_LIBRARIES}) 
 if (OpenSSL_FOUND)
     target_link_libraries(${PROJECT_NAME} OpenSSL::SSL)
 endif ()
@@ -148,6 +151,9 @@ install (FILES index.html DESTINATION share/${PROJECT_NAME}/)
 install (FILES hls.js/dist/hls.light.min.js DESTINATION share/${PROJECT_NAME}/hls.js/dist/)
 
 SET(CPACK_GENERATOR "DEB")
+if(NOT CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
+    SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
+endif()
 SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Michel Promonet") 
 SET(CPACK_PACKAGE_CONTACT "michel.promonet@free.fr") 
 SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_BUILD_TYPE})