summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052024-03-11 12:52:42 +0800
committerzxp198210052024-03-11 12:52:42 +0800
commit770c47b9c67a48a552f6d31d46473d596ca7b1ea (patch)
tree22f7b14d1a36f3fe4b732733ecb1fc7a1173907b
parent0f577efbb0df60d5622fa9bec12fd413f6443d9e (diff)
downloadaur-770c47b9c67a48a552f6d31d46473d596ca7b1ea.tar.gz
update to 1.17.2
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD8
-rw-r--r--escrcpy.sh5
3 files changed, 12 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d25de1b55ba2..0faf8a2a2efe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = escrcpy
pkgdesc = 使用图形化的 Scrcpy 显示和控制您的 Android 设备,由 Electron 驱动
- pkgver = 1.17.1
+ pkgver = 1.17.2
pkgrel = 1
url = https://github.com/viarotel-org/escrcpy
arch = aarch64
@@ -10,11 +10,12 @@ pkgbase = escrcpy
makedepends = npm
makedepends = nvm
makedepends = git
+ makedepends = icoutils
depends = electron27
conflicts = escrcpy
- source = escrcpy.git::git+https://github.com/viarotel-org/escrcpy.git#tag=v1.17.1
+ source = escrcpy.git::git+https://github.com/viarotel-org/escrcpy.git#tag=v1.17.2
source = escrcpy.sh
sha256sums = SKIP
- sha256sums = 50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe
+ sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8
pkgname = escrcpy
diff --git a/PKGBUILD b/PKGBUILD
index 6535f3f824f1..60bbdf3e1cfb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
pkgname=escrcpy
-pkgver=1.17.1
+pkgver=1.17.2
_electronversion=27
_nodeversion=18
pkgrel=1
@@ -20,13 +20,14 @@ makedepends=(
'npm'
'nvm'
'git'
+ 'icoutils'
)
source=(
"${pkgname}.git::git+${url}.git#tag=v${pkgver}"
"${pkgname}.sh"
)
sha256sums=('SKIP'
- '50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe')
+ 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8')
_ensure_local_nvm() {
export NVM_DIR="${srcdir}/.nvm"
source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
@@ -37,6 +38,7 @@ build() {
sed -e "s|@electronversion@|${_electronversion}|" \
-e "s|@appname@|${pkgname}|g" \
-e "s|@runname@|app.asar|g" \
+ -e "s|@options@||g" \
-i "${srcdir}/${pkgname}.sh"
_ensure_local_nvm
gendesk -q -f -n --categories="Utility" --name="${pkgname}" --exec="${pkgname} %U"
@@ -50,7 +52,7 @@ build() {
export npm_config_disturl=https://electronjs.org/headers
HOME="${srcdir}/.electron-gyp"
sed "s|--linux|-l AppImage|g" -i package.json
- convert public/logo.ico public/logo.png
+ icotool -i 1 -x public/logo.ico -o public/logo.png
sed "s|logo.icns|logo.png|g" -i electron-builder.json
npm install
npm run build:linux
diff --git a/escrcpy.sh b/escrcpy.sh
index 86cb3dc6a9bf..7ddcaab8d734 100644
--- a/escrcpy.sh
+++ b/escrcpy.sh
@@ -2,6 +2,7 @@
set -e
_APPDIR="/usr/lib/@appname@"
_RUNNAME="${_APPDIR}/@runname@"
+_OPTIONS="@options@"
export PATH="${_APPDIR}:${PATH}"
export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
export ELECTRON_IS_DEV=0
@@ -9,7 +10,7 @@ export ELECTRON_FORCE_IS_PACKAGED=true
export NODE_ENV=production
cd "${_APPDIR}"
if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
- exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
+ exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "$@" || exit $?
else
- exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+ exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $?
fi \ No newline at end of file