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

ffmpeg: remove 0.11 and replace by 0.10

Browse Source 
That branch is better supported, and 0.11 only had one user -
minidlna still builds
This commit is contained in:
Vladimír Čunát 2015-06-11 21:34:32 +02:00
parent e5b56cdfff
commit 69945a8701
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/ffmpeg/0.11.nix
View File

@ -1,7 +0,0 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "${branch}.5";
branch = "0.11";
sha256 = "1h5qwn4h7sppqw36hri5p6zlv2387vwaxh2pyj070xfn8hgrk4ll";
})

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

@ -5995,12 +5995,11 @@ let
fcgi = callPackage ../development/libraries/fcgi { }; fcgi = callPackage ../development/libraries/fcgi { };
ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { }; ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { };
ffmpeg_0_11 = callPackage ../development/libraries/ffmpeg/0.11.nix { };
ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { }; ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { };
ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.nix { }; ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.nix { };
ffmpeg_2_6 = callPackage ../development/libraries/ffmpeg/2.6.nix { }; ffmpeg_2_6 = callPackage ../development/libraries/ffmpeg/2.6.nix { };
# Aliases # Aliases
ffmpeg_0 = ffmpeg_0_11; ffmpeg_0 = ffmpeg_0_10;
ffmpeg_1 = ffmpeg_1_2; ffmpeg_1 = ffmpeg_1_2;
ffmpeg_2 = ffmpeg_2_6; ffmpeg_2 = ffmpeg_2_6;
ffmpeg = ffmpeg_2; ffmpeg = ffmpeg_2;
@ -6253,7 +6252,7 @@ let
gst_plugins_ugly = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-ugly {}; gst_plugins_ugly = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-ugly {};
gst_ffmpeg = callPackage ../development/libraries/gstreamer/legacy/gst-ffmpeg { gst_ffmpeg = callPackage ../development/libraries/gstreamer/legacy/gst-ffmpeg {
ffmpeg = ffmpeg_0_10; ffmpeg = ffmpeg_0;
}; };
gst_python = callPackage ../development/libraries/gstreamer/legacy/gst-python {}; gst_python = callPackage ../development/libraries/gstreamer/legacy/gst-python {};
@ -7572,7 +7571,7 @@ let
openscenegraph = callPackage ../development/libraries/openscenegraph { openscenegraph = callPackage ../development/libraries/openscenegraph {
giflib = giflib_4_1; giflib = giflib_4_1;
ffmpeg = ffmpeg_0_10; ffmpeg = ffmpeg_0;
}; };
openspades = callPackage ../games/openspades {}; openspades = callPackage ../games/openspades {};
@ -10476,7 +10475,7 @@ let
audacious = callPackage ../applications/audio/audacious { }; audacious = callPackage ../applications/audio/audacious { };
audacity = callPackage ../applications/audio/audacity { audacity = callPackage ../applications/audio/audacity {
ffmpeg = ffmpeg_0_10; ffmpeg = ffmpeg_0;
}; };
milkytracker = callPackage ../applications/audio/milkytracker { }; milkytracker = callPackage ../applications/audio/milkytracker { };
@ -11107,7 +11106,7 @@ let
blas liblapack libjpeg libpng mysql unixODBC mesa postgresql python blas liblapack libjpeg libpng mysql unixODBC mesa postgresql python
readline sqlite tcl tk libtiff freetype makeWrapper wxGTK; readline sqlite tcl tk libtiff freetype makeWrapper wxGTK;
fftw = fftwSinglePrec; fftw = fftwSinglePrec;
ffmpeg = ffmpeg_0_10; ffmpeg = ffmpeg_0;
motif = lesstif; motif = lesstif;
opendwg = libdwg; opendwg = libdwg;
wxPython = wxPython28; wxPython = wxPython28;
@ -13473,7 +13472,7 @@ let
ultimatestunts = callPackage ../games/ultimatestunts { }; ultimatestunts = callPackage ../games/ultimatestunts { };
ultrastardx = callPackage ../games/ultrastardx { ultrastardx = callPackage ../games/ultrastardx {
ffmpeg = ffmpeg_0_10; ffmpeg = ffmpeg_0;
lua = lua5; lua = lua5;
}; };