6 files changed, 40 insertions, 56 deletions
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index 700071afb070..adafbd751624 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/heimdall/Manifest b/app-mobilephone/heimdall/Manifest
index 5beecee41766..33c0294c7953 100644
--- a/app-mobilephone/heimdall/Manifest
+++ b/app-mobilephone/heimdall/Manifest
@@ -1,6 +1,4 @@
-DIST heimdall-1.4.2.tar.bz2 5506713 BLAKE2B 775abc8d47f9efac21f28e47d607ab4b07f8948fcca005c78ddb7ed093e51a76f60ac5c04150a3424c360813d180cd1df1ff8a87295918bff872f41123250a58 SHA512 b2b0a8a8db6a52236716fff9748a391388c1b2b1774a26fab9b451b8dab5ff35e8e1403555a65daec180fc961388c7581d170df6e3599a102fd304a133da8674
 DIST heimdall-1.4.2.tar.gz 5486693 BLAKE2B 213bfa5bb7ede8d418847916a5ec16c17e4dec7fcb07de296d96e16c929634167afb57e13cee0e8a6e42fbbddcd2f2e0f5069cfbc3e8c3b5721d2d303ef48407 SHA512 c554662f9ccb763a8e9867a0c563618879d2533af985d44db3c237d3ee51add44c1681d13b1a83b72b30ba6e5b32d7c2f9c02b31114c67c5fbe01cbb010acfe7
-EBUILD heimdall-1.4.2-r1.ebuild 1032 BLAKE2B 2098606391be23818664ae61af8757f78d65bcdbc6d377e97de0776b53aa89e714f29a1b315f1ed0a2f58212f48dfec20408fcfe8c7df12162c36841395812d5 SHA512 07f6b8a103e3ad382fa99e11ef3d95c6cd7fff5ea51ae20a1f44ea722ffeae2f87a9c54ab35ac8016bddcacbdaed411201e9c69a2e6e2056c21596004d02bc98
-EBUILD heimdall-1.4.2.ebuild 1055 BLAKE2B 6579d47c8e74492fbe3da7489fd6ebfb062cc5fd167fa8d7678447c0c2c62bdab0fc215362162b7aa09dac9b490eebbb963155f61a49afc8f2c09f210df55f1e SHA512 df06bdf6e550cdfbb4dfc025037002286cf8e0b677c7bfec4a68a2ec7257640e033be6c1c2a1f62f7122df487ff86ddb93058ac310535cca302dc99e13f667f2
+EBUILD heimdall-1.4.2-r1.ebuild 1039 BLAKE2B 32343fcb22532f8c4c2b1e34d738b490db4c40b416a1e8605940577c9ecceaa251d290bf165f89b3925a06844d27157a2384388723e20a44b684455942640173 SHA512 3dff78eb3eedef7f3dd8d7e96945ee9073cc194911dbf10e97091a236ffe1895b3414f54c3dae61157bf9f23bc3d839e2b322b1c6222980e821e5d01480e1e3f
 EBUILD heimdall-9999.ebuild 1033 BLAKE2B 511a9c38a9a064c19d89d4335d6cb6f1bd67c269aa527c4c85e12f83bec4c827c2be2163de970aa29fb5e19464dba484bae0620cbe1752197c5f27923749828c SHA512 542d168a44cdc9c4c77c6a22ee07d5a0491bcb752bbc5654c0ab2067332d8d7df4f0d886942bb1c8f1d1589632abf5de3f9ee67411fe434e9f4d95686fce3799
 MISC metadata.xml 257 BLAKE2B c8d6a583dfe72114b8cde3a88bbf779d8b8d5e1b641461cccdfd51a9fd3830a2442a194bc3c226cb9b093784a7f24190f36bab14e05290f16dc59af5347ddfcd SHA512 ff3dc036060236d97851e807048824827b0f6357f43820882bef939a1947c37624be8fd1b58e128c201bba23e70622148457c7a7ec705d72319baa69f7deb189
