jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CI: Update deps to obs-deps 2022-07-08 release 

Notable changes:
 * Windows: Add Qt 5 and 6 builds
 * Windows: Remove nasm native build
 * Windows: Update srt from 1.4.2 to 1.4.4
 * Windows: Update SWIG from 3.0.12 to 4.1.0-git
 * macOS: Update libvpx from 1.10.0 to 1.11.0
 * macOS: Update srt from 1.4.1 to 1.4.4
 * macOS: Update SWIG from 3.0.12 to 4.1.0-git
 * macOS: Update x264 from r3059 to r3060
master
Ryan Foster 2022-07-08 15:42:54 -04:00
parent e27f90fa5a
commit beaae2b9ce
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/main.yml vendored
View File

@ -19,14 +19,14 @@ env:
CEF_BUILD_VERSION_LINUX: '4638'
CEF_BUILD_VERSION_WIN: '4638'
QT_VERSION_MAC: '5.15.2'
QT_HASH_MAC_X86_64: 'eb52d5cad6160a333db0781490f703822688f94cbf75bf753116761653b657ca'
QT_HASH_MAC_ARM64: '8e0f614310e8686b10ff780050caac94ae4bc3ee9e3534e3ccf2300d59088ad0'
QT_HASH_MAC_UNIVERSAL: 'b62b8d4069278356ad70ae49ed8eb5cb1722b108cd1975e329779be6f998a098'
QT_HASH_MAC_X86_64: '4af7d84ed34b78f385609d04d56ce9dacac0f70dfe5a82fe81cd3fad487988b8'
QT_HASH_MAC_ARM64: '85590c0d1aaff432f499656320b248ebfbc130d0935a3b194af581b71ffe603a'
QT_HASH_MAC_UNIVERSAL: 'a466a73bb6fe6c0e6af9e64ad4f0044b5294cc55661501034b771608ad0e2ead'
QT_VERSION_WIN: '5.15.2'
DEPS_VERSION_MAC: '2022-05-23'
DEPS_HASH_MAC_X86_64: 'e0372850e2c1014301d8a121945ff4778b543f3a768ccfdeda02c3427572cbc3'
DEPS_HASH_MAC_ARM64: '3e9c5d58f558736a62397cd2fc084e0be9cafbc00ef708d31b487f4b03c34ac3'
DEPS_VERSION_WIN: '2022-05-23'
DEPS_VERSION_MAC: '2022-07-08'
DEPS_HASH_MAC_X86_64: 'f5024a9f20913eeabd978eff46f1c8c6cca552ad010673ac15e7266ae4158c62'
DEPS_HASH_MAC_ARM64: '20414f5823f774d12ff10b502508720e069e4fc088bd60aa5ccea1d3092ce5c5'
DEPS_VERSION_WIN: '2022-07-08'
VLC_VERSION_MAC: '3.0.8'
VLC_HASH_MAC: 'e0149ef4a20a19b9ecd87309c2d27787ee3f47dfd47c6639644bc1f6fd95bdf6'
VLC_VERSION_WIN: '3.0.0-git'

4
CI/macos/01_install_dependencies.sh
View File

@ -35,10 +35,10 @@ install_qt-deps() {
_HASH="${2}"
fi
check_and_fetch "https://github.com/obsproject/obs-deps/releases/download/${1}/macos-deps-qt-${1}-${_ARCH}.tar.xz" "${_HASH}"
check_and_fetch "https://github.com/obsproject/obs-deps/releases/download/${1}/macos-deps-qt5-${1}-${_ARCH}.tar.xz" "${_HASH}"
mkdir -p obs-deps
step "Unpack..."
/usr/bin/tar -xf "./macos-deps-qt-${1}-${_ARCH}.tar.xz" -C ./obs-deps
/usr/bin/tar -xf "./macos-deps-qt5-${1}-${_ARCH}.tar.xz" -C ./obs-deps
/usr/bin/xattr -r -d com.apple.quarantine ./obs-deps
}

8
CI/windows/01_install_dependencies.ps1
View File

@ -32,7 +32,7 @@ Function Install-obs-deps {
Write-Step "Download..."
$ProgressPreference = $(if ($Quiet.isPresent) { "SilentlyContinue" } else { "Continue" })
Invoke-WebRequest -Uri "https://github.com/obsproject/obs-deps/releases/download/win-${Version}/windows-deps-${Version}-${ArchSuffix}.zip" -UseBasicParsing -OutFile "windows-deps-${Version}-${ArchSuffix}.zip"
Invoke-WebRequest -Uri "https://github.com/obsproject/obs-deps/releases/download/${Version}/windows-deps-${Version}-${ArchSuffix}.zip" -UseBasicParsing -OutFile "windows-deps-${Version}-${ArchSuffix}.zip"
$ProgressPreference = "Continue"
Write-Step "Unpack..."
@ -58,12 +58,12 @@ function Install-qt-deps {
Write-Step "Download..."
$ProgressPreference = $(if ($Quiet.isPresent) { 'SilentlyContinue' } else { 'Continue' })
Invoke-WebRequest -Uri "https://cdn-fastly.obsproject.com/downloads/windows-deps-qt-${Version}-${ArchSuffix}.zip" -UseBasicParsing -OutFile "windows-deps-qt-${Version}-${ArchSuffix}.zip"
Invoke-WebRequest -Uri "https://github.com/obsproject/obs-deps/releases/download/${Version}/windows-deps-qt5-${Version}-${ArchSuffix}.zip" -UseBasicParsing -OutFile "windows-deps-qt5-${Version}-${ArchSuffix}.zip"
$ProgressPreference = "Continue"
Write-Step "Unpack..."
Expand-Archive -Path "windows-deps-qt-${Version}-${ArchSuffix}.zip" -DestinationPath "${DepsBuildDir}/windows-deps-${Version}-${ArchSuffix}" -Force
Expand-Archive -Path "windows-deps-qt5-${Version}-${ArchSuffix}.zip" -DestinationPath "${DepsBuildDir}/windows-deps-${Version}-${ArchSuffix}" -Force
} else {
Write-Step "Found existing pre-built Qt..."
}