From 17a51b5429b278da33e10ba9ae0d9494f2acd8bf182311f3d0a844e6da7006ca Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 19 Feb 2013 08:54:49 +0000
Subject: [PATCH] Accepting request 155783 from home:pgajdos:libpng16

- build also against libpng16
  * modified compilefixes.diff (#include <string.h> in hpng.c)
  * modified automake.diff (look for libpng16 and then for libpng15)

OBS-URL: https://build.opensuse.org/request/show/155783
OBS-URL: https://build.opensuse.org/package/show/games/blockout?expand=0&rev=5
---
 automake.diff     |  4 ++--
 blockout.changes  |  7 +++++++
 blockout.spec     |  2 +-
 compilefixes.diff | 12 ++++++++++--
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/automake.diff b/automake.diff
index aae146c..eb406cc 100644
--- a/automake.diff
+++ b/automake.diff
@@ -79,8 +79,8 @@ Index: bl24_lin_src/configure.ac
 +PKG_CHECK_MODULES([libGLU], [glu])
 +PKG_CHECK_MODULES([libSDL], [sdl >= 1.2.12])
 +PKG_CHECK_MODULES([libSDL_mixer], [SDL_mixer >= 1.2.8])
-+PKG_CHECK_MODULES([libpng], [libpng15], [:], [
-+	PKG_CHECK_MODULES([libpng], [libpng14])
++PKG_CHECK_MODULES([libpng], [libpng16], [:], [
++	PKG_CHECK_MODULES([libpng], [libpng15])
 +])
 +AC_CONFIG_FILES([Makefile ImageLib/src/Makefile BlockOut/Makefile])
 +AC_OUTPUT
diff --git a/blockout.changes b/blockout.changes
index 83c1d05..f8a02ac 100644
--- a/blockout.changes
+++ b/blockout.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Feb 19 08:36:08 UTC 2013 - pgajdos@suse.com
+
+- build also against libpng16
+  * modified compilefixes.diff (#include <string.h> in hpng.c)
+  * modified automake.diff (look for libpng16 and then for libpng15)
+
 -------------------------------------------------------------------
 Sun Mar 25 14:18:38 UTC 2012 - jengelh@medozas.de
 
diff --git a/blockout.spec b/blockout.spec
index 995e66c..339367b 100644
--- a/blockout.spec
+++ b/blockout.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package blockout
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
diff --git a/compilefixes.diff b/compilefixes.diff
index b616571..6153c8f 100644
--- a/compilefixes.diff
+++ b/compilefixes.diff
@@ -257,7 +257,15 @@ Index: bl24_lin_src/ImageLib/src/png/hpng.c
 ===================================================================
 --- bl24_lin_src.orig/ImageLib/src/png/hpng.c
 +++ bl24_lin_src/ImageLib/src/png/hpng.c
-@@ -45,10 +45,6 @@ int LoadPngImage(PNG_IMAGE *d) {
+@@ -1,6 +1,7 @@
+ #include <malloc.h>
+ #include <math.h>
+ #include <png.h>
++#include <string.h>
+ #include "hpng.h"
+ 
+ char PngErrorMessage[1024];
+@@ -45,10 +46,6 @@ int LoadPngImage(PNG_IMAGE *d) {
  	// ---------------- Error handling
  
  	png_set_error_fn(png,NULL,my_png_error,NULL);
@@ -268,7 +276,7 @@ Index: bl24_lin_src/ImageLib/src/png/hpng.c
  
  	// ----------------- Read the image
  
-@@ -154,7 +150,7 @@ char *WritePngImage(char *file_name,unsi
+@@ -154,7 +151,7 @@ char *WritePngImage(char *file_name,unsi
     {
      	sprintf(PngErrorMessage,"png_create_info_struct() failed");
        fclose(fp);