push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,71 @@
{
callPackage,
darwin,
cudaPackages,
}:
let
mkFFmpeg =
initArgs: ffmpegVariant:
callPackage ./generic.nix (
{
inherit (darwin) xcode;
inherit (cudaPackages) cuda_cudart cuda_nvcc libnpp;
}
// (initArgs // { inherit ffmpegVariant; })
);
v4 = {
version = "4.4.6";
hash = "sha256-IM+1+WJWHuUNHZCVs+eKlmaEkfbvay4vQ2I/GbV1fqk=";
};
v6 = {
version = "6.1.2";
hash = "sha256-h/N56iKkAR5kH+PRQceWZvHe3k+70KWMDEP5iVq/YFQ=";
};
v7 = {
version = "7.1.1";
hash = "sha256-GyS8imOqfOUPxXrzCiQtzCQIIH6bvWmQAB0fKUcRsW4=";
};
v8 = {
version = "8.0";
hash = "sha256-okNZ1/m/thFAY3jK/GSV0+WZFnjrMr8uBPsOdH6Wq9E=";
};
in
rec {
# We keep FFmpeg 4 around for now mainly for a couple of binary
# packages (Spotify and REAPER). Please dont add new source packages
# that depend on this version.
ffmpeg_4 = mkFFmpeg v4 "small";
ffmpeg_4-headless = mkFFmpeg v4 "headless";
ffmpeg_4-full = mkFFmpeg v4 "full";
ffmpeg_6 = mkFFmpeg v6 "small";
ffmpeg_6-headless = mkFFmpeg v6 "headless";
ffmpeg_6-full = mkFFmpeg v6 "full";
ffmpeg_7 = mkFFmpeg v7 "small";
ffmpeg_7-headless = mkFFmpeg v7 "headless";
ffmpeg_7-full = mkFFmpeg v7 "full";
ffmpeg_8 = mkFFmpeg v8 "small";
ffmpeg_8-headless = mkFFmpeg v8 "headless";
ffmpeg_8-full = mkFFmpeg v8 "full";
# Please make sure this is updated to new major versions once they
# build and work on all the major platforms. If absolutely necessary
# due to severe breaking changes, the bump can wait a little bit to
# give the most proactive users time to migrate, but dont hold off
# for too long.
#
# Packages which depend on FFmpeg should generally use these
# unversioned aliases to allow for quicker migration to new releases,
# but can pin one of the versioned variants if they do not work with
# the current default version.
ffmpeg = ffmpeg_7;
ffmpeg-headless = ffmpeg_7-headless;
ffmpeg-full = ffmpeg_7-full;
}

View File

@@ -0,0 +1,10 @@
diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak
index 869376dd18..d9348ee837 100644
--- a/tests/fate/ffmpeg.mak
+++ b/tests/fate/ffmpeg.mak
@@ -266,4 +266,4 @@
# test matching by stream disposition
fate-ffmpeg-spec-disposition: CMD = framecrc -i $(TARGET_SAMPLES)/mpegts/pmtchange.ts -map '0:disp:visual_impaired+descriptions:1' -c copy
-FATE_FFMPEG-$(call FRAMECRC, MPEGTS,,) += fate-ffmpeg-spec-disposition
+FATE_SAMPLES_FFMPEG-$(call FRAMECRC, MPEGTS,,) += fate-ffmpeg-spec-disposition

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,13 @@
diff --git a/configure b/configure
index ffa407d53d..f3e223cfac 100755
--- a/configure
+++ b/configure
@@ -6742,7 +6742,7 @@ if [ -z "$nvccflags" ]; then
nvccflags=$nvccflags_default
fi
-nvccflags="$nvccflags -std=c++11"
+nvccflags="$nvccflags -std=c++14"
if enabled x86_64 || enabled ppc64 || enabled aarch64; then
nvccflags="$nvccflags -m64"