Merge pull request #129 from iamscottxu/obs27

v2.3.0

.github/workflows/main.yml

@@ -14,11 +14,11 @@ on:
 
 env:
   PRODUCT_NAME: 'obs-rtspserver'
-  DEPS_VERSION_MAC: '2022-02-13'
-  DEPS_HASH_MAC: '77471b1d345a768e8efec3f6ad9dc79f3c7cd34840b66f721b80025d29713f5d'
+  DEPS_VERSION_MAC: '2022-05-23'
+  DEPS_HASH_MAC: '042d6ac1667727ec453d9221232168dbcf2b6ae4ffe63f7a9c2b088bd7d1980e'
   #QT_VERSION_MAC: '2022-02-13'
-  QT_HASH_MAC: '13fbcc45fd9d08b30e702d481fe4d58b23f93aa06848cede4ebe0956c79a5e8a'
-  DEPS_VERSION_WIN: '2022-02-13'
+  QT_HASH_MAC: 'b62b8d4069278356ad70ae49ed8eb5cb1722b108cd1975e329779be6f998a098'
+  DEPS_VERSION_WIN: '2022-05-23'
   QT_VERSION_WIN: '5.15.2'
   NSIS_VERSION_WIN: '3.08'
 jobs:
@@ -36,14 +36,15 @@ jobs:
       latest_created_at: ${{ steps.latest_release.outputs.created_at }}
       latest_published_at: ${{ steps.latest_release.outputs.published_at }}
     steps:
-      - name: Get latest release info
+      - name: Get v27.2.4 release info
         id: latest_release
         uses: kaliber5/action-get-release@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           owner: 'obsproject'
           repo: 'obs-studio'
-          latest: true
+          tag_name: '27.2.4'
+          #latest: true
 
   get_plugin_info:
     name: '01 - Get plugin git info'

.gitignore

@@ -7,4 +7,6 @@ bundle/LICENSE.txt
 bundle/macOS/Plugin-Info.plist
 installer/LICENSE
 build*/
-release/
+release/
+.vs/
+.vscode/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "rtsp-server/3rdpart/libb64/libb64"]
+	path = rtsp-server/3rdpart/libb64/libb64
+	url = https://github.com/libb64/libb64

external/GitInfoHelper.cmake

@@ -16,7 +16,12 @@ function(get_git_version git_tag_name git_tag_version_name git_tag_short_version
 	else()
 		set(_git_tag_tweak_version "0")
 	endif()
-	set(git_tag_long_version "${git_tag_short_version}.${_git_tag_tweak_version}")
+
+	if("${git_tag_short_version}" STREQUAL "")
+		set(git_tag_long_version "0.0.1.${_git_tag_tweak_version}")
+	else()
+		set(git_tag_long_version "${git_tag_short_version}.${_git_tag_tweak_version}")
+	endif()
 
 	set(${git_tag_name} "${git_tag}" PARENT_SCOPE)
 	set(${git_tag_version_name} "${git_tag_version}" PARENT_SCOPE)

external/ObsPluginHelpers.cmake

@@ -125,7 +125,7 @@ else()
 
 	if(OS_POSIX)
 		IF(NOT LINUX_PORTABLE)
-			set(OBS_LIBRARY_DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+			set(OBS_LIBRARY_DESTINATION "${CMAKE_INSTALL_LIBDIR}/${CMAKE_LIBRARY_ARCHITECTURE}")
 			set(OBS_PLUGIN_DESTINATION "${OBS_LIBRARY_DESTINATION}/obs-plugins")
 			set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 			set(OBS_DATA_DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/obs")

rtsp-server/3rdpart/libb64/CMakeLists.txt

@@ -3,13 +3,13 @@ project(libb64)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-include_directories("include")
+include_directories("libb64/include")
 
 file(GLOB libb64_SOURCES
-	src/*.c)
+	libb64/src/*.c)
 
 file(GLOB libb64_HEADERS
-	include/b64/*.h)
+	libb64/include/b64/*.h)
 
 add_library(libb64 STATIC
 	${libb64_SOURCES}