marfrit/marfrit-packages
0
0
Fork 1
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fourier-debian: fix mpv Conflicts: + daedalus ffmpeg conflict #35

Merged
marfrit merged 1 commits from noether/fourier-debian-fixes-mpv-daedalus into main 2026-05-19 06:42:31 +00:00
Conversation 0 Commits 1 Files Changed 2
+27 -3
marfrit commented 2026-05-19 06:42:24 +00:00
Owner
Copy Link
Copy Source

Fixes the two deterministic failures from run 115 (CI debian jobs):

mpv-fourier-debian (task 566): dpkg-deb: alternatives ('|') not allowed in 'Conflicts' field — debian/mpv-fourier/build-deb.sh wrote Conflicts: mpv, libmpv2 | libmpv1. Debian policy forbids alternatives in Conflicts. Split into Conflicts: mpv, libmpv2, libmpv1.

daedalus-v4l2-debian (task 563): pacman -Syu pulled stock arch ffmpeg which conflicts with ffmpeg-v4l2-request-fourier already installed on fermi by the earlier mpv-fourier-aarch64 job (which configures [marfrit] + pre-installs the fourier ffmpeg). Drop ffmpeg from pacman line; mirror the [marfrit] + pre-install pattern from mpv-fourier-debian.

Test plan

  • CI green for both jobs on rerun
  • mpv-fourier + daedalus-v4l2 .debs appear in packages.reauktion.de/debian/pool/main/{m,d}/
  • daedalus-v4l2-dkms-debian (which needs: daedalus-v4l2-debian) also runs + publishes
Fixes the two deterministic failures from run 115 (CI debian jobs): **mpv-fourier-debian (task 566)**: `dpkg-deb: alternatives ('|') not allowed in 'Conflicts' field` — `debian/mpv-fourier/build-deb.sh` wrote `Conflicts: mpv, libmpv2 | libmpv1`. Debian policy forbids alternatives in Conflicts. Split into `Conflicts: mpv, libmpv2, libmpv1`. **daedalus-v4l2-debian (task 563)**: pacman -Syu pulled stock arch `ffmpeg` which conflicts with `ffmpeg-v4l2-request-fourier` already installed on fermi by the earlier mpv-fourier-aarch64 job (which configures [marfrit] + pre-installs the fourier ffmpeg). Drop `ffmpeg` from pacman line; mirror the [marfrit] + pre-install pattern from mpv-fourier-debian. ## Test plan - [ ] CI green for both jobs on rerun - [ ] mpv-fourier + daedalus-v4l2 .debs appear in packages.reauktion.de/debian/pool/main/{m,d}/ - [ ] daedalus-v4l2-dkms-debian (which `needs: daedalus-v4l2-debian`) also runs + publishes
marfrit added 1 commit 2026-05-19 06:42:25 +00:00
fourier-debian: fix mpv Conflicts: + daedalus ffmpeg conflict e236ec1f42 
Two deterministic CI failures from run 115 (PR #34 wiring):

mpv-fourier-debian (task 566): dpkg-deb refuses `Conflicts: pkg1 |
pkg2` — Debian policy doesn't allow alternatives in Conflicts.
Split into separate entries.

daedalus-v4l2-debian (task 563): pacman -Syu pulled stock arch
ffmpeg which conflicts with the already-installed
ffmpeg-v4l2-request-fourier left behind by the earlier
mpv-fourier-aarch64 job (it configures [marfrit] + pre-installs
the fourier ffmpeg).  Drop 'ffmpeg' from the pacman line; mirror
the [marfrit]+pre-install step from mpv-fourier-debian.  Daedalus
only needs libavcodec/libavformat headers which the fourier
package supplies.
marfrit merged commit f22f8f03ac into main 2026-05-19 06:42:31 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
marfrit (Markus Fritsche)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: marfrit/marfrit-packages#35
Delete Branch "noether/fourier-debian-fixes-mpv-daedalus"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?