From 0a0354580a87301af07e283200439d7478da0ade Mon Sep 17 00:00:00 2001
From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sun, 28 Apr 2013 21:11:36 +0200
Subject: [PATCH] libpng: Update to 1.6.2.

This is a major release to the 1.6.x branch of libpng.
I've created a compat package for those binaries who are still linked against the old 1.5 version.

Fixes #10307.
---
 libpng/libpng.nm                          | 36 +++++++++++++++++++++--
 libpng/patches/libpng-1.4.2-pngconf.patch | 29 ------------------
 2 files changed, 34 insertions(+), 31 deletions(-)
 delete mode 100644 libpng/patches/libpng-1.4.2-pngconf.patch

diff --git a/libpng/libpng.nm b/libpng/libpng.nm
index 55268a8a4..cb08080d2 100644
--- a/libpng/libpng.nm
+++ b/libpng/libpng.nm
@@ -4,9 +4,11 @@
 ###############################################################################
 
 name       = libpng
-version    = 1.5.9
+version    = 1.6.2
 release    = 1
 
+compat_ver = 1.5.15
+
 groups     = System/Libraries
 url        = http://www.libpng.org/pub/png/
 license    = zlib
@@ -20,14 +22,36 @@ description
 	data compression algorithm.
 end
 
-source_dl  = http://downloads.sourceforge.net/project/libpng/libpng15/%{version}/
+source_dl  = http://downloads.sourceforge.net/project/libpng/libpng16/%{version}/
+
+# Source URL for comat package.
+source_dl +=  http://downloads.sourceforge.net/project/libpng/libpng15/%{compat_ver}/
+
 sources    = %{thisapp}.tar.xz
 
+# File for compat package.
+sources   += %{name}-%{compat_ver}.tar.xz
+
 build
 	requires
 		pkg-config
 		zlib-devel
 	end
+
+	# Build compat package.
+	build_cmds
+		cd %{DIR_SRC}/%{name}-%{compat_ver}
+		./configure %{configure_options}
+
+		make %{PARALLELISMFLAGS}
+	end
+
+	# Install compat package.
+	install_cmds
+		cd %{DIR_SRC}/%{name}-%{compat_ver}
+		install -m 755 .libs/libpng15.so.15.15.0 %{BUILDROOT}%{libdir}
+		ln -svf libpng15.so.15.15.0 %{BUILDROOT}%{libdir}/libpng15.so.15
+	end
 end
 
 packages
@@ -39,6 +63,14 @@ packages
 		requires = zlib-devel
 	end
 
+	package %{name}-compat
+		summary = Compat libraries of %{thisapp}.
+
+		files
+			%{libdir}/%{name}15.so*
+		end
+	end
+
 	package %{name}-debuginfo
 		template DEBUGINFO
 	end
diff --git a/libpng/patches/libpng-1.4.2-pngconf.patch b/libpng/patches/libpng-1.4.2-pngconf.patch
deleted file mode 100644
index 4f1e581ca..000000000
--- a/libpng/patches/libpng-1.4.2-pngconf.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Nur a/pngconf.h b/pngconf.h
---- a/pngconf.h	2010-05-06 12:30:09.000000000 +0200
-+++ b/pngconf.h	2010-05-09 13:19:16.000000000 +0200
-@@ -35,6 +35,25 @@
- #  ifdef HAVE_CONFIG_H
- #    include "config.h"
- #  endif
-+# else
-+/* pngconf.h is part of the exported API. When a libpng-using application
-+   includes us, PNG_CONFIGURE_LIBPNG is of course not defined as we do not have
-+   libpng's config.h available in this case. This means that we do not have the
-+   defines added to config.h and the commandline by libpng's ./configure .
-+   
-+   For all defines from config.h not having them set is not a problem, however
-+   ./configure also adds -DPNG_NO_ASSEMBLER_CODE to the CFLAGS when compiling
-+   on a platform on which the MMX and SSE asm code in libpng is not supported.
-+   
-+   We do need this define as this define is used to determine whether or not
-+   to define PNG_ASSEMBLER_CODE_SUPPORTED and other assembler related defines
-+   and prototypes. PNG_ASSEMBLER_CODE_SUPPORTED in turn is used by applications
-+   (ImageMagick for example) to determine whether or not they can use the asm
-+   functions. Thus we need to define PNG_NO_ASSEMBLER_CODE here on platforms
-+   on which the MMX and SSE asm code in libpng is not supported: */
-+#  ifndef __i386__ /* change this if MMX/SSE become supported on x86_64! */
-+#  define PNG_NO_ASSEMBLER_CODE
-+# endif
- #endif
- 
- /*
-- 
2.47.3