rustdesk: fetch aom and libyuv as git sources
googlesource's +archive tarballs are generated per request: their bytes change on every download, so the recipe skipped their checksums, and the endpoint refuses CI runners at times (503s on aom failed two #785 builds). Clone both at their pinned commits instead, which git verifies. _prepare_vc writes downloads/<port>-<ref>.tar.gz with the same git archive command vcpkg_from_git uses, so vcpkg finds them cached. The archives hold exactly the files of the old tarballs (aom 1347, libyuv 183).
This commit is contained in:
Emir Beganovic committed
1 parent
7246c2a3d5
commit
c050643155
1 file changed
+14
-6
@@ -229,14 +229,11 @@ if :; then
|
||||
"meson-${_meaver}.tar.gz::https://github.com/mesonbuild/meson/archive/refs/tags/${_meaver}.tar.gz" # meason and pkgconf versions are found in clean chroot
|
||||
"pkgconf-pkgconf-pkgconf-${_pcfver}.tar.gz::https://github.com/pkgconf/pkgconf/archive/refs/tags/pkgconf-${_pcfver}.tar.gz"
|
||||
# If your download gets renamed and replaced, vcpkg hash checked and found it to be the wrong one.
|
||||
# vcs sources are not hash checked. vcpkg doesn't use hash direct downloads like we do. vcpkg downloads with git and tars up, always with a different hash.
|
||||
"aom-${_aomver}.tar.gz::https://aomedia.googlesource.com/aom/+archive/${_aomver}.tar.gz"
|
||||
"libjpeg-turbo-libjpeg-turbo-${_jpgver}.tar.gz::https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/${_jpgver}.tar.gz"
|
||||
"libyuv-${_yuvver}.tar.gz::https://chromium.googlesource.com/libyuv/libyuv/+archive/${_yuvver}.tar.gz"
|
||||
"webmproject-libvpx-v${_wbmver}.tar.gz::https://github.com/webmproject/libvpx/archive/refs/tags/v${_wbmver}.tar.gz"
|
||||
"xiph-opus-v${_xipver}.tar.gz::https://github.com/xiph/opus/archive/refs/tags/v${_xipver}.tar.gz"
|
||||
)
|
||||
unset _meaver _pcfver _aomver _jpgver _yuvver _wbmver _xipver
|
||||
unset _meaver _pcfver _jpgver _wbmver _xipver
|
||||
if [ "${#_opt_hwcodec_vc[@]}" -ne 0 ]; then
|
||||
_ffmver='7.1'
|
||||
_vcs+=("ffmpeg-ffmpeg-n${_ffmver}.tar.gz::https://github.com/FFmpeg/FFmpeg/archive/refs/tags/n${_ffmver}.tar.gz")
|
||||
@@ -244,6 +241,13 @@ if :; then
|
||||
fi
|
||||
fi
|
||||
source+=("${_vcs[@]}")
|
||||
# googlesource's +archive tarballs differ on every download and are refused
|
||||
# from CI runners at times, so aom and libyuv are cloned at their pinned
|
||||
# commits instead. _prepare_vc turns them into the archives vcpkg expects.
|
||||
source+=(
|
||||
"aom::git+https://aomedia.googlesource.com/aom#commit=${_aomver}"
|
||||
"libyuv::git+https://chromium.googlesource.com/libyuv/libyuv#commit=${_yuvver}"
|
||||
)
|
||||
_FLX=(
|
||||
'1.2.7:3.19.6'
|
||||
#'1.3.3:3.24.5' # flutter_rust_bridge won't build
|
||||
@@ -265,8 +269,8 @@ source+=("${_vcs[@]}")
|
||||
)
|
||||
fi
|
||||
####
|
||||
md5sums=('ababb766c2c6ff58ab3e221681821286' '62184b10647731c59f239d16c72abac2' '6acc4b5b14befec55ef84006b60c7ff5' 'a77a4586f30f77de2eed63e160b3a051' '54a30a570a89caa701d9c0b139b39170' '379cfba8479c2a92e05e3b855d1e6901' 'f40cae9f445b22a00901678b72b320c0' '7887064dc9ce1cf7ae1c869bacd8e27e' '7745ca9bd6d05af8af0afd209375e209' 'SKIP' '4cc83d985db61e64bfa352388bb447ec' 'SKIP' '4c7a93808c12b359733430c8377b7fcf' '557a08d88aa605ee6cf4156686ce4cc2' '03485098fb64a000a4f7cd97e468dfff' 'a3efc04e00cede00296f1a0dc323e8d1' 'cc8e5418ff0c163228aabbe385ba2596')
|
||||
sha256sums=('52ef6e8e97a531faf572ad6b2df3daa3159f0043396ff44fc5c5673dd0ca3544' '4902cb2429d3ab7f055a7833c966d63b8531d3912a0423bd27cfe81fee000356' '8f7f1019404ce47dc012ba7c546ad634b973452fc2c57ac64b62cdc7c1f54ea3' '82757ee1ab6b956a3c601f7db82e2d9ad80dbbcf2ba68c63059f0b529426ccd0' '976944c6c163ed0810207f54bb4b5d5cf41aa4e4673133f188e0b0ada5eafc8e' '359046f24f8a81b96a198000a1cfd7934c1f4870b2a1306e13f65694cefef68f' 'e9255b62719c659f224fcc639b1bf4a6226e4996ad3fb006e18e1533cad77725' '6b878fb0f6f0318cbd54e13539f89a1a8305791668e8e93ffd59d82722888dac' '79721badcad1987dead9c3609eb4877ab9b58821c06bdacb824f2c8897c11f2a' 'SKIP' '304165ae11e64ab752e9cfc07c37bfdc87abd0bfe4bc699e59f34036d9c84f72' 'SKIP' '26fcd3db88045dee380e581862a6ef106f49b74b6396ee95c2993a260b4636aa' '9480e329e989f70d69886ded470c7f8cfe6c0667cc4196d4837ac9e668fb7404' '7ddad2d992bd250a6c56053c26029f7e728bebf0f37f80cf3f8a0e6ec706431a' 'a7c82f551a9eae018e078f6bb186171e5a77920d35a3d75a61d9a593d0a9e4ae' '5c1494e79024de228a9f383c8e52e45b042cd0cf24f4b0f47ee4d5448938b336')
|
||||
md5sums=('ababb766c2c6ff58ab3e221681821286' '62184b10647731c59f239d16c72abac2' '6acc4b5b14befec55ef84006b60c7ff5' 'a77a4586f30f77de2eed63e160b3a051' '54a30a570a89caa701d9c0b139b39170' '379cfba8479c2a92e05e3b855d1e6901' 'f40cae9f445b22a00901678b72b320c0' '7887064dc9ce1cf7ae1c869bacd8e27e' '7745ca9bd6d05af8af0afd209375e209' '4cc83d985db61e64bfa352388bb447ec' '4c7a93808c12b359733430c8377b7fcf' '557a08d88aa605ee6cf4156686ce4cc2' '03485098fb64a000a4f7cd97e468dfff' 'SKIP' 'SKIP' 'a3efc04e00cede00296f1a0dc323e8d1' 'cc8e5418ff0c163228aabbe385ba2596')
|
||||
sha256sums=('52ef6e8e97a531faf572ad6b2df3daa3159f0043396ff44fc5c5673dd0ca3544' '4902cb2429d3ab7f055a7833c966d63b8531d3912a0423bd27cfe81fee000356' '8f7f1019404ce47dc012ba7c546ad634b973452fc2c57ac64b62cdc7c1f54ea3' '82757ee1ab6b956a3c601f7db82e2d9ad80dbbcf2ba68c63059f0b529426ccd0' '976944c6c163ed0810207f54bb4b5d5cf41aa4e4673133f188e0b0ada5eafc8e' '359046f24f8a81b96a198000a1cfd7934c1f4870b2a1306e13f65694cefef68f' 'e9255b62719c659f224fcc639b1bf4a6226e4996ad3fb006e18e1533cad77725' '6b878fb0f6f0318cbd54e13539f89a1a8305791668e8e93ffd59d82722888dac' '79721badcad1987dead9c3609eb4877ab9b58821c06bdacb824f2c8897c11f2a' '304165ae11e64ab752e9cfc07c37bfdc87abd0bfe4bc699e59f34036d9c84f72' '26fcd3db88045dee380e581862a6ef106f49b74b6396ee95c2993a260b4636aa' '9480e329e989f70d69886ded470c7f8cfe6c0667cc4196d4837ac9e668fb7404' '7ddad2d992bd250a6c56053c26029f7e728bebf0f37f80cf3f8a0e6ec706431a' 'SKIP' 'SKIP' 'a7c82f551a9eae018e078f6bb186171e5a77920d35a3d75a61d9a593d0a9e4ae' '5c1494e79024de228a9f383c8e52e45b042cd0cf24f4b0f47ee4d5448938b336')
|
||||
_vcs=("${_vcs[@]%%::*}")
|
||||
_vcs=("${_vcs[@]##*/}")
|
||||
noextract=("${_vcs[@]}")
|
||||
@@ -296,6 +300,10 @@ _prepare_vc() {
|
||||
if [ "${#_vcs[@]}" -gt 0 ]; then
|
||||
cp -p "${_vcs[@]}" "${_srcdirvc}/downloads"
|
||||
fi
|
||||
# vcpkg_from_git uses downloads/<port>-<ref>.tar.gz when it exists, the
|
||||
# archive it would otherwise make itself with this git archive command.
|
||||
git -C aom -c core.autocrlf=false archive "${_aomver}" -o "${srcdir}/${_srcdirvc}/downloads/aom-${_aomver}.tar.gz"
|
||||
git -C libyuv -c core.autocrlf=false archive "${_yuvver}" -o "${srcdir}/${_srcdirvc}/downloads/libyuv-${_yuvver}.tar.gz"
|
||||
|
||||
# Check commit ID
|
||||
if :; then # [ ! -z "${_opt_VCPKG_COMMIT_ID}" ]; then
|
||||
|
||||
Reference in new issue
Block a user