diff --git a/lcms-endian.patch b/lcms-endian.patch deleted file mode 100644 index 18f512e..0000000 --- a/lcms-endian.patch +++ /dev/null @@ -1,169 +0,0 @@ -Index: include/lcms2.h -=================================================================== ---- include/lcms2.h.orig -+++ include/lcms2.h -@@ -30,9 +30,6 @@ - - // ********** Configuration toggles **************************************** - --// Uncomment this one if you are using big endian machines --// #define CMS_USE_BIG_ENDIAN 1 -- - // Uncomment this one if your compiler/machine does NOT support the - // "long long" type. - // #define CMS_DONT_USE_INT64 1 -@@ -173,47 +170,6 @@ typedef int cmsBool; - # define CMS_IS_WINDOWS_ 1 - #endif - --// Try to detect big endian platforms. This list can be endless, so only some checks are performed over here. --// you can pass this toggle to the compiler by using -DCMS_USE_BIG_ENDIAN or something similar -- --#if defined(__sgi__) || defined(__sgi) || defined(sparc) --# define CMS_USE_BIG_ENDIAN 1 --#endif -- --#if defined(__s390__) || defined(__s390x__) --# define CMS_USE_BIG_ENDIAN 1 --#endif -- --# ifdef TARGET_CPU_PPC --# if TARGET_CPU_PPC --# define CMS_USE_BIG_ENDIAN 1 --# endif --# endif -- --#if defined(__powerpc__) || defined(__ppc__) || defined(TARGET_CPU_PPC) --# define CMS_USE_BIG_ENDIAN 1 --# if defined (__GNUC__) && defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) --# if __BYTE_ORDER == __LITTLE_ENDIAN --// // Don't use big endian for PowerPC little endian mode --# undef CMS_USE_BIG_ENDIAN --# endif --# endif --#endif -- --// WORDS_BIGENDIAN takes precedence --#if defined(_HOST_BIG_ENDIAN) || defined(__BIG_ENDIAN__) || defined(WORDS_BIGENDIAN) --# define CMS_USE_BIG_ENDIAN 1 --#endif -- --#ifdef macintosh --# ifdef __BIG_ENDIAN__ --# define CMS_USE_BIG_ENDIAN 1 --# endif --# ifdef __LITTLE_ENDIAN__ --# undef CMS_USE_BIG_ENDIAN --# endif --#endif -- - // Calling convention -- this is hardly platform and compiler dependent - #ifdef CMS_IS_WINDOWS_ - # if defined(CMS_DLL) || defined(CMS_DLL_BUILD) -Index: src/cmsmd5.c -=================================================================== ---- src/cmsmd5.c.orig -+++ src/cmsmd5.c -@@ -26,7 +26,7 @@ - - #include "lcms2_internal.h" - --#ifdef CMS_USE_BIG_ENDIAN -+#ifdef WORDS_BIGENDIAN - - static - void byteReverse(cmsUInt8Number * buf, cmsUInt32Number longs) -Index: src/cmsplugin.c -=================================================================== ---- src/cmsplugin.c.orig -+++ src/cmsplugin.c -@@ -36,7 +36,7 @@ - // Adjust a word value after being readed/ before being written from/to an ICC profile - cmsUInt16Number CMSEXPORT _cmsAdjustEndianess16(cmsUInt16Number Word) - { --#ifndef CMS_USE_BIG_ENDIAN -+#ifndef WORDS_BIGENDIAN - - cmsUInt8Number* pByte = (cmsUInt8Number*) &Word; - cmsUInt8Number tmp; -@@ -57,7 +57,7 @@ cmsUInt16Number CMSEXPORT _cmsAdjustEnd - - cmsUInt32Number CMSEXPORT _cmsAdjustEndianess32(cmsUInt32Number DWord) - { --#ifndef CMS_USE_BIG_ENDIAN -+#ifndef WORDS_BIGENDIAN - - cmsUInt8Number* pByte = (cmsUInt8Number*) &DWord; - cmsUInt8Number temp1; -@@ -79,7 +79,7 @@ cmsUInt32Number CMSEXPORT _cmsAdjustEnd - void CMSEXPORT _cmsAdjustEndianess64(cmsUInt64Number* Result, cmsUInt64Number* QWord) - { - --#ifndef CMS_USE_BIG_ENDIAN -+#ifndef WORDS_BIGENDIAN - - cmsUInt8Number* pIn = (cmsUInt8Number*) QWord; - cmsUInt8Number* pOut = (cmsUInt8Number*) Result; -Index: testbed/testcms2.c -=================================================================== ---- testbed/testcms2.c.orig -+++ testbed/testcms2.c -@@ -761,15 +761,15 @@ cmsInt32Number CheckEndianess(void) - u.l = 1; - BigEndian = (u.c[sizeof (long) - 1] == 1); - --#ifdef CMS_USE_BIG_ENDIAN -+#ifdef WORDS_BIGENDIAN - IsOk = BigEndian; - #else - IsOk = !BigEndian; - #endif - - if (!IsOk) { -- Fail("\nOOOPPSS! You have CMS_USE_BIG_ENDIAN toggle misconfigured!\n\n" -- "Please, edit lcms2.h and %s the CMS_USE_BIG_ENDIAN toggle.\n", BigEndian? "uncomment" : "comment"); -+ Fail("\nOOOPPSS! You have WORDS_BIGENDIAN toggle misconfigured!\n\n" -+ "Please, edit lcms2.h and %s the WORDS_BIGENDIAN toggle.\n", BigEndian? "uncomment" : "comment"); - return 0; - } - -Index: src/lcms2_internal.h -=================================================================== ---- src/lcms2_internal.h.orig -+++ src/lcms2_internal.h -@@ -140,7 +140,7 @@ cmsINLINE int _cmsQuickFloor(cmsFloat64N - - temp.val = val + _lcms_double2fixmagic; - --#ifdef CMS_USE_BIG_ENDIAN -+#ifdef WORDS_BIGENDIAN - return temp.halves[1] >> 16; - #else - return temp.halves[0] >> 16; -Index: configure.ac -=================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -51,7 +51,8 @@ AM_INIT_AUTOMAKE([foreign 1.7.2 no-defin - AC_PROG_CC_STDC - AC_PROG_CPP - AC_PROG_CXX -- -+AC_USE_SYSTEM_EXTENSIONS -+AC_SYS_LARGEFILE - #AM_PROG_LD - #AC_SUBST(LD) - #AC_PROG_INSTALL -@@ -65,11 +66,7 @@ AC_EXEEXT - AC_OBJEXT - - # Configure libtool --AC_ENABLE_SHARED --AC_ENABLE_STATIC --AC_LIBTOOL_WIN32_DLL --AC_LIBTOOL_SETUP --AC_PROG_LIBTOOL -+LT_INIT([disable-static pic-only win32-dll]) - AC_SUBST(LIBTOOL_DEPS) - - # Add configure option --enable-maintainer-mode which enables dependency diff --git a/lcms2-2.6.tar.gz b/lcms2-2.6.tar.gz deleted file mode 100644 index dabf83b..0000000 --- a/lcms2-2.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5172528839647c54c3da211837225e221be93e4733f5b5e9f57668f7107e14b1 -size 4583389 diff --git a/lcms2-2.7.tar.gz b/lcms2-2.7.tar.gz new file mode 100644 index 0000000..af879e7 --- /dev/null +++ b/lcms2-2.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4524234ae7de185e6b6da5d31d6875085b2198bc63b1211f7dde6e2d197d6a53 +size 6497867 diff --git a/lcms2.changes b/lcms2.changes index ee9478b..45a6aef 100644 --- a/lcms2.changes +++ b/lcms2.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jun 26 11:04:33 UTC 2015 - aloisio@gmx.com + +- Update to version 2.7 + * improved multi-threading + * added contexts and a new locking plug-in type + * bugfixes and other minor features +- Dropped lcms-endian.patch that was fixed upstream. + ------------------------------------------------------------------- Fri May 16 06:27:26 UTC 2014 - mailaender@opensuse.org diff --git a/lcms2.spec b/lcms2.spec index eaddffb..8997c44 100644 --- a/lcms2.spec +++ b/lcms2.spec @@ -1,7 +1,7 @@ # # spec file for package lcms2 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Summary: Little CMS Engine - A color managment library and tools License: MIT Group: Productivity/Graphics/Other Url: http://www.littlecms.com/ -Version: 2.6 +Version: 2.7 Release: 0 %if 0%{?suse_version} @@ -53,7 +53,6 @@ BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://sourceforge.net/projects/lcms/files/lcms/%{version}/%{name}-%{version}.tar.gz Source1: baselibs.conf -Patch: lcms-endian.patch Patch1: lcms2-ocloexec.patch Patch2: lcms2-visibility.patch @@ -95,7 +94,6 @@ This package contains user and developer documentation for lcms2. %prep %setup -q -%patch %patch1 %patch2 chmod a-x doc/* COPYING AUTHORS