diff --git a/app-mobilephone/heimdall/heimdall-1.4.2-r1.ebuild b/app-mobilephone/heimdall/heimdall-1.4.2-r1.ebuild
index 9bd4e13eb6db..231109f885a2 100644
--- a/app-mobilephone/heimdall/heimdall-1.4.2-r1.ebuild
+++ b/app-mobilephone/heimdall/heimdall-1.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit cmake udev
 
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://github.com/Benjamin-Dobell/Heimdall/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 ~arm64"
 	S="${WORKDIR}/Heimdall-${PV}"
 else
 	inherit git-r3
diff --git a/app-mobilephone/heimdall/heimdall-1.4.2.ebuild b/app-mobilephone/heimdall/heimdall-1.4.2.ebuild
deleted file mode 100644
index ec8238d43d9b..000000000000
--- a/app-mobilephone/heimdall/heimdall-1.4.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake udev
-
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="https://gitlab.com/BenjaminDobell/Heimdall/-/archive/v${PV}/Heimdall-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-	KEYWORDS="amd64"
-	S="${WORKDIR}/Heimdall-v${PV}"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/BenjaminDobell/Heimdall.git"
-fi
-
-DESCRIPTION="Tool suite used to flash firmware onto Samsung Galaxy S devices"
-HOMEPAGE="https://glassechidna.com.au/heimdall/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="gui"
-
-RDEPEND="
-	>=dev-libs/libusb-1.0.18:1=
-	sys-libs/zlib
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_FRONTEND=$(usex !gui)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/bin/heimdall
-	use gui && dobin "${BUILD_DIR}"/bin/heimdall-frontend
-
-	insinto "$(get_udevdir)/rules.d"
-	doins heimdall/60-heimdall.rules
-
-	dodoc README.md Linux/README
-}
diff --git a/app-mobilephone/scrcpy/Manifest b/app-mobilephone/scrcpy/Manifest
index 6c943ae2ef65..71ddd60ab30f 100644
--- a/app-mobilephone/scrcpy/Manifest
+++ b/app-mobilephone/scrcpy/Manifest
@@ -1,7 +1,10 @@
 DIST scrcpy-1.22.tar.gz 388720 BLAKE2B 2cc9867ab854e81e502b1127e275f5bea7f061f19b08c94bf53c6ef6563c537e56f8531444e1ba7eaebd4f768946d1f19dab7f9cc7bce82eda0edf5fea64e79f SHA512 fa9dc1bf8ea542b0a2e4a972759e606db69ce8ef1809a595f69b59872d7c588d98708894e2c53d2244bd6625ed9a8136974768a9e231353c363285e19c126a6e
 DIST scrcpy-1.23.tar.gz 417069 BLAKE2B 3081c02ba43a7c1d089ea1908323591b737515c7708c64162393b6d16eb2916931218aaef8d0a1ed13d04b6ce83a074e266174919751deee8ffb5290d382a398 SHA512 a50aa64c612a87a79f4532c7f30db96f4fd63558202ed00f285c5e7dfc70413b707dbf2280d1d24733182e16edacde020897487eefaf6c502e6f5135daaae58e
+DIST scrcpy-1.24.tar.gz 424970 BLAKE2B 33a0249ee9e9579b3bf8e0a4f94427b0c44b2a3aaf953c527a072d4f69ab89a680107b234803415741ba003ea6a8a207d33ce0d40341560fd6d85cda3807f7a6 SHA512 0eda7d6b0fb7339e1e32114d861194fd6bfce5ddb15d8d241f94278cb5800c2dd6c3bd69ea0b09b2bd5137757e85d679b2c789218e6933d83df4bc07dac09b2e
 DIST scrcpy-server-v1.22 40955 BLAKE2B 691217a8e776eca14f4d40da3de50fa98687664747de8ef246d629a5a9f9394296b82760696e1b31a44287e3678cbd3e6be18c89e8347d6a5ce7c6bf7a1a3790 SHA512 1aab2befa783d5aa84a7e1e89a37924d4f9a2cc830bf8358b010864a071207fc1e40fa0d446ae743c1faef2b5d805518bade360a4d221b4fb3086954af3e6a62
 DIST scrcpy-server-v1.23 41123 BLAKE2B 909cd015e5acddffe93ecac1bb2f1e022cb30a21edfef02565879db6763035c759ea8d3b274a0d0d7aeec8da7d66c5eafe3c443f6e178e645a88f782882d42ca SHA512 31add6155db771a2285a3c2b918e0a05608dbaf21e8082dec09547d6d713f9251c607277c77d381e7c7415f359c41136eb194650620c0e8cd5ad81aec6eb904e
