update to 1.11.2

3 files changed, 36 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 94de1df4beb3..a0bb1262d1ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = escrcpy-bin
 	pkgdesc = 使用图形化的 Scrcpy 显示和控制您的 Android 设备，由 Electron 驱动
-	pkgver = 1.9.1
+	pkgver = 1.11.2
 	pkgrel = 1
 	url = https://github.com/viarotel-org/escrcpy
 	arch = aarch64
@@ -9,16 +9,15 @@ pkgbase = escrcpy-bin
 	depends = bash
 	depends = electron27
 	depends = scrcpy
-	depends = android-sdk-platform-tools
-	provides = escrcpy=1.9.1
+	provides = escrcpy=1.11.2
 	conflicts = escrcpy
-	source = LICENSE::https://raw.githubusercontent.com/viarotel-org/escrcpy/v1.9.1/LICENSE
+	source = LICENSE::https://raw.githubusercontent.com/viarotel-org/escrcpy/v1.11.2/LICENSE
 	source = escrcpy.sh
 	sha256sums = e03f21dc67e766661667d3268c1ce5fbce9c32fb4b6e70281722bfbc9e3b7a7e
-	sha256sums = 95b1863c49ed526e664d14fcb4cfe30be5f4f581dc60903a7421a91354ff3a61
-	source_aarch64 = escrcpy-1.9.1-aarch64.deb::https://github.com/viarotel-org/escrcpy/releases/download/v1.9.1/Escrcpy-1.9.1-linux-arm64.deb
-	sha256sums_aarch64 = 6fcdf983912afc25bf10d896810c90c18330454ebb1b146753ac5498d7ce2413
-	source_x86_64 = escrcpy-1.9.1-x86_64.deb::https://github.com/viarotel-org/escrcpy/releases/download/v1.9.1/Escrcpy-1.9.1-linux-amd64.deb
-	sha256sums_x86_64 = b0c252559dc3d6fd5c8c6915a20b1b77d27fcae892827ddb1ac51f13e70e8ee4
+	sha256sums = 941cb7196d03283a6e65a2271f0c8381a9ec8176f38ce9dc9916f3f89b29a720
+	source_aarch64 = escrcpy-1.11.2-aarch64.deb::https://github.com/viarotel-org/escrcpy/releases/download/v1.11.2/Escrcpy-1.11.2-linux-arm64.deb
+	sha256sums_aarch64 = df2ef78da040ec454a3a540152189931be0dff2bcabd6515ca0c2c58189df5bb
+	source_x86_64 = escrcpy-1.11.2-x86_64.deb::https://github.com/viarotel-org/escrcpy/releases/download/v1.11.2/Escrcpy-1.11.2-linux-amd64.deb
+	sha256sums_x86_64 = 82f2875f4f6261d162d1aa2d8fa344a28f267e3f8efc6223d421a72c8a0a6870
 
 pkgname = escrcpy-bin
diff --git a/PKGBUILD b/PKGBUILD
index d191d16e7b48..d08e5ca7cb09 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=escrcpy-bin
 _pkgname=Escrcpy
-pkgver=1.9.1
+pkgver=1.11.2
 pkgrel=1
 pkgdesc="使用图形化的 Scrcpy 显示和控制您的 Android 设备，由 Electron 驱动"
 arch=('aarch64' 'x86_64')
@@ -9,25 +9,38 @@ url="https://github.com/viarotel-org/escrcpy"
 license=('MIT')
 conflicts=("${pkgname%-bin}")
 provides=("${pkgname%-bin}=${pkgver}")
-depends=('bash' 'electron27' 'scrcpy' 'android-sdk-platform-tools')
+depends=(
+    'bash'
+    'electron27'
+    'scrcpy'
+)
 source_aarch64=("${pkgname%-bin}-${pkgver}-aarch64.deb::${url}/releases/download/v${pkgver}/${_pkgname}-${pkgver}-linux-arm64.deb")
 source_x86_64=("${pkgname%-bin}-${pkgver}-x86_64.deb::${url}/releases/download/v${pkgver}/${_pkgname}-${pkgver}-linux-amd64.deb")
