[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg-compat/

[Ionen Wolkens]

commit:     fab76beee082d9d661cd12d6fb94dff02a627588
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  6 13:40:10 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=fab76bee

media-video/ffmpeg-compat: sync with ffmpeg

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 media-video/ffmpeg-compat/ffmpeg-compat-4.4.5-r2.ebuild | 14 ++++++++++++++
 media-video/ffmpeg-compat/ffmpeg-compat-4.4.6-r1.ebuild | 14 ++++++++++++++
 media-video/ffmpeg-compat/ffmpeg-compat-6.1.3.ebuild    | 14 ++++++++++++++
 media-video/ffmpeg-compat/ffmpeg-compat-7.1.2.ebuild    | 14 ++++++++++++++
 4 files changed, 56 insertions(+)

diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5-r2.ebuild 
b/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5-r2.ebuild
index d4caf866d4b3..3b7fde23b516 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5-r2.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5-r2.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-compat/ffmpeg-compat-4.4.6-r1.ebuild 
b/media-video/ffmpeg-compat/ffmpeg-compat-4.4.6-r1.ebuild
index 1b3d236608ff..02b6717afa09 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-4.4.6-r1.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-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-compat/ffmpeg-compat-6.1.3.ebuild 
b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.3.ebuild
index bfb235e3dfcb..5a2967e8930a 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.3.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-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-compat/ffmpeg-compat-7.1.2.ebuild 
b/media-video/ffmpeg-compat/ffmpeg-compat-7.1.2.ebuild
index 165c65c83619..abcb1ae1c357 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-7.1.2.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-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=()