Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

libjpeg-turbo: 1.5.3 -> 2.0.1 #50249

Merged
merged 2 commits into from
Nov 28, 2018
Merged

libjpeg-turbo: 1.5.3 -> 2.0.1 #50249

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1488f51
libjpeg-turbo: 1.5.3 -> 2.0.1
romildo Nov 11, 2018
dd69374
libjpeg-turbo: don't change ABI, don't add *.a
vcunat Nov 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 15 additions & 7 deletions pkgs/development/libraries/libjpeg-turbo/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,35 @@
{ stdenv, fetchurl, nasm
}:
{ stdenv, fetchurl, cmake, nasm }:

stdenv.mkDerivation rec {
name = "libjpeg-turbo-${version}";
version = "1.5.3";
version = "2.0.1";

src = fetchurl {
url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz";
sha256 = "08r5b5mywwrxv4axvq80dm31cklz81grczlzlxr2xqa6pgi90j5j";
}; # github releases still need autotools, surprisingly
sha256 = "1zv6z093l3x3jzygvni7b819j7xhn6d63jhcdrckj7fz67n6ry75";
};

patches =
stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt")
./mingw-boolean.patch;

outputs = [ "bin" "dev" "out" "man" "doc" ];

nativeBuildInputs = [ nasm ];
nativeBuildInputs = [ cmake nasm ];

enableParallelBuilding = true;
preConfigure = ''
cmakeFlagsArray+=(
"-DCMAKE_INSTALL_BINDIR=$bin/bin"
"-DWITH_JPEG8=1"
"-DWITH_JPEG9=1"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We weren't been using --with-jpegN up to now. This changes soname from libjpeg.so.62 to libjpeg.so.8. I expect it will be safer for us to drop these two lines.

...backward-incompatible with libjpeg v6b

)
'';

doCheck = true; # not cross;
checkTarget = "test";
preCheck = ''
export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}:$LD_LIBRARY_PATH"
'';

meta = with stdenv.lib; {
homepage = http://libjpeg-turbo.virtualgl.org/;
Expand Down