Merge Upstream version 1.6.36 from branch 'upstream' into tizen

Change-Id: Id7e09620c614fc2b18e75c89f8d14b20bead16db

diff --cc packaging/libpng.spec
index 2a4a60c,0000000..7c58001
mode 100644,000000..100644
--- 1/packaging/libpng.spec
--- /dev/null
+++ b/packaging/libpng.spec
@@@ -1,72 -1,0 +1,72 @@@
- Version:        1.6.21
 +Name:           libpng
- Url:            http://www.libpng.org/pub/png/
++Version:        1.6.36
 +Release:        1
 +License:        Libpng
 +Summary:        A library of functions for manipulating PNG image format files
++Url:            http://www.libpng.org/pub/png/libpng.html
 +Group:          System/Libraries
 +Source:         %{name}-%{version}.tar.bz2
 +Source1001:     libpng.manifest
 +BuildRequires:  zlib-devel
 +
 +%description
 +The libpng package contains a library of functions for creating and
 +manipulating PNG (Portable Network Graphics) image format files.  PNG
 +is a bit-mapped graphics format similar to the GIF format.  PNG was
 +created to replace the GIF format, since GIF uses a patented data
 +compression algorithm.
 +
 +Libpng should be installed if you need to manipulate PNG format image
 +files.
 +
 +%package devel
 +Summary:        Development tools for programs to manipulate PNG image format files
 +Group:          Development/Libraries
 +Requires:       %{name} = %{version}-%{release}
 +Requires:       zlib-devel
 +
 +%description devel
 +The libpng-devel package contains header files and documentation necessary
 +for developing programs using the PNG (Portable Network Graphics) library.
 +
 +%prep
 +%setup -q
 +cp %{SOURCE1001} .
 +
 +%build
 +%ifarch %{arm}
 +CFLAGS+=" -D_ARCH_ARM_ -mfpu=neon"
 +%endif
 +
 +%if "%{tizen_profile_name}" == "tv"
 +CFLAGS+=" -D_PNG_COLOR_PICK_ENABLED_ -D_PNG_SEQUENTIAL_READ_SUPPORTED_"
 +%endif
 +
 +%configure \
 +    --disable-static \
 +%ifarch %arm armv7l armv7el aarch64
 +    --enable-arm-neon=check
 +%endif
 +
 +
 +%__make %{?_smp_mflags}
 +
 +%install
 +%make_install
 +rm -rf %{buildroot}/usr/share/man
 +
 +%post -p /sbin/ldconfig
 +%postun -p /sbin/ldconfig
 +
 +%files
 +%manifest %{name}.manifest
 +%license LICENSE
 +%{_libdir}/libpng*.so.*
 +
 +%files devel
 +%manifest %{name}.manifest
 +%{_bindir}/*
 +%{_includedir}/*
 +%{_libdir}/libpng*.so
 +%{_libdir}/pkgconfig/*
 +

diff --cc png.c
index 4a9d85c,3dce191..3dce191
mode 100755,100644..100755
--- 1/png.c
--- 2/png.c
+++ b/png.c

diff --cc png.h
Simple merge

diff --cc pngread.c
Simple merge

diff --cc pngrutil.c
Simple merge

diff --cc scripts/pnglibconf.dfa
index 291bb2e,15bd08e..53fc1a0
--- 1/scripts/pnglibconf.dfa
--- 2/scripts/pnglibconf.dfa
+++ b/scripts/pnglibconf.dfa
@@@ -297,10 -325,10 +325,10 @@@ option WRITE_INT_FUNCTIONS disable
  #     By default recoverable errors on write should just generate warnings,
  #     not generally safe because this allows the application to write invalid
  #     PNG files.  Applications should enable this themselves; it's useful
- #     because it means that a failure to write an ancilliary chunk can often be
+ #     because it means that a failure to write an ancillary chunk can often be
  #     ignored.
  
 -option WARNINGS
 +option WARNINGS disabled
  option ERROR_TEXT
  option ERROR_NUMBERS disabled
  

diff --cc scripts/symbols.def
index 4df4a4f,82494bb..5c29fdd
--- 1/scripts/symbols.def
--- 2/scripts/symbols.def
+++ b/scripts/symbols.def
@@@ -249,4 -248,8 +248,9 @@@ EXPORT
   png_set_check_for_invalid_index @242
   png_get_palette_max @243
   png_set_option @244
-  png_read_image_with_pick_color @245
+  png_image_write_to_memory @245
+  png_get_eXIf @246
+  png_set_eXIf @247
+  png_get_eXIf_1 @248
+  png_set_eXIf_1 @249
++ png_read_image_with_pick_color @250