Update 1.2.2-0

2 files changed, 93 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b0befe4d5eba..4b5e716f68e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,37 @@
 pkgbase = rustdesk-nightly
 	pkgdesc = Yet another remote desktop software, written in Rust. Works out of the box, no configuration required. Great alternative to TeamViewer and AnyDesk!
-	pkgver = 1.2.1
+	pkgver = 1.2.2
 	pkgrel = 0
 	url = https://github.com/rustdesk/rustdesk
 	arch = x86_64
+	arch = aarch64
 	license = GPL3
+	optdepends = libappindicator-gtk3: tray icon
+	optdepends = libayatana-appindicator: tray icon
+	options = !strip
+	source = rustdesk-1.2.2-x86_64.pkg.tar.zst::https://github.com/rustdesk/rustdesk/releases/download/1.2.2/rustdesk-1.2.2-0-x86_64.pkg.tar.zst
+	sha256sums = SKIP
+	source_x86_64 = rustdesk-1.2.2-x86_64.AppImage::https://github.com/rustdesk/rustdesk/releases/download/1.2.2/rustdesk-1.2.2-x86_64.AppImage
+	sha256sums_x86_64 = SKIP
+	source_aarch64 = rustdesk-1.2.2-aarch64.AppImage::https://github.com/rustdesk/rustdesk/releases/download/1.2.2/rustdesk-1.2.2-aarch64.AppImage
+	sha256sums_aarch64 = SKIP
+
+pkgname = rustdesk-nightly
+	depends = gstreamer
+	depends = gst-plugins-base-libs
 	depends = gtk3
-	depends = xdotool
+	depends = libpulse
+	depends = libva
+	depends = libvdpau
 	depends = libxcb
 	depends = libxfixes
-	depends = alsa-lib
-	depends = pulseaudio
-	depends = hicolor-icon-theme
 	depends = xdg-utils
-	depends = python-pynput
-	depends = libayatana-appindicator
+	depends = xdotool
+	depends = hicolor-icon-theme
 	provides = rustdesk
 	conflicts = rustdesk
-	options = !strip
-	source = https://github.com/rustdesk/rustdesk/releases/download/nightly/rustdesk-1.2.1-0-x86_64.pkg.tar.zst
-	sha256sums = SKIP
 
-pkgname = rustdesk-nightly
+pkgname = rustdesk-appimage-nightly
+	pkgdesc = Yet another remote desktop software, written in Rust. Works out of the box, no configuration required. Great alternative to TeamViewer and AnyDesk! (AppImage)
+	provides = rustdesk
+	conflicts = rustdesk
diff --git a/PKGBUILD b/PKGBUILD
index 93ad0794c2af..1256bc0d347b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,79 @@
 # Maintainer: taotieren <admin@taotieren.com>
 
-pkgname=rustdesk-nightly
-pkgver=1.2.1
+pkgbase=rustdesk-nightly
+pkgname=(rustdesk{,-appimage}-nightly)
+pkgver=1.2.2
 pkgrel=0
 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')
+arch=('x86_64' 'aarch64')
 url="https://github.com/rustdesk/rustdesk"
 license=('GPL3')
-provides=("${pkgname%-nightly}")
-conflicts=("${pkgname%-nightly}")
-# TODO: add dep on libsciter-gtk, remove libsciter-gtk.so from this package
-depends=('gtk3' 'xdotool' 'libxcb' 'libxfixes' 'alsa-lib' 'pulseaudio' 'hicolor-icon-theme' 'xdg-utils' 'python-pynput' 'libayatana-appindicator')
+optdepends=(
+    'libappindicator-gtk3: tray icon'
+    'libayatana-appindicator: tray icon'
+)
 options=('!strip')
-source=("$url/releases/download/nightly/rustdesk-${pkgver}-${pkgrel}-${arch}.pkg.tar.zst")
+source=("${pkgbase%-nightly}-${pkgver}-$CARCH.pkg.tar.zst::$url/releases/download/${pkgver}/rustdesk-${pkgver}-0-$CARCH.pkg.tar.zst")
+source_x86_64=("${pkgbase%-nightly}-${pkgver}-x86_64.AppImage::${url}/releases/download/${pkgver}/${pkgbase%-nightly}-${pkgver}-x86_64.AppImage")
+source_aarch64=("${pkgbase%-nightly}-${pkgver}-aarch64.AppImage::${url}/releases/download/${pkgver}/${pkgbase%-nightly}-${pkgver}-aarch64.AppImage")
 sha256sums=('SKIP')
