diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 4838c0cbb..4ea5a1a1c 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -649,7 +649,10 @@ jobs: printf '\n[marfrit]\nServer = https://packages.reauktion.de/arch/$arch\nSigLevel = Required\n' >> /etc/pacman.conf fi pacman -Sy --noconfirm - pacman -S --noconfirm marfrit/ffmpeg-v4l2-request-fourier + # Stock arch ffmpeg may already be installed from a prior fermi job; + # pacman -S --noconfirm defaults the [y/N] conflict prompt to N. + # Pipe yes to accept the swap (replaces= takes care of cleanup). + yes y | pacman -S marfrit/ffmpeg-v4l2-request-fourier - name: makepkg mpv-fourier run: | diff --git a/arch/mpv-fourier/PKGBUILD b/arch/mpv-fourier/PKGBUILD index 0f8eca282..09b5b4969 100644 --- a/arch/mpv-fourier/PKGBUILD +++ b/arch/mpv-fourier/PKGBUILD @@ -23,7 +23,7 @@ pkgname=mpv-fourier _upstreampkg=mpv epoch=1 pkgver=0.41.0 -pkgrel=5 +pkgrel=6 pkgdesc='mpv with fourier-umbrella patches (vo_dmabuf_wayland plane-semantics fix slot)' arch=('aarch64') url='https://mpv.io/'