From 2b9f68631cdb74d38abefa14cd697c0cc43b82dd Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Wed, 27 Apr 2016 22:40:39 -0500
Subject: [PATCH] [libpng16] Rebased contrib/intel_sse.patch.

---
 ANNOUNCE                      |  5 +++--
 CHANGES                       |  3 ++-
 contrib/intel/intel_sse.patch | 16 ++++++++--------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 026bd26cc..c8c85efac 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.22beta06 - April 27, 2016
+Libpng 1.6.22beta06 - April 28, 2016
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -91,7 +91,8 @@ Version 1.6.22beta05 [April 27, 2016]
   Fixed typo (missing underscore) in #define PNG_READ_16_TO_8_SUPPORTED
     (Bug report by Y.Ohashik).
 
-Version 1.6.22beta06 [April 27, 2016]
+Version 1.6.22beta06 [April 28, 2016]
+  Rebased contrib/intel_sse.patch.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 3fe91e8aa..11ec882e8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5551,7 +5551,8 @@ Version 1.6.22beta05 [April 27, 2016]
   Fixed typo (missing underscore) in #define PNG_READ_16_TO_8_SUPPORTED
     (Bug report by Y.Ohashik).
 
-Version 1.6.22beta06 [April 27, 2016]
+Version 1.6.22beta06 [April 28, 2016]
+  Rebased contrib/intel_sse.patch.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/contrib/intel/intel_sse.patch b/contrib/intel/intel_sse.patch
index 13472dc12..174f5895c 100644
--- a/contrib/intel/intel_sse.patch
+++ b/contrib/intel/intel_sse.patch
@@ -1,6 +1,6 @@
 diff --git a/configure.ac b/configure.ac
---- a/configure.ac	2016-02-22 17:24:25.000000000 -0600
-+++ b/configure.ac	2016-02-22 17:30:36.949159871 -0600
+--- a/configure.ac	2016-04-27 22:33:47.805069558 -0500
++++ b/configure.ac	2016-04-27 22:33:47.829012469 -0500
 @@ -1,10 +1,13 @@
  # configure.ac
  
@@ -15,7 +15,7 @@ diff --git a/configure.ac b/configure.ac
  # and license in png.h
  
  dnl Process this file with autoconf to produce a configure script.
-@@ -316,16 +319,50 @@ AC_ARG_ENABLE([arm-neon],
+@@ -335,16 +338,50 @@ AC_ARG_ENABLE([arm-neon],
  
  AM_CONDITIONAL([PNG_ARM_NEON],
     [test "$enable_arm_neon" != 'no' &&
@@ -67,8 +67,8 @@ diff --git a/configure.ac b/configure.ac
  
  AC_OUTPUT
 diff --git a/Makefile.am b/Makefile.am
---- a/Makefile.am	2016-02-22 17:24:24.000000000 -0600
-+++ b/Makefile.am	2016-02-22 17:32:18.387223996 -0600
+--- a/Makefile.am	2016-04-27 22:33:47.809928404 -0500
++++ b/Makefile.am	2016-04-27 22:33:47.832941146 -0500
 @@ -1,10 +1,13 @@
  # Makefile.am, the source file for Makefile.in (and hence Makefile), is
  #
@@ -83,7 +83,7 @@ diff --git a/Makefile.am b/Makefile.am
  # and license in png.h
  
  PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
-@@ -83,16 +86,20 @@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SO
+@@ -86,16 +89,20 @@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SO
  	pngset.c pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c\
  	png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h pngusr.dfa
  
@@ -105,8 +105,8 @@ diff --git a/Makefile.am b/Makefile.am
  #   Versioned symbols and restricted exports
  if HAVE_SOLARIS_LD
 diff --git a/pngpriv.h b/pngpriv.h
---- a/pngpriv.h	2016-04-18 09:34:43.670248185 -0500
-+++ b/pngpriv.h	2016-04-18 09:31:01.697943803 -0500
+--- a/pngpriv.h	2016-04-27 22:33:47.800157005 -0500
++++ b/pngpriv.h	2016-04-27 22:33:47.838191194 -0500
 @@ -177,16 +177,52 @@
  #  endif /* !PNG_ARM_NEON_IMPLEMENTATION */