Unverified Commit 58bd9022 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

ffmpeg_4: almost drop (#336401)

parents de4193d4 778806c4

pkgs/applications/kde/ffmpegthumbs.nix

+2 −2
Original line number Diff line number Diff line 
{

  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

+2 −2
Original line number Diff line number Diff line 
{ 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

+2 −2
Original line number Diff line number Diff line
@@ -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

+11 −3
Original line number Diff line number Diff line 
{ 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

+2 −2
Original line number Diff line number Diff line
@@ -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