libjpeg-turbo: 2.0.1 -> 2.0.2
This commit is contained in:
parent
a2aab0e413
commit
ab1ac905b4
@ -2,29 +2,16 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "libjpeg-turbo-${version}";
|
name = "libjpeg-turbo-${version}";
|
||||||
version = "2.0.1";
|
version = "2.0.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz";
|
url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz";
|
||||||
sha256 = "1zv6z093l3x3jzygvni7b819j7xhn6d63jhcdrckj7fz67n6ry75";
|
sha256 = "1v9gx1gdzgxf51nd55ncq7rghmj4x9x91rby50ag36irwngmkf5c";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches =
|
patches =
|
||||||
stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt")
|
stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt")
|
||||||
./mingw-boolean.patch
|
./mingw-boolean.patch;
|
||||||
++ [
|
|
||||||
./djpeg-rgb-islow-icc-cmp.patch # https://github.com/libjpeg-turbo/libjpeg-turbo/pull/321
|
|
||||||
(fetchpatch {
|
|
||||||
name = "cve-2018-19664.diff";
|
|
||||||
url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/f8cca819a4fb.diff";
|
|
||||||
sha256 = "1kgfag62qmphlrq0mz15g17zw7zrg9nzaz7d2vg50m6m7m5aw4y5";
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
name = "CVE-2018-20330.patch";
|
|
||||||
url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/3d9c64e9f8aa1ee954d1d0bb3390fc894bb84da3.diff";
|
|
||||||
sha256 = "1jai8izw6xl05ihx24rpc96d1jcr9rp421cb02pbz3v53cxdasji";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
outputs = [ "bin" "dev" "out" "man" "doc" ];
|
outputs = [ "bin" "dev" "out" "man" "doc" ];
|
||||||
|
|
||||||
|
@ -1,11 +0,0 @@
|
|||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -999,6 +999,8 @@ foreach(libtype ${TEST_LIBTYPES})
|
|
||||||
|
|
||||||
add_test(djpeg-${libtype}-rgb-islow-icc-cmp
|
|
||||||
${MD5CMP} b06a39d730129122e85c1363ed1bbc9e testout_rgb_islow.icc)
|
|
||||||
+ set_tests_properties(djpeg-${libtype}-rgb-islow-icc-cmp PROPERTIES
|
|
||||||
+ DEPENDS djpeg-${libtype}-rgb-islow)
|
|
||||||
|
|
||||||
add_bittest(jpegtran icc "-copy;all;-icc;${TESTIMAGES}/test2.icc"
|
|
||||||
testout_rgb_islow2.jpg testout_rgb_islow.jpg ${MD5_JPEG_RGB_ISLOW2})
|
|
Loading…
Reference in New Issue
Block a user