[t4k_common] libpng 1.5. fix.

Jon Ciesla limb at fedoraproject.org
Mon Jan 23 15:47:14 UTC 2012


commit a14466520e46c692041726f5fc03e3918620b467
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Jan 23 09:47:04 2012 -0600

    libpng 1.5. fix.

 t4k_common-0.1.1-libpng15.patch |   23 +++++++++++++++++++++++
 t4k_common.spec                 |    8 +++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/t4k_common-0.1.1-libpng15.patch b/t4k_common-0.1.1-libpng15.patch
new file mode 100644
index 0000000..930f94f
--- /dev/null
+++ b/t4k_common-0.1.1-libpng15.patch
@@ -0,0 +1,23 @@
+--- src/t4k_loaders.c.orig	2011-04-07 21:46:07.000000000 -0500
++++ src/t4k_loaders.c	2012-01-23 09:40:36.741027921 -0600
+@@ -1028,12 +1028,14 @@
+       {
+         png_init_io(png_ptr, fi);
+ 
+-        info_ptr->width = surf->w;
+-        info_ptr->height = surf->h;
+-        info_ptr->bit_depth = 8;
+-        info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+-        info_ptr->interlace_type = 1;
+-        info_ptr->valid = 0;	/* will be updated by various png_set_FOO() functions */
++        //info_ptr->width = surf->w;
++        //info_ptr->height = surf->h;
++        //info_ptr->bit_depth = 8;
++        //info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
++        //info_ptr->interlace_type = 1;
++        png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8, PNG_COLOR_TYPE_RGB_ALPHA, 1, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
++        //info_ptr->valid = 0;	/* will be updated by various png_set_FOO() functions */
++        png_set_valid(png_ptr, info_ptr, 0);
+ 
+         png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,
+                        PNG_sRGB_INTENT_PERCEPTUAL);
diff --git a/t4k_common.spec b/t4k_common.spec
index 54ef4bc..21bf563 100644
--- a/t4k_common.spec
+++ b/t4k_common.spec
@@ -1,10 +1,11 @@
 Name: t4k_common
 Version: 0.1.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://tux4kids.alioth.debian.org/
 Summary: Library for Tux4Kids applications
 License: GPLv3+
 Source0: https://alioth.debian.org/frs/download.php/3540/%{name}-%{version}.tar.gz
+Patch0: t4k_common-0.1.1-libpng15.patch
 Group: System Environment/Libraries
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: SDL-devel SDL_mixer-devel SDL_image-devel
@@ -31,6 +32,8 @@ These are the development files.
 %prep
 %setup -q
 
+%patch0 -p0
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -66,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/t4k_common.pc
 
 %changelog
+* Mon Jan 23 2012 Jon Ciesla <limburgher at gmail.com> - 0.1.1-6
+- libpng15 fix.
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list