-source=("LICENSE::https://raw.githubusercontent.com/viarotel-org/escrcpy/v${pkgver}/LICENSE"
-    "${pkgname%-bin}.sh")
+source=(
+    "LICENSE::https://raw.githubusercontent.com/viarotel-org/escrcpy/v${pkgver}/LICENSE"
+    "${pkgname%-bin}.sh"
+)
 sha256sums=('e03f21dc67e766661667d3268c1ce5fbce9c32fb4b6e70281722bfbc9e3b7a7e'
-            '95b1863c49ed526e664d14fcb4cfe30be5f4f581dc60903a7421a91354ff3a61')
-sha256sums_aarch64=('6fcdf983912afc25bf10d896810c90c18330454ebb1b146753ac5498d7ce2413')
-sha256sums_x86_64=('b0c252559dc3d6fd5c8c6915a20b1b77d27fcae892827ddb1ac51f13e70e8ee4')
+            '941cb7196d03283a6e65a2271f0c8381a9ec8176f38ce9dc9916f3f89b29a720')
+sha256sums_aarch64=('df2ef78da040ec454a3a540152189931be0dff2bcabd6515ca0c2c58189df5bb')
+sha256sums_x86_64=('82f2875f4f6261d162d1aa2d8fa344a28f267e3f8efc6223d421a72c8a0a6870')
 build() {
     bsdtar -xf "${srcdir}/data.tar.xz"
     sed "s|/opt/${_pkgname}/${pkgname%-bin} %U|${pkgname%-bin}|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
+    cd "${srcdir}/opt/${_pkgname}/resources/extra/linux"
+    chmod 755 android-platform-tools/{adb,etc1tool,fastboot,hprof-conv,make_f2fs,make_f2fs_casefold,mke2fs,sqlite3} \
+              gnirehtet/gnirehtet
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/opt/${_pkgname}/resources/app.asar" -t "${pkgdir}/opt/${pkgname%-bin}/resources"
-    install -Dm644 "${srcdir}/opt/${_pkgname}/resources/extra/"*.png \
-        -t "${pkgdir}/opt/${pkgname%-bin}/resources/extra"
+    install -Dm644 "${srcdir}/opt/${_pkgname}/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/opt/${_pkgname}/resources/extra/common/tray/icon.png" \
+        -t "${pkgdir}/usr/lib/${pkgname%-bin}/extra/common/tray"
+    cp -r "${srcdir}/opt/${_pkgname}/resources/extra/linux" "${pkgdir}/usr/lib/${pkgname%-bin}/extra"
     install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
-    install -Dm644 "${srcdir}/usr/share/icons/hicolor/0x0/apps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
+    for _icons in 16x16 32x32 48x48 64x64 128x128 256x256 512x512 1024x1024;do
+      install -Dm644 "${srcdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname%-bin}.png" \
+        -t "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps"
+    done
     install -Dm644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname%-bin}"
 }
\ No newline at end of file
diff --git a/escrcpy.sh b/escrcpy.sh
index 83c1d8a81f07..b2507a2428fc 100644
--- a/escrcpy.sh
+++ b/escrcpy.sh
@@ -1,12 +1,9 @@
 #!/bin/bash
 _ELECTRON=/usr/bin/electron27
-APPDIR="/opt/escrcpy"
-export PATH="${APPDIR}:${APPDIR}/usr/sbin:${PATH}"
-export XDG_DATA_DIRS="./share/:/usr/share/gnome:/usr/local/share/:/usr/share/:${XDG_DATA_DIRS}"
-export LD_LIBRARY_PATH="${APPDIR}/usr/lib:${LD_LIBRARY_PATH}"
-export XDG_DATA_DIRS="${APPDIR}"/usr/share/:"${XDG_DATA_DIRS}":/usr/share/gnome/:/usr/local/share/:/usr/share/
-export GSETTINGS_SCHEMA_DIR="${APPDIR}/usr/share/glib-2.0/schemas:${GSETTINGS_SCHEMA_DIR}"
-_ASAR="${APPDIR}/resources/app.asar"
+APPDIR="/usr/lib/escrcpy"
+export PATH="${APPDIR}:${PATH}"
+#export LD_LIBRARY_PATH="${APPDIR}/usr/lib:${LD_LIBRARY_PATH}"
+_ASAR="${APPDIR}/app.asar"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
     exec ${_ELECTRON} ${_ASAR} "$@"
 else