opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

CI: Update deps to 2023-03-30 release

Browse Source 
Notable changes:
 * deps.ffmpeg: Update FFmpeg to 3980415627

This update is to fix a crash when using FFmpeg NVENC. In particular, we
wanted these commmits:
 * https://github.com/FFmpeg/FFmpeg/commit/0981053c294f8a0edf1a06c329574fb2ebb5d5da
 * https://github.com/FFmpeg/FFmpeg/commit/916bdc0f197de7ea24d30f3f3c284e4332dd3720
This commit is contained in:
Ryan Foster
2023-03-31 17:59:02 -04:00
parent d71fa5248f
commit 1be1f51635
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/main.yml
+1 -1
View File
@@ -17,7 +17,7 @@ env:
CEF_BUILD_VERSION_WIN: '5060'
QT_VERSION_MAC: '6.4.3'
QT_VERSION_WIN: '6.4.3'
DEPS_VERSION_WIN: '2023-03-26'
DEPS_VERSION_WIN: '2023-03-30'
VLC_VERSION_WIN: '3.0.0-git'
TWITCH_CLIENTID: ${{ secrets.TWITCH_CLIENT_ID }}
TWITCH_HASH: ${{ secrets.TWITCH_HASH }}
CI/flatpak/com.obsproject.Studio.json
+3 -4
View File
@@ -249,16 +249,15 @@
{
"type": "git",
"url": "https://github.com/FFmpeg/FFmpeg.git",
"tag": "n6.0",
"commit": "ea3d24bbe3c58b171e55fe2151fc7ffaca3ab3d2",
"commit": "3980415627a187d188dc25669cea6b12912eb178",
"disable-shallow-clone": true
},
{
"type": "git",
"dest": "obs-deps",
"url": "https://github.com/obsproject/obs-deps.git",
"tag": "2023-03-26",
"commit": "4aa7eeff06a522db6f5e1c1a73075bbb4c83b147"
"tag": "2023-03-30",
"commit": "1a977b8ac95ac2bab5e6dbfd34e029ad06933548"
},
{
"type": "shell",
buildspec.json
+12 -12
View File
@@ -1,29 +1,29 @@
{
"dependencies": {
"prebuilt": {
"version": "2023-03-26",
"version": "2023-03-30",
"baseUrl": "https://github.com/obsproject/obs-deps/releases/download",
"label": "Pre-Built obs-deps",
"hashes": {
"macos-x86_64": "850741b11ca35290351ffa33e6310ba7a8e518c4a76b1dfd3fdb20679aacc695",
"macos-arm64": "b3b6308776451ad569c6cac145a1915312b9d19a4a8d3099d752994be4506d29",
"macos-universal": "070f80f136abde5708198ccd2008dec8037a09ba0dcc3f8f980a33029062308a",
"windows-x64": "cf43e5873639c95fc3eaaae910f554524c3f4e8b6533c71d10406093b44f3a60",
"linux-x86_64": "88ed0d6d2eabe90c115f5c1700a5628daa9c9c0df9595eb6f19df4893441d8a3"
"macos-x86_64": "2edacc4b50e5e4ba6dfb8aaa1b4402afc9fe3f1646d710f415a6a4ced83768fc",
"macos-arm64": "c8b76845aaee12eff02fd75e3127f2ff3c9b532a623cc6c7a4f7666ec10c9427",
"macos-universal": "5c0ac388817d485775f54bd84617239804bc7130fef3ad6fdee2b1d3a9580771",
"windows-x64": "4f7e1b43e361ac948427814e67fae7b83e49202082c31cfaf31cbe1153a28854",
"linux-x86_64": "28bc4487f8bd8b43c2066d6fcbf8c5dba871baa5017ba9d5fda133a19134e502"
}
},
"qt6": {
"version": "2023-03-26",
"version": "2023-03-30",
"baseUrl": "https://github.com/obsproject/obs-deps/releases/download",
"label": "Pre-Built Qt6",
"hashes": {
"macos-x86_64": "476859632357e9d00de6f5ec9a28410e0811c69456e610f7a1f09a56629badf1",
"macos-arm64": "d6c44de0b5968629b31685c59dffe5234887011c4769c6eda5fc47abdeedb2bd",
"macos-universal": "7b72e073b8f4a05010fd83f455881e24a505ee3c39f1c74408170da512c384f6",
"windows-x64": "28e90046211801c5c456b301597cd45423ea1a241cbe07b24956b6f438e96c93"
"macos-x86_64": "28c6fffee10d0651c70a5fef19421b5664c11971dc889840656c68ef4afb0745",
"macos-arm64": "a9192bbf56a5a1165163a15f8898abc3d00fb3c67e24be482d762f44dfd3c478",
"macos-universal": "b49f69fb265ff3bd54745cc555bb3e5f8d77860804b5871e03f0ea37f5a2bbf1",
"windows-x64": "d430ada2d053cda4a7de5389f72237de87593adf351099cecfc5bfca113b1b1a"
},
"debugSymbols": {
"windows-x64": "ffb666d27582c1af4089807638b3976cb5bfae811d3ac3d499d9497d77d71615"
"windows-x64": "e26b8634d45d3a924d78fcdce61fd11e1e15deec481fc954755e3a9b581b4ce5"
}
},
"cef": {