gd: 2.0.35 -> 2.1.1

Upstream claims 2.1 is fully API compatible with 2.0

https://libgd.github.io/release-2.1.0.html
https://libgd.github.io/release-2.1.1.html

Also includes meta updates, adds pkg-config to the build environment,
for proper detection of dependencies, and adds optional support for tiff
and xpm image formats.
This commit is contained in:
Joachim Fasting 2016-05-09 14:56:41 +02:00
parent 3f0518ac4d
commit f8bdd7969d
No known key found for this signature in database
GPG Key ID: 4330820E1E04DCF4
2 changed files with 26 additions and 14 deletions

View File

@ -1,21 +1,30 @@
{stdenv, fetchurl, zlib, libpng, freetype, libjpeg, fontconfig}: { stdenv, fetchurl
, pkgconfig
, zlib
, libjpeg
, libpng
, libtiff ? null
, libXpm ? null
, fontconfig
, freetype
}:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "gd-2.0.35"; name = "gd-${version}";
version = "2.1.1";
src = fetchurl { src = fetchurl {
url = http://www.libgd.org/releases/gd-2.0.35.tar.bz2; url = "https://github.com/libgd/libgd/releases/download/${name}/libgd-${version}.tar.xz";
sha256 = "1y80lcmb8qbzf0a28841zxhq9ndfapmh2fsrqfd9lalxfj8288mz"; sha256 = "11djy9flzxczphigqgp7fbbblbq35gqwwhn9xfcckawlapa1xnls";
}; };
buildInputs = [zlib libpng freetype]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ zlib fontconfig freetype libjpeg libpng libtiff libXpm ];
propagatedBuildInputs = [libjpeg fontconfig]; # urgh meta = with stdenv.lib; {
homepage = https://libgd.github.io/;
configureFlags = "--without-x"; description = "A dynamic image creation library";
license = licenses.free; # some custom license
meta = { platforms = platforms.unix;
homepage = http://www.libgd.org/;
description = "An open source code library for the dynamic creation of images by programmers";
}; };
} }

View File

@ -6963,7 +6963,10 @@ in
gettext = callPackage ../development/libraries/gettext { }; gettext = callPackage ../development/libraries/gettext { };
gd = callPackage ../development/libraries/gd { }; gd = callPackage ../development/libraries/gd {
libtiff = null;
libXpm = null;
};
gdal = callPackage ../development/libraries/gdal { }; gdal = callPackage ../development/libraries/gdal { };