update to 1.8.15

2 files changed, 23 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fc2f7779d7d3..62d343aea0c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,10 @@
 pkgbase = escrcpy
 	pkgdesc = 使用图形化的 Scrcpy 显示和控制您的 Android 设备，由 Electron 驱动
-	pkgver = 1.7.1
+	pkgver = 1.8.15
 	pkgrel = 1
 	url = https://github.com/viarotel-org/escrcpy
-	arch = any
+	arch = aarch64
+	arch = x86_64
 	license = MIT
 	makedepends = gendesk
 	makedepends = npm>=9.8.1
@@ -13,9 +14,9 @@ pkgbase = escrcpy
 	depends = scrcpy
 	depends = android-sdk-platform-tools
 	conflicts = escrcpy
-	source = escrcpy-1.7.1.zip::https://github.com/viarotel-org/escrcpy/archive/refs/tags/v1.7.1.zip
+	source = escrcpy-1.8.15.zip::https://github.com/viarotel-org/escrcpy/archive/refs/tags/v1.8.15.zip
 	source = escrcpy.sh
-	sha256sums = 48a909070edf858ff2d3351cfe5ed2853f6191d3e50a72db1371867fb8c9985d
+	sha256sums = 183669f89da070e877119ebba6bc69a642fa592c9e4f8e0e70168af887ad757a
 	sha256sums = 56ec78aeb841bb4c6d5c40893aff43a8a034bc4371684bc6a58404e6c8f45368
 
 pkgname = escrcpy
diff --git a/PKGBUILD b/PKGBUILD
index 710eecaa7afa..400d9199eeae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=escrcpy
-pkgver=1.7.1
+pkgver=1.8.15
 pkgrel=1
 pkgdesc="使用图形化的 Scrcpy 显示和控制您的 Android 设备，由 Electron 驱动"
-arch=('any')
+arch=('aarch64' 'x86_64')
 url="https://github.com/viarotel-org/escrcpy"
 license=('MIT')
 conflicts=("${pkgname}")
@@ -11,20 +11,31 @@ depends=('bash' 'electron26' 'scrcpy' 'android-sdk-platform-tools')
 makedepends=('gendesk' 'npm>=9.8.1' 'nodejs>=18.18.0')
 source=("${pkgname}-${pkgver}.zip::${url}/archive/refs/tags/v${pkgver}.zip"
     "${pkgname}.sh")
-sha256sums=('48a909070edf858ff2d3351cfe5ed2853f6191d3e50a72db1371867fb8c9985d'
+sha256sums=('183669f89da070e877119ebba6bc69a642fa592c9e4f8e0e70168af887ad757a'
             '56ec78aeb841bb4c6d5c40893aff43a8a034bc4371684bc6a58404e6c8f45368')
 build() {
     gendesk -q -f -n --categories "Utility" --name "${pkgname}" --exec "${pkgname}"
     cd "${srcdir}/${pkgname}-${pkgver}"
+    sed '80,83d' -i electron-builder.json
     npm install
     npm run build:linux
+    cp "${srcdir}/${pkgname}-${pkgver}/dist-release/.icon-set/logo_512.png" "${srcdir}/${pkgname}-${pkgver}/dist-release/icon_512x512.png"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist-release/linux-unpacked/resources/app.asar" -t "${pkgdir}/opt/${pkgname}/resources"
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist-release/linux-unpacked/resources/extra/core/"* \
-        -t "${pkgdir}/opt/${pkgname}/resources/extra/core"
+    if [ "${CARCH}" == "aarch64" ];then
+        install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist-release/linux-arm64-unpacked/resources/app.asar" -t "${pkgdir}/opt/${pkgname}/resources"
+        install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist-release/linux-arm64-unpacked/resources/extra/"*.png \
+            -t "${pkgdir}/opt/${pkgname}/resources/extra"
+    elif [ "${CARCH}" == "x86_64" ];then
+        install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist-release/linux-unpacked/resources/app.asar" -t "${pkgdir}/opt/${pkgname}/resources"
+        install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist-release/linux-unpacked/resources/extra/"*.png \
+            -t "${pkgdir}/opt/${pkgname}/resources/extra"
+    fi
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist-release/linux-unpacked/resources/extra/core/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    for _icons in 16x16 32x32 48x48 64x64 128x128 256x256;do
+        install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist-release/.icon-set/icon_${_icons}.png" \
+            "${pkgdir}/usr/share/icons/hicolor/${_icons}/apps/${pkgname}.png"
+    done
     install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file