diff options
| author | Peter Simons <simons@cryp.to> | 2012-12-06 12:02:17 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-12-06 12:02:17 +0100 |
| commit | fb31bcf2139c54d725bcf5a4e0a1c1ff1030fdca (patch) | |
| tree | 399712b3ac421ddc5ae3aedf55c904968929429b /pkgs/development/libraries/SDL_image | |
| parent | af6d8784e3a6022dff215cdcb4283644bea4dd13 (diff) | |
| download | nixpkgs-fb31bcf2139c54d725bcf5a4e0a1c1ff1030fdca.tar nixpkgs-fb31bcf2139c54d725bcf5a4e0a1c1ff1030fdca.tar.gz nixpkgs-fb31bcf2139c54d725bcf5a4e0a1c1ff1030fdca.tar.bz2 nixpkgs-fb31bcf2139c54d725bcf5a4e0a1c1ff1030fdca.tar.lz nixpkgs-fb31bcf2139c54d725bcf5a4e0a1c1ff1030fdca.tar.xz nixpkgs-fb31bcf2139c54d725bcf5a4e0a1c1ff1030fdca.tar.zst nixpkgs-fb31bcf2139c54d725bcf5a4e0a1c1ff1030fdca.zip | |
SDL_image: update to version 1.2.12
Diffstat (limited to 'pkgs/development/libraries/SDL_image')
| -rw-r--r-- | pkgs/development/libraries/SDL_image/default.nix | 34 | ||||
| -rw-r--r-- | pkgs/development/libraries/SDL_image/jpeg-linux.diff | 21 |
2 files changed, 10 insertions, 45 deletions
diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index 1ecb2f83082..8f0d59bc212 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -1,41 +1,27 @@ -{ stdenv, fetchhg, SDL, libpng, libjpeg, libtiff, libungif, libXpm, automake, - autoconf, pkgconfig }: +{ stdenv, fetchurl, SDL, libpng, libjpeg, libtiff, libungif, libXpm }: stdenv.mkDerivation rec { - pname = "SDL_image"; - version = "1.2.10-20110925"; + name = "SDL_image-1.2.12"; - name = "${pname}-${version}"; - - src = fetchhg { - url = http://hg.libsdl.org/SDL_image; - tag = "bb611e7cb1e5"; - sha256 = "0003inlvvmlc2fyrzy01lwhhfb90ppsar2skaa7x6rhmpc71dakz"; + src = fetchurl { + url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; + sha256 = "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b"; }; 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>,' \ - -e 's,"begin_code.h",<SDL/begin_code.h>,' \ - -e 's,"close_code.h",<SDL/close_code.h>,' \ + -e 's,"SDL_version.h",<SDL/SDL_version.h>,' \ + -e 's,"begin_code.h",<SDL/begin_code.h>,' \ + -e 's,"close_code.h",<SDL/close_code.h>,' \ $out/include/SDL/SDL_image.h - - ln -sv $out/include/SDL/SDL_image.h $out/include/ + ln -sv SDL/SDL_image.h $out/include/SDL_image.h ''; meta = { description = "SDL image library"; - homepage = http://www.libsdl.org/projects/SDL_image/; + homepage = "http://www.libsdl.org/projects/SDL_image/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/SDL_image/jpeg-linux.diff b/pkgs/development/libraries/SDL_image/jpeg-linux.diff deleted file mode 100644 index fd4cdf7f7a4..00000000000 --- a/pkgs/development/libraries/SDL_image/jpeg-linux.diff +++ /dev/null @@ -1,21 +0,0 @@ -# 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 |