cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to argyllcms-1.8.2.

Browse Source
This commit is contained in:
ajacoutot 2015-09-20 07:36:50 +00:00
parent a0f98ecaf4
commit d6f8d3d541
9 changed files with 21 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
graphics/argyll/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.13 2014/03/18 08:16:51 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.14 2015/09/20 07:36:50 ajacoutot Exp $
COMMENT= ICC compatible color management system
V= 1.6.3
V= 1.8.2
DISTNAME= Argyll_V${V}_src
PKGNAME= argyllcms-${V}
EXTRACT_SUFX= .zip
@ -16,22 +16,20 @@ HOMEPAGE= http://www.argyllcms.com/
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += X11 Xau Xdmcp Xext Xinerama Xrandr Xss Xxf86vm c jpeg
WANTLIB += m pthread tiff
WANTLIB += m png pthread ssl tiff z
MASTER_SITES= ${HOMEPAGE}
BUILD_DEPENDS= devel/jam
LIB_DEPENDS= graphics/tiff
LIB_DEPENDS= graphics/png \
graphics/tiff
MAKE_ENV= CCOPTFLAG="${CFLAGS} -I${X11BASE}/include" \
REFSUBDIR="share/color/argyll/ref"
NO_TEST= Yes
pre-configure:
${SUBST_CMD} ${WRKSRC}/Jamtop
do-build:
cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/jam -q -fJambase

4
graphics/argyll/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (Argyll_V1.6.3_src.zip) = GIvqoD3SRZQDQVAj+Pj5qrNivzBiqYIrNiLd5pAuS4Q=
SIZE (Argyll_V1.6.3_src.zip) = 10338488
SHA256 (Argyll_V1.8.2_src.zip) = Wb366s410gB8kPxTI0ujO/imTP/Aj3snopf8X4VFU3c=
SIZE (Argyll_V1.8.2_src.zip) = 13946428

24
graphics/argyll/patches/patch-Jambase
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-Jambase,v 1.1 2014/01/26 15:38:02 ajacoutot Exp $
sync with ports/devel/jam/patches/patch-Jambase
--- Jambase.orig Mon Nov 18 23:13:20 2013
+++ Jambase Sun Jan 26 16:21:36 2014
@@ -946,7 +946,7 @@ else if $(UNIX)
CRELIB ?= ;
DOT ?= . ;
DOTDOT ?= .. ;
- EXEMODE ?= 711 ;
+ EXEMODE ?= 755 ;
FILEMODE ?= 644 ;
FORTRAN ?= f77 ;
FORTRANFLAGS ?= ;
@@ -3726,7 +3726,7 @@ rule RmTemps_
rule Setuid
{
local _t = [ NormPaths $(>:S=$(SUFEXE)) ] ;
- MODE on $(_t) = 4711 ;
+ MODE on $(_t) = 4755 ;
}
# Shell

23
graphics/argyll/patches/patch-Jamtop
View File

