update to 1.15, okay brad@, mbalmer@

This commit is contained in:
espie 2006-03-16 11:03:07 +00:00
parent 8e47d16714
commit 0cbc6ee47f
9 changed files with 79 additions and 84 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.11 2006/01/08 01:01:18 steven Exp $
# $OpenBSD: Makefile,v 1.12 2006/03/16 11:03:07 espie Exp $
COMMENT= "color management library"
DISTNAME= lcms-1.12
PKGNAME= ${DISTNAME}p1
SHARED_LIBS= lcms 1.12
DISTNAME= lcms-1.15
PKGNAME= ${DISTNAME}
SHARED_LIBS= lcms 1.15
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lcms/}
@ -24,7 +24,7 @@ USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
LDFLAGS="-L${WRKBUILD}/src/.libs -L${LOCALBASE}/lib"
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/lcms

View File

@ -1,4 +1,4 @@
MD5 (lcms-1.12.tar.gz) = ac377fc055cf50aa8a8505aedb13a125
RMD160 (lcms-1.12.tar.gz) = 25cd670ff2eec5d6c0cf7e5e544d843aae83e939
SHA1 (lcms-1.12.tar.gz) = 91c184378287df26cd8d729b1aae00b49077b9fb
SIZE (lcms-1.12.tar.gz) = 567985
MD5 (lcms-1.15.tar.gz) = 76c921973fdea4f880944a024197f924
RMD160 (lcms-1.15.tar.gz) = 2cdb38039931cd35f550eabaa3421df6b9bfd0e4
SHA1 (lcms-1.15.tar.gz) = 45cabf4d251c031b13fc56239a06f00992320a2e
SIZE (lcms-1.15.tar.gz) = 777834

View File

@ -1,40 +1,22 @@
$OpenBSD: patch-include_lcms_h,v 1.2 2005/03/14 08:46:54 espie Exp $
--- include/lcms.h.orig Sat Dec 20 16:00:11 2003
+++ include/lcms.h Mon Mar 14 09:27:50 2005
@@ -75,7 +75,7 @@
// Metroworks CodeWarrior
-#if __MWERKS__
+#ifdef __MWERKS__
# define unlink remove
# if WIN32
# define USE_CUSTOM_SWAB 1
@@ -100,7 +100,7 @@
$OpenBSD: patch-include_lcms_h,v 1.3 2006/03/16 11:03:07 espie Exp $
--- include/lcms.h.orig Tue Mar 7 22:46:48 2006
+++ include/lcms.h Tue Mar 7 22:47:46 2006
@@ -131,11 +131,17 @@
# define USE_BIG_ENDIAN 1
#endif
-#if TARGET_CPU_PPC
+#ifdef TARGET_CPU_PPC
# define USE_BIG_ENDIAN 1
#endif
@@ -114,6 +114,9 @@
#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
-#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
+#if defined(__NetBSD__) || defined(__FreeBSD__)
# include <sys/types.h>
+# if BYTE_ORDER == BIG_ENDIAN
+# define USE_BIG_ENDIAN 1
+# endif
# define USE_INT64 1
# undef LONGLONG
# define LONGLONG u_int64_t
@@ -128,7 +131,7 @@
#include <memory.h>
#include <string.h>
-#if defined(__GNUC__) || defined(__FreeBSD__)
+#if defined(__GNUC__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
# include <unistd.h>
# define LCMSSLONGLONG int_64_t
# define LCMSULONGLONG u_int64_t
+#endif
+#if defined(__OpenBSD__)
+# include <stdint.h>
+# define USE_INT64 1
+# define LCMSSLONGLONG int64_t
+# define LCMSULONGLONG uint64_t
#endif
#ifdef USE_INT64

View File

