forked from mirrors/nixpkgs
Merge #84279: libjpeg(_turbo): 2.0.3 -> 2.0.4 (in staging)
This commit is contained in:
commit
f2198c46b2
|
@ -3,11 +3,11 @@
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
|
||||||
pname = "libjpeg-turbo";
|
pname = "libjpeg-turbo";
|
||||||
version = "2.0.3";
|
version = "2.0.4";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
|
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
|
||||||
sha256 = "1ds16bnj17v6hzd43w8pzijz3imd9am4hw75ir0fxm240m8dwij2";
|
sha256 = "01ill8bgjyk582wipx7sh7gj2nidylpbzvwhx0wkcm6mxx3qbp9k";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches =
|
patches =
|
||||||
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||||
homepage = http://libjpeg-turbo.virtualgl.org/;
|
homepage = http://libjpeg-turbo.virtualgl.org/;
|
||||||
description = "A faster (using SIMD) libjpeg implementation";
|
description = "A faster (using SIMD) libjpeg implementation";
|
||||||
license = licenses.ijg; # and some parts under other BSD-style licenses
|
license = licenses.ijg; # and some parts under other BSD-style licenses
|
||||||
maintainers = [ maintainers.vcunat ];
|
maintainers = with maintainers; [ vcunat colemickens ];
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -13006,6 +13006,7 @@ in
|
||||||
libiptcdata = callPackage ../development/libraries/libiptcdata { };
|
libiptcdata = callPackage ../development/libraries/libiptcdata { };
|
||||||
|
|
||||||
libjpeg_original = callPackage ../development/libraries/libjpeg { };
|
libjpeg_original = callPackage ../development/libraries/libjpeg { };
|
||||||
|
# also known as libturbojpeg
|
||||||
libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { };
|
libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { };
|
||||||
libjpeg_drop = callPackage ../development/libraries/libjpeg-drop { };
|
libjpeg_drop = callPackage ../development/libraries/libjpeg-drop { };
|
||||||
libjpeg = libjpeg_turbo;
|
libjpeg = libjpeg_turbo;
|
||||||
|
|
Loading…
Reference in a new issue