ffmpeg_4: almost drop (#336401)

pkgs/applications/kde/ffmpegthumbs.nix

@@ -1,7 +1,7 @@
 {
   mkDerivation, lib,
   extra-cmake-modules,
-  ffmpeg_4, kio, taglib
+  ffmpeg_7, kio, taglib
 }:
 
 mkDerivation {
@@ -11,5 +11,5 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ ffmpeg_4 kio taglib ];
+  buildInputs = [ ffmpeg_7 kio taglib ];
 }

pkgs/applications/science/networking/sumo/default.nix

@@ -1,4 +1,4 @@
-{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg_4, fox_1_6, gdal,
+{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg_7, 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 }:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     bzip2
     eigen
-    ffmpeg_4
+    ffmpeg_7
     fox_1_6
     gdal
     gl2ps

pkgs/applications/video/olive-editor/default.nix

@@ -6,7 +6,7 @@
 , which
 , frei0r
 , opencolorio
-, ffmpeg_4
+, ffmpeg_6
 , CoreFoundation
 , cmake
 , wrapQtAppsHook
@@ -70,7 +70,7 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    ffmpeg_4
+    ffmpeg_6
     frei0r
     opencolorio
     openimageio'

pkgs/applications/video/webcamoid/default.nix

@@ -1,6 +1,6 @@
-{ lib, fetchFromGitHub, pkg-config, libxcb, mkDerivation, cmake
+{ lib, fetchFromGitHub, fetchpatch2, pkg-config, libxcb, mkDerivation, cmake
 , qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2
-, ffmpeg_4, gst_all_1, libpulseaudio, alsa-lib, jack2
+, ffmpeg_7, gst_all_1, libpulseaudio, alsa-lib, jack2
 , v4l-utils }:
 mkDerivation rec {
   pname = "webcamoid";
@@ -13,10 +13,18 @@ mkDerivation rec {
     owner = "webcamoid";
   };
 
+  patches = [
+    # Update mediawriterffmpeg.cpp for ffmpeg-7.0
+    (fetchpatch2 {
+      url = "https://github.com/webcamoid/webcamoid/commit/b4864f13ec8c2ec93ebb5c13d9293cf9c02c93fd.patch?full_index=1";
+      hash = "sha256-QasfVocxAzRMME03JFRfz7QQYXQGq4TSFiBsKL1g/wU=";
+    })
+  ];
+
   buildInputs = [
     libxcb
     qtbase qtdeclarative qtquickcontrols qtquickcontrols2
-    ffmpeg_4
+    ffmpeg_7
     gst_all_1.gstreamer gst_all_1.gst-plugins-base
     alsa-lib libpulseaudio jack2
     v4l-utils

pkgs/by-name/al/alephone/package.nix

@@ -6,7 +6,7 @@
   alsa-lib,
   boost,
   curl,
-  ffmpeg_4,
+  ffmpeg_6,
   icoutils,
   libGLU,
   libmad,
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     boost
     curl
-    ffmpeg_4
+    ffmpeg_6
     libGLU
     libmad
     libogg

pkgs/by-name/ru/rustplayer/dynamic-lib.patch

@@ -6,8 +6,8 @@ index 9db9ac9..4546253 100644
  rodio_source = ['rodio']
  
  [dependencies]
--ffmpeg-sys-next = { git="https://github.com/Kingtous/rust-ffmpeg-sys.git", branch="fix/4.4.0", default-features=false, features=["avcodec", "avformat", "swresample", "static"] }
+-ffmpeg-sys-next = { git="https://github.com/KetaDotCC/rust-ffmpeg-sys.git", branch="master", default-features=false, features=["avcodec", "avformat", "swresample", "static"] }
-+ffmpeg-sys-next = { git="https://github.com/Kingtous/rust-ffmpeg-sys.git", branch="fix/4.4.0", default-features=false, features=["avcodec", "avformat", "swresample"] }
++ffmpeg-sys-next = { git="https://github.com/KetaDotCC/rust-ffmpeg-sys.git", branch="master", default-features=false, features=["avcodec", "avformat", "swresample"] }
  
  thiserror = "1.0"
  log = "0.4"

pkgs/by-name/ru/rustplayer/package.nix

@@ -4,18 +4,18 @@
 , pkg-config
 , openssl
 , alsa-lib
-, ffmpeg_4
+, ffmpeg_6
 }:
 
 rustPlatform.buildRustPackage {
   pname = "rustplayer";
-  version = "unstable-2022-12-29";
+  version = "1.1.2-unstable-2024-07-14";
 
   src = fetchFromGitHub {
     owner = "Kingtous";
     repo = "RustPlayer";
-    rev = "a369bc19ab4a8c568c73be25c5e6117e1ee5d848";
+    rev = "29a16f01912bc3e92008c7ae2f9569c8d7250bd3";
-    sha256 = "sha256-x82EdA7ezCzux1C85IcI2ZQ3M95sH6/k97Rv6lqc5eo=";
+    hash = "sha256-+36dLp54rfNK0lSSTG5+J6y51NUtBhtwfhD7L23J5aY=";
   };
 
   # This patch is from the source
@@ -26,11 +26,11 @@ rustPlatform.buildRustPackage {
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "ffmpeg-sys-next-4.4.0" = "sha256-TBgf+J+ud7nnVjf0r98/rujFPEayjEaVi+vnSE6/5Ak=";
+      "ffmpeg-sys-next-6.0.1" = "sha256-/CcyWDPeVLVSV8NfWFJhj1tGmuqLPnnyvVosIXM27NI=";
     };
   };
   nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
-  buildInputs = [ alsa-lib openssl ffmpeg_4 ];
+  buildInputs = [ alsa-lib openssl ffmpeg_6 ];
 
   checkFlags = [
     # network required

pkgs/development/libraries/ffmpeg/default.nix

@@ -34,6 +34,9 @@ let
 in
 
 rec {
+  # We keep FFmpeg 4 around for now mainly for a couple of binary
+  # packages (Spotify and REAPER). Please don’t 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";

pkgs/development/libraries/pangolin/default.nix

@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libGL, glew
-, xorg, ffmpeg_4, libjpeg, libpng, libtiff, eigen
+, xorg, ffmpeg_7, libjpeg, libpng, libtiff, eigen
 , Carbon, Cocoa
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     libGL
     glew
     xorg.libX11
-    ffmpeg_4
+    ffmpeg_7
     libjpeg
     libpng
     libtiff

pkgs/development/octave-modules/video/default.nix

@@ -1,18 +1,20 @@
 { buildOctavePackage
 , stdenv
 , lib
-, fetchurl
+, fetchFromGitHub
 , pkg-config
-, ffmpeg_4
+, ffmpeg_7
 }:
 
 buildOctavePackage rec {
   pname = "video";
-  version = "2.0.2";
+  version = "2.1.1";
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
+    owner = "Andy1978";
-    sha256 = "sha256-bZNaRnmJl5UF0bQMNoEWvoIXJaB0E6/V9eChE725OHY=";
+    repo = "octave-video";
+    rev = version;
+    hash = "sha256-JFySAu/3lCnfuFMNGYPzX2MqhsRi1+IyJQBcKB9vCo0=";
   };
 
   nativeBuildInputs = [
@@ -20,7 +22,7 @@ buildOctavePackage rec {
   ];
 
   propagatedBuildInputs = [
-    ffmpeg_4
+    ffmpeg_7
   ];
 
   meta = with lib; {
@@ -28,7 +30,5 @@ buildOctavePackage rec {
     license = with licenses; [ gpl3Plus bsd3 ];
     maintainers = with maintainers; [ KarlJoad ];
     description = "Wrapper for OpenCV's CvCapture_FFMPEG and CvVideoWriter_FFMPEG";
-    # error: declaration of 'panic' has a different language linkage
-    broken = stdenv.isDarwin;
   };
 }

pkgs/games/ultrastardx/default.nix

@@ -13,7 +13,7 @@
 , SDL2_gfx
 , SDL2_mixer
 , SDL2_net, SDL2_ttf
-, ffmpeg_4
+, ffmpeg_7
 , sqlite
 , zlib
 , libX11
@@ -25,7 +25,7 @@ let
   sharedLibs = [
     pcre portaudio freetype
     SDL2 SDL2_image SDL2_gfx SDL2_mixer SDL2_net SDL2_ttf
-    sqlite lua zlib libX11 libGLU libGL ffmpeg_4
+    sqlite lua zlib libX11 libGLU libGL ffmpeg_7
   ];
 
 in stdenv.mkDerivation rec {
@@ -45,26 +45,6 @@ in stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace src/config.inc.in \
       --subst-var-by libpcre_LIBNAME libpcre.so.1
-
-    # ultrastardx binds to libffmpeg (and sublibs), specifying a very restrictive
-    # upper bounds on the minor versions of .so files.
-    # We can assume ffmpeg_4 won’t break any major ABI compatibility, since it's
-    # effectively EOL
-    sed \
-      -e 's/^  LIBAVCODEC_MAX_VERSION_MINOR.*$/  LIBAVCODEC_MAX_VERSION_MINOR = 1000;/' \
-      -i src/lib/ffmpeg-4.0/avcodec.pas
-    sed \
-      -e 's/^  LIBAVFORMAT_MAX_VERSION_MINOR.*$/  LIBAVFORMAT_MAX_VERSION_MINOR = 1000;/' \
-      -i src/lib/ffmpeg-4.0/avformat.pas
-    sed \
-      -e 's/^  LIBAVUTIL_MAX_VERSION_MINOR.*$/  LIBAVUTIL_MAX_VERSION_MINOR = 1000;/' \
-      -i src/lib/ffmpeg-4.0/avutil.pas
-    sed \
-      -e 's/^  LIBSWRESAMPLE_MAX_VERSION_MINOR.*$/  LIBSWRESAMPLE_MAX_VERSION_MINOR = 1000;/' \
-      -i src/lib/ffmpeg-4.0/swresample.pas
-    sed \
-      -e 's/^  LIBSWSCALE_MAX_VERSION_MINOR.*$/  LIBSWSCALE_MAX_VERSION_MINOR = 1000;/' \
-      -i src/lib/ffmpeg-4.0/swscale.pas
   '';
 
   preBuild =

pkgs/misc/screensavers/electricsheep/default.nix

@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , autoreconfHook
 , wxGTK32
-, ffmpeg_4
+, ffmpeg_7
 , lua5_1
 , curl
 , libpng
@@ -19,22 +19,22 @@
 , glee
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "electricsheep";
-  version = "3.0.2-2019-10-05";
+  version = "3.0.2-unstable-2024-02-13";
 
   src = fetchFromGitHub {
     owner = "scottdraves";
-    repo = pname;
+    repo = "electricsheep";
-    rev = "37ba0fd692d6581f8fe009ed11c9650cd8174123";
+    rev = "5fbbb684752be06ccbea41639968aa7f1cc678dd";
-    sha256 = "sha256-v/+2dxOY/p6wNAywcFHUAfsZEJw31Syu2MacN/KeyWg=";
+    hash = "sha256-X3EZ1/VcLEU1GkZbskWSsqQWYTnsH3pbFDvDLpdLmcU=";
   };
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   buildInputs = [
     wxGTK32
-    ffmpeg_4
+    ffmpeg_7
     lua5_1
     curl
     libpng

pkgs/os-specific/linux/guvcview/default.nix

@@ -5,7 +5,7 @@
 , pkg-config
 , portaudio
 , SDL2
-, ffmpeg_4
+, ffmpeg_7
 , udev
 , libusb1
 , libv4l
@@ -27,12 +27,12 @@
 assert pulseaudioSupport -> libpulseaudio != null;
 
 stdenv.mkDerivation rec {
-  version = "2.0.6";
+  version = "2.1.0";
   pname = "guvcview";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/guvcview/source/guvcview-src-${version}.tar.gz";
+    url = "mirror://sourceforge/project/guvcview/source/guvcview-src-${version}.tar.bz2";
-    sha256 = "11byyfpkcik7wvf2qic77zjamfr2rhji97dpj1gy2fg1bvpiqf4m";
+    hash = "sha256-PZPkyfq40aepveGm278E1s+dNHwTS1EotFhqHZC2PPs=";
   };
 
   nativeBuildInputs = [
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     SDL2
     alsa-lib
-    ffmpeg_4
+    ffmpeg_7
     libusb1
     libv4l
     portaudio

pkgs/servers/guacamole-server/default.nix

@@ -1,11 +1,12 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch2
 , pkg-config
 , autoPatchelfHook
 , autoreconfHook
 , cairo
-, ffmpeg_4-headless
+, ffmpeg_7-headless
 , freerdp
 , libjpeg_turbo
 , libpng
@@ -35,6 +36,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ZrUaoWkZ3I/LxE7csDXXeUZ92jZDhkZ1c8EQU0gI1yY=";
   };
 
+  patches = [
+    # GUACAMOLE-1952: Add compatibility with FFMPEG 7.0
+    (fetchpatch2 {
+      url = "https://github.com/apache/guacamole-server/commit/cc8addf9beb90305037a32f9f861a893be4cae08.patch?full_index=1";
+      hash = "sha256-VCr2/8lQHKVdsdah9gvak4MjFHO+X4ixE5+zsvwIY1I=";
+    })
+  ];
+
   NIX_CFLAGS_COMPILE = [
     "-Wno-error=format-truncation"
     "-Wno-error=format-overflow"
@@ -52,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     cairo
-    ffmpeg_4-headless
+    ffmpeg_7-headless
     freerdp
     libjpeg_turbo
     libossp_uuid

pkgs/tools/graphics/vulkan-cts/default.nix

@@ -3,7 +3,7 @@
 , fetchurl
 , runCommand
 , cmake
-, ffmpeg_4
+, ffmpeg_7
 , glslang
 , libdrm
 , libglvnd
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   buildInputs = [
-    ffmpeg_4
+    ffmpeg_7
     libdrm
     libffi
     libglvnd

pkgs/tools/video/untrunc-anthwlock/default.nix

@@ -1,19 +1,19 @@
-{ lib, stdenv, fetchFromGitHub, ffmpeg_4, libui, unstableGitUpdater, wrapGAppsHook3 }:
+{ lib, stdenv, fetchFromGitHub, ffmpeg_7, libui, unstableGitUpdater, wrapGAppsHook3 }:
 
 stdenv.mkDerivation {
   pname = "untrunc-anthwlock";
-  version = "0-unstable-2021-11-21";
+  version = "0-unstable-2024-08-14";
 
   src = fetchFromGitHub {
     owner = "anthwlock";
     repo = "untrunc";
-    rev = "d72ec324fbc29eb00b53c7dafeef09f92308962b";
+    rev = "13cafedf59369db478af537fb909f0d7fd0eb85f";
-    hash = "sha256-h+aFPhlbEM6EfCKbsJPelBY5ys7kv5K4rbK/HTHeEcw=";
+    hash = "sha256-4GIPj8so7POEwxKZzFBoJTu76XKbGHYmXC/ILeo0dVE=";
   };
 
   nativeBuildInputs = [ wrapGAppsHook3 ];
 
-  buildInputs = [ ffmpeg_4 libui ];
+  buildInputs = [ ffmpeg_7 libui ];
 
   buildPhase = ''
     runHook preBuild

pkgs/tools/video/xjadeo/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, autoreconfHook, fetchFromGitHub, ffmpeg_4, freetype, libGLU
+{ lib, stdenv, autoreconfHook, fetchFromGitHub, ffmpeg_7, freetype, libGLU
 , libjack2, liblo, libX11, libXv, pkg-config, portmidi, xorg }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   buildInputs = [
-    ffmpeg_4
+    ffmpeg_7
     libjack2
     libX11
     xorg.libXext

pkgs/top-level/aliases.nix

@@ -448,9 +448,9 @@ mapAliases ({
   inherit (luaPackages) fennel; # Added 2022-09-24
   ferdi = throw "'ferdi' has been removed, upstream does not exist anymore and the package is insecure"; # Added 2024-08-22
   fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve
-  ffmpeg_5 = throw "ffmpeg_5 has been removed, please use a newer version or ffmpeg_4 for compatibility"; # Added 2024-07-12
+  ffmpeg_5 = throw "ffmpeg_5 has been removed, please use another version"; # Added 2024-07-12
-  ffmpeg_5-headless = throw "ffmpeg_5-headless has been removed, please use a newer version or ffmpeg_4-headless for compatibility"; # Added 2024-07-12
+  ffmpeg_5-headless = throw "ffmpeg_5-headless has been removed, please use another version"; # Added 2024-07-12
-  ffmpeg_5-full = throw "ffmpeg_5-full has been removed, please use a newer version or ffmpeg_4-full for compatibility"; # Added 2024-07-12
+  ffmpeg_5-full = throw "ffmpeg_5-full has been removed, please use another version"; # Added 2024-07-12
   FIL-plugins = fil-plugins; # Added 2024-06-12
   findimagedupes = throw "findimagedupes has been removed because the perl bindings are no longer compatible"; # Added 2023-07-10
   finger_bsd = bsd-finger;

pkgs/top-level/all-packages.nix

@@ -5639,7 +5639,7 @@ with pkgs;
   medusa = callPackage ../tools/security/medusa { };
 
   megasync = libsForQt5.callPackage ../applications/misc/megasync {
-    ffmpeg = ffmpeg_4;
+    ffmpeg = ffmpeg_7;
   };
 
   megacmd = callPackage ../applications/misc/megacmd { };