mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 05:00:16 +00:00
Code Issues Wiki Activity

SDL_image: update to version 1.2.12

Browse source
This commit is contained in:
Peter Simons 2012-12-06 12:02:17 +01:00
parent af6d8784e3
commit fb31bcf213
2 changed files with 10 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
pkgs/development/libraries/SDL_image/default.nix
View file

@ -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;
};
}

21
pkgs/development/libraries/SDL_image/jpeg-linux.diff
View file

@ -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