+sha256sums_x86_64=('SKIP')
+sha256sums_aarch64=('SKIP')
+
+_install_path="/opt/appimages"
+
+prepare() {
+    sed -i "s/^\(Icon=\).*$/\1rustdesk/" "$srcdir/usr/share/rustdesk/files/rustdesk.desktop"
+    cd ${srcdir}
+    chmod a+x ${pkgbase%-nightly}-${pkgver}-${CARCH}.AppImage
+    "./${pkgbase%-nightly}-${pkgver}-${CARCH}.AppImage" --appimage-extract > /dev/null
+    sed 's|usr/lib/rustdesk/rustdesk|/opt/appimages/rustdesk.AppImage|g' -i "${srcdir}/squashfs-root/${pkgbase%-nightly}.desktop"
+}
+
+package_rustdesk-nightly() {
+    provides=("${pkgname%-nightly}")
+    conflicts=("${pkgname%-nightly}")
+    depends=(
+        'gstreamer'
+        'gst-plugins-base-libs'
+        'gtk3'
+        'libpulse'
+        'libva'
+        'libvdpau'
+        'libxcb'
+        'libxfixes'
+        'xdg-utils'
+        'xdotool'
+        'hicolor-icon-theme'
+    )
+
+# TODO: add dep on libsciter-gtk, remove libsciter-gtk.so from this package
+
+    mkdir -p "$pkgdir/usr/bin/"
+    ln -s "/usr/lib/rustdesk/rustdesk" "$pkgdir/usr/bin/rustdesk"
+
+    mkdir -p "$pkgdir/usr/lib/"
+    cp -r "$srcdir/usr/lib/rustdesk/" "$pkgdir/usr/lib/"
+
+    install -Dm644 "$srcdir/usr/share/icons/hicolor/256x256/apps/rustdesk.png" "$pkgdir/usr/share/icons/hicolor/256x256/apps/rustdesk.png"
+    install -Dm644 "$srcdir/usr/share/icons/hicolor/scalable/apps/rustdesk.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/rustdesk.svg"
+    install -Dm644 "$srcdir/usr/share/rustdesk/files/rustdesk.desktop" "$pkgdir/usr/share/applications/rustdesk.desktop"
+    install -Dm644 "$srcdir/usr/share/rustdesk/files/rustdesk-link.desktop" "$pkgdir/usr/share/applications/rustdesk-link.desktop"
+    install -Dm644 "$srcdir/usr/share/rustdesk/files/rustdesk.service" "$pkgdir/usr/lib/systemd/system/rustdesk.service"
+}
+
+package_rustdesk-appimage-nightly() {
+    pkgdesc+=" (AppImage)"
+    provides=("${pkgname%-appimage-nightly}")
+    conflicts=("${pkgname%-appimage-nightly}")
+
+    install -Dm755 "${srcdir}"/${pkgbase%-nightly}-${pkgver}-${CARCH}.AppImage "${pkgdir}"/${_install_path}/${pkgbase%-nightly}.AppImage
+
+    local _icon
+    for _icon in 32 64 128 ; do
+        install -Dm0644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/${_icon}x${_icon}/apps/${pkgbase%-nightly}.png" \
+                    -t  "${pkgdir}/usr/share/icons/hicolor/${_icon}x${_icon}/apps"
+    done
 
-package() {
-    mv -v "${srcdir}/usr" "${pkgdir}"
-    install -Dm0644 "$pkgdir/usr/share/${pkgname%-nightly}/files/${pkgname%-nightly}.service" "$pkgdir/usr/lib/systemd/system/${pkgname%-nightly}.service"
-    install -Dm0644 "$pkgdir/usr/share/${pkgname%-nightly}/files/${pkgname%-nightly}.png" "$pkgdir/usr/share/icons/hicolor/256x256/apps/${pkgname%-nightly}.png"
-    install -Dm0644 "$pkgdir/usr/share/${pkgname%-nightly}/files/${pkgname%-nightly}.desktop" "$pkgdir/usr/share/applications/${pkgname%-nightly}.desktop"
-    rm -rf "$pkgdir/usr/share/${pkgname%-nightly}/files/${pkgname%-nightly}.service"
-    rm -rf "$pkgdir/usr/share/${pkgname%-nightly}/files/${pkgname%-nightly}.desktop"
-    rm -rf "$pkgdir/usr/share/${pkgname%-nightly}/files/${pkgname%-nightly}.png"
+    install -Dm644 "${srcdir}/squashfs-root/${pkgbase%-nightly}.desktop" -t "${pkgdir}/usr/share/applications"
 }