diff --git a/.gitignore b/.gitignore index 85cafcb..bdeada7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/lcms2-2.5.tar.gz +SOURCES/lcms2-2.6.tar.gz diff --git a/.lcms2.metadata b/.lcms2.metadata index 09fb155..fec98d9 100644 --- a/.lcms2.metadata +++ b/.lcms2.metadata @@ -1 +1 @@ -bab3470471fc7756c5fbe71be9a3c7d677d2ee7b SOURCES/lcms2-2.5.tar.gz +b0ecee5cb8391338e6c281d1c11dcae2bc22a5d2 SOURCES/lcms2-2.6.tar.gz diff --git a/SOURCES/define-ppc64le-endian.patch b/SOURCES/define-ppc64le-endian.patch new file mode 100644 index 0000000..bfbe7ac --- /dev/null +++ b/SOURCES/define-ppc64le-endian.patch @@ -0,0 +1,17 @@ +diff -up lcms2-2.6/include/lcms2.h.pccle lcms2-2.6/include/lcms2.h +--- lcms2-2.6/include/lcms2.h.pccle 2015-05-08 14:47:23.180315646 -0400 ++++ lcms2-2.6/include/lcms2.h 2015-05-08 14:48:27.071176735 -0400 +@@ -184,6 +184,13 @@ typedef int cmsBool; + # define CMS_USE_BIG_ENDIAN 1 + #endif + ++#if defined (__GNUC__) && defined(__BYTE_ORDER__) && defined(__LITTLE_ENDIAN__) ++# if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ ++// Don't use big endian for PowerPC little endian mode ++# undef CMS_USE_BIG_ENDIAN ++# endif ++#endif ++ + # ifdef TARGET_CPU_PPC + # if TARGET_CPU_PPC + # define CMS_USE_BIG_ENDIAN 1 diff --git a/SPECS/lcms2.spec b/SPECS/lcms2.spec index 83ae300..34ce2b2 100644 --- a/SPECS/lcms2.spec +++ b/SPECS/lcms2.spec @@ -1,10 +1,11 @@ Name: lcms2 -Version: 2.5 -Release: 4%{?dist} +Version: 2.6 +Release: 2%{?dist} Summary: Color Management Engine License: MIT URL: http://www.littlecms.com/ -Source0: http://www.littlecms.com/lcms2-2.5.tar.gz +Source0: http://www.littlecms.com/lcms2-2.6.tar.gz +Patch0: define-ppc64le-endian.patch BuildRequires: libjpeg-devel BuildRequires: libtiff-devel @@ -33,10 +34,10 @@ Provides: littlecms-devel = %{version}-%{release} Development files for LittleCMS. %prep -%setup -q -n lcms2-2.5 - +%setup -q -n lcms2-2.6 +%patch0 -p1 %build -export CFLAGS=-fno-strict-aliasing +export CFLAGS='-fno-strict-aliasing %optflags' %configure --disable-static --program-suffix=2 # remove rpath from libtool @@ -53,9 +54,9 @@ install -D -m 644 include/lcms2.h $RPM_BUILD_ROOT/usr/include/lcms2.h install -D -m 644 include/lcms2_plugin.h $RPM_BUILD_ROOT/usr/include/lcms2_plugin.h # install docs as this is all we've got -install -D -m 644 doc/LittleCMS2.?\ tutorial.pdf $RPM_BUILD_ROOT/usr/share/doc/lcms2-devel-2.5/tutorial.pdf -install -D -m 644 doc/LittleCMS2.?\ API.pdf $RPM_BUILD_ROOT/usr/share/doc/lcms2-devel-2.5/api.pdf -install -D -m 644 doc/LittleCMS2.?\ Plugin\ API.pdf $RPM_BUILD_ROOT/usr/share/doc/lcms2-devel-2.5/plugin-api.pdf +install -D -m 644 doc/LittleCMS2.?\ tutorial.pdf $RPM_BUILD_ROOT/usr/share/doc/lcms2-devel-2.6/tutorial.pdf +install -D -m 644 doc/LittleCMS2.?\ API.pdf $RPM_BUILD_ROOT/usr/share/doc/lcms2-devel-2.6/api.pdf +install -D -m 644 doc/LittleCMS2.?\ Plugin\ API.pdf $RPM_BUILD_ROOT/usr/share/doc/lcms2-devel-2.6/plugin-api.pdf %clean rm -rf ${RPM_BUILD_ROOT} @@ -76,12 +77,24 @@ rm -rf ${RPM_BUILD_ROOT} %files devel %defattr(-,root,root,-) -%{_datadir}/doc/lcms2-devel-2.5/*.pdf +%{_datadir}/doc/lcms2-devel-2.6/*.pdf %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue May 26 2015 Matthias Clasen 2.6-2 +- Build with -fno-strict-aliasing +Related: #1174406 + +* Tue Mar 17 2015 Richard Hughes 2.6-1 + Update to new upstream version. + Resolves: #1174406 + +* Thu Aug 14 2014 Richard Hughes - 2.5-5 +- Backport a patch for ppc64le support, many thanks to Tim Waugh. +- Resolves: #1125723 + * Fri Jan 24 2014 Daniel Mach - 2.5-4 - Mass rebuild 2014-01-24