Compare commits

...

6 Commits

Author SHA1 Message Date
WarmUpTill
f8212da80f debug 2025-11-06 20:09:00 +01:00
WarmUpTill
862bc420ad force 2025-11-06 20:09:00 +01:00
WarmUpTill
f832d6c52e debug 2025-11-06 20:09:00 +01:00
WarmUpTill
790d0095f3 use old cache 2025-11-06 20:09:00 +01:00
WarmUpTill
81409ba22d Revert "Update based on obs-plugintemplate to enable switch to OBS 31.1.1"
This reverts commit 1494b1db6c.
2025-11-06 20:09:00 +01:00
WarmUpTill
e687cf139a Revert "buildspec: Update OBS Studio dependency to 31.1.1"
This reverts commit 5f2237ac2a.
2025-11-06 20:09:00 +01:00
5 changed files with 49 additions and 40 deletions

View File

@@ -6,7 +6,7 @@ on:
description: "Project name detected by parsing build spec file" description: "Project name detected by parsing build spec file"
value: ${{ jobs.check-event.outputs.pluginName }} value: ${{ jobs.check-event.outputs.pluginName }}
env: env:
DEP_DIR: .deps/advss-build-dependencies-3 DEP_DIR: .deps/advss-build-dependencies-2
jobs: jobs:
check-event: check-event:
name: Check GitHub Event Data 🔎 name: Check GitHub Event Data 🔎

View File

