Created attachment 246502 [details] ffmpeg4: fix build with Texinfo 7.1 multimedia/ffmpeg4 fails to build now that print/texinfo has been updated to 7.1. It can be fixed by merging this set of upstream patches: https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/c980dd7a976635426f129417836251740e19b54b https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/bfbd5954e50e407693932b3900ca77c3daee26d7 https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/f01fdedb69e4accb1d1555106d8f682ff1f1ddc7 Patch attached.
I can't reproduce inside poudriere. Tested at least on FreeBSD 13.2 amd64, 12.4 i386. Is this a fix for non-default options or an update that hasn't landed yet? Looking at the code it should be using texi2html, so texinfo error is probably due to unclean build. Can you document the build error (excerpt) being fixed in the commit message? Also use "after <hash>" (in summary) or "Fixes: <hash>" (in body) to document which commit regressed the build. Both are important for posterity or deciding whether to cherry-pick into /quarterly or local branch (for vendors with private forks). Can you move the links from "Obtained from" into the patch as header? This helps deciding whether to to prune patches on updates. See files/patch-svtav1 or files/patch-vmaf or files/patch-libavfilter_vf__lensfun.c as examples. Also, use /commitdiff/ links instead of /commit/ to make it easier to see the upstream patch content. In the commit message "Obtained from: URL, URL, etc" can be dropped (due to being obvious when looking at the patch) or replaced with "Obtained from: upstream". Besides, submit patches via "git format-patch" suitable for applying via "git am" which helps to avoid mistakes if landed by someone else.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=fde4994308794c3f4925396332f8535e50ce9295 commit fde4994308794c3f4925396332f8535e50ce9295 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-11-24 10:52:56 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2023-11-24 10:58:28 +0000 multimedia/ffmpeg: disable untracked dependency on print/texinfo $ pkg install texinfo $ make configure [...] texi2html enabled no makeinfo enabled yes makeinfo supports HTML yes PR: 275268 multimedia/ffmpeg/Makefile | 1 + multimedia/ffmpeg4/Makefile | 1 + 2 files changed, 2 insertions(+)
A commit in branch 2023Q4 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=c159c53a6d9942d44cfd753e3654d633fc1ca8c2 commit c159c53a6d9942d44cfd753e3654d633fc1ca8c2 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-11-24 10:52:56 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2023-11-24 10:59:47 +0000 multimedia/ffmpeg: disable untracked dependency on print/texinfo $ pkg install texinfo $ make configure [...] texi2html enabled no makeinfo enabled yes makeinfo supports HTML yes PR: 275268 (cherry picked from commit fde4994308794c3f4925396332f8535e50ce9295) multimedia/ffmpeg/Makefile | 1 + multimedia/ffmpeg4/Makefile | 1 + 2 files changed, 2 insertions(+)
Let's keep the statu quo. If you want to switch from texi2html to texinfo (makeinfo) file a new bug.