From 80bda4d679891f6718674bdbba9fd14d892f7eed Mon Sep 17 00:00:00 2001 From: Markus Fritsche Date: Fri, 8 May 2026 17:34:50 +0000 Subject: [PATCH] mpv-fourier pkgrel=6 + workflow: pipe yes through pacman -S to accept swap Run #69 hit: ffmpeg-v4l2-request-fourier-2:... and ffmpeg-2:8.1.1-1 are in conflict. Remove ffmpeg? [y/N] error: unresolvable package conflicts detected pacman -S --noconfirm defaults [y/N] prompts to N and refuses the swap. Switch to `yes y | pacman -S ...` (without --noconfirm) to accept the conflict-removal prompt cleanly. Co-Authored-By: Claude Opus 4.7 (1M context) --- .gitea/workflows/build.yml | 5 ++++- arch/mpv-fourier/PKGBUILD | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) 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/'