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: default to ffmpeg_4 #89264

Merged
merged 2 commits into from
Jun 12, 2020
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
4 changes: 2 additions & 2 deletions pkgs/applications/audio/amarok/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
, qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine
, karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem
, fftw, phonon, plasma-framework, threadweaver
, curl, ffmpeg, gdk-pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
, curl, ffmpeg_3, gdk-pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
}:

mkDerivation rec {
Expand All @@ -26,7 +26,7 @@ mkDerivation rec {
qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine
karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem
phonon plasma-framework threadweaver
curl fftw ffmpeg gdk-pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static
curl fftw ffmpeg_3 gdk-pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static
pcre snappy taglib taglib_extras
];

Expand Down
8 changes: 4 additions & 4 deletions pkgs/applications/audio/ardour/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
, curl
, dbus
, doxygen
, ffmpeg
, ffmpeg_3
, fftw
, fftwSinglePrec
, flac
Expand Down Expand Up @@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
cppunit
curl
dbus
ffmpeg
ffmpeg_3
fftw
fftwSinglePrec
flac
Expand Down Expand Up @@ -149,8 +149,8 @@ stdenv.mkDerivation rec {
sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript
patchShebangs ./tools/
substituteInPlace libs/ardour/video_tools_paths.cc \
--replace 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg}/bin/ffmpeg");' \
--replace 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg}/bin/ffprobe");'
--replace 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg_3}/bin/ffmpeg");' \
--replace 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg_3}/bin/ffprobe");'
'';

postInstall = ''
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/audacious/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3
, libmowgli, dbus-glib, libxml2, xorg, gnome3, alsaLib
, libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis
, libcdio, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b
, libcdio, libcddb, flac, ffmpeg_3, mpg123, libcue, libmms, libbs2b
, libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack
, neon, faad2, lame, libnotify, libsidplayfp
}:
Expand All @@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
gettext glib gtk3 libmowgli dbus-glib libxml2
xorg.libXcomposite gnome3.adwaita-icon-theme alsaLib libjack2
libpulseaudio fluidsynth libmad libogg libvorbis libcdio
libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile
libcddb flac ffmpeg_3 mpg123 libcue libmms libbs2b libsndfile
libmodplug libsamplerate soxr lirc curl wavpack neon faad2
lame libnotify libsidplayfp
];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/audacious/qt-5.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
mkDerivation, lib, fetchurl, fetchpatch,
gettext, pkgconfig,
qtbase,
alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b,
alsaLib, curl, faad2, ffmpeg_3, flac, fluidsynth, gdk-pixbuf, lame, libbs2b,
libcddb, libcdio, libcue, libjack2, libmad, libmms, libmodplug,
libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp,
libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr,
Expand Down Expand Up @@ -45,7 +45,7 @@ mkDerivation {
qtbase

# Plugin dependencies
alsaLib curl faad2 ffmpeg flac fluidsynth gdk-pixbuf lame libbs2b libcddb
alsaLib curl faad2 ffmpeg_3 flac fluidsynth gdk-pixbuf lame libbs2b libcddb
libcdio libcue libjack2 libmad libmms libmodplug libmowgli
libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile
libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/audacity/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchzip, wxGTK30, pkgconfig, file, gettext,
libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame,
expat, libid3tag, ffmpeg, soundtouch, /*, portaudio - given up fighting their portaudio.patch */
expat, libid3tag, ffmpeg_3, soundtouch, /*, portaudio - given up fighting their portaudio.patch */
autoconf, automake, libtool
}:

Expand Down Expand Up @@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
buildInputs = [
file gettext wxGTK30 expat alsaLib
libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil wxGTK30.gtk
ffmpeg libmad lame libvorbis flac soundtouch
ffmpeg_3 libmad lame libvorbis flac soundtouch
]; #ToDo: detach sbsms

enableParallelBuilding = true;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk-pixbuf
, wrapGAppsHook, gtk2, gtk3, harfbuzz, jdk, lib, xorg
, libbsd, libjack2, libpng, ffmpeg
, libbsd, libjack2, libpng, ffmpeg_3
, libxkbcommon
, makeWrapper, pixman, autoPatchelfHook
, xdg_utils, zenity, zlib }:
Expand Down Expand Up @@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
];

binPath = lib.makeBinPath [
xdg_utils zenity ffmpeg
xdg_utils zenity ffmpeg_3
];

installPhase = ''
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/bs1770gain/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ffmpeg, sox }:
{ stdenv, fetchurl, ffmpeg_3, sox }:

stdenv.mkDerivation rec {
pname = "bs1770gain";
Expand All @@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk";
};

buildInputs = [ ffmpeg sox ];
buildInputs = [ ffmpeg_3 sox ];

NIX_CFLAGS_COMPILE = "-Wno-error";

Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/cantata/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

