gentoo auto-resync : 28:02:2024 - 23:41:01

5 files changed, 39 insertions, 53 deletions

diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index 6420c9bd3100..48eff02cc285 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/scrcpy/Manifest b/app-mobilephone/scrcpy/Manifest
index 3da91b8f06e5..e996c01ccd87 100644
--- a/app-mobilephone/scrcpy/Manifest
+++ b/app-mobilephone/scrcpy/Manifest
@@ -1,10 +1,6 @@
-DIST scrcpy-2.1.1.tar.gz 386002 BLAKE2B 3d1ec3829cc08d36a6b42f7429749000ea5a4aaf2b8501167fe03b68fb722ec9351da9f287aef752fbceebf04db1484071c4fdf3b84bc5d9eb3805f635502951 SHA512 247d2b4d5523412c667b3104621cdbb5d4a47f1fbc34e4fbde242212d9a4a198232d886eb5d4dc8678fbbe97a63d747827986fd34b08b0951bce02f256e65c47
-DIST scrcpy-2.2.tar.gz 396529 BLAKE2B 6f11dbde6900ef818dbd3e5f1edb169d8acc2a4940675a2cadaec362c1a56c409fe8bcdeab7fcd208c5b4c038d2ddb5da5b0092d5743b27f3719d0970d5553e5 SHA512 e1518d4eb649f40facfd61c8b29120dd11183dd1e753c3b3914794956f87c09777410d0b9f47a05be2763c92c352afd1ee0ac6077d7319e6b29835e1b1259f04
+AUX scrcpy-2.3.1-bash-completion.patch 895 BLAKE2B c527128495ed8e9aa5cc6b4e8f6014ba4a01fe183002776c52709b54ba29e133194e73fe3b36476c9bc25d9f1f6659f399bd2bf027f3d46be216ddfb30189e7d SHA512 e8864b370e678c3319f29391568712df2f9994ceb472133167979e3dc5520997489c89e22f31d677201e78dff0418231f5dbbe74786b1dbb3981a736ba78b650
 DIST scrcpy-2.3.1.tar.gz 401278 BLAKE2B 0cb231aef87965f346613987c45a624ad853ad870000d78ccaeda6fabaa39cfbd1fed5da50f028aece96c7c12395edc521bf629d935fb8e45a806e487681e6b8 SHA512 4ef9398f23740edf8d09bb18ecc9f6e120b7d3991b8d359836f5e3f4a568484307a1f020da2edeb3193a4f4d6820b5948d6b80600e7ceeed869a2ed8136bfefd
-DIST scrcpy-server-v2.1.1 56995 BLAKE2B 6a089ca33025873f48d62389b17ba6fb6249c007ef7d7fd21883351e7724c3207dce1cea8b655cb949361d26210f5bb6115a2f5f9895c8a3b129652a77848c3d SHA512 f9b27068a92042e6d05ca4d56e6220174fbb008d21c2c423ad3adf91ac1ba0d30cf63a2d9072608adee56f5b49e5a55f9a193737ddf80fb222b447af196c4a90
-DIST scrcpy-server-v2.2 64363 BLAKE2B 65f53a9b931ab076f06de174c1212077d5961a28881237967894ca5f9f59006b4974c4fd6c1e878df9fa7804b848a92b03689f07e27fa32489e66dede5220363 SHA512 7020b3e1b78a9e5896355d22855cffd338d2a455367a82a1aad0659511de42bff8112756ed614b56f9945340aeb56f42f6e093263450c08c02dd8774348dd64a
 DIST scrcpy-server-v2.3.1 66007 BLAKE2B f3b006bdec8fb3e34474a694fcd5d54fa1caac6b1757cd4ac74d84ce42c9e163e68dbb33985c1474fdeda4c124c317494837c24bc4c18e42cc7e285666d76374 SHA512 9360ad9321554bc9ab38833720e20fada1e0e3a9d1302fced2bbc035b87ea2bbc6802fa8d52fe73ae8d9272ac0f1759c6042badd0043392b90cb68c5c89fc57c
-EBUILD scrcpy-2.1.1.ebuild 1158 BLAKE2B f3516faed38199553e4d0089aee227545cc8bd80aed2a3e09c5fa5fee2a56a9dad0144c3e4c9452f0c75027d043ee83294874863df44f6c7596c394ce65e236a SHA512 c1d980d50e58868d54351c4b122d2232e52e2646817e19d01364351fb408aa5a8a211be7b17bc8249e20b13e57b3bedadb4bc6e87701f8d0299ddd7a851c90f8
-EBUILD scrcpy-2.2.ebuild 1147 BLAKE2B 483dd816b2ab285c4d98f992476b567ff008e732b80dc72266e1f25704ab2c2ec2d5d14516a48440284ba2b8fe421236c014010c4c8fb81677f00079f0da9a54 SHA512 d0eaa7d25749ebdc302d3bdf5fa003966efbb45a7d33611090c1f3e608032201ff2e23c5cb1767251c595a8c1b66039af4d7abf0e1ba03a5cf7c2dffaf2dc4a6
 EBUILD scrcpy-2.3.1-r1.ebuild 1158 BLAKE2B 652c3cba3087fbbe965471582dd53b815552d6c76759b13a8cbd592f73042eee5b7991edf964d66e116ad0998c39f7fc1aa0a584234f54192059478219ccb25a SHA512 7db1c0a76fcf488bcf4ef5e3a104603b17eea6eb3c67c5933e5b035b189e546e0989f6d70b34cf847d978ba31b07ab352e0b46c4e9183f3bc08b37fbadedb84d
