From 54aa628fa18346ac9c47aac0cb392f4fe734044d Mon Sep 17 00:00:00 2001 From: MechDR <45944962+MechDR@users.noreply.github.com> Date: Sat, 9 Dec 2023 03:02:13 +0100 Subject: [PATCH 1/3] AnyDesk: update to v6.3.0 and added RPi3 armv7hf/armv7l support Updated AnyDesk to version 6.3.0 and added repackage support for ARMv7 on RPi. Should also work on anything that is not an RPi but uses ARMv7HF or ARMv7L. The binaries are only for the RPi3, so they are 32-bit only. AnyDesk still doesn't have any ARM64 binaries, so no RPi4 support. But, in theory, they should run without a problem on any ARMv7HF/L device. --- srcpkgs/anydesk/template | 46 ++++++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template index eaec4b93ad602..fde3f8f42af0d 100644 --- a/srcpkgs/anydesk/template +++ b/srcpkgs/anydesk/template @@ -1,31 +1,49 @@ # Template file for 'anydesk' pkgname=anydesk -version=6.2.1 +version=6.3.0 revision=1 -archs="x86_64" +archs="x86_64 armv7l armv7hf" create_wrksrc=yes -hostmakedepends="patchelf" +hostmakedepends="patchelf tar gzip" depends="hicolor-icon-theme gtkglext" short_desc="Fast remote desktop application" maintainer="mobinmob " license="custom:Proprietary" -#Free for personal use. Terms and conditions:https://anydesk.com/en/terms +#Free for personal use. Terms and conditions: https://anydesk.com/en/terms homepage="https://anydesk.com/remote-desktop" nopie=yes restricted=yes -distfiles="https://download.anydesk.com/linux/anydesk_${version}-1_x86_64.rpm - https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz" -checksum="68f8395a0c84f2560ffa425497fbf9846a61bb2dbc4b1010a8ffca7856514ab2 - 96a7ded2144ecdaff381c34e49eee3275caaaac00847e91abf5e7783706c989c" - +if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ] ; then + distfiles="https://download.anydesk.com/linux/anydesk_${version}-1_x86_64.rpm + https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz" + checksum="6df804da6010e79f62274b10e0d0f110c538dd7e3f3a6abd8cb7ce20d88c8399 + b1e3337d35ce19af93963829988b2014e8acfbbf6bd1b5adfb8bc7dcd6fee452" +elif [ "${XBPS_TARGET_MACHINE}" = "armv7l" ] || [ "${XBPS_TARGET_MACHINE}" = "armv7hf" ]; then + distfiles="https://download.anydesk.com/rpi/anydesk_${version}-1_armhf.deb" + checksum="10a8f442877d65458c800da2a4c772532c178a675c55604cca66156a5c812e1a" +fi do_build() { patchelf --remove-needed libpangox-1.0.so.0 usr/bin/anydesk } -do_install() { - vlicense "${pkgname}-${version}"/copyright - rm -rf "${pkgname}-${version}" - vcopy "*" / -} +if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ] ; then + do_install() { + vlicense "${pkgname}-${version}"/copyright + rm -rf "${pkgname}-${version}" + vcopy "*" / + } +elif [ "${XBPS_TARGET_MACHINE}" = "armv7l" ] || [ "${XBPS_TARGET_MACHINE}" = "armv7hf" ]; then + do_extract() { + ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/anydesk_${version}-1_armhf.deb + gzip -df data.tar.gz + tar xopf data.tar + gzip -df control.tar.gz + tar xopf control.tar + } + + do_install() { + vcopy usr / + } +fi From c0889fced01b6e18d4f3fa3d36e32caa4da9676b Mon Sep 17 00:00:00 2001 From: MechDR <45944962+MechDR@users.noreply.github.com> Date: Sun, 10 Dec 2023 02:42:42 +0100 Subject: [PATCH 2/3] Update srcpkgs/anydesk/template Case instead of if for architecture checks, suggested by @classabbyamp Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com> --- srcpkgs/anydesk/template | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template index fde3f8f42af0d..e324d68b8775c 100644 --- a/srcpkgs/anydesk/template +++ b/srcpkgs/anydesk/template @@ -14,15 +14,16 @@ homepage="https://anydesk.com/remote-desktop" nopie=yes restricted=yes -if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ] ; then - distfiles="https://download.anydesk.com/linux/anydesk_${version}-1_x86_64.rpm - https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz" - checksum="6df804da6010e79f62274b10e0d0f110c538dd7e3f3a6abd8cb7ce20d88c8399 - b1e3337d35ce19af93963829988b2014e8acfbbf6bd1b5adfb8bc7dcd6fee452" -elif [ "${XBPS_TARGET_MACHINE}" = "armv7l" ] || [ "${XBPS_TARGET_MACHINE}" = "armv7hf" ]; then - distfiles="https://download.anydesk.com/rpi/anydesk_${version}-1_armhf.deb" - checksum="10a8f442877d65458c800da2a4c772532c178a675c55604cca66156a5c812e1a" -fi +case "${XBPS_TARGET_MACHINE}" in + x86_64) + distfiles="https://download.anydesk.com/linux/anydesk_${version}-1_amd64.deb" + checksum="..." + ;; + armv7*) + distfiles="https://download.anydesk.com/rpi/anydesk_${version}-1_armhf.deb" + checksum="10a8f442877d65458c800da2a4c772532c178a675c55604cca66156a5c812e1a" + ;; +esac do_build() { patchelf --remove-needed libpangox-1.0.so.0 usr/bin/anydesk From 7af5a7aa50daa655d7b11d4b2d4124dcdf940a61 Mon Sep 17 00:00:00 2001 From: MechDR <45944962+MechDR@users.noreply.github.com> Date: Sun, 10 Dec 2023 02:44:51 +0100 Subject: [PATCH 3/3] Update srcpkgs/anydesk/template No need for extract of deb files, xbps knows how to do it (suggested by @classabbyamp) Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com> --- srcpkgs/anydesk/template | 7 ------- 1 file changed, 7 deletions(-) diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template index e324d68b8775c..abcfac0221ab8 100644 --- a/srcpkgs/anydesk/template +++ b/srcpkgs/anydesk/template @@ -36,13 +36,6 @@ if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ] ; then vcopy "*" / } elif [ "${XBPS_TARGET_MACHINE}" = "armv7l" ] || [ "${XBPS_TARGET_MACHINE}" = "armv7hf" ]; then - do_extract() { - ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/anydesk_${version}-1_armhf.deb - gzip -df data.tar.gz - tar xopf data.tar - gzip -df control.tar.gz - tar xopf control.tar - } do_install() { vcopy usr /