From 98a8da98e39241d96890a7263d834eea86afd956 Mon Sep 17 00:00:00 2001
From: Erik Schilling <ablu.erikschilling@googlemail.com>
Date: Jul 31 2013 13:48:53 +0000
Subject: fixed newer libpng versions


---

diff --git a/valyriatear-libpng-fix.patch b/valyriatear-libpng-fix.patch
new file mode 100644
index 0000000..f9d54c5
--- /dev/null
+++ b/valyriatear-libpng-fix.patch
@@ -0,0 +1,27 @@
+From 2d6549d13f951c3f17dbdbedf8737a6053ec62a7 Mon Sep 17 00:00:00 2001
+From: Erik Schilling <ablu.erikschilling@googlemail.com>
+Date: Wed, 31 Jul 2013 14:09:31 +0200
+Subject: [PATCH] fix newer libpng versions
+
+Conflicts:
+	src/engine/video/image.cpp
+---
+ src/engine/video/image.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/engine/video/image.cpp b/src/engine/video/image.cpp
+index 3426d78..95caa7c 100644
+--- a/src/engine/video/image.cpp
++++ b/src/engine/video/image.cpp
+@@ -694,7 +694,7 @@ void ImageDescriptor::_GetPngImageInfo(const std::string &filename, uint32 &rows
+     png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_STRIP_16 | PNG_TRANSFORM_PACKING | PNG_TRANSFORM_EXPAND, NULL);
+ 
+     // grab the relevant data...
+-#if PNG_LIBPNG_VER_SONUM == 15
++#if PNG_LIBPNG_VER_DLLNUM >= 15
+     cols = png_get_image_width(png_ptr, info_ptr);
+     rows = png_get_image_height(png_ptr, info_ptr);
+     bpp = png_get_bit_depth(png_ptr, info_ptr) * 8;
+-- 
+1.8.3.1
+
diff --git a/valyriatear.spec b/valyriatear.spec
index 57f193a..44b51cb 100644
--- a/valyriatear.spec
+++ b/valyriatear.spec
@@ -1,7 +1,7 @@
 %global alias ValyriaTear
 Name:       valyriatear
 Version:    0.5.0
-Release:    5%{?dist}
+Release:    6%{?dist}
 Summary:    Valyria Tear is a free 2D J-RPG based on the Hero of Allacrost engine
 License:    GPLv2
 URL:        http://valyriatear.blogspot.de/
@@ -9,6 +9,9 @@ Source0:    https://github.com/Bertram25/ValyriaTear/archive/%{version}/%{name}-
 # Redhat bug: 928608, Upstream: https://github.com/Bertram25/ValyriaTear/issues/127
 # Patched this into the package since it makes the game unplayable if the bug is hit
 Patch0:     %{name}-fixed-inventory.patch
+# Picked from upstream to fix newer libpng versions:
+# See bugtracker: https://github.com/Bertram25/ValyriaTear/issues/199
+Patch1:     %{name}-libpng-fix.patch
 Requires:   %{name}-data = %{version}-%{release}
 BuildRequires: boost-devel
 BuildRequires: cmake
@@ -63,6 +66,7 @@ This package contains the game data.
 %prep
 %setup -q -n %{alias}-%{version}
 %patch0 -p1
+%patch1 -p1
 # Ensure that it builds against system libaries
 rm -r src/luabind
 # Use system fonts
@@ -96,19 +100,27 @@ desktop-file-validate  %{buildroot}/%{_datadir}/applications/%{name}.desktop
 %{_datadir}/%{name}
 
 %changelog
+* Tue Jul 30 2013 Erik Schilling <ablu.erikschilling@googlemail.com> 0.5.0-6
+- Fixed building with newer boost version
+
 * Tue Jul 30 2013 Petr Machata <pmachata@redhat.com> - 0.5.0-5
 - Rebuild for boost 1.54.0
 
 * Thu Mar 28 2013 Erik Schilling <ablu.erikschilling@googlemail.com> 0.5.0-4
 - Fixed serious crash in the inventory (redhat bug: #928608)
+
 * Fri Feb 1 2013 Erik Schilling <ablu.erikschilling@googlemail.com> 0.5.0-3
 - Fixed download link to github directly
+
 * Fri Feb 1 2013 Erik Schilling <ablu.erikschilling@googlemail.com> 0.5.0-2
 - Fixed Gnu -> GNU
 - Added comment to Source0
+
 * Fri Feb 1 2013 Erik Schilling <ablu.erikschilling@googlemail.com> 0.5.0-1
 - New upstream release 0.5.0
-* Wed Jan 8 2013 Erik Schilling <ablu.erikschilling@googlemail.com> 0.5.0-0.2rc2
+
+* Tue Jan 8 2013 Erik Schilling <ablu.erikschilling@googlemail.com> 0.5.0-0.2rc2
 - Added patch for lua 5.2
+
 * Tue Jan 8 2013 Erik Schilling <ablu.erikschilling@googlemail.com> 0.5.0-0.1rc2
 - Initial packaging