+DIST scrcpy-server-v1.24 41159 BLAKE2B 332f05198bd64392ed870add260249d7e549ceb963e707ee6a249c08197c2c6a52bc427be0dfa99a479d61926d1ccea1471f5a448816b4b157c933d7a17cd75f SHA512 1bbc921e954c722307ef4fb2e1478954f6bf14544da362a9edeefd0f90def435bee409130d2ef2fddee98ec6255e12e9bda595507fec479f3feae0a57fb78236
 EBUILD scrcpy-1.22.ebuild 1096 BLAKE2B 75e3cbd70778694da42139ee307e8ef4b57cba7af4d95caa2aaed71699e946899c82347bf1109a9f15c6962336d583fba37a7552c680c2e61e246c0d332811e6 SHA512 e76c4dfc951da58f864dc54df190576bc75a37bb84064d3d5fef5ece0a533db8e1b761918bdb760dd5d9eb25d612919fcedc16213517ff9ee851bb87f5e0ea96
 EBUILD scrcpy-1.23.ebuild 779 BLAKE2B 751c9af2102a6f6f67229bf698dd3843c0a5a1ad464d1c3545b587795c5a208c20f3cc3312a232ec61e293997805bbe448f4ff6f1f461f5764ecab4cba0f18c9 SHA512 bcb0436c76e990ac607912a8cfb52da3963e36abab65512c4cee3aeac519cd6273ce40f7b846c0cd0f739f033cddb3cb6c434d6674260e0722c58953c081ab85
+EBUILD scrcpy-1.24.ebuild 779 BLAKE2B 751c9af2102a6f6f67229bf698dd3843c0a5a1ad464d1c3545b587795c5a208c20f3cc3312a232ec61e293997805bbe448f4ff6f1f461f5764ecab4cba0f18c9 SHA512 bcb0436c76e990ac607912a8cfb52da3963e36abab65512c4cee3aeac519cd6273ce40f7b846c0cd0f739f033cddb3cb6c434d6674260e0722c58953c081ab85
 MISC metadata.xml 253 BLAKE2B 8557c513beef73e834b0a000c523a3241da961c6307b6e98ac857dad0888c4bbd028c98f8499f01086c24e8f2f57c64bc75db20154dab232adefc2510fccac03 SHA512 67dd372ef7b684101d9198c6199a6403f8750132d80aab4f4daa4b31ebaea3d82eb9a18e904734e2ac10c77b237d67210055949ff1c6d5aad4f75951a096884a
diff --git a/app-mobilephone/scrcpy/scrcpy-1.24.ebuild b/app-mobilephone/scrcpy/scrcpy-1.24.ebuild
new file mode 100644
index 000000000000..7ca29eab260b
--- /dev/null
+++ b/app-mobilephone/scrcpy/scrcpy-1.24.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="Display and control your Android device"
+HOMEPAGE="https://github.com/Genymobile/scrcpy"
+# Source code and server part on Android device
+SRC_URI="https://github.com/Genymobile/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/Genymobile/${PN}/releases/download/v${PV}/${PN}-server-v${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="media-libs/libsdl2[X]
+	media-video/ffmpeg
+	virtual/libusb:1"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+src_configure() {
+	local emesonargs=(
+		-Db_lto=true
+		-Dprebuilt_server="${DISTDIR}/${PN}-server-v${PV}"
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postrm
+}