@ -0,0 +1,10 @@
$OpenBSD: patch-lcms_pc_in,v 1.1 2006/03/16 11:03:07 espie Exp $
--- lcms.pc.in.orig Tue Mar 7 22:54:35 2006
+++ lcms.pc.in Tue Mar 7 22:54:46 2006
@@ -6,5 +6,5 @@ includedir=@includedir@
Name: @PACKAGE@
Description: LCMS Color Management Library
Version: @VERSION@
-Libs: -L${libdir} -llcms
+Libs: -L${libdir} -llcms @LCMS_LIB_DEPLIBS@
Cflags: -I${includedir}

View File

@ -1,27 +1,25 @@
$OpenBSD: patch-samples_Makefile_in,v 1.1 2004/02/03 05:15:16 brad Exp $
--- samples/Makefile.in.orig 2004-02-02 22:56:52.000000000 -0500
+++ samples/Makefile.in 2004-02-02 23:01:05.000000000 -0500
@@ -195,19 +195,19 @@ AM_CPPFLAGS = -I$(top_builddir)/include
bin_PROGRAMS = icctrans wtpt icc2ps icclink
$OpenBSD: patch-samples_Makefile_in,v 1.2 2006/03/16 11:03:07 espie Exp $
--- samples/Makefile.in.orig Tue Nov 1 01:13:40 2005
+++ samples/Makefile.in Tue Mar 7 22:42:42 2006
@@ -243,17 +243,17 @@ target_vendor = @target_vendor@
# Don't require all the GNU mandated files
AUTOMAKE_OPTIONS = 1.7 foreign
AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-icctrans_LDADD = $(top_builddir)/src/liblcms.la
+icctrans_LDADD = $(top_builddir)/src/liblcms.la $(LCMS_LIB_DEPLIBS)
+icctrans_LDADD = $(top_builddir)/src/liblcms.la $(LCMS_LIB_DEPLIBS)
icctrans_LDFLAGS = @LDFLAGS@
icctrans_SOURCES = icctrans.c xgetopt.c
icctrans_SOURCES = icctrans.c xgetopt.c vprf.c
icctrans_MANS = icctrans.1
-wtpt_LDADD = $(top_builddir)/src/liblcms.la
+wtpt_LDADD = $(top_builddir)/src/liblcms.la $(LCMS_LIB_DEPLIBS)
+wtpt_LDADD = $(top_builddir)/src/liblcms.la $(LCMS_LIB_DEPLIBS)
wtpt_LDFLAGS = @LDFLAGS@
wtpt_SOURCES = wtpt.c xgetopt.c
-icc2ps_LDADD = $(top_builddir)/src/liblcms.la
+icc2ps_LDADD = $(top_builddir)/src/liblcms.la $(LCMS_LIB_DEPLIBS)
+icc2ps_LDADD = $(top_builddir)/src/liblcms.la $(LCMS_LIB_DEPLIBS)
icc2ps_LDFLAGS = @LDFLAGS@
icc2ps_SOURCES = icc2ps.c xgetopt.c
-icclink_LDADD = $(top_builddir)/src/liblcms.la
+icclink_LDADD = $(top_builddir)/src/liblcms.la $(LCMS_LIB_DEPLIBS)
+icclink_LDADD = $(top_builddir)/src/liblcms.la $(LCMS_LIB_DEPLIBS)
icclink_LDFLAGS = @LDFLAGS@
icclink_SOURCES = icclink.c xgetopt.c
subdir = samples
icclink_SOURCES = icclink.c xgetopt.c vprf.c
man_MANS = wtpt.1 icc2ps.1 icclink.1

View File

