Merge pull request #785 from omacom/rustdesk-1.5.0
rustdesk: update to 1.5.0 and drop pam from its dependencies
This commit is contained in:
1 file changed
+25
-48
+25
-48
@@ -149,12 +149,12 @@ DLAGENTS="${DLAGENTS[@]/curl /curl -L}"
|
||||
set -u
|
||||
_pkgname='rustdesk'
|
||||
pkgname="${_pkgname}"
|
||||
pkgver=1.4.9
|
||||
pkgver=1.5.0
|
||||
_pkgver=$pkgver
|
||||
pkgrel=2
|
||||
pkgrel=1
|
||||
_sfx=''
|
||||
#_sfx='-pr1-998b758'
|
||||
_hbb_commit=7e1c392c62d39c364127307cd408421dd5f8cfb0
|
||||
_hbb_commit=229b904508364c8997aad0fb5af57effac859f60
|
||||
_pkgverhbb=${_hbb_commit}
|
||||
pkgdesc='Yet another remote desktop software, written in Rust. Works out of the box, no configuration required. Great alternative to TeamViewer and AnyDesk!'
|
||||
arch=('x86_64')
|
||||
@@ -162,7 +162,7 @@ url='https://rustdesk.com/'
|
||||
_giturl='https://github.com/rustdesk/rustdesk'
|
||||
_giturlhbb='https://github.com/rustdesk/hbb_common'
|
||||
license=('AGPL-3.0-only')
|
||||
_dpr=('gtk3' 'xdotool' 'libxcb' 'libxfixes' 'alsa-lib' 'libva' 'libappindicator-gtk3' 'pam' 'gst-plugins-base' 'gst-plugin-pipewire') # from res/PKGBUILD/depends
|
||||
_dpr=('gtk3' 'xdotool' 'libxcb' 'libxfixes' 'alsa-lib' 'libva' 'libappindicator-gtk3' 'gst-plugins-base' 'gst-plugin-pipewire') # from res/PKGBUILD/depends
|
||||
#_dpr=('gtk3' 'xdotool' 'libxcb' 'libxfixes' 'alsa-lib' 'libva' 'libvdpau' 'libappindicator-gtk3' 'pam' 'gst-plugins-base' 'gst-plugin-pipewire') # from res/PKGBUILD/depends
|
||||
depends=("${_dpr[@]}" 'pulse-native-provider' 'gst-plugins-base-libs')
|
||||
depends+=('hicolor-icon-theme' 'xdg-utils')
|
||||
@@ -188,7 +188,7 @@ _patches=(
|
||||
'0000-disable-update-check@rustdesk.patch'
|
||||
#'0001-extended_text-drop-version-for-flutter.3.22.3@rustdesk.patch' # https://github.com/rustdesk/rustdesk/blob/master/.github/workflows/bridge.yml#L77
|
||||
'0002-screen_retriever@rustdesk.patch'
|
||||
'0004-bindgen@rustdesk.patch' # kevinlpowell
|
||||
#'0004-bindgen@rustdesk.patch' # kevinlpowell; upstream requires bindgen 0.72.1 itself since 1.5.0
|
||||
)
|
||||
install="${pkgname}.install"
|
||||
_srcdir="${pkgname}-${_pkgver}"
|
||||
@@ -212,15 +212,16 @@ if :; then
|
||||
'1.3.6:#commit=20241115-b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c'
|
||||
'1.3.8:#commit=20250113-6f29f12e82a8293156836ad81cc9bf5af41fe836'
|
||||
'1.4.2:#commit=20250827-120deac3062162151622ca4860575a33844ba10b' # date comes from commit (tig)
|
||||
'1.5.0:#commit=20260730-9e593bb18ea69cc5095e012465dcd675a822ed0d'
|
||||
)
|
||||
_opt_VCPKG_COMMIT_ID="$(_fn_VCL "${_pkgver}" -ge "${_VCL[@]}")"; unset _VCL
|
||||
#source+=("git+https://github.com/microsoft/vcpkg${_opt_VCPKG_COMMIT_ID}")
|
||||
_srcdirvc="vcpkg-${_opt_VCPKG_COMMIT_ID##*-}"
|
||||
source+=("vcpkg-${_opt_VCPKG_COMMIT_ID##*=}.tgz::https://github.com/microsoft/vcpkg/archive/${_opt_VCPKG_COMMIT_ID##*-}.tar.gz")
|
||||
_meaver='1.8.2'
|
||||
_pcfver='2.5.1'
|
||||
_aomver='10aece4157eb79315da205f39e19bf6ab3ee30d0'
|
||||
_jpgver='3.1.1'
|
||||
_meaver='1.9.0'
|
||||
_pcfver='3.0.3'
|
||||
_aomver='03087864cf4bea6abb0d28f95cf7843511413d8f'
|
||||
_jpgver='3.2.0'
|
||||
_yuvver='0faf8dd0e004520a61a603a4d2996d5ecc80dc3f'
|
||||
_wbmver='1.15.2'
|
||||
_xipver='1.5.2'
|
||||
@@ -228,21 +229,25 @@ 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'
|
||||
_ffmver='7.1.1'
|
||||
_vcs+=("ffmpeg-ffmpeg-n${_ffmver}.tar.gz::https://github.com/FFmpeg/FFmpeg/archive/refs/tags/n${_ffmver}.tar.gz")
|
||||
unset _ffmver
|
||||
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
|
||||
@@ -264,40 +269,8 @@ source+=("${_vcs[@]}")
|
||||
)
|
||||
fi
|
||||
####
|
||||
md5sums=('befab3c858c685ae8bdbfc80f58a1a51'
|
||||
'8a51b7d11596bb9e87eb5224e5967eac'
|
||||
'6acc4b5b14befec55ef84006b60c7ff5'
|
||||
'a77a4586f30f77de2eed63e160b3a051'
|
||||
'54a30a570a89caa701d9c0b139b39170'
|
||||
'379cfba8479c2a92e05e3b855d1e6901'
|
||||
'56b134202b1ea88389d24d1c99635f6a'
|
||||
'7887064dc9ce1cf7ae1c869bacd8e27e'
|
||||
'7745ca9bd6d05af8af0afd209375e209'
|
||||
'9b056bb94ba70d6ec3f5901544239268'
|
||||
'4cc83d985db61e64bfa352388bb447ec'
|
||||
'f2f3868524b82915da3700267d116cdf'
|
||||
'4c7a93808c12b359733430c8377b7fcf'
|
||||
'557a08d88aa605ee6cf4156686ce4cc2'
|
||||
'03485098fb64a000a4f7cd97e468dfff'
|
||||
'a3efc04e00cede00296f1a0dc323e8d1'
|
||||
'cc8e5418ff0c163228aabbe385ba2596')
|
||||
sha256sums=('1769fcc51751aab91bc0cfa691723722f51d3693ce3ddea3d92cfb1c319100e0'
|
||||
'e108a197f00ae5b77a810a213d391469f8659ef51d7c975d858e5c1e0e22a899'
|
||||
'8f7f1019404ce47dc012ba7c546ad634b973452fc2c57ac64b62cdc7c1f54ea3'
|
||||
'82757ee1ab6b956a3c601f7db82e2d9ad80dbbcf2ba68c63059f0b529426ccd0'
|
||||
'976944c6c163ed0810207f54bb4b5d5cf41aa4e4673133f188e0b0ada5eafc8e'
|
||||
'359046f24f8a81b96a198000a1cfd7934c1f4870b2a1306e13f65694cefef68f'
|
||||
'f3b1ec711fa1ba291efd75e27983898a37be15760dfe129a406448fa7377b31d'
|
||||
'6b878fb0f6f0318cbd54e13539f89a1a8305791668e8e93ffd59d82722888dac'
|
||||
'79721badcad1987dead9c3609eb4877ab9b58821c06bdacb824f2c8897c11f2a'
|
||||
'2399c0f128ef148a785c139d631a204458b1715bb2cfb54acc65613c22d89d5c'
|
||||
'304165ae11e64ab752e9cfc07c37bfdc87abd0bfe4bc699e59f34036d9c84f72'
|
||||
'73a4ecb598cd6824cb7a0a0d934d81b866e2762acd8eb465e1510063b4649659'
|
||||
'26fcd3db88045dee380e581862a6ef106f49b74b6396ee95c2993a260b4636aa'
|
||||
'9480e329e989f70d69886ded470c7f8cfe6c0667cc4196d4837ac9e668fb7404'
|
||||
'7ddad2d992bd250a6c56053c26029f7e728bebf0f37f80cf3f8a0e6ec706431a'
|
||||
'a7c82f551a9eae018e078f6bb186171e5a77920d35a3d75a61d9a593d0a9e4ae'
|
||||
'5c1494e79024de228a9f383c8e52e45b042cd0cf24f4b0f47ee4d5448938b336')
|
||||
md5sums=('ababb766c2c6ff58ab3e221681821286' '62184b10647731c59f239d16c72abac2' '6acc4b5b14befec55ef84006b60c7ff5' 'a77a4586f30f77de2eed63e160b3a051' '379cfba8479c2a92e05e3b855d1e6901' 'f40cae9f445b22a00901678b72b320c0' '31921523e3f3c70c9c06666d65676a1a' '1efa96e6c35d1715dc6a7f83fd473953' '47d465f8ba76031a6717afc70c91eaf3' '4c7a93808c12b359733430c8377b7fcf' '557a08d88aa605ee6cf4156686ce4cc2' '5f8157e206bc430cbed92fb62144f30b' 'SKIP' 'SKIP' 'a3efc04e00cede00296f1a0dc323e8d1' 'cc8e5418ff0c163228aabbe385ba2596')
|
||||
sha256sums=('52ef6e8e97a531faf572ad6b2df3daa3159f0043396ff44fc5c5673dd0ca3544' '4902cb2429d3ab7f055a7833c966d63b8531d3912a0423bd27cfe81fee000356' '8f7f1019404ce47dc012ba7c546ad634b973452fc2c57ac64b62cdc7c1f54ea3' '82757ee1ab6b956a3c601f7db82e2d9ad80dbbcf2ba68c63059f0b529426ccd0' '359046f24f8a81b96a198000a1cfd7934c1f4870b2a1306e13f65694cefef68f' 'e9255b62719c659f224fcc639b1bf4a6226e4996ad3fb006e18e1533cad77725' '12ca5979a3a625c8944e093c17c32c4c2bd03a48c8877354d88a7077860ef740' '90bb12369d296f2e0bea14832b421c4ba40d442e1519758e6e1e7855afab3149' '980dd81f425082aa6d7c9e47fef27554ce7a9ffc8e2f6e863b97d263c5c50858' '26fcd3db88045dee380e581862a6ef106f49b74b6396ee95c2993a260b4636aa' '9480e329e989f70d69886ded470c7f8cfe6c0667cc4196d4837ac9e668fb7404' 'f117507dc501f2a6c11f9241d8d0c3213846cfad91764361af37befd6b6c523d' 'SKIP' 'SKIP' 'a7c82f551a9eae018e078f6bb186171e5a77920d35a3d75a61d9a593d0a9e4ae' '5c1494e79024de228a9f383c8e52e45b042cd0cf24f4b0f47ee4d5448938b336')
|
||||
_vcs=("${_vcs[@]%%::*}")
|
||||
_vcs=("${_vcs[@]##*/}")
|
||||
noextract=("${_vcs[@]}")
|
||||
@@ -327,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