@@ -1,33 +1,33 @@
{ {
"dependencies": { "dependencies": {
"obs-studio": { "obs-studio": {
"version": "31.1.1", "version": "30.1.2",
"baseUrl": "https://github.com/obsproject/obs-studio/archive/refs/tags", "baseUrl": "https://github.com/obsproject/obs-studio/archive/refs/tags",
"label": "OBS sources", "label": "OBS sources",
"hashes": { "hashes": {
"macos": "39751f067bacc13d44b116c5138491b5f1391f91516d3d590d874edd21292291", "macos": "490bae1c392b3b344b0270afd8cb887da4bc50bd92c0c426e96713c1ccb9701a",
"windows-x64": "2c8427c10b55ac6d68008df2e9a3e82f4647aaad18f105e30d4713c2de678ccf" "windows-x64": "c2dd03fa7fd01fad5beafce8f7156da11f9ed9a588373fd40b44a06f4c03b867"
} }
}, },
"prebuilt": { "prebuilt": {
"version": "2025-07-11", "version": "2024-03-19",
"baseUrl": "https://github.com/obsproject/obs-deps/releases/download", "baseUrl": "https://github.com/obsproject/obs-deps/releases/download",
"label": "Pre-Built obs-deps", "label": "Pre-Built obs-deps",
"hashes": { "hashes": {
"macos": "495687e63383d1a287684b6e2e9bfe246bb8f156fe265926afb1a325af1edd2a", "macos": "2e9bfb55a5e0e4c1086fa1fda4cf268debfead473089df2aaea80e1c7a3ca7ff",
"windows-x64": "c8c642c1070dc31ce9a0f1e4cef5bb992f4bff4882255788b5da12129e85caa7" "windows-x64": "6e86068371526a967e805f6f9903f9407adb683c21820db5f07da8f30d11e998"
} }
}, },
"qt6": { "qt6": {
"version": "2025-07-11", "version": "2024-03-19",
"baseUrl": "https://github.com/obsproject/obs-deps/releases/download", "baseUrl": "https://github.com/obsproject/obs-deps/releases/download",
"label": "Pre-Built Qt6", "label": "Pre-Built Qt6",
"hashes": { "hashes": {
"macos": "d3f5f04b6ea486e032530bdf0187cbda9a54e0a49621a4c8ba984c5023998867", "macos": "694f1e639c017e3b1f456f735330dc5afae287cbea85757101af1368de3142c8",
"windows-x64": "0e76bf0555dd5382838850b748d3dcfab44a1e1058441309ab54e1a65b156d0a" "windows-x64": "72d1df34a0ef7413a681d5fcc88cae81da60adc03dcd23ef17862ab170bcc0dd"
}, },
"debugSymbols": { "debugSymbols": {
"windows-x64": "11b7be92cf66a273299b8f3515c07a5cfb61614b59a4e67f7fc5ecba5e2bdf21" "windows-x64": "fbddd1f659c360f2291911ac5709b67b6f8182e6bca519d24712e4f6fd3cc865"
} }
} }
}, },

View File

@@ -65,16 +65,17 @@ function(_setup_obs_studio)
if(OS_WINDOWS) if(OS_WINDOWS)
set(_cmake_generator "${CMAKE_GENERATOR}") set(_cmake_generator "${CMAKE_GENERATOR}")
set(_cmake_arch set(_cmake_arch "-A ${arch}")
"-A ${arch},version=${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
set(_cmake_extra set(_cmake_extra
"-DCMAKE_SYSTEM_VERSION=${CMAKE_SYSTEM_VERSION} -DCMAKE_ENABLE_SCRIPTING=OFF" "-DCMAKE_SYSTEM_VERSION=${CMAKE_SYSTEM_VERSION} -DCMAKE_ENABLE_SCRIPTING=OFF"
) )
set(_cmake_version "2.0.0")
elseif(OS_MACOS) elseif(OS_MACOS)
set(_cmake_generator "Xcode") set(_cmake_generator "Xcode")
set(_cmake_arch "-DCMAKE_OSX_ARCHITECTURES:STRING='arm64;x86_64'") set(_cmake_arch "-DCMAKE_OSX_ARCHITECTURES:STRING='arm64;x86_64'")
set(_cmake_extra set(_cmake_extra
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}") "-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
set(_cmake_version "3.0.0")
endif() endif()
message(STATUS "Configure ${label} (${arch})") message(STATUS "Configure ${label} (${arch})")
@@ -82,42 +83,32 @@ function(_setup_obs_studio)
COMMAND COMMAND
"${CMAKE_COMMAND}" -S "${dependencies_dir}/${_obs_destination}" -B "${CMAKE_COMMAND}" -S "${dependencies_dir}/${_obs_destination}" -B
"${dependencies_dir}/${_obs_destination}/build_${arch}" -G "${dependencies_dir}/${_obs_destination}/build_${arch}" -G
${_cmake_generator} "${_cmake_arch}" -DOBS_CMAKE_VERSION:STRING=3.0.0 ${_cmake_generator} "${_cmake_arch}"
-DENABLE_PLUGINS:BOOL=OFF -DENABLE_FRONTEND:BOOL=OFF -DOBS_CMAKE_VERSION:STRING=${_cmake_version} -DENABLE_PLUGINS:BOOL=OFF
-DOBS_VERSION_OVERRIDE:STRING=${_obs_version} -DENABLE_UI:BOOL=OFF -DOBS_VERSION_OVERRIDE:STRING=${_obs_version}
"-DCMAKE_PREFIX_PATH='${CMAKE_PREFIX_PATH}'" ${_is_fresh} ${_cmake_extra} "-DCMAKE_PREFIX_PATH='${CMAKE_PREFIX_PATH}'" ${_is_fresh} ${_cmake_extra}
RESULT_VARIABLE _process_result COMMAND_ERROR_IS_FATAL ANY RESULT_VARIABLE _process_result COMMAND_ERROR_IS_FATAL ANY
OUTPUT_QUIET) OUTPUT_QUIET)
message(STATUS "Configure ${label} (${arch}) - done") message(STATUS "Configure ${label} (${arch}) - done")
message(STATUS "Build ${label} (Debug - ${arch})") message(STATUS "Build ${label} (${arch})")
execute_process( execute_process(
COMMAND "${CMAKE_COMMAND}" --build build_${arch} --target obs-frontend-api COMMAND "${CMAKE_COMMAND}" --build build_${arch} --target obs-frontend-api
--config Debug --parallel --config Debug --parallel
WORKING_DIRECTORY "${dependencies_dir}/${_obs_destination}" WORKING_DIRECTORY "${dependencies_dir}/${_obs_destination}"
RESULT_VARIABLE _process_result COMMAND_ERROR_IS_FATAL ANY RESULT_VARIABLE _process_result COMMAND_ERROR_IS_FATAL ANY
OUTPUT_QUIET) OUTPUT_QUIET)
message(STATUS "Build ${label} (Debug - ${arch}) - done") message(STATUS "Build ${label} (${arch}) - done")
message(STATUS "Build ${label} (Release - ${arch})")
execute_process(
COMMAND "${CMAKE_COMMAND}" --build build_${arch} --target obs-frontend-api
--config Release --parallel
WORKING_DIRECTORY "${dependencies_dir}/${_obs_destination}"
RESULT_VARIABLE _process_result COMMAND_ERROR_IS_FATAL ANY
OUTPUT_QUIET)
message(STATUS "Build ${label} (Reelase - ${arch}) - done")
message(STATUS "Install ${label} (${arch})") message(STATUS "Install ${label} (${arch})")
if(OS_WINDOWS)
set(_cmake_extra "--component obs_libraries")
else()
set(_cmake_extra "")
endif()
execute_process( execute_process(
COMMAND "${CMAKE_COMMAND}" --install build_${arch} --component Development COMMAND "${CMAKE_COMMAND}" --install build_${arch} --component Development
--config Debug --prefix "${dependencies_dir}" --config Debug --prefix "${dependencies_dir}" ${_cmake_extra}
WORKING_DIRECTORY "${dependencies_dir}/${_obs_destination}"
RESULT_VARIABLE _process_result COMMAND_ERROR_IS_FATAL ANY
OUTPUT_QUIET)
execute_process(
COMMAND "${CMAKE_COMMAND}" --install build_${arch} --component Development
--config Release --prefix "${dependencies_dir}"
WORKING_DIRECTORY "${dependencies_dir}/${_obs_destination}" WORKING_DIRECTORY "${dependencies_dir}/${_obs_destination}"
RESULT_VARIABLE _process_result COMMAND_ERROR_IS_FATAL ANY RESULT_VARIABLE _process_result COMMAND_ERROR_IS_FATAL ANY
OUTPUT_QUIET) OUTPUT_QUIET)

View File

@@ -4,7 +4,6 @@
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
if(WIN32 AND (NOT OpenSSL_FOUND)) if(WIN32 AND (NOT OpenSSL_FOUND))
set(_openssl_roots set(_openssl_roots
"$ENV{ProgramFiles}/OpenSSL-Win64" "$ENV{ProgramFiles}/OpenSSL" "$ENV{ProgramFiles}/OpenSSL-Win64" "$ENV{ProgramFiles}/OpenSSL"
"$ENV{ProgramW6432}/OpenSSL-Win64") "$ENV{ProgramW6432}/OpenSSL-Win64")
@@ -47,20 +46,33 @@ if(WIN32 AND (NOT OpenSSL_FOUND))
AND EXISTS "${_root}/${_suffix}/libcrypto.lib") AND EXISTS "${_root}/${_suffix}/libcrypto.lib")
set(OPENSSL_ROOT_DIR set(OPENSSL_ROOT_DIR
"${_root}" "${_root}"
CACHE PATH "Path to OpenSSL root") CACHE PATH "Path to OpenSSL root" FORCE)
set(OPENSSL_CRYPTO_LIBRARY set(OPENSSL_CRYPTO_LIBRARY
"${_root}/${_suffix}/libcrypto.lib" "${_root}/${_suffix}/libcrypto.lib"
CACHE FILEPATH "OpenSSL crypto lib") CACHE FILEPATH "OpenSSL crypto lib" FORCE)
set(OPENSSL_SSL_LIBRARY set(OPENSSL_SSL_LIBRARY
"${_root}/${_suffix}/libssl.lib" "${_root}/${_suffix}/libssl.lib"
CACHE FILEPATH "OpenSSL ssl lib") CACHE FILEPATH "OpenSSL ssl lib" FORCE)
set(OPENSSL_INCLUDE_DIR set(OPENSSL_INCLUDE_DIR
"${_root}/include" "${_root}/include"
CACHE PATH "OpenSSL include dir") CACHE PATH "OpenSSL include dir" FORCE)
set(OpenSSL_FOUND set(OpenSSL_FOUND
TRUE TRUE
CACHE BOOL "Whether OpenSSL was found") CACHE BOOL "Whether OpenSSL was found" FORCE)
message(STATUS "Found OpenSSL at: ${_root}/${_suffix}") message(STATUS "Found OpenSSL at: ${_root}/${_suffix}")
# Recursively list all files under OPENSSL_ROOT_DIR
file(GLOB_RECURSE OPENSSL_FILES "${OPENSSL_ROOT_DIR}/*")
message(STATUS "Listing contents of OPENSSL_ROOT_DIR:")
foreach(file ${OPENSSL_FILES})
message(STATUS " ${file}")
endforeach()
get_cmake_property(_variableNames VARIABLES)
list(SORT _variableNames)
foreach(_variableName ${_variableNames})
message(STATUS "${_variableName}=${${_variableName}}")
endforeach()
return() return()
endif() endif()
endforeach() endforeach()

View File

@@ -10,6 +10,12 @@ if(OS_MACOS)
endif() endif()
find_package(OpenSSL) find_package(OpenSSL)
get_cmake_property(_variableNames VARIABLES)
list(SORT _variableNames)
foreach(_variableName ${_variableNames})
message(STATUS "${_variableName}=${${_variableName}}")
endforeach()
find_package(PahoMqttCpp) find_package(PahoMqttCpp)
if(NOT PahoMqttCpp_FOUND) if(NOT PahoMqttCpp_FOUND)
message(WARNING "PahoMqttCpp not found!\n" message(WARNING "PahoMqttCpp not found!\n"