Author: urkud
Date: Sun Mar 4 11:06:51 2012
New Revision: 32759
URL: https://nixos.org/websvn/nix/?rev=32759&sc=1
Log:
svn merge --reintegrate ^/nixpkgs/branches/libpng15
Added:
nixpkgs/trunk/pkgs/development/libraries/SDL_image/jpeg-linux.diff
- copied unchanged from r32758,
nixpkgs/branches/libpng15/pkgs/development/libraries/SDL_image/jpeg-linux.diff
nixpkgs/trunk/pkgs/development/libraries/libpng/12.nix
- copied unchanged from r32758,
nixpkgs/branches/libpng15/pkgs/development/libraries/libpng/12.nix
nixpkgs/trunk/pkgs/misc/emulators/VisualBoyAdvance/libpng15.patch
- copied unchanged from r32758,
nixpkgs/branches/libpng15/pkgs/misc/emulators/VisualBoyAdvance/libpng15.patch
nixpkgs/trunk/pkgs/misc/ghostscript/libpng-1.5.patch
- copied unchanged from r32758,
nixpkgs/branches/libpng15/pkgs/misc/ghostscript/libpng-1.5.patch
nixpkgs/trunk/pkgs/tools/graphics/plotutils/debian-patches.nix
- copied unchanged from r32758,
nixpkgs/branches/libpng15/pkgs/tools/graphics/plotutils/debian-patches.nix
nixpkgs/trunk/pkgs/tools/graphics/plotutils/debian-patches.txt
- copied unchanged from r32758,
nixpkgs/branches/libpng15/pkgs/tools/graphics/plotutils/debian-patches.txt
Modified:
nixpkgs/trunk/ (props changed)
nixpkgs/trunk/pkgs/applications/display-managers/slim/default.nix
nixpkgs/trunk/pkgs/applications/graphics/xscreensaver/default.nix (props
changed)
nixpkgs/trunk/pkgs/applications/misc/xneur/0.8.nix (props changed)
nixpkgs/trunk/pkgs/applications/networking/browsers/icecat-4/ (props
changed)
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/
(props changed)
nixpkgs/trunk/pkgs/applications/video/xine-ui/default.nix
nixpkgs/trunk/pkgs/build-support/clang-wrapper/ (props changed)
nixpkgs/trunk/pkgs/build-support/gcc-wrapper/ (props changed)
nixpkgs/trunk/pkgs/build-support/release/debian-build.nix (props changed)
nixpkgs/trunk/pkgs/build-support/release/nix-build.nix (props changed)
nixpkgs/trunk/pkgs/build-support/release/rpm-build.nix (props changed)
nixpkgs/trunk/pkgs/build-support/release/source-tarball.nix (props changed)
nixpkgs/trunk/pkgs/desktops/kde-3/kdelibs/default.nix
nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.1.nix (props changed)
nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.2.nix (props changed)
nixpkgs/trunk/pkgs/development/compilers/ghc/6.8.2.nix (props changed)
nixpkgs/trunk/pkgs/development/compilers/ghc/6.8.3.nix (props changed)
nixpkgs/trunk/pkgs/development/libraries/SDL_image/default.nix
nixpkgs/trunk/pkgs/development/libraries/aterm/2.8.nix (props changed)
nixpkgs/trunk/pkgs/development/libraries/fltk/fltk13.nix (props changed)
nixpkgs/trunk/pkgs/development/libraries/glibc-2.9/ (props changed)
nixpkgs/trunk/pkgs/development/libraries/goocanvas/ (props changed)
nixpkgs/trunk/pkgs/development/libraries/libharu/default.nix
nixpkgs/trunk/pkgs/development/libraries/libpng/default.nix
nixpkgs/trunk/pkgs/development/libraries/pcre/default.nix (props changed)
nixpkgs/trunk/pkgs/development/libraries/qt-3/default.nix
nixpkgs/trunk/pkgs/development/libraries/readline/readline6.nix (props
changed)
nixpkgs/trunk/pkgs/development/tools/misc/autoconf/2.13.nix (props changed)
nixpkgs/trunk/pkgs/development/tools/misc/gnum4/default.nix (props changed)
nixpkgs/trunk/pkgs/misc/emulators/VisualBoyAdvance/default.nix
nixpkgs/trunk/pkgs/os-specific/linux/atheros/r3867.nix (props changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/2.6.28.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/2.6.32.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix (props changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.25.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.27.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.28.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.29.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.32.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.33.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kqemu/default.nix (props changed)
nixpkgs/trunk/pkgs/os-specific/linux/qemu-kvm/default.nix (props changed)
nixpkgs/trunk/pkgs/os-specific/linux/util-linux-ng/ (props changed)
nixpkgs/trunk/pkgs/servers/mail/dovecot/1.1.1.nix (props changed)
nixpkgs/trunk/pkgs/shells/bash/4.1.nix (props changed)
nixpkgs/trunk/pkgs/shells/bash/4.2.nix (props changed)
nixpkgs/trunk/pkgs/stdenv/generic/setup.sh (props changed)
nixpkgs/trunk/pkgs/stdenv/linux/make-bootstrap-tools.nix (props changed)
nixpkgs/trunk/pkgs/tools/graphics/enblend-enfuse/default.nix
nixpkgs/trunk/pkgs/tools/graphics/plotutils/default.nix
nixpkgs/trunk/pkgs/tools/graphics/pngcrush/default.nix
nixpkgs/trunk/pkgs/tools/networking/wget/default.nix (props changed)
nixpkgs/trunk/pkgs/tools/typesetting/tex/pgf/1.x.nix (props changed)
nixpkgs/trunk/pkgs/tools/typesetting/tex/pgf/2.x.nix (props changed)
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/display-managers/slim/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/display-managers/slim/default.nix Sun Mar
4 09:09:21 2012 (r32758)
+++ nixpkgs/trunk/pkgs/applications/display-managers/slim/default.nix Sun Mar
4 11:06:51 2012 (r32759)
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, x11, libjpeg, libpng, libXmu, freetype, pam}:
+{stdenv, fetchurl, x11, libjpeg, libpng12, libXmu, freetype, pam}:
stdenv.mkDerivation rec {
name = "slim-1.3.2";
@@ -24,7 +24,7 @@
./pam2.patch
];
- buildInputs = [x11 libjpeg libpng libXmu freetype pam];
+ buildInputs = [x11 libjpeg libpng12 libXmu freetype pam];
NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
Modified: nixpkgs/trunk/pkgs/applications/video/xine-ui/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/video/xine-ui/default.nix Sun Mar 4
09:09:21 2012 (r32758)
+++ nixpkgs/trunk/pkgs/applications/video/xine-ui/default.nix Sun Mar 4
11:06:51 2012 (r32759)
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng, readline, ncurses, curl
+{stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng12, readline, ncurses, curl
, lirc, xz, shared_mime_info }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@
buildNativeInputs = [ xz pkgconfig shared_mime_info ];
buildInputs =
- [ xineLib libpng readline ncurses curl lirc
+ [ xineLib libpng12 readline ncurses curl lirc
xlibs.xlibs xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst
xlibs.inputproto
xlibs.libXinerama xlibs.libXi xlibs.libXft
];
Modified: nixpkgs/trunk/pkgs/desktops/kde-3/kdelibs/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-3/kdelibs/default.nix Sun Mar 4
09:09:21 2012 (r32758)
+++ nixpkgs/trunk/pkgs/desktops/kde-3/kdelibs/default.nix Sun Mar 4
11:06:51 2012 (r32759)
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, xlibs, zlib, perl, qt3, openssl, pcre
-, pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat
+, pkgconfig, libtiff, libxml2, libxslt, libtool, expat
, freetype, bzip2, cups, attr, acl
}:
@@ -22,10 +22,8 @@
./kdelibs-3.5.10-openssl_1.0.0.patch
];
- passthru = {inherit openssl libjpeg qt3; inherit (xlibs) libX11;};
-
buildInputs = [
- zlib perl qt3 openssl pcre pkgconfig libjpeg libpng libtiff libxml2
+ zlib perl qt3 openssl pcre pkgconfig libtiff libxml2
libxslt expat libtool freetype bzip2 cups
xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft
];
@@ -45,7 +43,6 @@
configureFlags = ''
--without-arts
--with-ssl-dir=${openssl}
- --with-extra-includes=${libjpeg}/include
--x-includes=${xlibs.libX11}/include
--x-libraries=${xlibs.libX11}/lib
'';
Modified: nixpkgs/trunk/pkgs/development/libraries/SDL_image/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/SDL_image/default.nix Sun Mar
4 09:09:21 2012 (r32758)
+++ nixpkgs/trunk/pkgs/development/libraries/SDL_image/default.nix Sun Mar
4 11:06:51 2012 (r32759)
@@ -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>,' \
Copied: nixpkgs/trunk/pkgs/development/libraries/SDL_image/jpeg-linux.diff
(from r32758,
nixpkgs/branches/libpng15/pkgs/development/libraries/SDL_image/jpeg-linux.diff)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/SDL_image/jpeg-linux.diff Sun Mar
4 11:06:51 2012 (r32759, copy of r32758,
nixpkgs/branches/libpng15/pkgs/development/libraries/SDL_image/jpeg-linux.diff)
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User Yury G. Kudryashov <[email protected]>
+# 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
Modified: nixpkgs/trunk/pkgs/development/libraries/libharu/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/libharu/default.nix Sun Mar
4 09:09:21 2012 (r32758)
+++ nixpkgs/trunk/pkgs/development/libraries/libharu/default.nix Sun Mar
4 11:06:51 2012 (r32759)
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, libpng }:
+{ stdenv, fetchurl, zlib, libpng, patchutils }:
stdenv.mkDerivation {
name = "libharu-2.2.1";
@@ -12,6 +12,26 @@
buildInputs = [ zlib libpng ];
+ patches =
+ [ (stdenv.mkDerivation {
+ name = "linpng15.patch";
+
+ src = fetchurl {
+ url =
https://github.com/tony2001/libharu/commit/e5bf8b01f6c3d5e3fe0e26ac5345e0da10c03934.diff;
+ sha256 = "1993vskpycyr43rwdp8f688fc5zvllrqq935r7rhsgbqbipkk73h";
+ };
+
+ buildNativeInputs = [ patchutils ];
+
+ buildCommand = "filterdiff -x '*/CHANGES' $src > $out";
+ })
+ (fetchurl {
+ url =
https://github.com/tony2001/libharu/commit/b472b64ab44d834eb29d237f31bf12396fee9aca.diff;
+ name = "endless-loop.patch";
+ sha256 = "1c95mn6a5wddznqgrsaf3xsh27lz8q0pzc0a7ampxpscq0w6c9fq";
+ })
+ ];
+
meta = {
description = "Cross platform, open source library for generating PDF
files";
homepage = http://libharu.org/wiki/Main_Page;
Copied: nixpkgs/trunk/pkgs/development/libraries/libpng/12.nix (from r32758,
nixpkgs/branches/libpng15/pkgs/development/libraries/libpng/12.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/libpng/12.nix Sun Mar 4
11:06:51 2012 (r32759, copy of r32758,
nixpkgs/branches/libpng15/pkgs/development/libraries/libpng/12.nix)
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, zlib, xz }:
+
+assert zlib != null;
+
+stdenv.mkDerivation rec {
+ name = "libpng-1.2.47";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/libpng/${name}.tar.xz";
+ sha256 = "1lai3dnzw81y40jr17bdj1qh08hwv9mc1v74yybl7jdx2hiilsvx";
+ };
+
+ propagatedBuildInputs = [ zlib ];
+
+ buildNativeInputs = [ xz ];
+
+ passthru = { inherit zlib; };
+
+ meta = {
+ description = "The official reference implementation for the PNG file
format";
+ homepage = http://www.libpng.org/pub/png/libpng.html;
+ license = "free-non-copyleft"; #
http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
+ };
+}
Modified: nixpkgs/trunk/pkgs/development/libraries/libpng/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/libpng/default.nix Sun Mar 4
09:09:21 2012 (r32758)
+++ nixpkgs/trunk/pkgs/development/libraries/libpng/default.nix Sun Mar 4
11:06:51 2012 (r32759)
@@ -2,21 +2,20 @@
assert zlib != null;
-# If you want to upgrade libpng, look at libpng15 branch
stdenv.mkDerivation rec {
- name = "libpng-1.2.47";
-
+ name = "libpng-1.5.9";
+
src = fetchurl {
url = "mirror://sourceforge/libpng/${name}.tar.xz";
- sha256 = "1lai3dnzw81y40jr17bdj1qh08hwv9mc1v74yybl7jdx2hiilsvx";
+ sha256 = "0rd0kn7bpdhbv4gw6475plc51a4p5kzk26kag0d08wfvb7ip8wxq";
};
-
+
propagatedBuildInputs = [ zlib ];
buildNativeInputs = [ xz ];
passthru = { inherit zlib; };
-
+
meta = {
description = "The official reference implementation for the PNG file
format";
homepage = http://www.libpng.org/pub/png/libpng.html;
Modified: nixpkgs/trunk/pkgs/development/libraries/qt-3/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/qt-3/default.nix Sun Mar 4
09:09:21 2012 (r32758)
+++ nixpkgs/trunk/pkgs/development/libraries/qt-3/default.nix Sun Mar 4
11:06:51 2012 (r32759)
@@ -7,9 +7,11 @@
, threadSupport ? true
, mysqlSupport ? false, mysql ? null
, openglSupport ? false, mesa ? null, libXmu ? null
-, x11, xextproto, zlib, libjpeg, libpng, which
+, x11, xextproto, zlib, libjpeg, libpng12, which
}:
+let libpng = libpng12; in
+
assert xftSupport -> libXft != null;
assert xrenderSupport -> xftSupport && libXrender != null;
assert xrandrSupport -> libXrandr != null && randrproto != null;
@@ -29,7 +31,8 @@
sha256 = "0jd4g3bwkgk2s4flbmgisyihm7cam964gzb3pawjlkhas01zghz8";
};
- buildInputs = [x11 libXft libXrender zlib libjpeg libpng which];
+ buildNativeInputs = [ which ];
+ propagatedBuildInputs = [x11 libXft libXrender zlib libjpeg libpng];
configureFlags = "
-v
Modified: nixpkgs/trunk/pkgs/misc/emulators/VisualBoyAdvance/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/misc/emulators/VisualBoyAdvance/default.nix Sun Mar
4 09:09:21 2012 (r32758)
+++ nixpkgs/trunk/pkgs/misc/emulators/VisualBoyAdvance/default.nix Sun Mar
4 11:06:51 2012 (r32759)
@@ -6,7 +6,7 @@
url = mirror://sourceforge/vba/VisualBoyAdvance-src-1.7.2.tar.gz;
sha256 = "1dr9w5i296dyq2gbx7sijk6p375aqnwld2n6rwnbzm2g3a94y4gl";
};
- patches = [ ./fix.diff ]; # patch to shut up lost of precision errors
+ patches = [ ./libpng15.patch ./fix.diff ]; # patch to shut up lost of
precision errors
preConfigure = ''
# Fix errors with invalid conversion from 'const char*' to 'char*'
sed -i -e "s|char \* p = strrchr|const char * p = strrchr|g" src/GBA.cpp
Copied: nixpkgs/trunk/pkgs/misc/emulators/VisualBoyAdvance/libpng15.patch (from
r32758,
nixpkgs/branches/libpng15/pkgs/misc/emulators/VisualBoyAdvance/libpng15.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/misc/emulators/VisualBoyAdvance/libpng15.patch Sun Mar
4 11:06:51 2012 (r32759, copy of r32758,
nixpkgs/branches/libpng15/pkgs/misc/emulators/VisualBoyAdvance/libpng15.patch)
@@ -0,0 +1,13 @@
+From Gentoo. Fixes compilation with libpng-1.5
+
+--- a/src/Util.cpp
++++ b/src/Util.cpp
+@@ -79,7 +79,7 @@
+ return false;
+ }
+
+- if(setjmp(png_ptr->jmpbuf)) {
++ if(setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct(&png_ptr,NULL);
+ fclose(fp);
+ return false;
Copied: nixpkgs/trunk/pkgs/misc/ghostscript/libpng-1.5.patch (from r32758,
nixpkgs/branches/libpng15/pkgs/misc/ghostscript/libpng-1.5.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/misc/ghostscript/libpng-1.5.patch Sun Mar 4
11:06:51 2012 (r32759, copy of r32758,
nixpkgs/branches/libpng15/pkgs/misc/ghostscript/libpng-1.5.patch)
@@ -0,0 +1,198 @@
+$NetBSD: patch-ak,v 1.5 2011/01/15 14:08:10 wiz Exp $
+
+Fix build with png-1.5. From John Bowler.
+
+See also http://bugs.ghostscript.com/show_bug.cgi?id=692060
+
+--- a/base/gdevpng.c.orig 2008-07-17 02:34:01.000000000 +0000
++++ b/base/gdevpng.c
+@@ -36,12 +36,14 @@
+ #include "gdevpccm.h"
+ #include "gscdefs.h"
+
+-#define PNG_INTERNAL
+ /*
+ * libpng versions 1.0.3 and later allow disabling access to the stdxxx
+ * files while retaining support for FILE * I/O.
++ *
++ * This is a misunderstanding - this is a build time option for libpng,
++ * it has no effect on a user of libpng.
+ */
+-#define PNG_NO_CONSOLE_IO
++/*#define PNG_NO_CONSOLE_IO*/
+ /*
+ * Earlier libpng versions require disabling FILE * I/O altogether.
+ * This produces a compiler warning about no prototype for png_init_io.
+@@ -280,7 +282,7 @@ png_print_page(gx_device_printer * pdev,
+ goto done;
+ }
+ /* set error handling */
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ /* If we get here, we had a problem reading the file */
+ code = gs_note_error(gs_error_VMerror);
+ goto done;
+@@ -290,19 +292,12 @@ png_print_page(gx_device_printer * pdev,
+ png_init_io(png_ptr, file);
+
+ /* set the file information here */
+- info_ptr->width = pdev->width;
+- info_ptr->height = pdev->height;
+- /* resolution is in pixels per meter vs. dpi */
+- info_ptr->x_pixels_per_unit =
+- (png_uint_32) (pdev->HWResolution[0] * (100.0 / 2.54));
+- info_ptr->y_pixels_per_unit =
+- (png_uint_32) (pdev->HWResolution[1] * (100.0 / 2.54));
+- info_ptr->phys_unit_type = PNG_RESOLUTION_METER;
+- info_ptr->valid |= PNG_INFO_pHYs;
+ switch (depth) {
+ case 32:
+- info_ptr->bit_depth = 8;
+- info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
++ png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
++ 8, PNG_COLOR_TYPE_RGB_ALPHA,
++ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
++ PNG_FILTER_TYPE_DEFAULT);
+ png_set_invert_alpha(png_ptr);
+ { gx_device_pngalpha *ppdev = (gx_device_pngalpha *)pdev;
+ png_color_16 background;
+@@ -315,57 +310,69 @@ png_print_page(gx_device_printer * pdev,
+ }
+ break;
+ case 48:
+- info_ptr->bit_depth = 16;
+- info_ptr->color_type = PNG_COLOR_TYPE_RGB;
++ png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
++ 16, PNG_COLOR_TYPE_RGB,
++ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
++ PNG_FILTER_TYPE_DEFAULT);
+ #if defined(ARCH_IS_BIG_ENDIAN) && (!ARCH_IS_BIG_ENDIAN)
+ png_set_swap(png_ptr);
+ #endif
+ break;
+ case 24:
+- info_ptr->bit_depth = 8;
+- info_ptr->color_type = PNG_COLOR_TYPE_RGB;
++ png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
++ 8, PNG_COLOR_TYPE_RGB,
++ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
++ PNG_FILTER_TYPE_DEFAULT);
+ break;
+ case 8:
+- info_ptr->bit_depth = 8;
+- if (gx_device_has_color(pdev))
+- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
+- else
+- info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
++ png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
++ 8, gx_device_has_color(pdev) ?
++ PNG_COLOR_TYPE_PALETTE : PNG_COLOR_TYPE_GRAY,
++ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
++ PNG_FILTER_TYPE_DEFAULT);
+ break;
+ case 4:
+- info_ptr->bit_depth = 4;
+- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
++ png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
++ 4, PNG_COLOR_TYPE_PALETTE,
++ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
++ PNG_FILTER_TYPE_DEFAULT);
+ break;
+ case 1:
+- info_ptr->bit_depth = 1;
+- info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
++ png_set_IHDR(png_ptr, info_ptr, pdev->width, pdev->height,
++ 1, PNG_COLOR_TYPE_GRAY,
++ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
++ PNG_FILTER_TYPE_DEFAULT);
+ /* invert monocrome pixels */
+ png_set_invert_mono(png_ptr);
+ break;
++ default:
++ png_error(png_ptr, "invalid bit depth");
+ }
+
++ /* resolution is in pixels per meter vs. dpi */
++ png_set_pHYs(png_ptr, info_ptr,
++ (png_uint_32) (pdev->HWResolution[0] * (100.0 / 2.54)),
++ (png_uint_32) (pdev->HWResolution[1] * (100.0 / 2.54)),
++ PNG_RESOLUTION_METER);
++
+ /* set the palette if there is one */
+- if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) {
++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE) {
+ int i;
+ int num_colors = 1 << depth;
+ gx_color_value rgb[3];
++ png_color palette[256];
++
++ if (num_colors > 256)
++ num_colors = 256;
+
+- info_ptr->palette =
+- (void *)gs_alloc_bytes(mem, 256 * sizeof(png_color),
+- "png palette");
+- if (info_ptr->palette == 0) {
+- code = gs_note_error(gs_error_VMerror);
+- goto done;
+- }
+- info_ptr->num_palette = num_colors;
+- info_ptr->valid |= PNG_INFO_PLTE;
+ for (i = 0; i < num_colors; i++) {
+ (*dev_proc(pdev, map_color_rgb)) ((gx_device *) pdev,
+ (gx_color_index) i, rgb);
+- info_ptr->palette[i].red = gx_color_value_to_byte(rgb[0]);
+- info_ptr->palette[i].green = gx_color_value_to_byte(rgb[1]);
+- info_ptr->palette[i].blue = gx_color_value_to_byte(rgb[2]);
++ palette[i].red = gx_color_value_to_byte(rgb[0]);
++ palette[i].green = gx_color_value_to_byte(rgb[1]);
++ palette[i].blue = gx_color_value_to_byte(rgb[2]);
+ }
++ png_set_PLTE(png_ptr, info_ptr, palette, num_colors);
+ }
+ /* add comment */
+ strncpy(software_key, "Software", sizeof(software_key));
+@@ -375,15 +382,14 @@ png_print_page(gx_device_printer * pdev,
+ text_png.key = software_key;
+ text_png.text = software_text;
+ text_png.text_length = strlen(software_text);
+- info_ptr->text = &text_png;
+- info_ptr->num_text = 1;
++ png_set_text(png_ptr, info_ptr, &text_png, 1);
+
+ /* write the file information */
+ png_write_info(png_ptr, info_ptr);
+
+ /* don't write the comments twice */
+- info_ptr->num_text = 0;
+- info_ptr->text = NULL;
++ /*info_ptr->num_text = 0;*/
++ /*info_ptr->text = NULL;*/
+
+ /* Write the contents of the image. */
+ for (y = 0; y < height; y++) {
+@@ -395,7 +401,7 @@ png_print_page(gx_device_printer * pdev,
+ png_write_end(png_ptr, info_ptr);
+
+ /* if you alloced the palette, free it here */
+- gs_free_object(mem, info_ptr->palette, "png palette");
++ /*gs_free_object(mem, info_ptr->palette, "png palette");*/
+
+ done:
+ /* free the structures */
+@@ -405,6 +411,7 @@ png_print_page(gx_device_printer * pdev,
+ return code;
+ }
+
++#if 0 /* not required in 1.5 */
+ /*
+ * Patch around a static reference to a never-used procedure.
+ * This could be avoided if we were willing to edit pngconf.h to
+@@ -422,6 +429,7 @@ png_push_fill_buffer(png_structp png_ptr
+ {
+ }
+ #endif
++#endif
+
+ static int
+ pngalpha_open(gx_device * pdev)
Modified: nixpkgs/trunk/pkgs/tools/graphics/enblend-enfuse/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/graphics/enblend-enfuse/default.nix Sun Mar
4 09:09:21 2012 (r32758)
+++ nixpkgs/trunk/pkgs/tools/graphics/enblend-enfuse/default.nix Sun Mar
4 11:06:51 2012 (r32759)
@@ -13,6 +13,22 @@
buildNativeInputs = [ perl pkgconfig ];
+ patches =
+ let
+ prefix =
"http://enblend.hg.sourceforge.net/hgweb/enblend/enblend/raw-diff";;
+ in map fetchurl [
+ {
+ url = "${prefix}/9d9b5f3a97cd/src/vigra_impex/png.cxx";
+ name = "ftbfs-libpng15.patch";
+ sha256 = "1nqhbbgphwi087qpazngg04c1whc1p4fwq19fx36jrir96xywgzg";
+ }
+ {
+ url = "${prefix}/101796703d73/src/vigra_impex/png.cxx";
+ name = "ftbfs-libpng15.patch";
+ sha256 = "14frqg4hab9ab6pdypkrmji43fmxjj918j7565rdwmifbm9i3005";
+ }
+ ];
+
meta = {
homepage = http://enblend.sourceforge.net/;
description = "Blends away the seams in a panoramic image mosaic using a
multiresolution spline";
Copied: nixpkgs/trunk/pkgs/tools/graphics/plotutils/debian-patches.nix (from
r32758,
nixpkgs/branches/libpng15/pkgs/tools/graphics/plotutils/debian-patches.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/graphics/plotutils/debian-patches.nix Sun Mar
4 11:06:51 2012 (r32759, copy of r32758,
nixpkgs/branches/libpng15/pkgs/tools/graphics/plotutils/debian-patches.nix)
@@ -0,0 +1,14 @@
+# Generated by debian-patches.sh from debian-patches.txt
+let
+ prefix = "http://patch-tracker.debian.org/patch/series/dl/plotutils/2.6-2";;
+in
+[
+ {
+ url = "${prefix}/10_repair_postscript";
+ sha256 = "01v4a8mdhgsjxbf9a2xppx2lb05lp818v8afp5x2njv64wpgla8p";
+ }
+ {
+ url = "${prefix}/25_libpng15";
+ sha256 = "0l640rcsgc2mwpk7iqm0cf3b0gfcdgcn9wg4x88gaqxzx9rriph0";
+ }
+]
Copied: nixpkgs/trunk/pkgs/tools/graphics/plotutils/debian-patches.txt (from
r32758,
nixpkgs/branches/libpng15/pkgs/tools/graphics/plotutils/debian-patches.txt)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/graphics/plotutils/debian-patches.txt Sun Mar
4 11:06:51 2012 (r32759, copy of r32758,
nixpkgs/branches/libpng15/pkgs/tools/graphics/plotutils/debian-patches.txt)
@@ -0,0 +1,3 @@
+plotutils/2.6-2
+10_repair_postscript
+25_libpng15
Modified: nixpkgs/trunk/pkgs/tools/graphics/plotutils/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/graphics/plotutils/default.nix Sun Mar 4
09:09:21 2012 (r32758)
+++ nixpkgs/trunk/pkgs/tools/graphics/plotutils/default.nix Sun Mar 4
11:06:51 2012 (r32759)
@@ -15,6 +15,8 @@
buildInputs = [libpng];
+ patches = map fetchurl (import ./debian-patches.nix);
+
configureFlags = "--enable-libplotter"; # required for pstoedit
doCheck = true;
Modified: nixpkgs/trunk/pkgs/tools/graphics/pngcrush/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/graphics/pngcrush/default.nix Sun Mar 4
09:09:21 2012 (r32758)
+++ nixpkgs/trunk/pkgs/tools/graphics/pngcrush/default.nix Sun Mar 4
11:06:51 2012 (r32759)
@@ -1,18 +1,19 @@
{ stdenv, fetchurl, libpng, xz }:
stdenv.mkDerivation rec {
- name = "pngcrush-1.7.17";
+ name = "pngcrush-1.7.22";
src = fetchurl {
url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz";
- sha256 = "0lh6wl0ci2y9b690n2zggc1mk21xj6iv378gvxk6gksgjkdw2rj2";
+ sha256 = "1sngz34cssni4j7hvqhq5ms6h4ydb3b0s5y7fidv3kjms9g1xcsp";
};
configurePhase = ''
sed -i s,/usr,$out, Makefile
'';
- buildInputs = [ xz libpng ];
+ buildInputs = [ libpng ];
+ buildNativeInputs = [ xz ];
meta = {
homepage = http://pmt.sourceforge.net/pngcrush;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Mar 4 09:09:21
2012 (r32758)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Mar 4 11:06:51
2012 (r32759)
@@ -1228,7 +1228,9 @@
pngnq = callPackage ../tools/graphics/pngnq { };
- pngtoico = callPackage ../tools/graphics/pngtoico { };
+ pngtoico = callPackage ../tools/graphics/pngtoico {
+ libpng = libpng12;
+ };
polipo = callPackage ../servers/polipo { };
@@ -3830,7 +3832,9 @@
ilmbase = callPackage ../development/libraries/ilmbase { };
- imlib = callPackage ../development/libraries/imlib { };
+ imlib = callPackage ../development/libraries/imlib {
+ libpng = libpng12;
+ };
imlib2 = callPackage ../development/libraries/imlib2 { };
@@ -4026,6 +4030,7 @@
libgcrypt = callPackage ../development/libraries/libgcrypt { };
libgdiplus = callPackage ../development/libraries/libgdiplus {
+ libpng = pkgs.libpng12;
};
libgpgerror = callPackage ../development/libraries/libgpg-error { };
@@ -4180,6 +4185,7 @@
libpng = callPackage ../development/libraries/libpng { };
libpng_apng = callPackage ../development/libraries/libpng/libpng-apng.nix {
};
+ libpng12 = callPackage ../development/libraries/libpng/12.nix { };
libproxy = callPackage ../development/libraries/libproxy { };
@@ -4460,6 +4466,7 @@
opencv_2_1 = callPackage ../development/libraries/opencv/2.1.nix {
ffmpeg = ffmpeg_0_6_90;
+ libpng = libpng12;
inherit (gst_all) gstreamer;
};
@@ -4766,13 +4773,14 @@
inherit (gnome) gtkdoc libsoup;
inherit (gtkLibs) gtk atk pango glib;
inherit freetype fontconfig gettext gperf curl
- libjpeg libtiff libpng libxml2 libxslt sqlite
+ libjpeg libtiff libxml2 libxslt sqlite
icu cairo perl intltool automake libtool
pkgconfig autoconf bison libproxy enchant
python ruby which flex geoclue;
inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg
gstPluginsGood;
inherit (xlibs) libXt renderproto libXrender;
+ libpng = libpng12;
};
webkitSVN =
@@ -4780,13 +4788,14 @@
inherit (gnome) gtkdoc libsoup;
inherit (gtkLibs) gtk atk pango glib;
inherit freetype fontconfig gettext gperf curl
- libjpeg libtiff libpng libxml2 libxslt sqlite
+ libjpeg libtiff libxml2 libxslt sqlite
icu cairo perl intltool automake libtool
pkgconfig autoconf bison libproxy enchant
python ruby which flex geoclue;
inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg
gstPluginsGood;
inherit (xlibs) libXt renderproto libXrender;
+ libpng = libpng12;
};
wvstreams = callPackage ../development/libraries/wvstreams { };
@@ -6951,7 +6960,7 @@
};
qrdecode = builderDefsPackage (import ../tools/graphics/qrdecode) {
- inherit libpng;
+ libpng = libpng12;
opencv = opencv_2_1;
};
@@ -7889,6 +7898,7 @@
exult = callPackage ../games/exult {
stdenv = overrideGCC stdenv gcc42;
+ libpng = libpng12;
};
/*
@@ -8076,7 +8086,9 @@
warzone2100 = callPackage ../games/warzone2100 { };
- widelands = callPackage ../games/widelands {};
+ widelands = callPackage ../games/widelands {
+ libpng = libpng12;
+ };
xboard = builderDefsPackage (import ../games/xboard) {
inherit (xlibs) libX11 xproto libXt libXaw libSM
@@ -8673,7 +8685,7 @@
splix = callPackage ../misc/cups/drivers/splix { };
- tetex = callPackage ../tools/typesetting/tex/tetex { };
+ tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
tex4ht = callPackage ../tools/typesetting/tex/tex4ht { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
