gentoo auto-resync : 15:03:2023 - 00:19:47

5 files changed, 48 insertions, 41 deletions

diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index 20c2e2f91d38..17e07efab827 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/scrcpy/Manifest b/app-mobilephone/scrcpy/Manifest
index 0e68028c2d3a..410a5fd943fe 100644
--- a/app-mobilephone/scrcpy/Manifest
+++ b/app-mobilephone/scrcpy/Manifest
@@ -1,8 +1,8 @@
-DIST scrcpy-1.24.tar.gz 424970 BLAKE2B 33a0249ee9e9579b3bf8e0a4f94427b0c44b2a3aaf953c527a072d4f69ab89a680107b234803415741ba003ea6a8a207d33ce0d40341560fd6d85cda3807f7a6 SHA512 0eda7d6b0fb7339e1e32114d861194fd6bfce5ddb15d8d241f94278cb5800c2dd6c3bd69ea0b09b2bd5137757e85d679b2c789218e6933d83df4bc07dac09b2e
+AUX scrcpy-2.0-desktop.patch 1828 BLAKE2B 3c851590f3fb7c983cdf0dfa866ccc13dd5ead987a592843af304aff204cc31ee8413c72edd7690d09ac9ef56d140f7d754b7a873ba53e205f4ae8680d69d1ea SHA512 7025335d6d4fba4b7c221562d40fb1006a7365eb6c5e159f7b69caf76f114592be47997c515447617de22295d4435f31afa80f621e0b838d05439b22260681fa
 DIST scrcpy-1.25.tar.gz 345594 BLAKE2B 9be58de258d2e048fc87ef642ba668ad7427faea51d6bd06d48d1ca61a5c55bbce2b758b445d21ea3052ac63809769043e57a28502c53fae98079056029ded1f SHA512 7f28adb69becdc247156d664744ef382cc9ac5e746d2be9c833a53309386c22eb90893b499aee80404cb9903ea40ce5f389b41f2201bf85801e1b8ab920b4eb0
-DIST scrcpy-server-v1.24 41159 BLAKE2B 332f05198bd64392ed870add260249d7e549ceb963e707ee6a249c08197c2c6a52bc427be0dfa99a479d61926d1ccea1471f5a448816b4b157c933d7a17cd75f SHA512 1bbc921e954c722307ef4fb2e1478954f6bf14544da362a9edeefd0f90def435bee409130d2ef2fddee98ec6255e12e9bda595507fec479f3feae0a57fb78236
+DIST scrcpy-2.0.tar.gz 375902 BLAKE2B b45a0191a4b634a6fd165a870ce925968eb2bf697eedd88744abf6e6282afa8a4c2108e85e6d479be47e6ddc08a8b5a54875315d1319721639fea8b49f423817 SHA512 c7f6a20ff470c529f3d9a211ee02eebc028f698b2215665c8386afda8db4ea51206bb3c3182d846485399101f0add35844477ebd37df30724cb43c3882c6dc4d
 DIST scrcpy-server-v1.25 42151 BLAKE2B 90789c8b259f9a63820652f8884b51abe1040201f37788542796fbff6445bc13259e2aaf635c99c6ccdb515d8fd4b0b3bcd54d8972d134086f05d149a5073d41 SHA512 2861f423b6c982354c5959570708b51832e18b9d376397f98a78c8d6137af22bb3f19cbce501d7f413276362e9ac9e0358b8984566ff04102a3720074ff1fea1
-EBUILD scrcpy-1.24-r1.ebuild 868 BLAKE2B 62269b6e351772639366f7254583a6c84a7362d7b3f68dc6eec929fd2041de97ba57ba75003aaa71d736e07788920d7bad372aab0315355d5fbf6c7c87d96e53 SHA512 43c83f799e73b5bfcec7f60cad1d5c60c36d8028f71330d217eb96a3953ad504b7e8264df073d9e75d9f5e50232fc87aa7bd93bc0e85b9266f61701bc89364ad
-EBUILD scrcpy-1.24-r2.ebuild 889 BLAKE2B 690408122b728cb507fff76599647a3a5747ac881ff224cef13f06f66bf1ac75b997824b406856ea7f4db75cc8e8449f2e550bf9d5e5c79c043e329d80db2615 SHA512 83c4e242982ccca4bfc69deccb9501c356a29f55dbdaae0c271f31b8b7564fb493866bc44019798b96826530ac9e77b3096c22a8b4c2b0dae99c39ee84a45b25
+DIST scrcpy-server-v2.0 52867 BLAKE2B 6867677059ed60358e8d4f62a01d09d177a52a3ad5d9faf29017666b4566052c9be1777b75df24989d49acf640ff10071daddf760990f18c1df07e1f70c772ff SHA512 366e594ee87101635050185759eb03982b8749f1efe5c8f02d0fb5f60edfdacbd8280a183b872b1484648d2556cbde5abbaf1f3fd92a7f6f604181b9e81ffcde
 EBUILD scrcpy-1.25.ebuild 889 BLAKE2B 690408122b728cb507fff76599647a3a5747ac881ff224cef13f06f66bf1ac75b997824b406856ea7f4db75cc8e8449f2e550bf9d5e5c79c043e329d80db2615 SHA512 83c4e242982ccca4bfc69deccb9501c356a29f55dbdaae0c271f31b8b7564fb493866bc44019798b96826530ac9e77b3096c22a8b4c2b0dae99c39ee84a45b25