+EBUILD scrcpy-2.3.1-r2.ebuild 1212 BLAKE2B 51e964ce830bb982256748cc4968276899a7ebea61ba745a34b0f32b91c33d54c2b9c0a71867ce320e317835cb6495f2a3bc9cc48a88b66c71e2837ee71c11ef SHA512 e7141c86c3fbcbb9b1fe8ab0bcfde8820a44ff58e9fb1e1cd694bcfc4694a35275ee49544cfd72ba9cc5d4da7768cedb754b003f7821372aff2a3d40d19b207c
 MISC metadata.xml 335 BLAKE2B bd0432780a07abb2159a90ca8d5e44deb9255b7716d3198447325c0bdbda585524c35c540e88e03cbc84450c5113d81bf65f34ad8c666a0d8dfc9e6efb3c7296 SHA512 5fbc23ed2cf0679827ff68284ee43ef1aada2a80b4adebf668ca1ee348c1b8ab02b2582d39477d91b9c930b8511f6e31841526dd70fd524d85123d97f2f20fb4
diff --git a/app-mobilephone/scrcpy/files/scrcpy-2.3.1-bash-completion.patch b/app-mobilephone/scrcpy/files/scrcpy-2.3.1-bash-completion.patch
new file mode 100644
index 000000000000..6540db5fdb8e
--- /dev/null
+++ b/app-mobilephone/scrcpy/files/scrcpy-2.3.1-bash-completion.patch
@@ -0,0 +1,22 @@
+diff --git a/app/data/bash-completion/scrcpy b/app/data/bash-completion/scrcpy
+index 0c8543107..694ce1899 100644
+--- a/app/data/bash-completion/scrcpy
++++ b/app/data/bash-completion/scrcpy
+@@ -115,13 +115,13 @@ _scrcpy() {
+             COMPREPLY=($(compgen -W 'front back external' -- "$cur"))
+             return
+             ;;
+-        --orientation
+-        --display-orientation)
+-            COMPREPLY=($(compgen -> '0 90 180 270 flip0 flip90 flip180 flip270' -- "$cur"))
++        --orientation \
++        |--display-orientation)
++            COMPREPLY=($(compgen -W '0 90 180 270 flip0 flip90 flip180 flip270' -- "$cur"))
+             return
+             ;;
+         --record-orientation)
+-            COMPREPLY=($(compgen -> '0 90 180 270' -- "$cur"))
++            COMPREPLY=($(compgen -W '0 90 180 270' -- "$cur"))
+             return
+             ;;
+         --lock-video-orientation)
diff --git a/app-mobilephone/scrcpy/scrcpy-2.2.ebuild b/app-mobilephone/scrcpy/scrcpy-2.2.ebuild
deleted file mode 100644
index b353534c5781..000000000000
--- a/app-mobilephone/scrcpy/scrcpy-2.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 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"
-
-DEPEND="media-libs/libsdl2[X]
-	media-video/ffmpeg
-	virtual/libusb:1"
-# Manual install for ppc64 until bug #723528 is fixed
-RDEPEND="${DEPEND}
-	!ppc64? ( dev-util/android-tools )"
-
-src_configure() {
-	local emesonargs=(
-		-Dprebuilt_server="${DISTDIR}/${PN}-server-v${PV}"
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postrm
-
-	einfo "If you use pipewire because of a problem with libsdl2 it is possible that"
-	einfo "scrcpy will not start, in which case start the program by exporting the"
-	einfo "environment variable SDL_AUDIODRIVER=pipewire."
-	einfo "For more information see https://github.com/Genymobile/scrcpy/issues/3864."
-}
diff --git a/app-mobilephone/scrcpy/scrcpy-2.1.1.ebuild b/app-mobilephone/scrcpy/scrcpy-2.3.1-r2.ebuild
index 6b6083dbe912..6183caa2ec12 100644
--- a/app-mobilephone/scrcpy/scrcpy-2.1.1.ebuild
+++ b/app-mobilephone/scrcpy/scrcpy-2.3.1-r2.ebuild
@@ -8,20 +8,27 @@ 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}"
+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"
 
-DEPEND="media-libs/libsdl2[X]
-	media-video/ffmpeg
-	virtual/libusb:1"
+DEPEND="
+	media-libs/libsdl2[X]
+	media-video/ffmpeg:=
+	virtual/libusb:1
+"
 # Manual install for ppc64 until bug #723528 is fixed
-RDEPEND="${DEPEND}
-	!ppc64? ( dev-util/android-tools )"
-BDEPEND=""
+RDEPEND="
+	${DEPEND}
+	!ppc64? ( dev-util/android-tools )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-bash-completion.patch )
 
 src_configure() {
 	local emesonargs=(