From 874aaf882ec5f92fd50093e83755921c399baa9b Mon Sep 17 00:00:00 2001 From: moparisthebest Date: Thu, 21 Nov 2024 00:02:15 -0500 Subject: [PATCH] Add and update things --- src/chirp-daily/PKGBUILD | 27 --- src/chirp-next/PKGBUILD | 38 ++++ src/chirp-next/chirp-next.install | 7 + src/fish-git/PKGBUILD | 78 ++++++++ src/fish-git/fish.install | 14 ++ src/helix-git-custom/PKGBUILD | 70 +++++++ src/helix-git/PKGBUILD | 70 +++++++ src/initramfs-pgp-encrypt/PKGBUILD | 2 +- src/initramfs-pgp-encrypt/pgp-encrypt-hook | 6 +- src/initramfs-pgp-encrypt/pgp-encrypt-install | 5 +- src/inspircd/PKGBUILD | 4 +- src/makemkv/PKGBUILD | 27 ++- src/makemkv/makemkv-ffmpeg.patch | 25 --- src/orca-slicer-bin/PKGBUILD | 40 ++++ src/python-yattag/PKGBUILD | 28 +++ src/repose-patched/PKGBUILD | 29 ++- src/sendxmpp-rs-git/PKGBUILD | 2 +- src/ttf-harmonyos-sans/PKGBUILD | 19 ++ src/vdhcoapp/PKGBUILD | 183 ++++++++++++++---- src/veloren/PKGBUILD | 22 ++- 20 files changed, 570 insertions(+), 126 deletions(-) delete mode 100644 src/chirp-daily/PKGBUILD create mode 100644 src/chirp-next/PKGBUILD create mode 100644 src/chirp-next/chirp-next.install create mode 100644 src/fish-git/PKGBUILD create mode 100644 src/fish-git/fish.install create mode 100644 src/helix-git-custom/PKGBUILD create mode 100644 src/helix-git/PKGBUILD delete mode 100644 src/makemkv/makemkv-ffmpeg.patch create mode 100644 src/orca-slicer-bin/PKGBUILD create mode 100644 src/python-yattag/PKGBUILD create mode 100644 src/ttf-harmonyos-sans/PKGBUILD diff --git a/src/chirp-daily/PKGBUILD b/src/chirp-daily/PKGBUILD deleted file mode 100644 index 2132701..0000000 --- a/src/chirp-daily/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: Erez Raviv (erezraviv@gmail.com) -pkgname=chirp-daily -pkgver=20200409 -pkgrel=1 -pkgdesc="Latest build for GUI tool for programming ham radios" -arch=('any') -url="http://chirp.danplanet.com/" -license=('GPL3') -depends=('python2-lxml' 'python2-pyserial' 'pygtk') -optdepends=('hamradio-menus') -options=(!emptydirs) -conflicts=(chirp) -provides=(chirp) -install= -sha1sums=(8c332cbd36335d8b8390d5a62ea96891219bc6ce) -DLAGENTS=("https::/usr/bin/curl -k -o %o %u") -source=("https://trac.chirp.danplanet.com/chirp_daily/LATEST/chirp-daily-20200409.tar.gz") - -build() { - tar xvf $pkgname-$pkgver.tar.gz -} - -package() { - cd "$pkgname-$pkgver" - python2 setup.py install --root="$pkgdir/" --optimize=1 -} - diff --git a/src/chirp-next/PKGBUILD b/src/chirp-next/PKGBUILD new file mode 100644 index 0000000..5e4d952 --- /dev/null +++ b/src/chirp-next/PKGBUILD @@ -0,0 +1,38 @@ +# Thanks to the maintainer(s) of chirp-daily +# Maintainer: WT5A +# Contributor: 0b100100 <0b100100 at protonmail dot ch> +# Contributor: Ashley Roll (ash@digitalnemesis.com) +# Contributor: Erez Raviv (erezraviv@gmail.com) + +pkgname=chirp-next +pkgver=20240911 +pkgrel=1 +pkgdesc="GUI tool for programming ham radios, built from daily build" +arch=('any') +url="https://chirpmyradio.com/projects/chirp/wiki/Home" +license=('GPL-3.0-or-later') +depends=('python-six' 'python-pyserial' 'python-future' 'python-requests' 'python-suds' 'python-yattag' 'python-wxpython') +optdepends=('hamradio-menus: XDG menus for ham radio software') +makedepends=('python-build' 'python-installer' 'python-wheel' 'python-setuptools') +options=(!emptydirs) +conflicts=('chirp' 'chirp-daily') +provides=(chirp) +install=$pkgname.install +source=("${pkgname}-${pkgver}.tar.gz::https://archive.chirpmyradio.com/chirp_next/next-${pkgver}/chirp-${pkgver}.tar.gz") +# Checksums: https://archive.chirpmyradio.com/chirp_next/next-$pkgver/SHA1SUM +sha1sums=('c8da0c949830f735f18129c471ed765335076a3d') + +build() { + cd "chirp-${pkgver}" + python -m build --wheel --no-isolation +} + +package() { + _site_packages=$(python -c "import site; print(site.getsitepackages()[0])") + cd "chirp-$pkgver" + python -m installer --destdir="${pkgdir}" dist/*.whl + install -D -m644 "${srcdir}/chirp-${pkgver}/chirp/share/chirpw.1" "${pkgdir}/usr/share/man/man1/chirp.1" + install -D -m644 "${srcdir}/chirp-${pkgver}/chirp/share/chirp.desktop" "${pkgdir}/usr/share/applications/chirp.desktop" + install -D -m644 "${srcdir}/chirp-${pkgver}/chirp/share/chirp.png" "${pkgdir}/usr/share/pixmaps/chirp.png" + cp -dr --preserve=mode,timestamp "${srcdir}/chirp-${pkgver}/chirp/locale/" "${pkgdir}${_site_packages}/chirp/locale" +} diff --git a/src/chirp-next/chirp-next.install b/src/chirp-next/chirp-next.install new file mode 100644 index 0000000..b7033a3 --- /dev/null +++ b/src/chirp-next/chirp-next.install @@ -0,0 +1,7 @@ +post_install() { + # serial port permissions + # (https://chirp.danplanet.com/projects/chirp/wiki/Running_Under_Linux#serial-port-permissions) + echo "==> You may need to add your user to the 'uucp' group to access serial ports and devices." + echo -e "==> This can be accomplished with: '\e[32msudo usermod -aG uucp \$USER\e[0m'" + echo "==> Then you will need to log out and back in for it to take effect." +} diff --git a/src/fish-git/PKGBUILD b/src/fish-git/PKGBUILD new file mode 100644 index 0000000..b361a05 --- /dev/null +++ b/src/fish-git/PKGBUILD @@ -0,0 +1,78 @@ +# Contributor: Abhishek Dasgupta +# Contributor: Eric Belanger +# Contributor: Jan Fader +# Contributor: Stephen Drodge +# Contributor: Akatsuki Rui +# Maintainer: SanskritFritz (gmail) + +pkgname=fish-git +_gitname="fish-shell" +pkgver=3.7.1.r2517.g31b15405e +pkgrel=1 +epoch=2 +pkgdesc="User friendly shell intended mostly for interactive use." +arch=('i686' 'x86_64' 'arm') +url="https://github.com/fish-shell/fish-shell" +license=('GPL-2.0-or-later') +depends=( + 'glibc' + 'ncurses' + 'pcre2' +) +optdepends=( + 'python: man page completion parser / web config tool' + 'pkgfile: command-not-found hook' +) +makedepends=( + 'cargo' + 'cmake' + 'git' + 'python-sphinx' +) +checkdepends=( + 'expect' + 'procps-ng' +) +options=(!lto) +provides=( + 'fish' + 'fish-shell' +) +conflicts=( + 'fish' + 'fish-shell' +) +source=( + "git+https://github.com/fish-shell/fish-shell.git" +) +install='fish.install' +backup=(etc/fish/config.fish) +b2sums=('SKIP') + +pkgver() { + cd "$_gitname" + git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g' +} + +build() { + cd "$_gitname" + export CXXFLAGS+=" ${CPPFLAGS}" + cmake \ + -B build \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc \ + -DBUILD_DOCS=True \ + -Wno-dev + make -C build +} + +check() { + cd "$_gitname" + make -C build test +} + +package() { + cd "$_gitname" + make -C build DESTDIR="$pkgdir" install +} diff --git a/src/fish-git/fish.install b/src/fish-git/fish.install new file mode 100644 index 0000000..d14a4fe --- /dev/null +++ b/src/fish-git/fish.install @@ -0,0 +1,14 @@ +post_install() { + grep -qe '^/usr/bin/fish$' etc/shells || echo '/usr/bin/fish' >> etc/shells + grep -qe '^/bin/fish$' etc/shells || echo '/bin/fish' >> etc/shells +} + +post_upgrade() { + post_install +} + +pre_remove() { + sed -ri -e '\|^/usr/bin/fish$|d' -e '\|^/bin/fish$|d' etc/shells +} + +# vim:set ts=2 sw=2 et: diff --git a/src/helix-git-custom/PKGBUILD b/src/helix-git-custom/PKGBUILD new file mode 100644 index 0000000..801a54f --- /dev/null +++ b/src/helix-git-custom/PKGBUILD @@ -0,0 +1,70 @@ +# Maintainer: Robin Jadoul (aur@ur4ndom.dev) +# Contributor: Wojciech Kępka (wojciech@wkepka.dev) +pkgname=helix-git-custom +_pkgname=helix +pkgver=24.03.r412.g9aca652b +pkgrel=1 +pkgdesc="A text editor written in rust" +url="https://helix-editor.com" +license=("MPL-2.0") +_git="https://github.com/moparisthebest/${_pkgname}.git" +arch=(x86_64) +makedepends=('git' 'cargo') +depends=() +provides=('hx') +conflicts=('helix') +options=(!lto) +source=("${_pkgname}::git+${_git}") +sha256sums=('SKIP') + +_bin="hx" +_lib_path="/usr/lib/${_pkgname}" +_rt_path="${_lib_path}/runtime" + + +pkgver() { + cd "${_pkgname}" + git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' +} + +prepare() { + cat > "$_bin" << EOF +#!/usr/bin/env sh +HELIX_RUNTIME=${_rt_path} exec ${_lib_path}/${_bin} "\$@" +EOF + chmod +x "$_bin" + + cd "${_pkgname}" + export CARGO_TARGET_DIR=target + cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')" +} + +build() { + cd "${_pkgname}" + export CARGO_TARGET_DIR=target + cargo build --locked --profile opt +} + +check() { + cd "${_pkgname}" + export CARGO_TARGET_DIR=target + # cargo test --workspace --locked + export RUSTFLAGS="${RUSTFLAGS} --cfg tokio_unstable" + # cargo integration-test --locked +} + +package() { + cd "${_pkgname}" + mkdir -p "${pkgdir}${_lib_path}" + rm -r "runtime/grammars/sources" + cp -r "runtime" "${pkgdir}${_lib_path}" + install -Dm 0755 "target/opt/${_bin}" "${pkgdir}${_lib_path}/${_bin}" + install -Dm 0644 "LICENSE" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" + install -Dm 0777 "${srcdir}/${_bin}" "${pkgdir}/usr/bin/${_bin}" + install -Dm 0644 "contrib/Helix.desktop" "${pkgdir}/usr/share/applications/Helix.desktop" + install -Dm 0644 "contrib/Helix.appdata.xml" "${pkgdir}/usr/share/appdata/Helix.appdata.xml" + install -Dm 0644 "contrib/helix.png" "${pkgdir}/usr/share/icons/Helix.png" + install -Dm 0644 "contrib/completion/hx.zsh" "${pkgdir}/usr/share/zsh/site-functions/_hx" + install -Dm 0644 "contrib/completion/hx.bash" "${pkgdir}/usr/share/bash-completion/completions/hx.bash" + install -Dm 0644 "contrib/completion/hx.fish" "${pkgdir}/usr/share/fish/vendor_completions.d/hx.fish" +} diff --git a/src/helix-git/PKGBUILD b/src/helix-git/PKGBUILD new file mode 100644 index 0000000..f9b2c72 --- /dev/null +++ b/src/helix-git/PKGBUILD @@ -0,0 +1,70 @@ +# Maintainer: Robin Jadoul (aur@ur4ndom.dev) +# Contributor: Wojciech Kępka (wojciech@wkepka.dev) +pkgname=helix-git +_pkgname=helix +pkgver=24.07.r149.gaf7a1fd20 +pkgrel=1 +pkgdesc="A text editor written in rust" +url="https://helix-editor.com" +license=("MPL-2.0") +_git="https://github.com/helix-editor/${_pkgname}.git" +arch=(x86_64) +makedepends=('git' 'cargo') +depends=() +provides=('hx') +conflicts=('helix') +options=(!lto) +source=("${_pkgname}::git+${_git}") +sha256sums=('SKIP') + +_bin="hx" +_lib_path="/usr/lib/${_pkgname}" +_rt_path="${_lib_path}/runtime" + + +pkgver() { + cd "${_pkgname}" + git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' +} + +prepare() { + cat > "$_bin" << EOF +#!/usr/bin/env sh +HELIX_RUNTIME=${_rt_path} exec ${_lib_path}/${_bin} "\$@" +EOF + chmod +x "$_bin" + + cd "${_pkgname}" + export CARGO_TARGET_DIR=target + cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')" +} + +build() { + cd "${_pkgname}" + export CARGO_TARGET_DIR=target + cargo build --locked --profile opt +} + +check() { + cd "${_pkgname}" + export CARGO_TARGET_DIR=target + cargo test --workspace --locked + export RUSTFLAGS="${RUSTFLAGS} --cfg tokio_unstable" + cargo integration-test --locked +} + +package() { + cd "${_pkgname}" + mkdir -p "${pkgdir}${_lib_path}" + rm -r "runtime/grammars/sources" + cp -r "runtime" "${pkgdir}${_lib_path}" + install -Dm 0755 "target/opt/${_bin}" "${pkgdir}${_lib_path}/${_bin}" + install -Dm 0644 "LICENSE" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" + install -Dm 0777 "${srcdir}/${_bin}" "${pkgdir}/usr/bin/${_bin}" + install -Dm 0644 "contrib/Helix.desktop" "${pkgdir}/usr/share/applications/Helix.desktop" + install -Dm 0644 "contrib/Helix.appdata.xml" "${pkgdir}/usr/share/appdata/Helix.appdata.xml" + install -Dm 0644 "contrib/helix.png" "${pkgdir}/usr/share/icons/Helix.png" + install -Dm 0644 "contrib/completion/hx.zsh" "${pkgdir}/usr/share/zsh/site-functions/_hx" + install -Dm 0644 "contrib/completion/hx.bash" "${pkgdir}/usr/share/bash-completion/completions/hx.bash" + install -Dm 0644 "contrib/completion/hx.fish" "${pkgdir}/usr/share/fish/vendor_completions.d/hx.fish" +} diff --git a/src/initramfs-pgp-encrypt/PKGBUILD b/src/initramfs-pgp-encrypt/PKGBUILD index f4c66b5..f9d5151 100644 --- a/src/initramfs-pgp-encrypt/PKGBUILD +++ b/src/initramfs-pgp-encrypt/PKGBUILD @@ -1,6 +1,6 @@ pkgname=initramfs-pgp-encrypt pkgdesc="initramfs hook that adds PGP smartcard and Dvorak support while keeping regular LUKS support" -pkgver=1.0 +pkgver=1.1 pkgrel=1 license=(AGPL-3.0) arch=(any) diff --git a/src/initramfs-pgp-encrypt/pgp-encrypt-hook b/src/initramfs-pgp-encrypt/pgp-encrypt-hook index e7af05e..009c262 100644 --- a/src/initramfs-pgp-encrypt/pgp-encrypt-hook +++ b/src/initramfs-pgp-encrypt/pgp-encrypt-hook @@ -122,12 +122,16 @@ EOF dv_pass="$(echo "$pass" | dvorak)" rm -f ${ckeyfile} + + if [ -f /root/disk.bin.gpg ]; then # try dvorak gpg pass first gpg --passphrase "$dv_pass" --batch --pinentry-mode loopback --quiet --output ${ckeyfile} --decrypt /root/disk.bin.gpg 2>/dev/null # if dv_pass was wrong, try qwerty pass [ ! -f ${ckeyfile} ] && gpg --passphrase "$pass" --batch --pinentry-mode loopback --quiet --output ${ckeyfile} --decrypt /root/disk.bin.gpg 2>/dev/null + + fi # end disk.bin.gpg exists # if no gpg pass, try direct luks pass, qwerty first [ ! -f ${ckeyfile} ] && echo -n "$pass" > ${ckeyfile} @@ -147,7 +151,7 @@ EOF # sleep 2; done rm -f ${ckeyfile} - gpg-connect-agent KILLAGENT /bye >/dev/null 2>&1 + [ -f /root/disk.bin.gpg ] && gpg-connect-agent KILLAGENT /bye >/dev/null 2>&1 rm -rf "$GNUPGHOME" fi fi diff --git a/src/initramfs-pgp-encrypt/pgp-encrypt-install b/src/initramfs-pgp-encrypt/pgp-encrypt-install index 159bdaf..72dbdfc 100644 --- a/src/initramfs-pgp-encrypt/pgp-encrypt-install +++ b/src/initramfs-pgp-encrypt/pgp-encrypt-install @@ -28,6 +28,8 @@ build() { add_binary '/usr/lib/ossl-modules/legacy.so' # above is from encrypt hook, below is for gpg + add_binary "tr" + if [ -f "/root/disk.bin.gpg" ]; then if [ -d $BUILDROOT/etc/initcpio/gpg ]; then echo "WARNING! /etc/initcpio/gpg exists in initramfs buildroot. Huh?" @@ -37,7 +39,6 @@ build() { mkdir -p $BUILDROOT/etc/initcpio/gpg chmod 0700 $BUILDROOT/etc/initcpio/gpg - add_binary "tr" add_binary "dmsetup" add_binary "gpg" add_binary "gpg-agent" @@ -56,6 +57,8 @@ build() { rm -f "$BUILDROOT/etc/initcpio/gpg/S.gpg-agent"* + fi # end if disk.bin.gpg exists + add_runscript } diff --git a/src/inspircd/PKGBUILD b/src/inspircd/PKGBUILD index 964f8f4..131d970 100644 --- a/src/inspircd/PKGBUILD +++ b/src/inspircd/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: jibi pkgname='inspircd' -pkgver='3.16.1' +pkgver='3.17.1' pkgrel='2' pkgdesc='InspIRCd is a modular Internet Relay Chat (IRC) server written in C++ for Linux, BSD, Windows and macOS systems.' arch=('x86_64' 'aarch64') @@ -53,7 +53,7 @@ source=( "$pkgname.sysusers" ) sha512sums=( - '2b488858b0012bcb3eb92a33960e9927c861587c7b7451a47fd3e10a97fad9c392524d98712593fd455c5cbae7fd1779e4b90b9e55680c2f36b483e0acf2bba5' + 'ae8699506d32e7c09c1b982baeea36eca520d6be65732976e77695f1ca1768aa070f0ae3b9abf9fd390201021a679ef5478114b66f40e996de6873f3fb83836b' '5a16a7c237693ffc6a108358f339b6aa2451fb16430561848ae869f890199b38fab6a13640bcc35cf1d07e32d7e5fff405d88668ee05ddaffc2ef61cb42ee832' '90e7ae20a0d13cef2ff00c56382ea5cf1ed8843228937c49cab7fe0e2a34d02b9fac20dd55c6cd5e79533b5764a9d10d19e26b043a2d9c98a4384a7e1c2859c4' ) diff --git a/src/makemkv/PKGBUILD b/src/makemkv/PKGBUILD index 8c2a300..ddb6bc8 100644 --- a/src/makemkv/PKGBUILD +++ b/src/makemkv/PKGBUILD @@ -1,32 +1,31 @@ # Maintainer: Fabio 'Lolix' Loli -> https://github.com/FabioLolix +# Contributor: txtsd # Contributor: Marcel Korpel # Contributor: Olaf Bauer pkgname=makemkv -pkgver=1.17.2 -pkgrel=2 +pkgver=1.17.7 +pkgrel=4 pkgdesc="DVD and Blu-ray to MKV converter" -arch=(x86_64 i686) +arch=(x86_64 i686 aarch64) url="https://www.makemkv.com" -license=('custom: GuinpinSoft Inc EULA' LGPL MPL) -depends=(qt5-base ffmpeg) -optdepends=(java-runtime) -optdepends_x86_64=('lib32-glibc: dts support') +license=('LicenseRef-GuinpinSoft-inc-EULA' LGPL-2.1-or-later) +depends=(qt5-base ffmpeg libavcodec.so) +optdepends=('java-runtime: bdjava https://www.makemkv.com/bdjava/') install=makemkv.install source=(${url}/download/${pkgname}-bin-${pkgver}.tar.gz ${url}/download/${pkgname}-oss-${pkgver}.tar.gz makemkv.1 makemkvcon.1 - mmdtsdec.1) -sha256sums=('80008ccc9ee864293f20d49e25a57b1a717d872ffa17d7744032e9e633e21789' - 'a83f8abb3f23def0dc8783e535062a75b7df2f7612291a8a83a21f90b93f2da4' + ) +sha256sums=('8c5bc831bc952b1f873cc8450c64e392db0b2479b626d180f0ffc965668951d0' + '762e552d46f9ec75a7c62dcb7d97c0fd9e6a15120d0ef6f5a080cee291d3a0ef' '5573b2e4bade10d8cd258a7c235eb46f66ef8c8c97e5d5eb090c38fa0f94389b' - 'f12c0facf2f0071a9f728b138986f0a4c2b4ff6ace2dfb2e96364e215e9fda6f' - '2a6237d3d5ce073734c658c7ec5d2141ecd0047e6d3c45d1bd594135c928878f') + 'f12c0facf2f0071a9f728b138986f0a4c2b4ff6ace2dfb2e96364e215e9fda6f') build() { cd "${srcdir}/${pkgname}-oss-${pkgver}" - CFLAGS="$CFLAGS -std=c++11" CC=gcc CXX=g++ ./configure --prefix=/usr + ./configure --prefix=/usr make } @@ -43,5 +42,5 @@ package() { cd "${srcdir}/" install -d "${pkgdir}/usr/share/man/man1/" - install -m 644 -t "${pkgdir}/usr/share/man/man1/" makemkv.1 makemkvcon.1 mmdtsdec.1 + install -m 644 -t "${pkgdir}/usr/share/man/man1/" makemkv.1 makemkvcon.1 } diff --git a/src/makemkv/makemkv-ffmpeg.patch b/src/makemkv/makemkv-ffmpeg.patch deleted file mode 100644 index 83dafc1..0000000 --- a/src/makemkv/makemkv-ffmpeg.patch +++ /dev/null @@ -1,25 +0,0 @@ -Taken from https://negativo17.org/repos/multimedia/epel-7/SRPMS/makemkv-1.12.2-2.el7.src.rpm -See https://github.com/FFmpeg/FFmpeg/commit/7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615 -and https://github.com/FFmpeg/FFmpeg/commit/b79a7da36faa6bb5914b04800b548e99eb3b81ca -diff --git a/libffabi/src/ffabi.c b/libffabi/src/ffabi.c -index 20db4e9..f08d53c 100644 ---- a/libffabi/src/ffabi.c -+++ b/libffabi/src/ffabi.c -@@ -517,7 +517,7 @@ FFM_AudioEncodeContext* __cdecl ffm_audio_encode_init(void* logctx,const char* n - info->profile : FF_PROFILE_UNKNOWN; - - if ((CodecFlags&FFM_CODEC_FLAG_GLOBAL_HEADER)!=0) -- ctx->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ ctx->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - - if (argp) { - for (i=0;argp[i];i+=2) { -@@ -718,7 +718,7 @@ int __cdecl ffm_audio_encode_get_info(FFM_AudioEncodeContext* ctx,FFM_AudioEncod - info->delay = (int32_t)ctx->avctx->delay; - info->flags = 0; - -- if ((ctx->avctx->flags&CODEC_FLAG_GLOBAL_HEADER)!=0) -+ if ((ctx->avctx->flags&AV_CODEC_FLAG_GLOBAL_HEADER)!=0) - info->flags |= FFM_CODEC_FLAG_GLOBAL_HEADER; - - return 0; diff --git a/src/orca-slicer-bin/PKGBUILD b/src/orca-slicer-bin/PKGBUILD new file mode 100644 index 0000000..e58a7e0 --- /dev/null +++ b/src/orca-slicer-bin/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer: sem.z + +pkgname="orca-slicer-bin" +pkgver=2.1.1 +pkgrel=1 +pkgdesc="G-code generator for 3D printers" +arch=('x86_64') +url="https://github.com/SoftFever/OrcaSlicer" +license=('AGPL3') +depends=('mesa' 'glu' 'cairo' 'gtk3' 'libsoup' 'webkit2gtk' 'gstreamer' 'openvdb' 'gst-plugins-base' 'gst-libav' 'libxkbcommon' 'ttf-harmonyos-sans') +provides=("orca-slicer") +conflicts=("orca-slicer") +source=("https://github.com/SoftFever/OrcaSlicer/releases/download/v${pkgver}/OrcaSlicer_Linux_V${pkgver}.AppImage") +sha512sums=('f3e5ee8a8bd1b0c6ad3f8a2ce317d85fb6dd2c6232d89d2cfe1188caa7f2d74e5016b155dd3a4811f3d2369bd9da0e62f9d9a09181776356055101b0fc97d6b1') + +prepare() { + chmod +x OrcaSlicer_Linux_V${pkgver}.AppImage + ./OrcaSlicer_Linux_V${pkgver}.AppImage --appimage-extract + + sed -i 's|Exec=AppRun|Exec=/opt/orca-slicer/bin/orca-slicer|g' \ + "squashfs-root/OrcaSlicer.desktop" +} + +package() { + find squashfs-root/{resources,usr/share/icons}/ -type d -exec chmod 755 {} + + + install -d "$pkgdir/opt/${pkgname%-bin}/" + cp -av squashfs-root/* "$pkgdir/opt/${pkgname%-bin}/" + rm -rf "$pkgdir/opt/${pkgname%-bin}/usr/" + rm "$pkgdir/opt/${pkgname%-bin}"/{OrcaSlicer.desktop,AppRun,OrcaSlicer.png,OrcaSlicer-x86_64.AppImage} + + install -d "$pkgdir/usr/bin" + ln -s "/opt/${pkgname%-bin}/bin/orca-slicer" "$pkgdir/usr/bin/" + + install -Dm644 "squashfs-root/OrcaSlicer.desktop" -t \ + "$pkgdir/usr/share/applications/" + + install -d "$pkgdir/usr/share/icons/" + cp -r squashfs-root/usr/share/icons/hicolor/ "$pkgdir/usr/share/icons/" +} diff --git a/src/python-yattag/PKGBUILD b/src/python-yattag/PKGBUILD new file mode 100644 index 0000000..00b9636 --- /dev/null +++ b/src/python-yattag/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Kyle Manna + +_pkgname=yattag +pkgname=python-${_pkgname} +pkgver=1.15.2 +pkgrel=1 +pkgdesc='Python library for generating HTML or XML in a pythonic way.' +url='http://yattag.org' +depends=('python') +makedepends=('python-build' + 'python-installer' + 'python-setuptools' + 'python-wheel') +license=('LGPL') +arch=('any') +source=("https://pypi.python.org/packages/source/y/${_pkgname}/${_pkgname}-${pkgver}.tar.gz") +sha256sums=('aad9f540bd22dc503e5b5506cc47856facf081aa71fd35f727371b63e1e402bf') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + python -m build --wheel --no-isolation +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + python -m installer --destdir="$pkgdir" dist/*.whl + rm -rf ${pkgdir}/usr/lib/python3*/site-packages/tests/ +} diff --git a/src/repose-patched/PKGBUILD b/src/repose-patched/PKGBUILD index 8c9bad8..622bd9e 100644 --- a/src/repose-patched/PKGBUILD +++ b/src/repose-patched/PKGBUILD @@ -3,19 +3,30 @@ pkgname=repose-patched pkgver=7.1 -pkgrel=1 - -pkgdesc="Arch Linux repo building tool" -url="https://github.com/vodik/repose" -arch=('x86_64') -license=('GPL') +pkgrel=2 provides=('repose') conflicts=('repose') -depends=('pacman' 'libarchive' 'gnupg') -makedepends=('ragel') -checkdepends=('python-pytest' 'python-cffi' 'python-pytest-xdist') +pkgdesc="Arch Linux repo building tool" +url="https://github.com/vodik/repose" +arch=('x86_64') +license=('GPL-2.0-or-later') +depends=( + 'gpgme' 'libgpgme.so' + 'libarchive' 'libarchive.so' + 'openssl' 'libcrypto.so' + 'pacman' 'libalpm.so' +) +makedepends=( + 'ragel' +) +checkdepends=( + 'python-cffi' + 'python-pytest' + 'python-pytest-xdist' + 'python-setuptools' +) source=("repose-$pkgver.tar.gz::https://github.com/vodik/repose/archive/$pkgver.tar.gz" "fix.patch") diff --git a/src/sendxmpp-rs-git/PKGBUILD b/src/sendxmpp-rs-git/PKGBUILD index 85788a6..07e7c1a 100644 --- a/src/sendxmpp-rs-git/PKGBUILD +++ b/src/sendxmpp-rs-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: moparisthebest pkgname=sendxmpp-rs-git -pkgver=1.0.0.r1.g37b5efd +pkgver=3.0.1.r0.g5b36300 pkgrel=1 pkgdesc="sendxmpp is the XMPP equivalent of sendmail. It is an alternative to the old sendxmpp written in Perl." url="https://code.moparisthebest.com/moparisthebest/sendxmpp-rs" diff --git a/src/ttf-harmonyos-sans/PKGBUILD b/src/ttf-harmonyos-sans/PKGBUILD new file mode 100644 index 0000000..ce4e69d --- /dev/null +++ b/src/ttf-harmonyos-sans/PKGBUILD @@ -0,0 +1,19 @@ +# Maintainer: zxp19821005 +pkgname=ttf-harmonyos-sans +_pkgname="HarmonyOS Sans" +pkgver=2024.06.19 +pkgrel=1 +pkgdesc="HarmonyOS Sans 字体" +arch=("any") +url='https://developer.harmonyos.com/cn/design/resource' +license=("LicenseRef-custom") +conflicts=("${pkgname//ttf-/}") +source=( + "${pkgname}-${pkgver}.zip::https://developer.huawei.com/images/download/next/${_pkgname// /-}.zip" +) +sha256sums=('c8ac95f3715631f3787336e9689571c12ae818a0059713a726313605ce0eb8d3') +package() { + export LC_CTYPE="zh_CN.UTF-8" + install -Dm644 "${srcdir}/${_pkgname} /${_pkgname// /_}"*/*.ttf -t "${pkgdir}/usr/share/fonts/${pkgname//ttf-/}" + install -Dm644 "${srcdir}/${_pkgname} /${_pkgname// /_}/LICENSE.txt" -t "${pkgdir}/usr/share/licenses/${pkgname}" +} \ No newline at end of file diff --git a/src/vdhcoapp/PKGBUILD b/src/vdhcoapp/PKGBUILD index 06eaa5d..196cad2 100644 --- a/src/vdhcoapp/PKGBUILD +++ b/src/vdhcoapp/PKGBUILD @@ -1,49 +1,160 @@ -# Maintainer: Damien Guihal -# Maintainer: Rodrigo Bezerra +# Maintainer: +# Contributor: Damien Guihal +# Contributor: Rodrigo Bezerra -pkgname=vdhcoapp -pkgver=1.6.0 -pkgrel=1 +: ${CARGO_HOME:=$SRCDEST/cargo-home} +: ${_nodeversion:=18} + +_pkgname="vdhcoapp" +pkgname="$_pkgname" +pkgver=2.0.20 +pkgrel=2 pkgdesc="Companion application for Video DownloadHelper browser add-on" +url="https://github.com/aclap-dev/vdhcoapp" +license=('GPL-2.0-or-later') arch=('x86_64') -url="https://github.com/mi-g/vdhcoapp" -license=('GPL2') -depends=('ffmpeg') -makedepends=('gulp' 'nodejs-lts-dubnium' 'npm') -options=(!strip) -source=($pkgname-$pkgver.tar.gz::https://github.com/mi-g/vdhcoapp/archive/v${pkgver}.tar.gz - vdhcoapp.patch - vdhcoapp-install.hook - vdhcoapp-remove.hook) -sha256sums=('47e7fc4dbc3f8f01fa1e07abe5fe1fd220f38d3bfe3c75ded9a5861d91263b81' - 'ab240d9d9fea27792d008eaffe14de5f798ced0938cc79351ed108185baf93a3' - '9f8cbe84b2543738390b70d770551259c6db2b67235b7792e9094908cecbc955' - '448ee36b350b6bcd304d33cf7638c13bda88d5086f2256e823d73ccc22e52ce0') + +_source_vdhcoapp() { + makedepends=( + 'esbuild' + 'jq' + 'nvm' # AUR + 'yq' + ) + + options=('emptydirs' '!strip' '!debug') + install="$_pkgname.install" + + _pkgsrc="$_pkgname-$pkgver" + _pkgext="tar.gz" + source=("$_pkgsrc.$_pkgext"::"$url/archive/v$pkgver.$_pkgext") + sha256sums=('f39a17e0375b0b58cd7326fafe51de7e8b1f32a11b24583baa41f9e0b8c0ef68') +} + +_source_filepicker() { + depends+=( + 'gtk3' + ) + makedepends+=( + 'cargo' + 'git' + ) + + _filepicker_url="https://github.com/paulrouget/static-filepicker" + _filepicker_pkgsrc="vdhcoapp-filepicker" + source+=("$_filepicker_pkgsrc"::"git+$_filepicker_url.git") + sha256sums+=('SKIP') +} + +_prepare_vdhcoapp() ( + cd "$_pkgsrc" + mv -f app/* . + + # create config.json + tomlq . ./config.toml \ + | jq '.target.os = "linux"' \ + | jq '.target.arch = "amd64"' \ + | jq ".meta.version = \"${pkgver}\"" \ + > src/config.json + + # fix path to config.json + sed -E -i src/main.js src/native-autoinstall.js \ + -e 's&^(const config = require\('\'')(config.json'\''\);)$&\1./\2&' +) + +_prepare_filepicker() ( + _cargo_env + + cd "$_filepicker_pkgsrc" + cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')" +) + +_build_vdhcoapp() ( + _nvm_env + + cd "$_pkgsrc" + + npm install --no-package-lock --no-audit --no-fund --prefer-offline + npm install pkg --no-package-lock --no-audit --no-fund --prefer-offline + + local _esbuild_options=( + src/main.js + --target=esnext + "--banner:js=const _importMetaUrl=require('url').pathToFileURL(__filename)" + "--define:import.meta.url=_importMetaUrl" + --format=cjs + --bundle + --platform=node + --tree-shaking=true + --alias:electron=electron2 + --outfile=bundled.js + ) + + esbuild "${_esbuild_options[@]}" + + local _pkg_options=( + bundled.js + --target "node$_nodeversion-linux-x64" + --output vdhcoapp + ) + + ./node_modules/.bin/pkg "${_pkg_options[@]}" +) + +_build_filepicker() ( + _cargo_env + + cd "$_filepicker_pkgsrc" + cargo build --frozen --release --all-features +) + +_package_vdhcoapp() ( + cd "$_pkgsrc" + install -Dm755 vdhcoapp -t "$pkgdir/usr/bin/" + + install -dm755 "$pkgdir/usr/lib/mozilla/native-messaging-hosts/" + install -dm755 "$pkgdir/etc/opt/chrome/native-messaging-hosts/" + install -dm755 "$pkgdir/etc/chromium/native-messaging-hosts/" + install -dm755 "$pkgdir/etc/opt/edge/native-messaging-hosts/" +) + +_package_filepicker() ( + _cargo_env + install -Dm755 "$_filepicker_pkgsrc/$CARGO_TARGET_DIR/release/filepicker" -t "$pkgdir/usr/bin/" +) + +_cargo_env() { + export CARGO_HOME + export RUSTUP_TOOLCHAIN=stable + export CARGO_TARGET_DIR=target +} + +_nvm_env() { + export HOME="$SRCDEST/node-home" + export NVM_DIR="$SRCDEST/node-nvm" + + # set up nvm + source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]] + nvm install $_nodeversion + nvm use $_nodeversion +} + +_source_vdhcoapp +_source_filepicker prepare() { - cd ${pkgname}-${pkgver} - - patch -Np2 -i "${srcdir}/vdhcoapp.patch" + _prepare_vdhcoapp + _prepare_filepicker } build() { - cd "${pkgname}-${pkgver}" - - npm install - - gulp + _build_vdhcoapp + _build_filepicker } package() { - cd "${pkgname}-${pkgver}" + depends+=('ffmpeg') - install -Dm755 bin/net.downloadhelper.coapp-* "${pkgdir}/usr/bin/vdhcoapp" - install -Dm644 config.json "${pkgdir}/usr/share/vdhcoapp/config.json" - - install -dm755 "${pkgdir}/usr/lib/mozilla/native-messaging-hosts/" - install -dm755 "${pkgdir}/etc/opt/chrome/native-messaging-hosts/" - install -dm755 "${pkgdir}/etc/chromium/native-messaging-hosts/" - - install -Dm644 "${srcdir}/vdhcoapp-install.hook" "${pkgdir}/usr/share/libalpm/hooks/vdhcoapp-install.hook" - install -Dm644 "${srcdir}/vdhcoapp-remove.hook" "${pkgdir}/usr/share/libalpm/hooks/vdhcoapp-remove.hook" + _package_vdhcoapp + _package_filepicker } diff --git a/src/veloren/PKGBUILD b/src/veloren/PKGBUILD index 31e904c..5c80cc8 100644 --- a/src/veloren/PKGBUILD +++ b/src/veloren/PKGBUILD @@ -1,23 +1,27 @@ -# Maintainer: Mckol +# Maintainer: LunarEclipse # Contributor: Jean Lucas -export GIT_LFS_SKIP_SMUDGE=1 # This is to prevent Git LFS errors +export GIT_LFS_SKIP_SMUDGE=1 # This is to prevent Git LFS errors pkgname=veloren -pkgver=0.12.0 -pkgrel=3 -pkgdesc='An open-world, open-source multiplayer voxel RPG' +pkgver=0.16.0 +pkgrel=2 +pkgdesc='The last stable release of an open-world, open-source multiplayer voxel RPG.' arch=('x86_64' 'i686') url='https://veloren.net/' license=('GPL3') options=('!strip') # This makes debugging issues easier sometimes, comment out if small package size is needed -depends=('alsa-lib' 'glslang' 'libxkbcommon-x11' 'pulseaudio-alsa' 'vulkan-icd-loader') -makedepends=('atk' 'cairo' 'cmake' 'gdk-pixbuf2' 'git' 'git-lfs' 'openssl' 'pango' 'python' 'rustup' 'systemd') +depends=('alsa-lib' 'glslang' 'libxkbcommon-x11' 'vulkan-icd-loader') +optdepends=( + 'pulseaudio-alsa: audio support on pulseaudio' + 'pipewire-alsa: audio support on pipewire' +) +makedepends=('atk' 'cairo' 'cmake' 'gdk-pixbuf2' 'git' 'git-lfs' 'openssl' 'pango' 'python' 'rustup' 'udev') provides=() conflicts=() _repo='https://gitlab.com/veloren/veloren.git' -source=("$pkgname"::"git+$_repo#commit=a22f03563819725af9477c61efc3cc569858a917") +source=("$pkgname"::"git+$_repo#tag=v$pkgver") noextract=() -sha512sums=('SKIP') +sha512sums=('3785641aaa5b5849d44c6ac99dd414fd02aeba95cd12ccb3c52da64a9f92f8d8fe7cbdf04956d014b7823d925c1af21347cff2ccfeb8924563646afff274a4ee') prepare() { unset GIT_LFS_SKIP_SMUDGE