@ -1,23 +0,0 @@
$OpenBSD: patch-Jamtop,v 1.4 2014/03/24 07:23:28 espie Exp $
--- Jamtop.orig Mon Nov 18 23:13:20 2013
+++ Jamtop Fri Jan 3 11:13:17 2014
@@ -73,7 +73,9 @@ if $(UNIX) {
EXIT Unable to locate the X11 include files ;
}
- if $(HOST64) {
+ if $(OS) = OPENBSD {
+ LibWinD = ${X11BASE}/lib ;
+ } else if $(HOST64) {
if [ GLOB /usr/X11R6/lib : libX11.so ] {
LibWinD = /usr/X11R6/lib ;
} else if [ GLOB /usr/lib/x86_64-linux-gnu : libX11.so ] {
@@ -100,6 +102,8 @@ if $(UNIX) {
}
if $(OS) = FREEBSD {
LINKFLAGS += -L$(LibWinD) -g -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -lusb ;
+ } else if $(OS) = OPENBSD {
+ LINKFLAGS += -L$(LibWinD) -g -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -L${LOCALBASE}/lib ;
} else {
LINKFLAGS += -L$(LibWinD) -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss ;
}

12
graphics/argyll/patches/patch-spectro_hidio_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-spectro_hidio_c,v 1.3 2014/01/03 10:22:12 ajacoutot Exp $
--- spectro/hidio.c.orig Mon Nov 18 23:13:36 2013
+++ spectro/hidio.c Fri Jan 3 11:13:17 2014
@@ -85,7 +85,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
#include <sys/types.h>
#include <usbhid.h>
#else /* assume Linux */

22
graphics/argyll/patches/patch-spectro_icoms_ux_c
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-spectro_icoms_ux_c,v 1.2 2014/03/18 08:16:51 ajacoutot Exp $
--- spectro/icoms_ux.c.orig Fri Jan 31 05:08:57 2014
+++ spectro/icoms_ux.c Tue Mar 18 09:10:33 2014
@@ -218,7 +218,7 @@ int icompaths_refresh_paths(icompaths *p) {
break;
if (!(
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
/* This should match uart & USB devs. */
( strncmp (de->d_name, "cua", 3) == 0
&& strlen (de->d_name) < 7)
@@ -340,6 +340,9 @@ static int icoms_ser_read(icoms *p, char *rbuf, int bs
# ifndef IOSSIOSPEED
# define IOSSIOSPEED _IOW('T', 2, speed_t)
# endif
+#endif
+
+#if defined(__APPLE__) || defined(__OpenBSD__)
# ifndef B921600
# define B921600 921600
# endif

12
graphics/argyll/patches/patch-spectro_usbio_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-spectro_usbio_c,v 1.1 2013/09/16 15:48:29 ajacoutot Exp $
--- spectro/usbio.c.orig Mon Aug 19 08:29:25 2013
+++ spectro/usbio.c Mon Sep 16 14:59:13 2013
@@ -94,7 +94,7 @@ static int icoms_usb_wait_io(
# include "usbio_ox.c"
# endif
# if defined(UNIX_X11)
-# if defined(__FreeBSD__)
+# if defined(__FreeBSD__) || defined(__OpenBSD__)
# include "usbio_bsd.c"
# else
# include "usbio_lx.c"

12
graphics/argyll/patches/patch-spectro_webwin_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-spectro_webwin_c,v 1.1 2013/09/16 15:48:30 ajacoutot Exp $
--- spectro/webwin.c.orig Mon Sep 16 14:00:48 2013
+++ spectro/webwin.c Mon Sep 16 14:03:52 2013
@@ -24,7 +24,7 @@
# include <ifaddrs.h>
# include <netinet/in.h>
# include <arpa/inet.h>
-# ifdef __FreeBSD__
+# if defined(__FreeBSD__) || defined(__OpenBSD__)
# include <sys/socket.h>
# endif /* __FreeBSD__ */
#endif

19
graphics/argyll/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2014/03/18 08:16:51 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.5 2015/09/20 07:36:50 ajacoutot Exp $
@conflict argyll-*
@bin bin/applycal
@bin bin/average
@ -23,6 +23,7 @@
@bin bin/illumread
@bin bin/invprofcheck
@bin bin/kodak2ti3
@bin bin/ls2ti3
@bin bin/mppcheck
@bin bin/mpplu
@bin bin/mppprof
@ -51,9 +52,9 @@ share/color/argyll/ref/
share/color/argyll/ref/3dap5k.sp
share/color/argyll/ref/CIE_C.sp
share/color/argyll/ref/CMP_DT_003.cht
share/color/argyll/ref/CMP_Digital_Target-3.cht
share/color/argyll/ref/CMP_Digital_Target-3.cie
share/color/argyll/ref/CMP_Digital_Target-3.ti2
share/color/argyll/ref/CMP_Digital_Target-4.cht
share/color/argyll/ref/CMP_Digital_Target-4.cie
share/color/argyll/ref/CMP_Digital_Target-4.ti2
share/color/argyll/ref/ClayRGB1998.icm
share/color/argyll/ref/ColorChecker.cht
share/color/argyll/ref/ColorChecker.cie
@ -63,6 +64,7 @@ share/color/argyll/ref/ColorCheckerDC.ti2
share/color/argyll/ref/ColorCheckerPassport.cht
share/color/argyll/ref/ColorCheckerPassport.cie
share/color/argyll/ref/ColorCheckerSG.cht
share/color/argyll/ref/ColorCheckerSG.ti2
share/color/argyll/ref/D50_0.0.sp
share/color/argyll/ref/D50_0.1.sp
share/color/argyll/ref/D50_0.3.sp
@ -116,11 +118,13 @@ share/color/argyll/ref/linear.cal
share/color/argyll/ref/sRGB.icm
share/color/argyll/ref/strange.cal
share/doc/argyllcms/
share/doc/argyllcms/3dformat.html
share/doc/argyllcms/ArgyllCMS_arts_tag.html
share/doc/argyllcms/ArgyllDoc.html
share/doc/argyllcms/ArgyllFlow.jpg
share/doc/argyllcms/ArgyllFlowThumb.jpg
share/doc/argyllcms/CMP_DT_003.jpg
share/doc/argyllcms/CMP_Digital_Target-3.jpg
share/doc/argyllcms/CMP_Digital_Target-4.jpg
share/doc/argyllcms/CRTspectrum.jpg
share/doc/argyllcms/ChangesSummary.html
share/doc/argyllcms/Chroma4.jpg
@ -142,6 +146,7 @@ share/doc/argyllcms/DTP51.jpg
share/doc/argyllcms/DTP92.jpg
share/doc/argyllcms/DTP94.jpg
share/doc/argyllcms/DocLicense.txt
share/doc/argyllcms/EX1.jpg
share/doc/argyllcms/Environment.html
share/doc/argyllcms/EyeOne_Display_1_NEC1990SXi.ccmx
share/doc/argyllcms/EyeOne_Display_2_EIZO_S2233W.ccmx
@ -169,6 +174,7 @@ share/doc/argyllcms/Installing_Linux.html
share/doc/argyllcms/Installing_MSWindows.html
share/doc/argyllcms/Installing_OSX.html
share/doc/argyllcms/JETI_1211.jpg
share/doc/argyllcms/K10A.jpg
share/doc/argyllcms/Kgraph1.jpg
share/doc/argyllcms/Kgraph2.jpg
share/doc/argyllcms/Kgraph3.jpg
@ -195,6 +201,7 @@ share/doc/argyllcms/QPcard202.jpg
share/doc/argyllcms/SG.jpg
share/doc/argyllcms/SG_footer.txt
share/doc/argyllcms/SG_header.txt
share/doc/argyllcms/SMCube.jpg
share/doc/argyllcms/Scenarios.html
share/doc/argyllcms/Smile.jpg
share/doc/argyllcms/Source.html
@ -202,6 +209,7 @@ share/doc/argyllcms/Spyd2.jpg
share/doc/argyllcms/Spyd3.jpg
share/doc/argyllcms/Spyd3x.jpg
share/doc/argyllcms/Spyd4.jpg
share/doc/argyllcms/Spyd5.jpg
share/doc/argyllcms/Spyder2_EIZO_S2433W_standard_1931.ccmx
share/doc/argyllcms/Spyder2_EIZO_S2433W_standard_1964.ccmx
share/doc/argyllcms/Spyder3_EIZO_S2233_standard_1964.ccmx
@ -210,6 +218,7 @@ share/doc/argyllcms/Spyder3_HP_LP2475w.ccmx
share/doc/argyllcms/Spyder3_NEC2690WUXi2.ccmx
share/doc/argyllcms/Spyder3_NEC_PA301W.ccmx
share/doc/argyllcms/SpyderChecker.jpg
share/doc/argyllcms/VideoEOTFs.html
share/doc/argyllcms/WideGamutColmters.html
share/doc/argyllcms/YellowGreen.jpg
share/doc/argyllcms/afiles