@ -1,15 +1,12 @@
$OpenBSD: patch-src_Makefile_in,v 1.2 2005/12/26 17:27:24 steven Exp $
--- src/Makefile.in.orig Fri Dec 5 11:31:28 2003
+++ src/Makefile.in Mon Dec 26 17:11:24 2005
@@ -202,9 +202,9 @@ liblcms_la_LDFLAGS = -no-undefined \
$OpenBSD: patch-src_Makefile_in,v 1.3 2006/03/16 11:03:07 espie Exp $
--- src/Makefile.in.orig Tue Nov 1 01:13:40 2005
+++ src/Makefile.in Tue Mar 7 22:43:15 2006
@@ -242,7 +242,7 @@ INCLUDES = -I$(top_builddir)/include -I$
liblcms_la_LDFLAGS = -no-undefined \
-version-info $(LIBRARY_CURRENT):$(LIBRARY_REVISION):$(LIBRARY_AGE)
-liblcms_la_LIBADD = $(LCMS_LIB_DEPLIBS)
+liblcms_la_LIBADD =
-liblcms_la_CFLAGS = -O3
+liblcms_la_CFLAGS =
# liblcms_la_CFLAGS = -O3
liblcms_la_SOURCES = \
cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c cmslut.c \

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_cmsmtrx_c,v 1.1 2004/02/03 05:15:16 brad Exp $
--- src/cmsmtrx.c.orig 2003-12-20 10:00:11.000000000 -0500
+++ src/cmsmtrx.c 2004-02-02 22:06:07.000000000 -0500
@@ -733,9 +733,9 @@ void MAT3fromFix(LPMAT3 r, LPWMAT3 v)
$OpenBSD: patch-src_cmsmtrx_c,v 1.2 2006/03/16 11:03:07 espie Exp $
--- src/cmsmtrx.c.orig Fri Nov 25 12:11:16 2005
+++ src/cmsmtrx.c Tue Mar 7 22:36:36 2006
@@ -797,9 +797,9 @@ void MAT3fromFix(LPMAT3 r, LPWMAT3 v)
void VEC3scaleAndCut(LPWVEC3 r, LPVEC3 v, double d)
{

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-testbed_Makefile_in,v 1.1 2004/02/03 05:15:57 brad Exp $
--- testbed/Makefile.in.orig 2004-02-03 00:08:07.000000000 -0500
+++ testbed/Makefile.in 2004-02-03 00:08:36.000000000 -0500
@@ -195,7 +195,7 @@ INCLUDES = -I$(top_builddir)/include -I$
check_PROGRAMS = testcms
$OpenBSD: patch-testbed_Makefile_in,v 1.2 2006/03/16 11:03:07 espie Exp $
--- testbed/Makefile.in.orig Tue Nov 1 01:13:40 2005
+++ testbed/Makefile.in Tue Mar 7 22:43:47 2006
@@ -222,7 +222,7 @@ target_vendor = @target_vendor@
# Don't require all the GNU mandated files
AUTOMAKE_OPTIONS = 1.7 foreign
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
-testcms_LDADD = $(top_builddir)/src/liblcms.la
+testcms_LDADD = $(top_builddir)/src/liblcms.la $(LCMS_LIB_DEPLIBS)
+testcms_LDADD = $(top_builddir)/src/liblcms.la $(LCMS_LIB_DEPLIBS)
testcms_LDFLAGS = @LDFLAGS@
testcms_SOURCES = testcms.c
EXTRA_DIST = sRGBSpac.icm

View File

@ -1,14 +1,22 @@
@comment $OpenBSD: PLIST,v 1.3 2004/08/10 13:35:50 espie Exp $
@comment $OpenBSD: PLIST,v 1.4 2006/03/16 11:03:07 espie Exp $
bin/icc2ps
bin/icclink
bin/icctrans
bin/jpegicc
bin/tiffdiff
bin/tifficc
bin/wtpt
include/icc34.h
include/lcms.h
lib/liblcms.a
lib/liblcms.la
lib/pkgconfig/
lib/pkgconfig/lcms.pc
@man man/man1/icc2ps.1
@man man/man1/icclink.1
@man man/man1/jpegicc.1
@man man/man1/tifficc.1
@man man/man1/wtpt.1
share/doc/lcms/
share/doc/lcms/LCMSAPI.TXT
share/doc/lcms/TUTORIAL.TXT