Merge #84279: libjpeg(_turbo): 2.0.3 -> 2.0.4 (in staging)

This commit is contained in:
Vladimír Čunát 2020-04-10 09:02:21 +02:00
commit f2198c46b2
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
2 changed files with 4 additions and 3 deletions

View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "libjpeg-turbo";
version = "2.0.3";
version = "2.0.4";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "1ds16bnj17v6hzd43w8pzijz3imd9am4hw75ir0fxm240m8dwij2";
sha256 = "01ill8bgjyk582wipx7sh7gj2nidylpbzvwhx0wkcm6mxx3qbp9k";
};
patches =
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
homepage = http://libjpeg-turbo.virtualgl.org/;
description = "A faster (using SIMD) libjpeg implementation";
license = licenses.ijg; # and some parts under other BSD-style licenses
maintainers = [ maintainers.vcunat ];
maintainers = with maintainers; [ vcunat colemickens ];
platforms = platforms.all;
};
}

View file

@ -13006,6 +13006,7 @@ in
libiptcdata = callPackage ../development/libraries/libiptcdata { };
libjpeg_original = callPackage ../development/libraries/libjpeg { };
# also known as libturbojpeg
libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { };
libjpeg_drop = callPackage ../development/libraries/libjpeg-drop { };
libjpeg = libjpeg_turbo;