, withTaglib ? true, taglib, taglib_extras
, withHttpStream ? true, qtmultimedia
, withReplaygain ? true, ffmpeg, speex, mpg123
, withReplaygain ? true, ffmpeg_3, speex, mpg123
, withMtp ? true, libmtp
, withOnlineServices ? true
, withDevices ? true, udisks2
Expand Down Expand Up @@ -50,7 +50,7 @@ in mkDerivation {

buildInputs = [ qtbase qtsvg ]
++ lib.optionals withTaglib [ taglib taglib_extras ]
++ lib.optionals withReplaygain [ ffmpeg speex mpg123 ]
++ lib.optionals withReplaygain [ ffmpeg_3 speex mpg123 ]
++ lib.optional withHttpStream qtmultimedia
++ lib.optional withCdda cdparanoia
++ lib.optional withCddb libcddb
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/carla/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg, jack2,
{ stdenv, fetchFromGitHub, alsaLib, file, fluidsynth, ffmpeg_3, jack2,
liblo, libpulseaudio, libsndfile, pkgconfig, python3Packages,
which, withFrontend ? true,
withQt ? true, qtbase ? null, wrapQtAppsHook ? null,
Expand Down Expand Up @@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
] ++ optional withFrontend pyqt5;

buildInputs = [
file liblo alsaLib fluidsynth ffmpeg jack2 libpulseaudio libsndfile
file liblo alsaLib fluidsynth ffmpeg_3 jack2 libpulseaudio libsndfile
] ++ pythonPath
++ optional withQt qtbase
++ optional withGtk2 gtk2
Expand Down
6 changes: 3 additions & 3 deletions pkgs/applications/audio/deadbeef/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
, aacSupport ? true, faad2 ? null
, opusSupport ? true, opusfile ? null
, wavpackSupport ? false, wavpack ? null
, ffmpegSupport ? false, ffmpeg ? null
, ffmpegSupport ? false, ffmpeg_3 ? null
, apeSupport ? true, yasm ? null
# misc plugins
, zipSupport ? true, libzip ? null
Expand Down Expand Up @@ -45,7 +45,7 @@ assert cdaSupport -> (libcdio != null && libcddb != null);
assert aacSupport -> faad2 != null;
assert opusSupport -> opusfile != null;
assert zipSupport -> libzip != null;
assert ffmpegSupport -> ffmpeg != null;
assert ffmpegSupport -> ffmpeg_3 != null;
assert apeSupport -> yasm != null;
assert artworkSupport -> imlib2 != null;
assert hotkeysSupport -> libX11 != null;
Expand Down Expand Up @@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
++ optional aacSupport faad2
++ optional opusSupport opusfile
++ optional zipSupport libzip
++ optional ffmpegSupport ffmpeg
++ optional ffmpegSupport ffmpeg_3
++ optional apeSupport yasm
++ optional artworkSupport imlib2
++ optional hotkeysSupport libX11
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/audio/dr14_tmeter/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
};

propagatedBuildInputs = with pkgs; [
python3Packages.numpy flac vorbis-tools ffmpeg faad2 lame
python3Packages.numpy flac vorbis-tools ffmpeg_3 faad2 lame
];

