Merge branch 'upstream' into tizen

Change-Id: I6475d1aa957032f907b9d81f0d83ee6b3140797e

diff --cc packaging/libpng.spec
index df06560,0000000..4d79b1f
mode 100644,000000..100644
--- 1/packaging/libpng.spec
--- /dev/null
+++ b/packaging/libpng.spec
@@@ -1,73 -1,0 +1,73 @@@
- Version:        1.6.39
 +Name:           libpng
++Version:        1.6.40
 +Release:        0
 +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:  cmake
 +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
 +
 +%cmake . -DPNG_STATIC=OFF \
 +         -DSKIP_INSTALL_PROGRAMS=ON \
 +         -DSKIP_INSTALL_EXPORT=ON \
 +%ifarch %{arm}
 +         -DPNG_ARM_NEON=on \
 +%else
 +         -DPNG_ARM_NEON=off \
 +%endif
 +         %{?ubsan: -DPNG_ARM_NEON=off}
 +
 +make %{?jobs:-j%jobs}
 +
 +%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 4f3e8bb,d6471b0..d6471b0
mode 100755,100644..100755
--- 1/png.c
--- 2/png.c
+++ b/png.c

diff --cc png.h
Simple merge

diff --cc pngget.c
Simple merge

diff --cc pngpriv.h
index 0bb9473,7c19373..0757ecc
--- 1/pngpriv.h
--- 2/pngpriv.h
+++ b/pngpriv.h
@@@ -626,12 -626,8 +626,12 @@@
  #define PNG_BACKGROUND_IS_GRAY     0x800U
  #define PNG_HAVE_PNG_SIGNATURE    0x1000U
  #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000U /* Have another chunk after IDAT */
-                    /*             0x4000U (unused) */
+ #define PNG_WROTE_eXIf            0x4000U
  #define PNG_IS_READ_STRUCT        0x8000U /* Else is a write struct */
 +#ifdef PNG_APNG_SUPPORTED
 +#define PNG_HAVE_acTL            0x10000U
 +#define PNG_HAVE_fcTL            0x20000U
 +#endif
  
  /* Flags for the transformations the PNG library does on the image data */
  #define PNG_BGR                 0x0001U

diff --cc pngset.c
Simple merge

diff --cc pngtest.c
Simple merge

diff --cc pngwrite.c
Simple merge

diff --cc scripts/pnglibconf.dfa
Simple merge