summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052024-05-13 12:26:22 +0800
committerzxp198210052024-05-13 12:26:22 +0800
commitb1650079ae884785a79549e71a3af900c3c19f05 (patch)
tree132d5471ff62ec047d47913e798d9a7b051d6b40
parenta6c62a9421c12f916a05ff72710558ec7e8bb6b5 (diff)
downloadaur-b1650079ae884785a79549e71a3af900c3c19f05.tar.gz
update to 3.60.0.r132.g236bdd8
Diffstat
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD20
-rw-r--r--losslesscut.sh21
3 files changed, 31 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a9ae4e92f899..b9953545d481 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = losslesscut-git
pkgdesc = The swiss army knife of lossless video/audio editing.Using system-wide ffmpeg.
- pkgver = 3.60.0.r89.gb791c9f
+ pkgver = 3.60.0.r132.g236bdd8
pkgrel = 1
url = https://github.com/mifi/lossless-cut
arch = x86_64
@@ -12,6 +12,7 @@ pkgbase = losslesscut-git
makedepends = yarn
makedepends = base-devel
makedepends = gcc
+ makedepends = curl
depends = electron27
depends = ffmpeg
provides = losslesscut
@@ -19,6 +20,6 @@ pkgbase = losslesscut-git
source = losslesscut.git::git+https://github.com/mifi/lossless-cut.git
source = losslesscut.sh
sha256sums = SKIP
- sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8
+ sha256sums = 41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d
pkgname = losslesscut-git
diff --git a/PKGBUILD b/PKGBUILD
index c9818945481e..7b965519bdfa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
pkgname=losslesscut-git
-pkgver=3.60.0.r89.gb791c9f
+pkgver=3.60.0.r132.g236bdd8
_electronversion=27
_nodeversion=18
pkgrel=1
@@ -26,16 +26,17 @@ makedepends=(
'yarn'
'base-devel'
'gcc'
+ 'curl'
)
source=(
"${pkgname//-/.}::git+${url}.git"
"${pkgname%-git}.sh"
)
sha256sums=('SKIP'
- 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8')
+ '41b6d61dffef064762b3eec3dfeca7a3e1f57cbcb6dce9a6940c06797a0eae9d')
pkgver() {
cd "${srcdir}/${pkgname//-/.}"
- git describe --long --tags --exclude='*[a-z][a-z]*' | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
+ git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/v//g'
}
_ensure_local_nvm() {
export NVM_DIR="${srcdir}/.nvm"
@@ -47,29 +48,30 @@ build() {
sed -e "s|@electronversion@|${_electronversion}|" \
-e "s|@appname@|${pkgname%-git}|g" \
-e "s|@runname@|app.asar|g" \
+ -e "s|@cfgdirname@|${pkgname%-git}|g" \
-e "s|@options@||g" \
-i "${srcdir}/${pkgname%-git}.sh"
_ensure_local_nvm
- gendesk -q -f -n --categories="Utility" --name="${pkgname%-git}" --exec="${pkgname%-git} %U"
+ gendesk -q -f -n --pkgname="${pkgname%-git}" --categories="AudioVideo" --name="${pkgname%-git}" --exec="${pkgname%-git} %U"
cd "${srcdir}/${pkgname//-/.}"
export npm_config_build_from_source=true
export ELECTRON_SKIP_BINARY_DOWNLOAD=1
export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')"
export npm_config_target="${SYSTEM_ELECTRON_VERSION}"
export ELECTRONVERSION="${_electronversion}"
- export npm_config_disturl=https://electronjs.org/headers
HOME="${srcdir}/.electron-gyp"
mkdir -p "${srcdir}/.electron-gyp"
touch "${srcdir}/.electron-gyp/.yarnrc"
if [ `curl -s ipinfo.io/country | grep CN | wc -l ` -ge 1 ];then
- echo 'registry="https://registry.npmmirror.com/"' >> .npmrc
- echo 'electron_mirror="https://registry.npmmirror.com/-/binary/electron/"' >> .npmrc
- echo 'electron_builder_binaries_mirror="https://registry.npmmirror.com/-/binary/electron-builder-binaries/"' >> .npmrc
+ export npm_config_registry=https://registry.npmmirror.com
+ export npm_config_disturl=https://registry.npmmirror.com/-/binary/node/
+ export npm_config_electron_mirror=https://registry.npmmirror.com/-/binary/electron/
+ export npm_config_electron_builder_binaries_mirror=https://registry.npmmirror.com/-/binary/electron-builder-binaries/
else
echo "Your network is OK."
fi
# .yarnrc.yml existed
- sed "s|--linux|--dir|g" -i package.json
+ sed "s|--linux|-l --dir|g" -i package.json
yarn install
yarn run build
yarn run pack-linux
diff --git a/losslesscut.sh b/losslesscut.sh
index 7ddcaab8d734..398398461fee 100644
--- a/losslesscut.sh
+++ b/losslesscut.sh
@@ -1,16 +1,29 @@
#!/bin/bash
-set -e
+set -o pipefail
_APPDIR="/usr/lib/@appname@"
_RUNNAME="${_APPDIR}/@runname@"
+_CFGDIR="@cfgdirname@/"
_OPTIONS="@options@"
export PATH="${_APPDIR}:${PATH}"
export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
export ELECTRON_IS_DEV=0
export ELECTRON_FORCE_IS_PACKAGED=true
+export ELECTRON_DISABLE_SECURITY_WARNINGS=true
+export ELECTRON_OVERRIDE_DIST_PATH="/usr/bin/electron@electronversion@"
export NODE_ENV=production
+export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
+export _FLAGS_FILE="${XDG_CONFIG_HOME}/${_CFGDIR}@appname@-flags.conf"
+declare -a _USER_FLAGS
+if [[ -f "${_FLAGS_FILE}" ]]; then
+ while read -r line; do
+ if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then
+ _USER_FLAGS+=("${line}")
+ fi
+ done < "${_FLAGS_FILE}"
+fi
cd "${_APPDIR}"
-if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
- exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "$@" || exit $?
+if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then
+ exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "${_USER_FLAGS[@]}" "$@"
else
- exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $?
+ exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "${_USER_FLAGS[@]}" "$@"
fi \ No newline at end of file