# There are no tests
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/kid3/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchurl
, pkgconfig, cmake, python, ffmpeg, phonon, automoc4
, pkgconfig, cmake, python, ffmpeg_3, phonon, automoc4
, chromaprint, docbook_xml_dtd_45, docbook_xsl, libxslt
, id3lib, taglib, mp4v2, flac, libogg, libvorbis
, zlib, readline , qtbase, qttools, qtmultimedia, qtquickcontrols
Expand All @@ -18,7 +18,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ wrapQtAppsHook ];
buildInputs = with stdenv.lib;
[ pkgconfig cmake python ffmpeg phonon automoc4
[ pkgconfig cmake python ffmpeg_3 phonon automoc4
chromaprint docbook_xml_dtd_45 docbook_xsl libxslt
id3lib taglib mp4v2 flac libogg libvorbis zlib readline
qtbase qttools qtmultimedia qtquickcontrols ];
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 @@ -14,7 +14,7 @@
, musepackSupport ? true, libmpc, libmpcdec, taglib
, vorbisSupport ? true, libvorbis
, speexSupport ? true, speex
, ffmpegSupport ? true, ffmpeg
, ffmpegSupport ? true, ffmpeg_3
, sndfileSupport ? true, libsndfile
, wavpackSupport ? true, wavpack
# Misc
Expand Down Expand Up @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec {
++ stdenv.lib.optionals musepackSupport [ libmpc libmpcdec taglib ]
++ opt vorbisSupport libvorbis
++ opt speexSupport speex
++ opt (ffmpegSupport && !withffmpeg4) ffmpeg
++ opt (ffmpegSupport && !withffmpeg4) ffmpeg_3
++ opt (ffmpegSupport && withffmpeg4) ffmpeg_4
++ opt sndfileSupport libsndfile
++ opt wavpackSupport wavpack
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/musikcube/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
, boost
, curl
, fetchFromGitHub
, ffmpeg
, ffmpeg_3
, lame
, libev
, libmicrohttpd
Expand Down Expand Up @@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
alsaLib
boost
curl
ffmpeg
ffmpeg_3
lame
libev
libmicrohttpd
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 @@
{ fetchurl, stdenv, pkgconfig, libao, json_c, libgcrypt, ffmpeg, curl }:
{ fetchurl, stdenv, pkgconfig, libao, json_c, libgcrypt, ffmpeg_3, curl }:

stdenv.mkDerivation rec {
name = "pianobar-2020.04.05";
Expand All @@ -10,7 +10,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ pkgconfig ];
buildInputs = [
libao json_c libgcrypt ffmpeg curl
libao json_c libgcrypt ffmpeg_3 curl
];

makeFlags = [ "PREFIX=$(out)" ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/qmmp/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
, curl, libmms
# input plugins
, libmad, taglib, libvorbis, libogg, flac, libmpcdec, libmodplug, libsndfile
, libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi
, libcdio, cdparanoia, libcddb, faad2, ffmpeg_3, wildmidi
# output plugins
, alsaLib, libpulseaudio
# effect plugins
Expand Down Expand Up @@ -44,7 +44,7 @@ mkDerivation rec {
curl libmms
# input plugins
libmad taglib libvorbis libogg flac libmpcdec libmodplug libsndfile
libcdio cdparanoia libcddb faad2 ffmpeg wildmidi
libcdio cdparanoia libcddb faad2 ffmpeg_3 wildmidi
# output plugins
alsaLib libpulseaudio
# effect plugins
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/r128gain/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ lib
, fetchFromGitHub
, substituteAll
, ffmpeg
, ffmpeg_3
, python3Packages
, sox
}:
Expand All @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
(
substituteAll {
src = ./ffmpeg-location.patch;
inherit ffmpeg;
ffmpeg = ffmpeg_3;
}
)
];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/audio/squeezelite/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
, alsaLib, flac, libmad, libvorbis, mpg123
, dsdSupport ? true
, faad2Support ? true, faad2
, ffmpegSupport ? true, ffmpeg
, ffmpegSupport ? true, ffmpeg_3
, opusSupport ? true, opusfile
, resampleSupport ? true, soxr
, sslSupport ? true, openssl
Expand Down Expand Up @@ -35,7 +35,7 @@ in stdenv.mkDerivation {

buildInputs = [ alsaLib flac libmad libvorbis mpg123 ]
++ optional faad2Support faad2
++ optional ffmpegSupport ffmpeg
++ optional ffmpegSupport ffmpeg_3
++ optional opusSupport opusfile
++ optional resampleSupport soxr
++ optional sslSupport openssl;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/gis/grass/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw
, cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas
, cairo, readline, ffmpeg_3, makeWrapper, wxGTK30, netcdf, blas
, proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid
}:

Expand All @@ -16,7 +16,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj
readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas
readline ffmpeg_3 makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas
libLAS proj-datumgrid ]
++ (with python2Packages; [ python dateutil wxPython30 numpy ]);

Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/graphics/pqiv/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig
, ffmpeg, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler
, ffmpeg_3, gtk3, imagemagick, libarchive, libspectre, libwebp, poppler
}:

stdenv.mkDerivation (rec {
Expand All @@ -14,7 +14,7 @@ stdenv.mkDerivation (rec {
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ffmpeg gtk3 imagemagick libarchive libspectre libwebp poppler ];
buildInputs = [ ffmpeg_3 gtk3 imagemagick libarchive libspectre libwebp poppler ];

prePatch = "patchShebangs .";

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, kio
ffmpeg_3, kio
}:

mkDerivation {
Expand All @@ -11,5 +11,5 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ ffmpeg kio ];
buildInputs = [ ffmpeg_3 kio ];
}
4 changes: 2 additions & 2 deletions pkgs/applications/kde/k3b.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
, flac, lame, libmad, libmpcdec, libvorbis
, libsamplerate, libsndfile, taglib
, cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager
, ffmpeg, libmusicbrainz3, normalize, sox, transcode, kinit
, ffmpeg_3, libmusicbrainz3, normalize, sox, transcode, kinit
}:

mkDerivation {
Expand All @@ -28,7 +28,7 @@ mkDerivation {
# cd/dvd
cdparanoia libdvdcss libdvdread
# others
ffmpeg libmusicbrainz3 shared-mime-info
ffmpeg_3 libmusicbrainz3 shared-mime-info
];
propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
postFixup =
Expand Down
Loading