[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
lcms update to 1.15

To: ports_(_at_)_openbsd_(_dot_)_org
Subject: lcms update to 1.15
From: Marc Espie <espie_(_at_)_nerim_(_dot_)_net>
Date: Tue, 7 Mar 2006 23:43:13 +0100
Mail-followup-to: ports_(_at_)_openbsd_(_dot_)_org
Reply-to: espie_(_at_)_nerim_(_dot_)_net
This needs somewhat more thorough testing that my casual rebuild.

Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/lcms/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile	8 Jan 2006 01:01:18 -0000	1.11
+++ Makefile	7 Mar 2006 22:41:02 -0000
@@ -2,9 +2,9 @@
 
 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
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/lcms/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo	5 Jan 2005 16:50:36 -0000	1.5
+++ distinfo	7 Mar 2006 22:41:02 -0000
@@ -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
Index: patches/patch-include_lcms_h
===================================================================
RCS file: /cvs/ports/graphics/lcms/patches/patch-include_lcms_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-include_lcms_h
--- patches/patch-include_lcms_h	14 Mar 2005 08:46:54 -0000	1.2
+++ patches/patch-include_lcms_h	7 Mar 2006 22:41:02 -0000
@@ -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$
+--- 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
Index: patches/patch-lcms_pc_in
===================================================================
RCS file: patches/patch-lcms_pc_in
diff -N patches/patch-lcms_pc_in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-lcms_pc_in	7 Mar 2006 22:41:02 -0000
@@ -0,0 +1,10 @@
+$OpenBSD$
+--- 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=_(_at_)_includedir@
+ Name: @PACKAGE@
+ Description: LCMS Color Management Library
+ Version: @VERSION@
+-Libs: -L${libdir} -llcms
++Libs: -L${libdir} -llcms @LCMS_LIB_DEPLIBS@
+ Cflags: -I${includedir}
Index: patches/patch-samples_Makefile_in
===================================================================
RCS file: /cvs/ports/graphics/lcms/patches/patch-samples_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-samples_Makefile_in
--- patches/patch-samples_Makefile_in	3 Feb 2004 05:15:16 -0000	1.1
+++ patches/patch-samples_Makefile_in	7 Mar 2006 22:41:02 -0000
@@ -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
- 
+--- 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
- 
+ 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
- 
+ 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
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/graphics/lcms/patches/patch-src_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_Makefile_in
--- patches/patch-src_Makefile_in	26 Dec 2005 17:27:24 -0000	1.2
+++ patches/patch-src_Makefile_in	7 Mar 2006 22:41:02 -0000
@@ -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 \
+--- 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 \
Index: patches/patch-src_cmsmtrx_c
===================================================================
RCS file: /cvs/ports/graphics/lcms/patches/patch-src_cmsmtrx_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_cmsmtrx_c
--- patches/patch-src_cmsmtrx_c	3 Feb 2004 05:15:16 -0000	1.1
+++ patches/patch-src_cmsmtrx_c	7 Mar 2006 22:41:02 -0000
@@ -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)
+--- 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)
  {
Index: patches/patch-testbed_Makefile_in
===================================================================
RCS file: /cvs/ports/graphics/lcms/patches/patch-testbed_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-testbed_Makefile_in
--- patches/patch-testbed_Makefile_in	3 Feb 2004 05:15:57 -0000	1.1
+++ patches/patch-testbed_Makefile_in	7 Mar 2006 22:41:02 -0000
@@ -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
- 
+--- 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
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/lcms/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST	10 Aug 2004 13:35:50 -0000	1.3
+++ pkg/PLIST	7 Mar 2006 22:41:02 -0000
@@ -3,12 +3,20 @@ 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
+_(_at_)_man man/man1/icc2ps.1
+_(_at_)_man man/man1/icclink.1
+_(_at_)_man man/man1/jpegicc.1
+_(_at_)_man man/man1/tifficc.1
+_(_at_)_man man/man1/wtpt.1
 share/doc/lcms/
 share/doc/lcms/LCMSAPI.TXT
 share/doc/lcms/TUTORIAL.TXT
Prev by Date: Re: UPDATE: net/bitlbee
Next by Date: psi port fix
Previous by thread: CHANGE: pilot-link-0.11.8
Next by thread: psi port fix
Index(es):
- Date
- Thread
Visit your host, monkey.org