Author: sls Date: Tue Feb 9 23:28:03 2010 GMT Module: packages Tag: HEAD ---- Log message: - added libpng14.patch (and undos related sources) - rel. 4
---- Files affected: packages/DevIL: DevIL.spec (1.24 -> 1.25) , libpng14.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/DevIL/DevIL.spec diff -u packages/DevIL/DevIL.spec:1.24 packages/DevIL/DevIL.spec:1.25 --- packages/DevIL/DevIL.spec:1.24 Thu Jan 28 14:09:24 2010 +++ packages/DevIL/DevIL.spec Wed Feb 10 00:27:57 2010 @@ -5,7 +5,7 @@ Version: 1.7.2 %define manual_version 1.5.5 %define docs_version 1.6.5 -Release: 3 +Release: 4 License: LGPL v2.1 Group: Libraries Source0: http://dl.sourceforge.net/openil/%{name}-%{version}.tar.gz @@ -17,6 +17,7 @@ Patch0: %{name}-c++.patch Patch1: %{name}-link.patch Patch2: %{name}-gnu-inline.patch +Patch3: libpng14.patch URL: http://openil.sourceforge.net/ BuildRequires: OpenGL-GLU-devel BuildRequires: SDL-devel >= 1.2.5 @@ -30,6 +31,8 @@ BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: libtool >= 2:1.5 +BuildRequires: rpmbuild(macros) >= 1.533 +BuildRequires: sed >= 4.0 BuildRequires: unzip BuildRequires: which Requires: allegro >= 4.1.16 @@ -105,6 +108,9 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%undos src-IL/src/il_png.c +%undos src-IL/src/il_icon.c +%patch3 -p1 # just SDL and messing libtool macros rm -f acinclude.m4 @@ -163,6 +169,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.25 2010/02/09 23:27:57 sls +- added libpng14.patch (and undos related sources) +- rel. 4 + Revision 1.24 2010/01/28 13:09:24 amateja - release 3 ================================================================ Index: packages/DevIL/libpng14.patch diff -u /dev/null packages/DevIL/libpng14.patch:1.1 --- /dev/null Wed Feb 10 00:28:03 2010 +++ packages/DevIL/libpng14.patch Wed Feb 10 00:27:57 2010 @@ -0,0 +1,40 @@ +--- DevIL-1.7.2/src-IL/src/il_png.c.orig 2010-02-07 16:59:29.208824733 +0100 ++++ DevIL-1.7.2/src-IL/src/il_png.c 2010-02-07 17:04:17.675411333 +0100 +@@ -103,7 +103,11 @@ ILboolean iIsValidPng() + Read = iread(Signature, 1, 8); + iseek(-Read, IL_SEEK_CUR); + ++#if PNG_LIBPNG_VER < 10400 + return png_check_sig(Signature, 8); ++#else ++ return png_sig_cmp(Signature, 0, 8) == 0; ++#endif + } + + +@@ -278,7 +282,11 @@ ILboolean readpng_get_image(ILdouble dis + + // Expand low-bit-depth grayscale images to 8 bits + if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { ++#if PNG_LIBPNG_VER < 10400 + png_set_gray_1_2_4_to_8(png_ptr); ++#else ++ png_set_expand_gray_1_2_4_to_8(png_ptr); ++#endif + } + + // Expand RGB images with transparency to full alpha channels +--- DevIL-1.7.2/src-IL/src/il_icon.c.orig 2010-02-07 17:15:17.456176881 +0100 ++++ DevIL-1.7.2/src-IL/src/il_icon.c 2010-02-07 17:15:59.942840566 +0100 +@@ -530,7 +530,11 @@ + + // Expand low-bit-depth grayscale images to 8 bits + if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { ++#if PNG_LIBPNG_VER < 10400 + png_set_gray_1_2_4_to_8(ico_png_ptr); ++#else ++ png_set_expand_gray_1_2_4_to_8(ico_png_ptr); ++#endif + } + + // Expand RGB images with transparency to full alpha channels ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/DevIL/DevIL.spec?r1=1.24&r2=1.25&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
