commit: 1be575db34ed86d9a05decf263a8f8088bb13239 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Thu Nov 6 13:28:43 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Thu Nov 6 13:57:27 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1be575db
media-video/ffmpeg: skip tests that are picky about zlib for zlib-ng At same time setup a placeholder variable to make it easy to skip more tests in the future if needed given need to be all be gathered in a single configure option. Will likely keep that there even no longer need to skip anything. A downside of --ignore-tests is that configure options are recorded and users will see the whole list of test skips in ffmpeg invocations (which will vary depending on which zlib it built against, not that it actually changes the code). Haven't verified the skip list for old ffmpeg versions, so it may be skipping some not-yet-existing tests (does pass though). Closes: https://bugs.gentoo.org/965737 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> media-video/ffmpeg/ffmpeg-4.4.5-r4.ebuild | 14 ++++++++++++++ media-video/ffmpeg/ffmpeg-4.4.6-r1.ebuild | 14 ++++++++++++++ media-video/ffmpeg/ffmpeg-6.1.3.ebuild | 14 ++++++++++++++ media-video/ffmpeg/ffmpeg-7.1.2.ebuild | 14 ++++++++++++++ media-video/ffmpeg/ffmpeg-8.0.ebuild | 14 ++++++++++++++ media-video/ffmpeg/ffmpeg-9999.ebuild | 14 ++++++++++++++ 6 files changed, 84 insertions(+) diff --git a/media-video/ffmpeg/ffmpeg-4.4.5-r4.ebuild b/media-video/ffmpeg/ffmpeg-4.4.5-r4.ebuild index d4caf866d4b3..3b7fde23b516 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.5-r4.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.5-r4.ebuild @@ -447,6 +447,20 @@ multilib_src_configure() { esac fi + # skipping tests is handled at configure-time + local skip_tests=() + + # zlib-ng is not bitexact w/ zlib producing mismatching md5sum (bug #965737) + has_version 'sys-libs/zlib-ng[compat]' && + skip_tests+=( + lavf-{apng{,.png},gray16be.png,png,rgb48be.png} + mov-mp4-frag-flush + vsynth{1,2,3}-{flashsv,mpng,zlib} + ) + + (( ${#skip_tests[@]} )) && + conf+=( --ignore-tests=$(IFS=,; echo "${skip_tests[*]}") ) + # import options from FFMPEG_IUSE_MAP local flag license mod v local -A optmap=() licensemap=() diff --git a/media-video/ffmpeg/ffmpeg-4.4.6-r1.ebuild b/media-video/ffmpeg/ffmpeg-4.4.6-r1.ebuild index 1b3d236608ff..02b6717afa09 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.6-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.6-r1.ebuild @@ -447,6 +447,20 @@ multilib_src_configure() { esac fi + # skipping tests is handled at configure-time + local skip_tests=() + + # zlib-ng is not bitexact w/ zlib producing mismatching md5sum (bug #965737) + has_version 'sys-libs/zlib-ng[compat]' && + skip_tests+=( + lavf-{apng{,.png},gray16be.png,png,rgb48be.png} + mov-mp4-frag-flush + vsynth{1,2,3}-{flashsv,mpng,zlib} + ) + + (( ${#skip_tests[@]} )) && + conf+=( --ignore-tests=$(IFS=,; echo "${skip_tests[*]}") ) + # import options from FFMPEG_IUSE_MAP local flag license mod v local -A optmap=() licensemap=() diff --git a/media-video/ffmpeg/ffmpeg-6.1.3.ebuild b/media-video/ffmpeg/ffmpeg-6.1.3.ebuild index bfb235e3dfcb..5a2967e8930a 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.3.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.3.ebuild @@ -505,6 +505,20 @@ multilib_src_configure() { esac fi + # skipping tests is handled at configure-time + local skip_tests=() + + # zlib-ng is not bitexact w/ zlib producing mismatching md5sum (bug #965737) + has_version 'sys-libs/zlib-ng[compat]' && + skip_tests+=( + lavf-{apng{,.png},gray16be.png,png,rgb48be.png} + mov-mp4-frag-flush + vsynth{1,2,3}-{flashsv,mpng,zlib} + ) + + (( ${#skip_tests[@]} )) && + conf+=( --ignore-tests=$(IFS=,; echo "${skip_tests[*]}") ) + # import options from FFMPEG_IUSE_MAP local flag license mod v local -A optmap=() licensemap=() diff --git a/media-video/ffmpeg/ffmpeg-7.1.2.ebuild b/media-video/ffmpeg/ffmpeg-7.1.2.ebuild index 165c65c83619..abcb1ae1c357 100644 --- a/media-video/ffmpeg/ffmpeg-7.1.2.ebuild +++ b/media-video/ffmpeg/ffmpeg-7.1.2.ebuild @@ -519,6 +519,20 @@ multilib_src_configure() { esac fi + # skipping tests is handled at configure-time + local skip_tests=() + + # zlib-ng is not bitexact w/ zlib producing mismatching md5sum (bug #965737) + has_version 'sys-libs/zlib-ng[compat]' && + skip_tests+=( + lavf-{apng{,.png},gray16be.png,png,rgb48be.png} + mov-mp4-frag-flush + vsynth{1,2,3}-{flashsv,mpng,zlib} + ) + + (( ${#skip_tests[@]} )) && + conf+=( --ignore-tests=$(IFS=,; echo "${skip_tests[*]}") ) + # import options from FFMPEG_IUSE_MAP local flag license mod v local -A optmap=() licensemap=() diff --git a/media-video/ffmpeg/ffmpeg-8.0.ebuild b/media-video/ffmpeg/ffmpeg-8.0.ebuild index 974c497eedcd..67ef4e1fa04f 100644 --- a/media-video/ffmpeg/ffmpeg-8.0.ebuild +++ b/media-video/ffmpeg/ffmpeg-8.0.ebuild @@ -515,6 +515,20 @@ multilib_src_configure() { esac fi + # skipping tests is handled at configure-time + local skip_tests=() + + # zlib-ng is not bitexact w/ zlib producing mismatching md5sum (bug #965737) + has_version 'sys-libs/zlib-ng[compat]' && + skip_tests+=( + lavf-{apng{,.png},gray16be.png,png,rgb48be.png} + mov-mp4-frag-flush + vsynth{1,2,3}-{flashsv,mpng,zlib} + ) + + (( ${#skip_tests[@]} )) && + conf+=( --ignore-tests=$(IFS=,; echo "${skip_tests[*]}") ) + # import options from FFMPEG_IUSE_MAP local flag license mod v local -A optmap=() licensemap=() diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 9d88f584adca..3d8cc53f07fb 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -520,6 +520,20 @@ multilib_src_configure() { esac fi + # skipping tests is handled at configure-time + local skip_tests=() + + # zlib-ng is not bitexact w/ zlib producing mismatching md5sum (bug #965737) + has_version 'sys-libs/zlib-ng[compat]' && + skip_tests+=( + lavf-{apng{,.png},gray16be.png,png,rgb48be.png} + mov-mp4-frag-flush + vsynth{1,2,3}-{flashsv,mpng,zlib} + ) + + (( ${#skip_tests[@]} )) && + conf+=( --ignore-tests=$(IFS=,; echo "${skip_tests[*]}") ) + # import options from FFMPEG_IUSE_MAP local flag license mod v local -A optmap=() licensemap=()
