diff --git a/buildspec.json b/buildspec.json index cf4c3f80..e1aabb92 100644 --- a/buildspec.json +++ b/buildspec.json @@ -1,33 +1,33 @@ { "dependencies": { "obs-studio": { - "version": "28.0.1", + "version": "29.1.2", "baseUrl": "https://github.com/obsproject/obs-studio/archive/refs/tags", "label": "OBS sources", "hashes": { - "macos": "e6074ba5be56b2b06a44329279f1eada662686b68e44616f453f1fa4c2c33165", - "windows-x64": "1efc8f266740877ae76fd2182522884ceeb9f10ff8cca70cb718979cc9c47964" + "macos": "215f1fa5772c5dd9f3d6e35b0cb573912b00320149666a77864f9d305525504b", + "windows-x64": "46d451f3f42b9d2c59339ec268165849c7b7904cdf1cc2a8d44c015815a9e37d" } }, "prebuilt": { - "version": "2022-08-02", + "version": "2023-04-12", "baseUrl": "https://github.com/obsproject/obs-deps/releases/download", "label": "Pre-Built obs-deps", "hashes": { - "macos": "de057e73e6fe0825664c258ca2dd6798c41ae580bf4d896e1647676a4941934a", - "windows-x64": "2192d8ce780c4281b807cd457994963669e5202659ecd92f19b54c3e7d0c1915" + "macos": "9535c6e1ad96f7d49960251e85a245774088d48da1d602bb82f734b10219125a", + "windows-x64": "c13a14a1acc4224b21304d97b63da4121de1ed6981297e50496fbc474abc0503" } }, "qt6": { - "version": "2022-08-02", + "version": "2023-04-12", "baseUrl": "https://github.com/obsproject/obs-deps/releases/download", "label": "Pre-Built Qt6", "hashes": { - "macos": "252e6684f43ab9c6f262c73af739e2296ce391b998da2c4ee04c254aaa07db18", - "windows-x64": "e5509b54196a3f935250cc4b9c54160c8e588fd0f92bc078a2a64f9d9e2e4e93" + "macos": "eb7614544ab4f3d2c6052c797635602280ca5b028a6b987523d8484222ce45d1", + "windows-x64": "4d39364b8a8dee5aa24fcebd8440d5c22bb4551c6b440ffeacce7d61f2ed1add" }, "debugSymbols": { - "windows-x64": "60e5b1d2bc4d7c431bc05f14e3b1e85e088788c372fa85f58717cd6c49555a46" + "windows-x64": "f34ee5067be19ed370268b15c53684b7b8aaa867dc800b68931df905d679e31f" } } }, @@ -54,4 +54,4 @@ "macosInstaller": "368f7535-4e71-4587-952b-33ad935bf9f3", "windowsApp": "1527c9ec-2638-4e3b-94d7-cc25d27cd725" } -} +} \ No newline at end of file diff --git a/cmake/common/buildspec_common.cmake b/cmake/common/buildspec_common.cmake index fd1cd637..b2c24144 100644 --- a/cmake/common/buildspec_common.cmake +++ b/cmake/common/buildspec_common.cmake @@ -79,8 +79,8 @@ function(_setup_obs_studio) "${CMAKE_COMMAND}" -S "${dependencies_dir}/${_obs_destination}" -B "${dependencies_dir}/${_obs_destination}/build_${arch}" -G ${_cmake_generator} "${_cmake_arch}" -DOBS_CMAKE_VERSION:STRING=${_cmake_version} -DENABLE_PLUGINS:BOOL=OFF -DENABLE_UI:BOOL=OFF - -DENABLE_SCRIPTING:BOOL=OFF -DOBS_VERSION_OVERRIDE:STRING=${_obs_version} - "-DCMAKE_PREFIX_PATH='${CMAKE_PREFIX_PATH}'" ${_is_fresh} ${_cmake_extra} + -DOBS_VERSION_OVERRIDE:STRING=${_obs_version} "-DCMAKE_PREFIX_PATH='${CMAKE_PREFIX_PATH}'" ${_is_fresh} + ${_cmake_extra} RESULT_VARIABLE _process_result COMMAND_ERROR_IS_FATAL ANY OUTPUT_QUIET) message(STATUS "Configure ${label} (${arch}) - done") @@ -94,7 +94,7 @@ function(_setup_obs_studio) message(STATUS "Build ${label} (${arch}) - done") message(STATUS "Install ${label} (${arch})") - if(OS_WINDOWS OR OS_MACOS) + if(OS_WINDOWS) set(_cmake_extra "--component obs_libraries") else() set(_cmake_extra "")