Update to lcms2 2.5.

ok kili@ ajacoutot@
This commit is contained in:
brad 2013-10-03 20:21:01 +00:00
parent e1a56cbb50
commit 7f5d68ee2e
7 changed files with 6 additions and 147 deletions

View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.7 2013/03/30 15:49:43 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.8 2013/10/03 20:21:01 brad Exp $
COMMENT = color management library
DISTNAME = lcms2-2.4
SHARED_LIBS = lcms2 0.3
DISTNAME = lcms2-2.5
CATEGORIES = graphics
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=lcms/}
REVISION = 0
SHARED_LIBS = lcms2 1.0
HOMEPAGE = http://www.littlecms.com/

View File

@ -1,2 +1,2 @@
SHA256 (lcms2-2.4.tar.gz) = KlFNEO/yaQFQXBkaFcJYjHUet/uGV3EY9sI1r/C+N+g=
SIZE (lcms2-2.4.tar.gz) = 4293291
SHA256 (lcms2-2.5.tar.gz) = Zyd3K0RHCiER26U7nOTJUrh+fRtyoxxevfRLpusKpys=
SIZE (lcms2-2.5.tar.gz) = 7000396

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-include_lcms2_h,v 1.1 2013/03/30 15:49:43 ajacoutot Exp $
From d2d902b9a03583ae482c782b2f243f7e5268a47d Mon Sep 17 00:00:00 2001
From: Marti Maria <info@littlecms.com>
Date: Tue, 26 Mar 2013 11:29:50 +0100
Subject: [PATCH] >Changes from Richard Hughes
--- include/lcms2.h.orig Mon Sep 10 18:01:51 2012
+++ include/lcms2.h Sat Mar 30 16:42:26 2013
@@ -338,6 +338,7 @@ typedef enum {
cmsSigPreview1Tag = 0x70726531, // 'pre1'
cmsSigPreview2Tag = 0x70726532, // 'pre2'
cmsSigProfileDescriptionTag = 0x64657363, // 'desc'
+ cmsSigProfileDescriptionMLTag = 0x6473636d, // 'dscm'
cmsSigProfileSequenceDescTag = 0x70736571, // 'pseq'
cmsSigProfileSequenceIdTag = 0x70736964, // 'psid'
cmsSigPs2CRD0Tag = 0x70736430, // 'psd0'
@@ -1395,6 +1396,7 @@ CMSAPI cmsUInt32Number CMSEXPORT cmsGetHeaderRenderi
CMSAPI void CMSEXPORT cmsSetHeaderFlags(cmsHPROFILE hProfile, cmsUInt32Number Flags);
CMSAPI cmsUInt32Number CMSEXPORT cmsGetHeaderManufacturer(cmsHPROFILE hProfile);
CMSAPI void CMSEXPORT cmsSetHeaderManufacturer(cmsHPROFILE hProfile, cmsUInt32Number manufacturer);
+CMSAPI cmsUInt32Number CMSEXPORT cmsGetHeaderCreator(cmsHPROFILE hProfile);
CMSAPI cmsUInt32Number CMSEXPORT cmsGetHeaderModel(cmsHPROFILE hProfile);
CMSAPI void CMSEXPORT cmsSetHeaderModel(cmsHPROFILE hProfile, cmsUInt32Number model);
CMSAPI void CMSEXPORT cmsSetHeaderAttributes(cmsHPROFILE hProfile, cmsUInt64Number Flags);

View File

@ -1,61 +0,0 @@
$OpenBSD: patch-src_cmsio0_c,v 1.1 2013/03/30 15:49:43 ajacoutot Exp $
From d2d902b9a03583ae482c782b2f243f7e5268a47d Mon Sep 17 00:00:00 2001
From: Marti Maria <info@littlecms.com>
Date: Tue, 26 Mar 2013 11:29:50 +0100
Subject: [PATCH] >Changes from Richard Hughes
--- src/cmsio0.c.orig Mon Sep 10 18:01:51 2012
+++ src/cmsio0.c Sat Mar 30 16:42:26 2013
@@ -614,10 +614,13 @@ cmsBool _cmsReadHeader(_cmsICCPROFILE* Icc)
Icc -> DeviceClass = (cmsProfileClassSignature) _cmsAdjustEndianess32(Header.deviceClass);
Icc -> ColorSpace = (cmsColorSpaceSignature) _cmsAdjustEndianess32(Header.colorSpace);
Icc -> PCS = (cmsColorSpaceSignature) _cmsAdjustEndianess32(Header.pcs);
+
Icc -> RenderingIntent = _cmsAdjustEndianess32(Header.renderingIntent);
Icc -> flags = _cmsAdjustEndianess32(Header.flags);
Icc -> manufacturer = _cmsAdjustEndianess32(Header.manufacturer);
Icc -> model = _cmsAdjustEndianess32(Header.model);
+ Icc -> creator = _cmsAdjustEndianess32(Header.creator);
+
_cmsAdjustEndianess64(&Icc -> attributes, &Header.attributes);
Icc -> Version = _cmsAdjustEndianess32(Header.version);
@@ -786,27 +789,32 @@ void CMSEXPORT cmsSetHeaderFlags(cmsHPROFILE hProfile,
cmsUInt32Number CMSEXPORT cmsGetHeaderManufacturer(cmsHPROFILE hProfile)
{
_cmsICCPROFILE* Icc = (_cmsICCPROFILE*) hProfile;
- return (cmsUInt32Number) Icc ->manufacturer;
+ return Icc ->manufacturer;
}
void CMSEXPORT cmsSetHeaderManufacturer(cmsHPROFILE hProfile, cmsUInt32Number manufacturer)
{
_cmsICCPROFILE* Icc = (_cmsICCPROFILE*) hProfile;
- Icc -> manufacturer = (cmsUInt32Number) manufacturer;
+ Icc -> manufacturer = manufacturer;
}
+cmsUInt32Number CMSEXPORT cmsGetHeaderCreator(cmsHPROFILE hProfile)
+{
+ _cmsICCPROFILE* Icc = (_cmsICCPROFILE*) hProfile;
+ return Icc ->creator;
+}
+
cmsUInt32Number CMSEXPORT cmsGetHeaderModel(cmsHPROFILE hProfile)
{
_cmsICCPROFILE* Icc = (_cmsICCPROFILE*) hProfile;
- return (cmsUInt32Number) Icc ->model;
+ return Icc ->model;
}
void CMSEXPORT cmsSetHeaderModel(cmsHPROFILE hProfile, cmsUInt32Number model)
{
_cmsICCPROFILE* Icc = (_cmsICCPROFILE*) hProfile;
- Icc -> model = (cmsUInt32Number) model;
+ Icc -> model = model;
}
-
void CMSEXPORT cmsGetHeaderAttributes(cmsHPROFILE hProfile, cmsUInt64Number* Flags)
{

View File

@ -1,20 +0,0 @@
$OpenBSD: patch-src_cmstypes_c,v 1.1 2013/03/30 15:49:43 ajacoutot Exp $
From d2d902b9a03583ae482c782b2f243f7e5268a47d Mon Sep 17 00:00:00 2001
From: Marti Maria <info@littlecms.com>
Date: Tue, 26 Mar 2013 11:29:50 +0100
Subject: [PATCH] >Changes from Richard Hughes
--- src/cmstypes.c.orig Mon Sep 10 18:01:51 2012
+++ src/cmstypes.c Sat Mar 30 16:42:26 2013
@@ -5362,7 +5362,9 @@ static _cmsTagLinkedList SupportedTags[] = {
{ cmsSigScreeningTag, { 1, 1, { cmsSigScreeningType}, NULL }, &SupportedTags[59]},
{ cmsSigVcgtTag, { 1, 1, { cmsSigVcgtType}, NULL }, &SupportedTags[60]},
{ cmsSigMetaTag, { 1, 1, { cmsSigDictType}, NULL }, &SupportedTags[61]},
- { cmsSigProfileSequenceIdTag, { 1, 1, { cmsSigProfileSequenceIdType}, NULL}, NULL}
+ { cmsSigProfileSequenceIdTag, { 1, 1, { cmsSigProfileSequenceIdType}, NULL }, &SupportedTags[62]},
+ { cmsSigProfileDescriptionMLTag,{ 1, 1, { cmsSigMultiLocalizedUnicodeType}, NULL}, NULL}
+
};

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_lcms2_def,v 1.1 2013/03/30 15:49:43 ajacoutot Exp $
From d2d902b9a03583ae482c782b2f243f7e5268a47d Mon Sep 17 00:00:00 2001
From: Marti Maria <info@littlecms.com>
Date: Tue, 26 Mar 2013 11:29:50 +0100
Subject: [PATCH] >Changes from Richard Hughes
--- src/lcms2.def.orig Mon Sep 10 18:01:51 2012
+++ src/lcms2.def Sat Mar 30 16:42:26 2013
@@ -318,3 +318,4 @@ _cmsGetTransformUserData = _cmsGetTr
_cmsSetTransformUserData = _cmsSetTransformUserData
_cmsGetTransformFormatters16 = _cmsGetTransformFormatters16
_cmsGetTransformFormattersFloat = _cmsGetTransformFormattersFloat
+cmsGetHeaderCreator = cmsGetHeaderCreator

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_lcms2_internal_h,v 1.1 2013/03/30 15:49:43 ajacoutot Exp $
From d2d902b9a03583ae482c782b2f243f7e5268a47d Mon Sep 17 00:00:00 2001
From: Marti Maria <info@littlecms.com>
Date: Tue, 26 Mar 2013 11:29:50 +0100
Subject: [PATCH] >Changes from Richard Hughes
--- src/lcms2_internal.h.orig Mon Sep 10 18:01:51 2012
+++ src/lcms2_internal.h Sat Mar 30 16:42:26 2013
@@ -301,9 +301,11 @@ typedef struct _cms_iccprofile_struct {
cmsColorSpaceSignature ColorSpace;
cmsColorSpaceSignature PCS;
cmsUInt32Number RenderingIntent;
+
cmsUInt32Number flags;
cmsUInt32Number manufacturer, model;
cmsUInt64Number attributes;
+ cmsUInt32Number creator;
cmsProfileID ProfileID;