Update all

12 files changed, 162 insertions, 91 deletions

diff --git a/.gitignore b/.gitignore
index 3a006ec..db1d818 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.bz2
 *.gz
+*.tgz
 *.xz
 *.zip
 *.zst
@@ -14,6 +15,7 @@ mpv/mpv
 msmtp/msmtp
 mutt/mutt
 neovim/neovim
+nsxiv/nsxiv
 pass/pass
 site-gen/site-gen
 slock/slock
diff --git a/cspell/PKGBUILD b/cspell/PKGBUILD
index ba6cc2d..cf50ee7 100644
--- a/cspell/PKGBUILD
+++ b/cspell/PKGBUILD
@@ -2,7 +2,7 @@
 
 _npmname=cspell
 pkgname=cspell-jxir
-pkgver=7.3.8
+pkgver=8.3.0
 pkgrel=1
 pkgdesc="A Spelling Checker for Code!"
 arch=(any)
@@ -12,7 +12,7 @@ depends=('nodejs' 'npm')
 optdepends=()
 source=(https://registry.npmjs.org/$_npmname/-/$_npmname-$pkgver.tgz)
 noextract=($_npmname-$pkgver.tgz)
-sha1sums=('69b7bca7decaca54b101389c749d3eb53e797d3c')
+sha1sums=('647c080acfeaa99736e2359c9da937ea4b189666')
 
 package() {
   cd $srcdir
diff --git a/dwm/PKGBUILD b/dwm/PKGBUILD
index 6615d5c..f10c0d0 100644
--- a/dwm/PKGBUILD
+++ b/dwm/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=dwm
 pkgname=$_pkgname-jxir
-pkgver=6.4.r15.g9761028
+pkgver=6.4.r15.gec31ab6
 pkgrel=1
 pkgdesc='A dynamic window manager for X'
 arch=('x86_64')
diff --git a/ffmpeg/PKGBUILD b/ffmpeg/PKGBUILD
index f59f78e..8a40386 100644
--- a/ffmpeg/PKGBUILD
+++ b/ffmpeg/PKGBUILD
@@ -54,12 +54,11 @@ build() {
     --disable-postproc \
     --enable-network \
     --disable-everything \
-    --enable-decoder=aac,h264,opus \
-    --enable-encoder=aac \
+    --enable-decoder=aac,h264,opus,vp9 \
     --enable-hwaccel=h264_vaapi,vp9_vaapi \
-    --enable-muxer=ffmetadata,mp4,matroska,webm \
-    --enable-demuxer=aac,ass,ffmetadata,h264,mpegts,matroska,mov \
     --enable-parser=aac,h264,opus,vp9 \
+    --enable-demuxer=aac,ass,ffmetadata,h264,matroska,mov,mpegts \
+    --enable-muxer=ffmetadata,mp4,matroska,webm \
     --enable-bsf=vp9_superframe \
     --enable-protocol=file \
     --enable-libass \
diff --git a/gc b/gc
index 856b394..66f905e 100755
--- a/gc
+++ b/gc
@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-for pkg in arch-config dmenu dwm ffmpeg mpop mpv msmtp mutt neovim pass site-gen slock st vifm youtube-dl; do
+for pkg in dmenu dwm ffmpeg mpop mpv msmtp mutt nsxiv pass st; do
   git -C $pkg/$pkg gc --prune=now
 done
 
diff --git a/mpop/PKGBUILD b/mpop/PKGBUILD
index fc93e33..e4179dd 100644
--- a/mpop/PKGBUILD
+++ b/mpop/PKGBUILD
@@ -2,14 +2,14 @@
 
 _pkgname=mpop
 pkgname=$_pkgname-jxir
-pkgver=1.4.6.r0.g7d3a000
+pkgver=1.4.18.r5.g8c562e6
 pkgrel=1
 pkgdesc='A small, fast POP3 client'
 arch=('x86_64')
 url="https://marlam.de/$_pkgname/"
 license=('GPL3')
 depends=('gnutls')
-makedepends=('git' 'texlive-plainextra')
+makedepends=('git' 'texlive-plaingeneric')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
 source=("git+https://git.marlam.de/git/$_pkgname.git")
@@ -27,6 +27,7 @@ build() {
     --prefix=/usr \
     --disable-nls \
     --with-tls=gnutls \
+    --without-libgsasl \
     --without-libsecret
   make
   make -C doc pdf
diff --git a/mpv/PKGBUILD b/mpv/PKGBUILD
index e31f910..03bf4c5 100644
--- a/mpv/PKGBUILD
+++ b/mpv/PKGBUILD
@@ -3,18 +3,23 @@
 _pkgname=mpv
 pkgname=$_pkgname-jxir
 epoch=1
-pkgver=0.30.0.r162.g78cf974375
+_tag='807b9343ef911d138950411cdb83c16a151d2018'
+pkgver=0.37.0.r0.g818ce7c51a
 pkgrel=1
 pkgdesc='a free, open source, and cross-platform media player'
 arch=('x86_64')
-license=('GPL')
-url='https://mpv.io'
-depends=('ffmpeg' 'libarchive' 'libxinerama' 'libxrandr' 'libxss' 'lua52')
-makedepends=('git' 'mesa' 'python-docutils')
-optdepends=('youtube-dl: for video-sharing websites playback')
+# We link against libraries that are licensed GPLv3 explicitly, so our
+# package is GPLv3 only as well. (Is this still correct?)
+license=('GPL3')
+url='https://mpv.io/'
+depends=('ffmpeg' 'libplacebo' 'libass' 'libva' 'libxinerama' 'libxpresent' 'libxss' 'luajit' 'pipewire')
+makedepends=('git' 'meson' 'python-docutils')
+optdepends=('yt-dlp: for video-sharing websites playback'
+            'youtube-dl: for video-sharing websites playback')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
-source=('git+https://github.com/mpv-player/mpv')
+options=('!emptydirs')
+source=("git+https://github.com/mpv-player/mpv.git#tag=$_tag")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -22,70 +27,137 @@ pkgver() {
   git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g;'
 }
 
-prepare() {
-  cd "$srcdir/$_pkgname"
-  ./bootstrap.py
+build() {
+
+  local _meson_options=(
+    --auto-features auto
+
+    -Dgpl=true
+    -Dcplayer=true
+    -Dlibmpv=false
+    -Dbuild-date=false
+
+    -Dcdda=disabled
+    -Dcplugins=disabled
+    -Ddvbin=disabled
+    -Ddvdnav=disabled
+    -Diconv=disabled
+    -Djavascript=disabled
+    -Dlcms2=disabled
+    -Dlibarchive=disabled
+    -Dlibavdevice=disabled
+    -Dlibbluray=disabled
+    -Dlua=luajit
+    -Dpthread-debug=disabled
+    -Drubberband=disabled
+    -Dsdl2=disabled
+    -Dsdl2-gamepad=disabled
+    -Duchardet=auto
+    -Duwp=disabled
+    -Dvapoursynth=disabled
+    -Dvector=auto
+    -Dwin32-threads=disabled
+    -Dzimg=disabled
+    -Dzlib=enabled
+
+    -Dalsa=disabled
+    -Daudiounit=disabled
+    -Dcoreaudio=disabled
+    -Djack=disabled
+    -Dopenal=disabled
+    -Dopensles=disabled
+    -Doss-audio=disabled
+    -Dpipewire=enabled
+    -Dpulse=disabled
+    -Dsdl2-audio=disabled
+    -Dsndio=disabled
+    -Dwasapi=disabled
+
+    -Dcaca=disabled
+    -Dcocoa=disabled
+    -Dd3d11=disabled
+    -Ddirect3d=disabled
+    -Ddmabuf-wayland=disabled
+    -Ddrm=enabled
+    -Degl=enabled
+    -Degl-android=disabled
+    -Degl-angle=disabled
+    -Degl-angle-lib=disabled
+    -Degl-angle-win32=disabled
+    -Degl-drm=enabled
+    -Degl-wayland=disabled
+    -Degl-x11=enabled
+    -Dgbm=enabled
+    -Dgl=enabled
+    -Dgl-cocoa=disabled
+    -Dgl-dxinterop=disabled
+    -Dgl-win32=disabled
+    -Dgl-x11=disabled
+    -Djpeg=disabled
+    -Drpi=disabled
+    -Dsdl2-video=disabled
+    -Dshaderc=disabled
+    -Dsixel=disabled
+    -Dspirv-cross=disabled
+    -Dplain-gl=enabled
+    -Dvdpau=disabled
+    -Dvdpau-gl-x11=disabled
+    -Dvaapi=enabled
+    -Dvaapi-drm=enabled
+    -Dvaapi-wayland=disabled
+    -Dvaapi-x11=enabled
+    -Dvulkan=disabled
+    -Dwayland=disabled
+    -Dx11=enabled
+    -Dxv=disabled
+
+    -Dandroid-media-ndk=disabled
+    -Dcuda-hwaccel=disabled
+    -Dcuda-interop=disabled
+    -Dd3d-hwaccel=disabled
+    -Dd3d9-hwaccel=disabled
+    -Dgl-dxinterop-d3d9=disabled
+    -Dios-gl=disabled
+    -Drpi-mmal=disabled
+    -Dvideotoolbox-gl=disabled
+    -Dvideotoolbox-pl=disabled
+    -Dvulkan-interop=disabled
+
+    -Dmacos-cocoa-cb=disabled
+    -Dmacos-media-player=disabled
+    -Dmacos-touchbar=disabled
+    -Dswift-build=disabled
+    -Dswift-flags=disabled
+
+    -Dhtml-build=disabled
+    -Dmanpage-build=enabled
+    -Dpdf-build=disabled
+  )
+
+  arch-meson "${_pkgname}" build "${_meson_options[@]}"
+
+  meson compile -C build
 }
 
-build() {
-  cd "$srcdir/$_pkgname"
-  ./waf configure \
-    --prefix=/usr \
-    --confdir=/etc/mpv \
-    --disable-debug-build \
-    --enable-manpage-build \
-    --disable-android \
-    --disable-javascript \
-    --disable-libbluray \
-    --disable-uchardet \
-    --disable-rubberband \
-    --disable-zimg \
-    --disable-lcms2 \
-    --disable-vapoursynth \
-    --disable-libavdevice \
-    --lua=52arch \
-    --disable-oss-audio \
-    --disable-rsound \
-    --disable-pulse \
-    --disable-jack \
-    --disable-opensles \
-    --disable-coreaudio \
-    --disable-audiounit \
-    --disable-wasapi \
-    --disable-cocoa \
-    --disable-drm \
-    --disable-drmprime \
-    --disable-gbm \
-    --disable-wayland-scanner \
-    --disable-wayland-protocols \
-    --disable-wayland \
-    --disable-xv \
-    --disable-vdpau \
-    --enable-vaapi \
-    --disable-caca \
-    --disable-jpeg \
-    --disable-direct3d \
-    --disable-shaderc \
-    --disable-spirv-cross \
-    --disable-rpi \
-    --disable-ios-gl \
-    --disable-libplacebo \
-    --disable-vulkan \
-    --disable-videotoolbox-gl \
-    --disable-d3d-hwaccel \
-    --disable-d3d9-hwaccel \
-    --disable-gl-dxinterop-d3d9 \
-    --disable-cuda-hwaccel \
-    --disable-apple-remote \
-    --disable-macos-touchbar
-  ./waf build
+check() {
+  meson test -C build
 }
 
 package() {
-  cd "$srcdir/$_pkgname"
-  ./waf install --destdir="$pkgdir"
-  rm -rf "$pkgdir/usr/share/applications/"
-  rm -rf "$pkgdir/usr/share/doc/mpv/mplayer-input.conf"
-  rm -rf "$pkgdir/usr/share/doc/mpv/restore-old-bindings.conf"
-  rm -rf "$pkgdir/usr/share/icons/"
+  meson install -C build --destdir "${pkgdir}"
+
+  # delete private entries only required for static linking 
+  #sed -i -e '/Requires.private/d' -e '/Libs.private/d' "${pkgdir}"/usr/lib/pkgconfig/mpv.pc
+
+  install -m0644 "${_pkgname}"/DOCS/{encoding.rst,tech-overview.txt} \
+    "${pkgdir}"/usr/share/doc/mpv
+
+  install -m0644 "${_pkgname}"/TOOLS/lua/* \
+    -D -t "${pkgdir}"/usr/share/mpv/scripts
+
+  rm -r "$pkgdir/etc/"
+  rm -r "$pkgdir/usr/share/applications/"
+  rm -r "$pkgdir/usr/share/doc/mpv/mplayer-input.conf"
+  rm -r "$pkgdir/usr/share/doc/mpv/restore-old-bindings.conf"
+  rm -r "$pkgdir/usr/share/icons/"
 }
diff --git a/msmtp/PKGBUILD b/msmtp/PKGBUILD
index c5f4060..8289789 100644
--- a/msmtp/PKGBUILD
+++ b/msmtp/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=msmtp
 pkgname=$_pkgname-jxir
-pkgver=1.8.24.r9.gb3500e2
+pkgver=1.8.25.r4.gf789ee1
 pkgrel=1
 pkgdesc='A small, fast SMTP client'
 arch=('x86_64')
diff --git a/mutt/PKGBUILD b/mutt/PKGBUILD
index ae7d4fb..f37823d 100644
--- a/mutt/PKGBUILD
+++ b/mutt/PKGBUILD
@@ -2,13 +2,13 @@
 
 _pkgname=mutt
 pkgname=$_pkgname-jxir
-pkgver=1.12.2.r229.g40e7c914
+pkgver=2.2.12.r69.g354c5b11
 pkgrel=1
 pkgdesc='Small but very powerful text-based mail client'
 arch=('x86_64')
 url='http://www.mutt.org'
 license=('GPL')
-depends=('gpgme' 'libidn')
+depends=('gpgme' 'libidn' 'perl')
 makedepends=('git')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
@@ -29,21 +29,18 @@ build() {
     --enable-gpgme \
     --disable-pgp \
     --enable-sidebar \
-    --enable-hcache \
     --disable-nls \
     --disable-full-doc \
-    --with-curses=/usr \
-    --with-regex
+    --with-curses=/usr
   make
 }
 
 package() {
   cd "$srcdir/$_pkgname"
   make DESTDIR="$pkgdir" install
-  rm "$pkgdir"/etc/Muttrc.dist
-  rm "$pkgdir"/etc/mime.types{,.dist}
-  rm "$pkgdir"/usr/share/man/man1/pgpewrap.1
+  rm -r "$pkgdir"/etc/
   rm -r "$pkgdir"/usr/share/doc/mutt/samples/
-  rm "$pkgdir"/usr/share/doc/mutt/{applying-patches.txt,devel-notes.txt,patch-notes.txt,PGP-Notes.txt,smime-notes.txt}
+  rm "$pkgdir"/usr/share/doc/mutt/{applying-patches,devel-notes,patch-notes,PGP-Notes,smime-notes}.txt
   rm "$pkgdir"/usr/share/doc/mutt/{ChangeLog,COPYRIGHT,GPL,INSTALL,NEWS,README,README.SECURITY,README.SSL,TODO}
+  rm "$pkgdir"/usr/share/man/man1/{mutt_pgpring,pgpewrap}.1
 }
diff --git a/nsxiv/PKGBUILD b/nsxiv/PKGBUILD
index 3d7c5a4..4683b1f 100644
--- a/nsxiv/PKGBUILD
+++ b/nsxiv/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=nsxiv
 pkgname=$_pkgname-jxir
-pkgver=32.r2.gc08c267
+pkgver=32.r3.g3ca7339
 pkgrel=1
 pkgdesc='Neo (or New or Not) Simple (or Small or Suckless) X Image Viewer'
 arch=('x86_64')
diff --git a/pass/PKGBUILD b/pass/PKGBUILD
index 8626a84..941a406 100644
--- a/pass/PKGBUILD
+++ b/pass/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=pass
 pkgname=$_pkgname-jxir
-pkgver=1.7.4.r13.g0725291
+pkgver=1.7.4.r14.ge85315b
 pkgrel=1
 pkgdesc='Stores, retrieves, generates, and synchronizes passwords securely'
 arch=('any')
diff --git a/st/PKGBUILD b/st/PKGBUILD
index c9bbd51..484b06c 100644
--- a/st/PKGBUILD
+++ b/st/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=st
 pkgname=$_pkgname-jxir
-pkgver=0.9.r18.gea2ee01
+pkgver=0.9.r18.gb6d2fa7
 pkgrel=1
 pkgdesc='A simple virtual terminal emulator for X'
 arch=('x86_64')