JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #16632: ffmpeg3 by default

Browse Source
This commit is contained in:
Vladimír Čunát 2016-07-02 08:52:41 +02:00
commit 6b80d74ab7
2 changed files with 62 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
pkgs/top-level/all-packages.nix
View File

@ -963,7 +963,9 @@ in
davix = callPackage ../tools/networking/davix { };
cantata = qt5.callPackage ../applications/audio/cantata { };
cantata = qt5.callPackage ../applications/audio/cantata {
ffmpeg = ffmpeg_2;
};
can-utils = callPackage ../os-specific/linux/can-utils { };
@ -986,7 +988,9 @@ in
ceph-dev = self.ceph;
#ceph-dev = lowPrio (callPackage ../tools/filesystems/ceph/dev.nix { });
cfdg = callPackage ../tools/graphics/cfdg { };
cfdg = callPackage ../tools/graphics/cfdg {
ffmpeg = ffmpeg_2;
};
checkinstall = callPackage ../tools/package-management/checkinstall { };
@ -2158,7 +2162,9 @@ in
lesspipe = callPackage ../tools/misc/lesspipe { };
liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { };
liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix {
ffmpeg = ffmpeg_2;
};
lnav = callPackage ../tools/misc/lnav { };
@ -5793,6 +5799,7 @@ in
renpy = callPackage ../development/interpreters/renpy {
wrapPython = pythonPackages.wrapPython;
ffmpeg = ffmpeg_2;
};
pixie = callPackage ../development/interpreters/pixie { };
@ -6997,7 +7004,7 @@ in
ffmpeg_1 = self.ffmpeg_1_2;
ffmpeg_2 = self.ffmpeg_2_8;
ffmpeg_3 = self.ffmpeg_3_0;
ffmpeg = self.ffmpeg_2;
ffmpeg = self.ffmpeg_3;
ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
# The following need to be fixed on Darwin
@ -7017,11 +7024,15 @@ in
MediaToolbox VideoDecodeAcceleration;
};
ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { };
ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer {
ffmpeg = ffmpeg_2;
};
ffmpeg-sixel = callPackage ../development/libraries/ffmpeg-sixel { };
ffms = callPackage ../development/libraries/ffms { };
ffms = callPackage ../development/libraries/ffms {
ffmpeg = ffmpeg_2;
};
fftw = callPackage ../development/libraries/fftw { };
fftwSinglePrec = self.fftw.override { precision = "single"; };
@ -8542,6 +8553,7 @@ in
avahi = avahi.override {
withLibdnssdCompat = true;
};
ffmpeg = ffmpeg_2;
};
mkvtoolnix = callPackage ../applications/video/mkvtoolnix { };
@ -8551,6 +8563,7 @@ in
};
mlt-qt4 = callPackage ../development/libraries/mlt {
ffmpeg = ffmpeg_2;
qt = qt4;
};
@ -8691,7 +8704,9 @@ in
openct = callPackage ../development/libraries/openct { };
opencv = callPackage ../development/libraries/opencv { };
opencv = callPackage ../development/libraries/opencv {
ffmpeg = ffmpeg_2;
};
opencv3 = callPackage ../development/libraries/opencv/3.x.nix { };
@ -8706,7 +8721,9 @@ in
ois = callPackage ../development/libraries/ois {};
opal = callPackage ../development/libraries/opal {};
opal = callPackage ../development/libraries/opal {
ffmpeg = ffmpeg_2;
};
openh264 = callPackage ../development/libraries/openh264 { };
@ -8935,7 +8952,9 @@ in
libkeyfinder = callPackage ../development/libraries/libkeyfinder { };
mlt = callPackage ../development/libraries/mlt/qt-5.nix {};
mlt = callPackage ../development/libraries/mlt/qt-5.nix {
ffmpeg = ffmpeg_2;
};
openbr = callPackage ../development/libraries/openbr { };
@ -9487,7 +9506,9 @@ in
xdo = callPackage ../tools/misc/xdo { };
xineLib = callPackage ../development/libraries/xine-lib { };
xineLib = callPackage ../development/libraries/xine-lib {
ffmpeg = ffmpeg_2;
};
xautolock = callPackage ../misc/screensavers/xautolock { };
@ -12019,6 +12040,7 @@ in
avxsynth = callPackage ../applications/video/avxsynth {
libjpeg = libjpeg_original; # error: 'JCOPYRIGHT_SHORT' was not declared in this scope
ffmpeg = ffmpeg_2;
};
awesome-3-4 = callPackage ../applications/window-managers/awesome/3.4.nix {
@ -12103,7 +12125,9 @@ in
bristol = callPackage ../applications/audio/bristol { };
bs1770gain = callPackage ../applications/audio/bs1770gain { };
bs1770gain = callPackage ../applications/audio/bs1770gain {
ffmpeg = ffmpeg_2;
};
bspwm = callPackage ../applications/window-managers/bspwm { };
@ -12204,6 +12228,7 @@ in
cmus = callPackage ../applications/audio/cmus {
libjack = libjack2;
libcdio = libcdio082;
ffmpeg = ffmpeg_2;
pulseaudioSupport = config.pulseaudio or false;
};
@ -12852,6 +12877,7 @@ in
};
freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix {
ffmpeg = ffmpeg_2;
cmake = cmake-2_8;
};
@ -13058,6 +13084,7 @@ in
guvcview = callPackage ../os-specific/linux/guvcview {
pulseaudioSupport = config.pulseaudio or true;
ffmpeg = ffmpeg_2;
};
gxmessage = callPackage ../applications/misc/gxmessage { };
@ -13291,6 +13318,7 @@ in
kino = callPackage ../applications/video/kino {
inherit (gnome) libglade;
ffmpeg = ffmpeg_2;
};
kiwix = callPackage ../applications/misc/kiwix { };
@ -13411,7 +13439,9 @@ in
links2 = callPackage ../applications/networking/browsers/links2 { };
linphone = callPackage ../applications/networking/instant-messengers/linphone rec { };
linphone = callPackage ../applications/networking/instant-messengers/linphone rec {
ffmpeg = ffmpeg_2;
};
linuxsampler = callPackage ../applications/audio/linuxsampler {
bison = bison2;
@ -13441,6 +13471,7 @@ in
handbrake = callPackage ../applications/video/handbrake {
webkitgtk = webkitgtk24x;
ffmpeg = ffmpeg_2;
};
lilyterm = callPackage ../applications/misc/lilyterm {
@ -13531,7 +13562,9 @@ in
mmex = callPackage ../applications/office/mmex { };
moc = callPackage ../applications/audio/moc { };
moc = callPackage ../applications/audio/moc {
ffmpeg = ffmpeg_2;
};
mod-distortion = callPackage ../applications/audio/mod-distortion { };
@ -13858,7 +13891,9 @@ in
pbrt = callPackage ../applications/graphics/pbrt { };
pcsxr = callPackage ../misc/emulators/pcsxr { };
pcsxr = callPackage ../misc/emulators/pcsxr {
ffmpeg = ffmpeg_2;
};
pcsx2 = callPackage_i686 ../misc/emulators/pcsx2 { };
@ -14315,7 +14350,9 @@ in
soxr = callPackage ../applications/misc/audio/soxr { };
spek = callPackage ../applications/audio/spek { };
spek = callPackage ../applications/audio/spek {
ffmpeg = ffmpeg_2;
};
spotify = callPackage ../applications/audio/spotify {
inherit (gnome) GConf;
@ -15498,7 +15535,9 @@ in
steam-run = steam.run;
stepmania = callPackage ../games/stepmania { };
stepmania = callPackage ../games/stepmania {
ffmpeg = ffmpeg_2;
};
stuntrally = callPackage ../games/stuntrally {
bullet = bullet283;
@ -15726,7 +15765,9 @@ in
# the real work in this function is done below this list
extraPackages = callPackage:
rec {
amarok = callPackage ../applications/audio/amarok { };
amarok = callPackage ../applications/audio/amarok {
ffmpeg = ffmpeg_2;
};
bangarang = callPackage ../applications/video/bangarang { };
@ -17000,7 +17041,9 @@ in
vault = callPackage ../tools/security/vault { };
vbam = callPackage ../misc/emulators/vbam {};
vbam = callPackage ../misc/emulators/vbam {
ffmpeg = ffmpeg_2;
};
vice = callPackage ../misc/emulators/vice {
libX11 = xorg.libX11;

2
pkgs/top-level/python-packages.nix
View File

@ -1289,7 +1289,7 @@ in modules // {
buildInputs
= (with self; [ nose pillow numpy ])
++ (with pkgs; [ ffmpeg git libav pkgconfig ]);
++ (with pkgs; [ ffmpeg_2 git libav pkgconfig ]);
# Because of https://github.com/mikeboers/PyAV/issues/152
doCheck = false;