Date: Fri, 4 Jan 2002 14:18:35 +0300 From: "Lev A.Serebryakov" <lev@macro.ru> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/33528: Update for port graphics/lcms to version 1.08 Message-ID: <81402100339.20020104141835@macro.ru>
next in thread | raw e-mail | index | archive | help
>Number: 33528
>Category: ports
>Synopsis: Update for port graphics/lcms to version 1.08
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Jan 04 03:20:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Lev A. Serebryakov <lev@macro.ru>
>Release: FreeBSD 4.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD freebsd.sereb.net 4.4-STABLE FreeBSD 4.4-STABLE #1: Sat Dec 8 13:48:40 MSK 2001 root@freebsd.sereb.net:/usr/obj/usr/src/sys/LEVMAIL i386
Ports collection: 03 Jan 2002
>Description:
Update for port graphics/lcms to version 1.08.
It is latest vendor's version. It is needed by some new programs.
>How-To-Repeat:
>Fix:
diff -ruN lcms.orig/Makefile lcms/Makefile
--- lcms.orig/Makefile Thu Jan 3 23:47:01 2002
+++ lcms/Makefile Fri Jan 4 00:34:56 2002
@@ -6,8 +6,7 @@
#
PORTNAME= lcms
-PORTVERSION= 1.07
-PORTREVISION= 1
+PORTVERSION= 1.08
CATEGORIES= graphics
MASTER_SITES= http://www.littlecms.com/
@@ -21,13 +20,13 @@
.ifndef NOPORTDOCS
post-install:
${MKDIR} ${PREFIX}/share/doc/lcms
- ${CP} -rp ${WRKSRC}/../doc/* ${WRKSRC}/../samples/tifficc.c \
- ${WRKSRC}/../samples/wtpt.c ${WRKSRC}/../samples/neutral.c \
+ ${CP} -rp ${WRKSRC}/../doc/* ${WRKSRC}/../tifficc/tifficc.c \
+ ${WRKSRC}/../samples/wtpt.c ${WRKSRC}/../samples/icctrans.c \
${PREFIX}/share/doc/lcms/
.endif
post-build test:
cd ${WRKSRC}/../testbed && \
- ${SETENV} CFLAGS="${CFLAGS} -I../src" make -E CFLAGS test
+ ${SETENV} CFLAGS="${CFLAGS} -I../include" make -E CFLAGS test
.include <bsd.port.mk>
diff -ruN lcms.orig/distinfo lcms/distinfo
--- lcms.orig/distinfo Thu Jan 3 23:47:01 2002
+++ lcms/distinfo Thu Jan 3 23:48:10 2002
@@ -1 +1 @@
-MD5 (lcms-1.07.tar.gz) = bea30720a2a322b5b25e4f5b657f6994
+MD5 (lcms-1.08.tar.gz) = a1987f5043bc1a21f94c9dbc4adccbfe
diff -ruN lcms.orig/files/Makefile.bsd lcms/files/Makefile.bsd
--- lcms.orig/files/Makefile.bsd Thu Jan 3 23:47:01 2002
+++ lcms/files/Makefile.bsd Fri Jan 4 00:04:26 2002
@@ -6,7 +6,9 @@
NOPROFILE=YES
-INCS= lcms.h icc34.h
+INCS= ../include/lcms.h ../include/icc34.h
+
+CFLAGS+= -I../include
INCDIR= ${LOCALBASE}/include
LIBDIR= ${LOCALBASE}/lib
diff -ruN lcms.orig/files/patch-32bit lcms/files/patch-32bit
--- lcms.orig/files/patch-32bit Thu Jan 3 23:47:01 2002
+++ lcms/files/patch-32bit Thu Jan 3 23:54:00 2002
@@ -1,127 +1,16 @@
This patch fixes assumptions made in different parts of the code
regarding the sizeof long and int. The original code appears to use them
interchangeably, even though it expects them to be 32 bit wide.
---- cmsio1.c Tue Feb 13 12:08:06 2001
-+++ cmsio1.c Wed Sep 5 10:20:58 2001
-@@ -96,5 +96,5 @@
- /* Dictionary */
-
-- int TagCount;
-+ icInt32Number TagCount;
- icTagSignature TagNames[MAX_TABLE_TAG];
- size_t TagSizes[MAX_TABLE_TAG];
-@@ -194,5 +194,5 @@
- icTag Tag;
- icHeader Header;
-- long TagCount, i;
-+ icInt32Number TagCount, i;
-
- fread(&Header, sizeof(icHeader), 1, ICCfile);
-@@ -230,5 +230,5 @@
- Icc -> stream = ICCfile;
-
-- if (fread(&TagCount, sizeof(long), 1, ICCfile) != 1)
-+ if (fread(&TagCount, sizeof(TagCount), 1, ICCfile) != 1)
- goto ErrorCleanup;
-
-@@ -276,7 +276,7 @@
-
- static
--int SearchTag(LPICCPROFILE Profile, icTagSignature sig)
-+icInt32Number SearchTag(LPICCPROFILE Profile, icTagSignature sig)
- {
-- int i;
-+ icInt32Number i;
-
- for (i=0; i < Profile -> TagCount; i++)
-@@ -297,5 +297,5 @@
- {
- LPVOID Ptr;
-- int i;
-+ icInt32Number i;
-
- i = SearchTag(Icc, sig);
-@@ -525,5 +525,5 @@
- if (!file)
- {
-- int i;
-+ icInt32Number i;
-
- for (i=0; i < icco -> TagCount; i++)
-@@ -1383,7 +1383,7 @@
-
- static
--long TransportValue32(long Value)
-+icInt32Number TransportValue32(icInt32Number Value)
- {
-- long Temp = Value;
-+ icInt32Number Temp = Value;
-
- AdjustEndianess32((LPBYTE) &Temp);
-@@ -1520,5 +1520,5 @@
- BOOL SaveGamma(FILE *OutStream, LPGAMMATABLE Gamma)
- {
-- long Count;
-+ icInt32Number Count;
- int i;
-
-@@ -1528,5 +1528,5 @@
- Count = TransportValue32(Gamma->nEntries);
-
-- if (!DoWrite(OutStream, sizeof(long), &Count)) return FALSE;
-+ if (!DoWrite(OutStream, sizeof(Count), &Count)) return FALSE;
-
- for (i=0; i < Gamma->nEntries; i++)
-@@ -1549,5 +1549,5 @@
-
-
--/* Save an ASCII Tag (long) */
-+/* Save an ASCII Tag (icInt32Number) */
-
- static
-@@ -1644,9 +1644,9 @@
- BOOL SaveTagDirectory(FILE *OutStream, LPICCPROFILE Icc)
- {
-- int i;
-+ icInt32Number i;
- icTag Tag;
-- long TagCount = TransportValue32(Icc -> TagCount);
-+ icInt32Number TagCount = TransportValue32(Icc -> TagCount);
-
-- if (!DoWrite(OutStream, sizeof(long) , &TagCount)) return FALSE;
-+ if (!DoWrite(OutStream, sizeof(TagCount) , &TagCount)) return FALSE;
-
- for (i=0; i < Icc -> TagCount; i++) {
-@@ -1670,5 +1670,5 @@
-
- LPBYTE Data;
-- int i;
-+ icInt32Number i;
- size_t Begin;
-
--- cmsmtrx.c Tue Feb 13 12:08:06 2001
+++ cmsmtrx.c Wed Sep 5 10:28:02 2001
@@ -705,6 +705,6 @@
void VEC3scaleAndCut(LPWVEC3 r, LPVEC3 v, double d)
{
-- r -> n[VX] = (long) floor(v -> n[VX] * d + .5);
-- r -> n[VY] = (long) floor(v -> n[VY] * d + .5);
-- r -> n[VZ] = (long) floor(v -> n[VZ] * d + .5);
+- r -> n[VX] = (int) floor(v -> n[VX] * d + .5);
+- r -> n[VY] = (int) floor(v -> n[VY] * d + .5);
+- r -> n[VZ] = (int) floor(v -> n[VZ] * d + .5);
+ r -> n[VX] = (icInt32Number) floor(v -> n[VX] * d + .5);
+ r -> n[VY] = (icInt32Number) floor(v -> n[VY] * d + .5);
+ r -> n[VZ] = (icInt32Number) floor(v -> n[VZ] * d + .5);
}
---- lcms.h Mon Feb 19 04:55:06 2001
-+++ lcms.h Wed Sep 5 10:31:08 2001
-@@ -621,9 +621,9 @@
- /* Fixed point */
-
--typedef long Fixed32; /* Fixed 15.16 whith sign */
-+typedef icInt32Number Fixed32; /* Fixed 15.16 whith sign */
-
-
- #define INT_TO_FIXED(x) ((x)<<16)
--#define DOUBLE_TO_FIXED(x) ((long)((x)*65536.0+.5))
-+#define DOUBLE_TO_FIXED(x) ((icInt32Number)((x)*65536.0+.5))
- #define FIXED_TO_INT(x) ((x)>>16)
- #define FIXED_REST_TO_INT(x) ((x)&0xFFFFU)
+
diff -ruN lcms.orig/files/patch-icc34 lcms/files/patch-icc34
--- lcms.orig/files/patch-icc34 Thu Jan 3 23:47:01 2002
+++ lcms/files/patch-icc34 Thu Jan 3 23:58:09 2002
@@ -1,14 +1,13 @@
-Try to use the int32 and friends on all Unixes -- not just SGI's Irix.
---- icc34.h Tue Feb 13 12:08:06 2001
-+++ icc34.h Wed Sep 5 10:08:42 2001
-@@ -141,8 +141,10 @@
- * etc into icXXX form. The rest of the header uses the icXXX
- * typedefs. Signatures are 4 byte quantities.
+--- ../include/icc34.h.orig Mon Oct 29 23:17:39 2001
++++ ../include/icc34.h Thu Jan 3 23:57:42 2002
+@@ -143,8 +143,10 @@
+ *
*/
+
+#ifdef __unix__
#ifdef __sgi
#include "sgidefs.h"
+#endif
- typedef __int32_t icSignature;
+ typedef __int32_t icSignature;
diff -ruN lcms.orig/files/patch-test lcms/files/patch-test
--- lcms.orig/files/patch-test Thu Jan 3 23:47:01 2002
+++ lcms/files/patch-test Thu Jan 1 03:00:00 1970
@@ -1,10 +0,0 @@
-Inititialize/clear more variables. Now this test works on Alphas too.
---- ../testbed/testcms.c Tue Feb 13 12:08:32 2001
-+++ ../testbed/testcms.c Wed Sep 5 10:04:07 2001
-@@ -582,5 +582,5 @@
- static void ClearStats(LPSTATS p)
- {
-- p -> x = p -> y = p -> x2 = p -> y2 = p -> xy
-+ p -> n = p -> x = p -> y = p -> x2 = p -> y2 = p -> xy
- = p -> Peak = 0.0;
- }
diff -ruN lcms.orig/pkg-plist lcms/pkg-plist
--- lcms.orig/pkg-plist Thu Jan 3 23:47:01 2002
+++ lcms/pkg-plist Fri Jan 4 00:35:42 2002
@@ -5,7 +5,7 @@
lib/liblcms.so.1.7
%%PORTDOCS%%share/doc/lcms/LCMSAPI.TXT
%%PORTDOCS%%share/doc/lcms/TUTORIAL.TXT
-%%PORTDOCS%%share/doc/lcms/neutral.c
+%%PORTDOCS%%share/doc/lcms/icctrans.c
%%PORTDOCS%%share/doc/lcms/tifficc.c
%%PORTDOCS%%share/doc/lcms/wtpt.c
%%PORTDOCS%%@dirrm share/doc/lcms
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?81402100339.20020104141835>