Merge branch 'upstream' into tizen

Change-Id: I58dfbeb2c894ccd5b9eba7c4b6f750bfc8cf13ee

diff --cc include/lcms2.h
Simple merge

diff --cc packaging/lcms2.spec
index 5608c4e,0000000..897a371
mode 100644,000000..100644
--- 1/packaging/lcms2.spec
--- /dev/null
+++ b/packaging/lcms2.spec
@@@ -1,77 -1,0 +1,77 @@@
- Version:        2.12
 +%define lname libcms2
 +Name:           lcms2
 +Summary:        Little CMS Engine - A color managment library and tools
 +License:        MIT
 +Group:          Graphics/Libraries
 +Url:            http://www.littlecms.com/
- chmod a-x doc/* COPYING AUTHORS
++Version:        2.16
 +Release:        0
 +BuildRequires:  libjpeg-devel
 +BuildRequires:  libtiff-devel
 +BuildRequires:  pkg-config
 +BuildRequires:  zlib-devel
 +Source0:        http://sourceforge.net/projects/lcms/files/lcms/%{version}/%{name}-%{version}.tar.gz
 +Source1001:   lcms2.manifest
 +
 +%description
 +Littlecms is a small speed optimized color management engine.
 +Little CMS intends to be a small-footprint color management engine
 +with a special focus on accuracy and performance. It uses the International
 +Color Consortium standard (ICC), which is the modern standard when
 +regarding to color management. The ICC specification is widely used and is
 +referred to in many International and other de-facto standards.
 +
 +%package -n libcms2
 +Summary:        Libraries for the Little CMS Engine
 +Group:          Graphics/Libraries
 +
 +%description -n libcms2
 +Little CMS Engine - A color managment library and tools.
 +
 +%package -n liblcms2-devel
 +Summary:        Include Files and Libraries Mandatory for Development
 +Group:          Development/Libraries
 +Requires:       libcms2 = %{version}
 +Requires:       glibc-devel
 +
 +%description -n liblcms2-devel
 +This package contains all necessary include files and libraries needed
 +to develop applications that require these.
 +
 +%prep
 +%setup -q
 +cp %{SOURCE1001} .
 +
- %license COPYING
++chmod a-x doc/* LICENSE AUTHORS
 +
 +%build
 +%configure --without-threads
 +make %{?_smp_flags}
 +
 +%install
 +%make_install
 +
 +%post -n libcms2 -p /sbin/ldconfig
 +
 +%postun -n libcms2 -p /sbin/ldconfig
 +
 +%files
 +%manifest %{name}.manifest
 +%defattr(-,root,root)
- %license COPYING
++%license LICENSE
 +%{_bindir}/*
 +
 +%files -n libcms2
 +%manifest %{name}.manifest
 +%defattr(-,root,root)
++%license LICENSE
 +%{_libdir}/liblcms2.so.2*
 +
 +%files -n liblcms2-devel
 +%manifest %{name}.manifest
 +%defattr(-,root,root)
 +%{_includedir}/*.h
 +%{_libdir}/*.so
 +%{_libdir}/pkgconfig/*.pc
 +
 +%docs_package

diff --cc src/cmscgats.c
Simple merge

diff --cc src/lcms2_internal.h
index d1e311a,8e78a71..faf5255
--- 1/src/lcms2_internal.h
--- 2/src/lcms2_internal.h
+++ b/src/lcms2_internal.h
@@@ -1119,6 -1150,8 +1151,9 @@@ cmsBool   _cmsAdaptationMatrix(cmsMAT3
  cmsBool   _cmsBuildRGB2XYZtransferMatrix(cmsMAT3* r, const cmsCIExyY* WhitePoint, const cmsCIExyYTRIPLE* Primaries);
  
  
+ // thread-safe gettime
+ cmsBool _cmsGetTime(struct tm* ptr_time);
+ 
  #define _lcms_internal_H
 +#pragma GCC visibility pop
  #endif