From: MechDR <MechDR@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] AnyDesk: update to v6.3.0 and added RPi3 armv7hf/armv7l support
Date: Sun, 10 Dec 2023 04:58:34 +0100 [thread overview]
Message-ID: <20231210035834.Hf9MwZYGqdfgKTorI7-9XXrMBB4CLZqLW5liNaOdDVw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-47656@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1141 bytes --]
There is an updated pull request by MechDR against master on the void-packages repository
https://github.com/MechDR/void-packages anydesk
https://github.com/void-linux/void-packages/pull/47656
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.
Don't know if multilib is a thing on ARM64... I presume not...
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- armv7l
- armv7hf
A patch file from https://github.com/void-linux/void-packages/pull/47656.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-anydesk-47656.patch --]
[-- Type: text/x-diff, Size: 11499 bytes --]
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/7] 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 <mobinmob@disroot.org>"
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/7] 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/7] 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 /
From aec58300f080a5de9defbb09372acd16eb164720 Mon Sep 17 00:00:00 2001
From: MechDR <45944962+MechDR@users.noreply.github.com>
Date: Sun, 10 Dec 2023 02:45:55 +0100
Subject: [PATCH 4/7] Update srcpkgs/anydesk/template
No need for tar and gzip in hostmakedepends, xbps knows how to extract deb files (suggested by @classabbyamp)
Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
srcpkgs/anydesk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index abcfac0221ab8..93b7555a654cf 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -4,7 +4,7 @@ version=6.3.0
revision=1
archs="x86_64 armv7l armv7hf"
create_wrksrc=yes
-hostmakedepends="patchelf tar gzip"
+hostmakedepends="patchelf"
depends="hicolor-icon-theme gtkglext"
short_desc="Fast remote desktop application"
maintainer="mobinmob <mobinmob@disroot.org>"
From fd947e681a8344194e4986e8a7792ef38ec8070f Mon Sep 17 00:00:00 2001
From: MechDR <45944962+MechDR@users.noreply.github.com>
Date: Sun, 10 Dec 2023 02:52:08 +0100
Subject: [PATCH 5/7] Added the checksums and proper download URLs
---
srcpkgs/anydesk/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index 93b7555a654cf..090a7d73d5d7f 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -16,8 +16,10 @@ restricted=yes
case "${XBPS_TARGET_MACHINE}" in
x86_64)
- distfiles="https://download.anydesk.com/linux/anydesk_${version}-1_amd64.deb"
- checksum="..."
+ distfiles="https://download.anydesk.com/linux/anydesk_${version}-1_x86_64.rpm
+ https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz"
+ checksum=checksum="68f8395a0c84f2560ffa425497fbf9846a61bb2dbc4b1010a8ffca7856514ab2
+ 96a7ded2144ecdaff381c34e49eee3275caaaac00847e91abf5e7783706c989c"
;;
armv7*)
distfiles="https://download.anydesk.com/rpi/anydesk_${version}-1_armhf.deb"
@@ -36,7 +38,6 @@ if [ "${XBPS_TARGET_MACHINE}" = "x86_64" ] ; then
vcopy "*" /
}
elif [ "${XBPS_TARGET_MACHINE}" = "armv7l" ] || [ "${XBPS_TARGET_MACHINE}" = "armv7hf" ]; then
-
do_install() {
vcopy usr /
}
From 2511480f6636461c5a77ae8076b45312a4cc5aa5 Mon Sep 17 00:00:00 2001
From: MechDR <45944962+MechDR@users.noreply.github.com>
Date: Sun, 10 Dec 2023 03:20:48 +0100
Subject: [PATCH 6/7] Opps, wrong checksums
---
srcpkgs/anydesk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index 090a7d73d5d7f..f5508c67bae2a 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -18,8 +18,8 @@ case "${XBPS_TARGET_MACHINE}" in
x86_64)
distfiles="https://download.anydesk.com/linux/anydesk_${version}-1_x86_64.rpm
https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz"
- checksum=checksum="68f8395a0c84f2560ffa425497fbf9846a61bb2dbc4b1010a8ffca7856514ab2
- 96a7ded2144ecdaff381c34e49eee3275caaaac00847e91abf5e7783706c989c"
+ checksum="6df804da6010e79f62274b10e0d0f110c538dd7e3f3a6abd8cb7ce20d88c8399
+ b1e3337d35ce19af93963829988b2014e8acfbbf6bd1b5adfb8bc7dcd6fee452"
;;
armv7*)
distfiles="https://download.anydesk.com/rpi/anydesk_${version}-1_armhf.deb"
From 15bfc37c93c992ac06ecab23223fe028b44ac07e Mon Sep 17 00:00:00 2001
From: MechDR <45944962+MechDR@users.noreply.github.com>
Date: Sun, 10 Dec 2023 04:58:31 +0100
Subject: [PATCH 7/7] Removed the tar.gz and .rpm files, everything is repacked
through .deb
---
srcpkgs/anydesk/template | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index f5508c67bae2a..b8e5e2d1468ce 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -16,10 +16,8 @@ restricted=yes
case "${XBPS_TARGET_MACHINE}" in
x86_64)
- 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"
+ distfiles="https://download.anydesk.com/linux/anydesk_${version}-1_amd64.deb"
+ checksum="30f6e44cea28428d1cb645055fae72cf166f63318e0c94f2c12d18a3614ce30c"
;;
armv7*)
distfiles="https://download.anydesk.com/rpi/anydesk_${version}-1_armhf.deb"
@@ -31,14 +29,10 @@ do_build() {
patchelf --remove-needed libpangox-1.0.so.0 usr/bin/anydesk
}
-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_install() {
- vcopy usr /
- }
-fi
+echo "See: https://anydesk.com/en/terms" > "${pkgname}-${version}"/LICENSE
+
+do_install() {
+ echo "See: https://anydesk.com/en/terms" > LICENSE
+ vlicense LICENSE
+ vcopy usr /
+}
next prev parent reply other threads:[~2023-12-10 3:58 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-09 2:07 [PR PATCH] " MechDR
2023-12-10 0:01 ` [PR REVIEW] " classabbyamp
2023-12-10 0:01 ` classabbyamp
2023-12-10 0:01 ` classabbyamp
2023-12-10 0:01 ` classabbyamp
2023-12-10 0:02 ` classabbyamp
2023-12-10 1:42 ` [PR PATCH] [Updated] " MechDR
2023-12-10 1:44 ` MechDR
2023-12-10 1:45 ` MechDR
2023-12-10 1:52 ` MechDR
2023-12-10 1:53 ` classabbyamp
2023-12-10 1:59 ` [PR REVIEW] " MechDR
2023-12-10 2:09 ` classabbyamp
2023-12-10 2:20 ` [PR PATCH] [Updated] " MechDR
2023-12-10 2:25 ` MechDR
2023-12-10 2:28 ` [PR REVIEW] " MechDR
2023-12-10 2:33 ` classabbyamp
2023-12-10 2:33 ` [PR REVIEW] " MechDR
2023-12-10 2:34 ` MechDR
2023-12-10 2:37 ` MechDR
2023-12-10 2:38 ` [PR REVIEW] " classabbyamp
2023-12-10 2:39 ` classabbyamp
2023-12-10 2:39 ` classabbyamp
2023-12-10 2:40 ` [PR REVIEW] " classabbyamp
2023-12-10 2:47 ` MechDR
2023-12-10 2:53 ` MechDR
2023-12-10 3:09 ` [PR REVIEW] " classabbyamp
2023-12-10 3:11 ` MechDR
2023-12-10 3:12 ` classabbyamp
2023-12-10 3:58 ` MechDR [this message]
2023-12-10 4:00 ` MechDR
2023-12-10 4:01 ` MechDR
2023-12-10 4:02 ` MechDR
2023-12-10 4:11 ` [PR REVIEW] " classabbyamp
2023-12-10 4:28 ` classabbyamp
2023-12-11 15:41 ` [PR PATCH] [Updated] " MechDR
2023-12-11 15:49 ` MechDR
2023-12-11 15:50 ` MechDR
2023-12-11 15:50 ` MechDR
2023-12-11 15:52 ` MechDR
2023-12-11 15:57 ` MechDR
2023-12-13 23:23 ` AnyDesk: update to 6.3.0, add armv7 support MechDR
2023-12-13 23:50 ` classabbyamp
2023-12-14 0:58 ` MechDR
2023-12-14 0:59 ` classabbyamp
2023-12-14 1:02 ` MechDR
2023-12-14 1:03 ` MechDR
2023-12-14 1:08 ` classabbyamp
2023-12-14 1:11 ` MechDR
2023-12-14 1:12 ` [PR PATCH] [Updated] " MechDR
2023-12-14 1:54 ` MechDR
2023-12-14 1:55 ` MechDR
2023-12-14 1:56 ` MechDR
2023-12-14 23:54 ` [PR PATCH] [Updated] " MechDR
2023-12-15 1:58 ` MechDR
2023-12-15 1:59 ` MechDR
2023-12-22 19:37 ` 0x5c
2023-12-23 16:58 ` MechDR
2023-12-23 17:03 ` classabbyamp
2023-12-23 17:23 ` MechDR
2023-12-23 17:25 ` 0x5c
2023-12-23 17:28 ` classabbyamp
2023-12-23 18:38 ` MechDR
2023-12-23 18:38 ` MechDR
2023-12-23 18:45 ` 0x5c
2023-12-23 19:32 ` MechDR
2023-12-23 19:44 ` [PR PATCH] [Updated] " MechDR
2023-12-23 19:46 ` MechDR
2023-12-23 22:51 ` MechDR
2023-12-23 22:51 ` MechDR
2023-12-23 22:54 ` [PR PATCH] [Updated] anydesk: " MechDR
2023-12-23 22:56 ` MechDR
2023-12-23 23:08 ` classabbyamp
2023-12-23 23:54 ` MechDR
2023-12-24 2:52 ` 0x5c
2023-12-24 3:06 ` MechDR
2023-12-24 12:24 ` [PR REVIEW] " ahesford
2023-12-24 12:31 ` ahesford
2023-12-24 12:49 ` [PR REVIEW] " classabbyamp
2023-12-24 12:57 ` ahesford
2023-12-25 8:08 ` MechDR
2023-12-25 8:08 ` MechDR
2023-12-25 8:09 ` MechDR
2023-12-25 8:12 ` MechDR
2023-12-25 9:48 ` [PR PATCH] [Updated] " MechDR
2024-01-21 2:48 ` MechDR
2024-02-15 5:32 ` [PR PATCH] [Closed]: " classabbyamp
2024-02-15 5:32 ` classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231210035834.Hf9MwZYGqdfgKTorI7-9XXrMBB4CLZqLW5liNaOdDVw@z \
--to=mechdr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).