+EBUILD scrcpy-2.0.ebuild 935 BLAKE2B 8d89ce17a9f3ff5e323b3d065a75d770d4b570ddeacf5375c9d11f379165d61b6f8742398cda72e67b47bfedb7059f91661e1dd898ebdf48dc7f89c5b67f5732 SHA512 712736981e5928ba571869af71565e12edf3aa184e8a22eb8510ccfe054d13cc92feb76456a3cf442d489210a6a62892dddcf428b22a9d321387c653822c7c83
 MISC metadata.xml 416 BLAKE2B a0f726ba54b43d068ed72c75576a9d397a0f358f98b97ac2db8eaf3fe2e6df4943e9e9b9e3a6ccdbdd3de2827b27178033228e43e3a1d6e93ef3db6ac5d2245e SHA512 d9765dc3395923a1f6b630c82ea5a1d08caa8a762b4bb58d5f271e36c6f78a363cb294e80bf32d04015eb1a0360b1f179a20bffc05c50b91b1be5ea34bbeda02
diff --git a/app-mobilephone/scrcpy/files/scrcpy-2.0-desktop.patch b/app-mobilephone/scrcpy/files/scrcpy-2.0-desktop.patch
new file mode 100644
index 000000000000..531a4101a53c
--- /dev/null
+++ b/app-mobilephone/scrcpy/files/scrcpy-2.0-desktop.patch
@@ -0,0 +1,41 @@
+From 6706f3ce7f70a3ba5d09279be9c78d358af31e88 Mon Sep 17 00:00:00 2001
+From: Bernard Cafarelli <bernard.cafarelli@gmail.com>
+Date: Tue, 14 Mar 2023 21:48:23 +0100
+Subject: [PATCH] Fix linux desktop files validation
+
+Follow quoting rules from:
+https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#exec-variables
+Also use /bin/sh for scrpy-console
+
+Fixes #3633 <https://github.com/Genymobile/scrcpy/issues/3633>
+---
+ app/data/scrcpy-console.desktop | 2 +-
+ app/data/scrcpy.desktop         | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/app/data/scrcpy-console.desktop b/app/data/scrcpy-console.desktop
+index 47a63ec99..db3d9014c 100644
+--- a/app/data/scrcpy-console.desktop
++++ b/app/data/scrcpy-console.desktop
+@@ -5,7 +5,7 @@ Comment=Display and control your Android device
+ # For some users, the PATH or ADB environment variables are set from the shell
+ # startup file, like .bashrc or .zshrc… Run an interactive shell to get
+ # environment correctly initialized.
+-Exec=/bin/bash --norc --noprofile -i -c '"$SHELL" -i -c scrcpy || read -p "Press any key to quit..."'
++Exec=/bin/sh --norc --noprofile -i -c "\"\\$SHELL\" -i -c scrcpy || read -p 'Press any key to quit...'"
+ Icon=scrcpy
+ Terminal=true
+ Type=Application
+diff --git a/app/data/scrcpy.desktop b/app/data/scrcpy.desktop
+index 082b75e0f..1be86a2ba 100644
+--- a/app/data/scrcpy.desktop
++++ b/app/data/scrcpy.desktop
+@@ -5,7 +5,7 @@ Comment=Display and control your Android device
+ # For some users, the PATH or ADB environment variables are set from the shell
+ # startup file, like .bashrc or .zshrc… Run an interactive shell to get
+ # environment correctly initialized.
+-Exec=/bin/sh -c '"$SHELL" -i -c scrcpy'
++Exec=/bin/sh -c "\"\\$SHELL\" -i -c scrcpy"
+ Icon=scrcpy
+ Terminal=false
+ Type=Application
diff --git a/app-mobilephone/scrcpy/scrcpy-1.24-r1.ebuild b/app-mobilephone/scrcpy/scrcpy-1.24-r1.ebuild
deleted file mode 100644
index d4a1b612ed53..000000000000
--- a/app-mobilephone/scrcpy/scrcpy-1.24-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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"
-
-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=""
-
-src_configure() {
-	local emesonargs=(
-		-Db_lto=true
-		-Dprebuilt_server="${DISTDIR}/${PN}-server-v${PV}"
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postrm
-}
diff --git a/app-mobilephone/scrcpy/scrcpy-1.24-r2.ebuild b/app-mobilephone/scrcpy/scrcpy-2.0.ebuild
index a244fae445e4..819f99b5380d 100644
--- a/app-mobilephone/scrcpy/scrcpy-1.24-r2.ebuild
+++ b/app-mobilephone/scrcpy/scrcpy-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,6 +24,8 @@ RDEPEND="${DEPEND}
 	!ppc64? ( dev-util/android-tools )"
 BDEPEND=""
 
+PATCHES=( "${FILESDIR}"/${P}-desktop.patch )
+
 src_configure() {
 	local emesonargs=(
 		$(meson_use lto b_lto)