Archives
Archives
| From: | "Samuli Suominen (ssuominen)" <ssuominen@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in dev-scheme/plt-scheme/files: plt-scheme-4.2.2-libpng14.patch |
| Date: | Tue, 11 May 2010 10:28:03 |
| Message-Id: | 20100511102801.18F092C5E5@corvid.gentoo.org |
| 1 | ssuominen 10/05/11 10:28:01 |
| 2 | |
| 3 | Added: plt-scheme-4.2.2-libpng14.patch |
| 4 | Log: |
| 5 | Fix building with libpng 1.4.x wrt #319253 by Dmitry Kravtsov. |
| 6 | (Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.1 dev-scheme/plt-scheme/files/plt-scheme-4.2.2-libpng14.patch |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/plt-scheme/files/plt-scheme-4.2.2-libpng14.patch?rev=1.1&view=markup |
| 12 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/plt-scheme/files/plt-scheme-4.2.2-libpng14.patch?rev=1.1&content-type=text/plain |
| 13 | |
| 14 | Index: plt-scheme-4.2.2-libpng14.patch |
| 15 | =================================================================== |
| 16 | diff -ur plt-4.2.2.orig/src/wxcommon/wxJPEG.cxx plt-4.2.2/src/wxcommon/wxJPEG.cxx |
| 17 | --- plt-4.2.2.orig/src/wxcommon/wxJPEG.cxx 2009-09-17 06:08:52.000000000 +0300 |
| 18 | +++ plt-4.2.2/src/wxcommon/wxJPEG.cxx 2010-05-11 13:17:28.000000000 +0300 |
| 19 | @@ -726,7 +726,11 @@ |
| 20 | png_set_strip_16(png_ptr); |
| 21 | |
| 22 | /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */ |
| 23 | + #if PNG_LIBPNG_VER < 10400 |
| 24 | png_set_gray_1_2_4_to_8(png_ptr); |
| 25 | + #else |
| 26 | + png_set_expand_gray_1_2_4_to_8(png_ptr); |
| 27 | + #endif |
| 28 | } |
| 29 | |
| 30 | /* Set the background color to draw transparent and alpha images over. |