Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ffmpeg: ffmpeg_6 -> ffmpeg_7 #337855

Merged
merged 4 commits into from
Sep 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions nixos/doc/manual/release-notes/rl-2411.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -391,9 +391,6 @@
- The `services.mxisd` module has been removed as both [mxisd](https://github.com/kamax-matrix/mxisd) and [ma1sd](https://github.com/ma1uta/ma1sd) are not maintained any longer.
Consequently the package `pkgs.ma1sd` has also been removed.

- `ffmpeg_5` has been removed. Please use the unversioned `ffmpeg`,
pin a newer version, or if necessary pin `ffmpeg_4` for compatibility.

- The `xdg.portal.gtkUsePortal` option has been removed, as it had been deprecated for over 2 years. Using the `GTK_USE_PORTAL` environment variable in this manner is not intended nor encouraged by the GTK developers, but can still be done manually via `environment.sessionVariables`.

- The `services.trust-dns` module has been renamed to `services.hickory-dns`.
Expand Down Expand Up @@ -425,6 +422,14 @@
- Minimal installer ISOs are no longer built on the small channel.
Please obtain installer images from the full release channels.

- The default FFmpeg version is now 7, and FFmpeg 5 has been removed.
Please prefer using the package variants without a version suffix,
or pin FFmpeg 6 or 4 if necessary for compatibility.
Note that we keep old versions around only as required
to support packages in the tree,
and FFmpeg 4 especially should be avoided in favour of newer versions
as it may be removed soon.

## Other Notable Changes {#sec-release-24.11-notable-changes}

<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
Expand Down
4 changes: 2 additions & 2 deletions nixos/modules/services/video/go2rtc/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ in
ffmpeg = {
bin = mkOption {
type = path;
default = lib.getExe pkgs.ffmpeg_7-headless;
defaultText = literalExpression "lib.getExe pkgs.ffmpeg_7-headless";
default = lib.getExe pkgs.ffmpeg-headless;
defaultText = literalExpression "lib.getExe pkgs.ffmpeg-headless";
description = ''
The ffmpeg package to use for transcoding.
'';
Expand Down
6 changes: 3 additions & 3 deletions pkgs/applications/audio/audacity/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
, libid3tag
, libopus
, libuuid
, ffmpeg_7
, ffmpeg
, soundtouch
, pcre
, portaudio # given up fighting their portaudio.patch?
Expand Down Expand Up @@ -95,7 +95,7 @@ stdenv.mkDerivation rec {

buildInputs = [
expat
ffmpeg_7
ffmpeg
file
flac
gtk3
Expand Down Expand Up @@ -179,7 +179,7 @@ stdenv.mkDerivation rec {
postFixup = lib.optionalString stdenv.isLinux ''
wrapProgram "$out/bin/audacity" \
"''${gappsWrapperArgs[@]}" \
--prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg_7 ]} \
--prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg ]} \
--suffix AUDACITY_MODULES_PATH : "$out/lib/audacity/modules" \
--suffix AUDACITY_PATH : "$out/share/audacity"
'' + lib.optionalString stdenv.isDarwin ''
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/keyfinder-cli/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, ffmpeg_7, libkeyfinder, fftw }:
{ lib, stdenv, fetchFromGitHub, ffmpeg, libkeyfinder, fftw }:

stdenv.mkDerivation rec {
pname = "keyfinder-cli";
Expand All @@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
hash = "sha256-9/+wzPTaQ5PfPiqTZ5EuHdswXJgfgnvAul/FeeDbbJA=";
};

buildInputs = [ ffmpeg_7 libkeyfinder fftw ];
buildInputs = [ ffmpeg libkeyfinder fftw ];

makeFlags = [ "PREFIX=$(out)" ];

Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/moc/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
, musepackSupport ? true, libmpc, libmpcdec, taglib
, vorbisSupport ? true, libvorbis
, speexSupport ? true, speex
, ffmpegSupport ? true, ffmpeg_7
, ffmpegSupport ? true, ffmpeg
, sndfileSupport ? true, libsndfile
, wavpackSupport ? true, wavpack
# Misc
Expand Down Expand Up @@ -74,7 +74,7 @@ stdenv.mkDerivation {
++ lib.optionals musepackSupport [ libmpc libmpcdec taglib ]
++ lib.optional vorbisSupport libvorbis
++ lib.optional speexSupport speex
++ lib.optional ffmpegSupport ffmpeg_7
++ lib.optional ffmpegSupport ffmpeg
++ lib.optional sndfileSupport libsndfile
++ lib.optional wavpackSupport wavpack
# Misc
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/pianobar/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ fetchFromGitHub, lib, stdenv, pkg-config, libao, json_c, libgcrypt, ffmpeg_7, curl }:
{ fetchFromGitHub, lib, stdenv, pkg-config, libao, json_c, libgcrypt, ffmpeg, curl }:

stdenv.mkDerivation rec {
pname = "pianobar";
Expand All @@ -13,7 +13,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ pkg-config ];
buildInputs = [
libao json_c libgcrypt ffmpeg_7 curl
libao json_c libgcrypt ffmpeg curl
];

makeFlags = [ "PREFIX=$(out)" ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/emulators/retroarch/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
, alsa-lib
, dbus
, fetchFromGitHub
, ffmpeg_7
, ffmpeg
, flac
, freetype
, gamemode
Expand Down Expand Up @@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
lib.optional (runtimeLibs != [ ]) makeWrapper;

buildInputs = [
ffmpeg_7
ffmpeg
flac
freetype
libGL
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/openboard/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch2, copyDesktopItems, makeDesktopItem, qmake
, qtbase, qtxmlpatterns, qttools, qtwebengine, libGL, fontconfig, openssl, poppler, wrapQtAppsHook
, ffmpeg_7, libva, alsa-lib, SDL, x264, libvpx, libvorbis, libtheora, libogg
, ffmpeg, libva, alsa-lib, SDL, x264, libvpx, libvorbis, libtheora, libogg
, libopus, lame, fdk_aac, libass, quazip, libXext, libXfixes }:

let
Expand Down Expand Up @@ -68,7 +68,7 @@ in stdenv.mkDerivation (finalAttrs: {
fontconfig
openssl
poppler
ffmpeg_7
ffmpeg
libva
alsa-lib
SDL
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/kde/ffmpegthumbs.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules,
ffmpeg_7, kio, taglib
ffmpeg, kio, taglib
}:

mkDerivation {
Expand All @@ -11,5 +11,5 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ ffmpeg_7 kio taglib ];
buildInputs = [ ffmpeg kio taglib ];
}
4 changes: 2 additions & 2 deletions pkgs/applications/science/networking/sumo/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg_7, fox_1_6, gdal,
{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg, fox_1_6, gdal,
git, gl2ps, gpp , gtest, jdk, libGL, libGLU, libX11, libjpeg,
libpng, libtiff, libxcrypt, openscenegraph , proj, python3,
python3Packages, stdenv, swig, xercesc, xorg, zlib }:
Expand All @@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [
bzip2
eigen
ffmpeg_7
ffmpeg
fox_1_6
gdal
gl2ps
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/video/dvdstyler/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
, docbook-xsl-nons
, dvdauthor
, dvdplusrwtools
, ffmpeg_7
, ffmpeg
, flex
, fontconfig
, gettext
Expand Down Expand Up @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
cdrtools
dvdauthor
dvdplusrwtools
ffmpeg_7
ffmpeg
fontconfig
glib
libexif
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/video/mplayer/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg_7
{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg
, aalibSupport ? true, aalib
, fontconfigSupport ? true, fontconfig, freefont_ttf
, fribidiSupport ? true, fribidi
Expand Down Expand Up @@ -86,7 +86,7 @@ stdenv.mkDerivation rec {

depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkg-config yasm ];
buildInputs = [ freetype ffmpeg_7 ]
buildInputs = [ freetype ffmpeg ]
++ lib.optional aalibSupport aalib
++ lib.optional fontconfigSupport fontconfig
++ lib.optional fribidiSupport fribidi
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/video/simplescreenrecorder/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, alsa-lib, ffmpeg_7, libjack2, libX11, libXext, libXinerama, qtx11extras
{ lib, stdenv, mkDerivation, fetchFromGitHub, alsa-lib, ffmpeg, libjack2, libX11, libXext, libXinerama, qtx11extras
, libXfixes, libGLU, libGL, pkg-config, libpulseaudio, libv4l, qtbase, qttools, cmake, ninja, nix-update-script
}:

Expand Down Expand Up @@ -29,7 +29,7 @@ mkDerivation rec {

nativeBuildInputs = [ pkg-config cmake ninja ];
buildInputs = [
alsa-lib ffmpeg_7 libjack2 libX11 libXext libXfixes libXinerama libGLU libGL
alsa-lib ffmpeg libjack2 libX11 libXext libXfixes libXinerama libGLU libGL
libpulseaudio libv4l qtbase qttools qtx11extras
];

Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/video/webcamoid/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, fetchpatch2, pkg-config, libxcb, mkDerivation, cmake
, qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2
, ffmpeg_7, gst_all_1, libpulseaudio, alsa-lib, jack2
, ffmpeg, gst_all_1, libpulseaudio, alsa-lib, jack2
, v4l-utils }:
mkDerivation rec {
pname = "webcamoid";
Expand All @@ -24,7 +24,7 @@ mkDerivation rec {
buildInputs = [
libxcb
qtbase qtdeclarative qtquickcontrols qtquickcontrols2
ffmpeg_7
ffmpeg
gst_all_1.gstreamer gst_all_1.gst-plugins-base
alsa-lib libpulseaudio jack2
v4l-utils
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/at/attract-mode/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
fetchFromGitHub,
pkg-config,
expat,
ffmpeg_7,
ffmpeg,
freetype,
libarchive,
libjpeg,
Expand Down Expand Up @@ -32,7 +32,7 @@ stdenv.mkDerivation {
buildInputs =
[
expat
ffmpeg_7
ffmpeg
freetype
libarchive
libjpeg
Expand Down
8 changes: 4 additions & 4 deletions pkgs/by-name/cc/ccextractor/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
zlib,
utf8proc,
freetype,
ffmpeg_7,
ffmpeg,
libarchive,
curl,
libiconv,
Expand Down Expand Up @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
zlib
utf8proc
freetype
ffmpeg_7
ffmpeg
libarchive
curl
libiconv
Expand All @@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
];

env = {
FFMPEG_INCLUDE_DIR = "${lib.getDev ffmpeg_7}/include";
FFMPEG_INCLUDE_DIR = "${lib.getDev ffmpeg}/include";

# Upstream’s FFmpeg binding crate needs an explicit path to a shared
# object to do dynamic linking. The key word is *an* explicit path;
Expand All @@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
"swresample"
"swscale"
];
ffmpegLibDir = "${lib.getLib ffmpeg_7}/lib";
ffmpegLibDir = "${lib.getLib ffmpeg}/lib";
ffmpegLibExt = stdenv.hostPlatform.extensions.library;
ffmpegLibPath = ffmpegLibName: "${ffmpegLibDir}/lib${ffmpegLibName}.${ffmpegLibExt}";
ffmpegLinkerScript = writeTextFile {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/fe/febio-studio/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
tetgenSupport ? true,
tetgen,
ffmpegSupport ? true,
ffmpeg_7,
ffmpeg,
dicomSupport ? false,
dcmtk,
withModelRepo ? true,
Expand Down Expand Up @@ -75,7 +75,7 @@ stdenv'.mkDerivation (finalAttrs: {
libssh
]
++ lib.optional tetgenSupport tetgen
++ lib.optional ffmpegSupport ffmpeg_7
++ lib.optional ffmpegSupport ffmpeg
++ lib.optional dicomSupport dcmtk;

meta = {
Expand Down
6 changes: 3 additions & 3 deletions pkgs/by-name/me/metadata/package.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ lib
, fetchFromGitHub
, pkg-config
, ffmpeg_7
, ffmpeg
, rustPlatform
, glib
, installShellFiles
Expand Down Expand Up @@ -35,11 +35,11 @@ rustPlatform.buildRustPackage rec {
'';

buildInputs = [
ffmpeg_7
ffmpeg
glib
];

env.FFMPEG_DIR = ffmpeg_7.dev;
env.FFMPEG_DIR = ffmpeg.dev;

meta = {
description = "Media metadata parser and formatter designed for human consumption, powered by FFmpeg";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/mu/musly/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
ninja,
pkg-config,
eigen,
ffmpeg_7,
ffmpeg,
libresample,
kissfft,
}:
Expand Down Expand Up @@ -47,7 +47,7 @@ stdenv.mkDerivation {

buildInputs = [
eigen
ffmpeg_7
ffmpeg
libresample
kissfft
];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/chromaprint/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
, fetchpatch2
, cmake
, ninja
, ffmpeg_7
, ffmpeg
, darwin
, zlib
}:
Expand Down Expand Up @@ -42,7 +42,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ cmake ninja ];

buildInputs = [ ffmpeg_7 ] ++ lib.optionals stdenv.isDarwin
buildInputs = [ ffmpeg ] ++ lib.optionals stdenv.isDarwin
(with darwin.apple_sdk.frameworks; [ Accelerate CoreGraphics CoreVideo zlib ]);

cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ];
Expand Down
20 changes: 13 additions & 7 deletions pkgs/development/libraries/ffmpeg/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,17 @@ rec {
ffmpeg_7-headless = mkFFmpeg v7 "headless";
ffmpeg_7-full = mkFFmpeg v7 "full";

# Please make sure this is updated to the latest version on the next major
# update to ffmpeg
# Packages which use ffmpeg as a library, should pin to the relevant major
# version number which the upstream support.
ffmpeg = ffmpeg_6;
ffmpeg-headless = ffmpeg_6-headless;
ffmpeg-full = ffmpeg_6-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 don’t 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;
}
Loading
Loading