diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-09-26 00:12:48 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-09-26 00:12:48 +0000 |
| commit | 03aae985bc8430e06c0d41d055fab359a689bfca (patch) | |
| tree | ea7cbc7f330c61c435cc2c46bc04b68614f21ab5 /pkgs/development/libraries/SDL_image | |
| parent | 221227ecfebf3cac0363d61471cdd6a94bce09e7 (diff) | |
SDL_image: use HG version
Fix one of the upstream commits
svn path=/nixpkgs/branches/libpng15/; revision=29487
Diffstat (limited to 'pkgs/development/libraries/SDL_image')
| -rw-r--r-- | pkgs/development/libraries/SDL_image/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/development/libraries/SDL_image/jpeg-linux.diff | 21 |
2 files changed, 36 insertions, 5 deletions
diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index 21461cc42595..8e8854e25bc8 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -1,18 +1,28 @@ -{ stdenv, fetchurl, SDL, libpng, libjpeg, libtiff, libungif, libXpm }: +{ stdenv, fetchhg, SDL, libpng, libjpeg, libtiff, libungif, libXpm, automake, + autoconf, pkgconfig }: stdenv.mkDerivation rec { pname = "SDL_image"; - version = "1.2.10"; + version = "1.2.10-20110925"; name = "${pname}-${version}"; - src = fetchurl { - url = "http://www.libsdl.org/projects/${pname}/release/${name}.tar.gz"; - sha256 = "0xhqw56xgc0rn3ziccirib8ai2whbbidjmvig527n9znjlg5vq3m"; + src = fetchhg { + url = http://hg.libsdl.org/SDL_image; + tag = "bb611e7cb1e5"; + sha256 = "0003inlvvmlc2fyrzy01lwhhfb90ppsar2skaa7x6rhmpc71dakz"; }; buildInputs = [SDL libpng libjpeg libtiff libungif libXpm]; + buildNativeInputs = [ automake autoconf pkgconfig ]; + + patches = [ ./jpeg-linux.diff ]; + + preConfigure = '' + ./autogen.sh + ''; + postInstall = '' sed -i -e 's,"SDL.h",<SDL/SDL.h>,' \ -e 's,"SDL_version.h",<SDL/SDL_version.h>,' \ diff --git a/pkgs/development/libraries/SDL_image/jpeg-linux.diff b/pkgs/development/libraries/SDL_image/jpeg-linux.diff new file mode 100644 index 000000000000..fd4cdf7f7a49 --- /dev/null +++ b/pkgs/development/libraries/SDL_image/jpeg-linux.diff @@ -0,0 +1,21 @@ +# HG changeset patch +# User Yury G. Kudryashov <urkud@ya.ru> +# Date 1316994786 -14400 +# Node ID 4c3cd9a4b0602c45c11ec62bcc1f5562ea071d70 +# Parent bb611e7cb1e58cc37a6773a22a15c74b55e3d267 +Fix compilation on Linux + +Submitted upstream, see http://bugzilla.libsdl.org/show_bug.cgi?id=1179 + +diff -r bb611e7cb1e5 -r 4c3cd9a4b060 IMG_jpg.c +--- a/IMG_jpg.c Thu Aug 25 02:24:35 2011 -0400 ++++ b/IMG_jpg.c Mon Sep 26 03:53:06 2011 +0400 +@@ -34,7 +34,7 @@ + + #include <jpeglib.h> + +-#if JPEG_LIB_VERSION >= 80 ++#ifdef JPEG_TRUE /* MinGW version of jpeg-8.x renamed TRUE to JPEG_TRUE etc. */ + typedef JPEG_boolean boolean; + #define TRUE JPEG_TRUE + #define FALSE JPEG_FALSE |