View | Details | Raw Unified | Return to bug 240568 | Differences between
and this patch

Collapse All | Expand All

(-)i/graphics/argyllcms/Makefile (-4 / +4 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	argyllcms
4
PORTNAME=	argyllcms
5
PORTVERSION=	1.9.2
5
PORTVERSION=	2.1.2
6
PORTREVISION=	5
7
CATEGORIES=	graphics
6
CATEGORIES=	graphics
8
MASTER_SITES=	https://www.argyllcms.com/
7
MASTER_SITES=	https://www.argyllcms.com/
9
DISTNAME=	Argyll_V${PORTVERSION}_src
8
DISTNAME=	Argyll_V${PORTVERSION}_src
Lines 17-27 BUILD_DEPENDS= jam:devel/jam Link Here
17
LIB_DEPENDS=	libtiff.so:graphics/tiff \
16
LIB_DEPENDS=	libtiff.so:graphics/tiff \
18
		libpng.so:graphics/png
17
		libpng.so:graphics/png
19
18
20
WRKSRC=		${WRKDIR}/Argyll_V${PORTVERSION}
21
22
USES=		compiler:c11 cpe jpeg ssl xorg zip
19
USES=		compiler:c11 cpe jpeg ssl xorg zip
23
USE_XORG=	x11 xau xdmcp xext xinerama xrandr xscrnsaver xxf86vm
20
USE_XORG=	x11 xau xdmcp xext xinerama xrandr xscrnsaver xxf86vm
24
21
22
EXTRACT_AFTER_ARGS=	-x */zlib/* -x */tiff/* -x */png/* -x */jpeg/*
23
WRKSRC=		${WRKDIR}/Argyll_V${PORTVERSION}
24
25
post-patch:
25
post-patch:
26
	@${REINPLACE_CMD} 's:711:755:g' ${WRKSRC}/Jambase
26
	@${REINPLACE_CMD} 's:711:755:g' ${WRKSRC}/Jambase
27
27
(-)i/graphics/argyllcms/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1479769420
1
TIMESTAMP = 1586604000
2
SHA256 (Argyll_V1.9.2_src.zip) = 4d61ae0b91686dea721d34df2e44eaf36c88da87086fd50ccc4e999a58e9ce90
2
SHA256 (Argyll_V2.1.2_src.zip) = be378ca836b17b8684db05e9feaab138d711835ef00a04a76ac0ceacd386a3e3
3
SIZE (Argyll_V1.9.2_src.zip) = 13624924
3
SIZE (Argyll_V2.1.2_src.zip) = 13837056
(-)i/graphics/argyllcms/files/patch-Jambase (-3 / +3 lines)
Lines 1-6 Link Here
1
--- Jambase.orig	2016-09-28 02:58:53 UTC
1
--- Jambase.orig	2020-01-19 01:38:04 UTC
2
+++ Jambase
2
+++ Jambase
3
@@ -966,7 +966,7 @@ else if $(UNIX)
3
@@ -992,7 +992,7 @@ else if $(UNIX)
4
 	YACCFILES		?= y.tab ;
4
 	YACCFILES		?= y.tab ;
5
 	YACCFLAGS		?= -d ;
5
 	YACCFLAGS		?= -d ;
6
 
6
 
Lines 9-15 Link Here
9
 
9
 
10
 	# Add some good defaults for OS X
10
 	# Add some good defaults for OS X
11
 	if $(OS) = MACOSX {
11
 	if $(OS) = MACOSX {
12
@@ -999,7 +999,11 @@ else if $(UNIX)
12
@@ -1038,7 +1038,11 @@ else if $(UNIX)
13
 # General defaults; a lot like UNIX
13
 # General defaults; a lot like UNIX
14
 #
14
 #
15
 
15
 
(-)i/graphics/argyllcms/files/patch-Jamtop (-5 / +14 lines)
Lines 1-6 Link Here
1
--- Jamtop.orig	2017-05-22 19:09:44 UTC
1
--- Jamtop.orig	2020-01-19 01:38:05 UTC
2
+++ Jamtop
2
+++ Jamtop
3
@@ -76,8 +76,8 @@ if $(UNIX) {
3
@@ -87,8 +87,8 @@ if $(UNIX) {
4
 			LibWinH = /usr/X11R6/include ;
4
 			LibWinH = /usr/X11R6/include ;
5
 		} else if [ GLOB /usr/include/X11 : X.h ] {
5
 		} else if [ GLOB /usr/include/X11 : X.h ] {
6
 			LibWinH = /usr/include ;
6
 			LibWinH = /usr/include ;
Lines 11-17 Link Here
11
 		} else {
11
 		} else {
12
 			EXIT Unable to locate the X11 include files ;
12
 			EXIT Unable to locate the X11 include files ;
13
 		}
13
 		}
14
@@ -91,8 +91,8 @@ if $(UNIX) {
14
@@ -102,8 +102,8 @@ if $(UNIX) {
15
 				LibWinD = /usr/lib64 ;
15
 				LibWinD = /usr/lib64 ;
16
 			} else if [ GLOB /usr/lib : libX11.so libX11.a ] {
16
 			} else if [ GLOB /usr/lib : libX11.so libX11.a ] {
17
 				LibWinD = /usr/lib ;
17
 				LibWinD = /usr/lib ;
Lines 22-28 Link Here
22
 			} else {
22
 			} else {
23
 				ECHO Unable to locate the 64 bit X11 library files ;
23
 				ECHO Unable to locate the 64 bit X11 library files ;
24
 			}
24
 			}
25
@@ -103,8 +103,8 @@ if $(UNIX) {
25
@@ -114,8 +114,8 @@ if $(UNIX) {
26
 				LibWinD = /usr/lib/i386-linux-gnu ;
26
 				LibWinD = /usr/lib/i386-linux-gnu ;
27
 			} else if [ GLOB /usr/lib : libX11.so libX11.a ] {
27
 			} else if [ GLOB /usr/lib : libX11.so libX11.a ] {
28
 				LibWinD = /usr/lib ;
28
 				LibWinD = /usr/lib ;
Lines 33-39 Link Here
33
 			} else {
33
 			} else {
34
 				ECHO Unable to locate the 32 bit X11 library files ;
34
 				ECHO Unable to locate the 32 bit X11 library files ;
35
 			}
35
 			}
36
@@ -140,11 +140,11 @@ rule CheckForLibrary {
36
@@ -154,11 +154,11 @@ rule CheckForLibrary {
37
 
37
 
38
 	if ! $(BUILTIN_$(UCASE)) && $(UNIX) {
38
 	if ! $(BUILTIN_$(UCASE)) && $(UNIX) {
39
 		if  [ GLOB /usr/include$(subd) : $(lcase).h $(lcase)lib.h ]
39
 		if  [ GLOB /usr/include$(subd) : $(lcase).h $(lcase)lib.h ]
Lines 47-49 Link Here
47
 			 || [ GLOB /usr/lib64 : lib$(lcase).so ] || [ GLOB /usr/lib64 : lib$(lcase).a ]
47
 			 || [ GLOB /usr/lib64 : lib$(lcase).so ] || [ GLOB /usr/lib64 : lib$(lcase).a ]
48
 			 || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).so ]
48
 			 || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).so ]
49
 			 || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).a ]
49
 			 || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).a ]
50
@@ -167,7 +167,7 @@ rule CheckForLibrary {
51
 				echo "Using system $(UCASE) library" ;
52
 				$(UCASE)LIB = ;
53
 				$(UCASE)INC = ;
54
-				LINKFLAGS += $(LINKFLAG)$(lcase) ;
55
+				LINKFLAGS += -L$(LOCALBASE)/lib $(LINKFLAG)$(lcase) ;
56
 				HAVE_$(UCASE) = true ;
57
 			}
58
 		}
(-)i/graphics/argyllcms/files/patch-gcc5 (-5 / +7 lines)
Lines 4-20 Bug-Debian: https://bugs.debian.org/777779 Link Here
4
Forwarded: no
4
Forwarded: no
5
---
5
---
6
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
6
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
7
--- icc/icc.h
7
--- icc/icc.h.orig	2019-09-13 20:11:47 UTC
8
+++ icc/icc.h
8
+++ icc/icc.h
9
@@ -100,7 +100,11 @@
9
@@ -131,8 +131,13 @@
10
 #define CF64PREC "LL"		/* Constant precision specifier */
10
 #define CF64PREC "LL"				/* Constant precision specifier */
11
 
11
 
12
 #ifndef ATTRIBUTE_NORETURN
12
 #ifndef ATTRIBUTE_NORETURN
13
+#ifdef _MSC_VER
13
+#ifdef _MSC_VER
14
 # define ATTRIBUTE_NORETURN __declspec(noreturn)
14
 # define ATTRIBUTE_NORETURN __declspec(noreturn)
15
+#else
15
+#else
16
+# define ATTRIBUTE_NORETURN __attribute__((noreturn))
16
+# define ATTRIBUTE_NORETURN __attribute__((noreturn))
17
+#endif
18
 #endif
17
 #endif
18
+#endif
19
+
20
 
21
 #else  /* !_MSC_VER */
19
 
22
 
20
 #else  /* !__STDC_VERSION__ */
(-)i/graphics/argyllcms/pkg-plist (+7 lines)
Lines 7-12 bin/chartread Link Here
7
bin/collink
7
bin/collink
8
bin/colprof
8
bin/colprof
9
bin/colverify
9
bin/colverify
10
bin/cxf2ti3
10
bin/dispcal
11
bin/dispcal
11
bin/dispread
12
bin/dispread
12
bin/dispwin
13
bin/dispwin
Lines 52-57 share/argyll/ref/CMP_Digital_Target-4.cht Link Here
52
share/argyll/ref/CMP_Digital_Target-4.cie
53
share/argyll/ref/CMP_Digital_Target-4.cie
53
share/argyll/ref/CMP_Digital_Target-4.ti2
54
share/argyll/ref/CMP_Digital_Target-4.ti2
54
share/argyll/ref/CMP_Digital_Target-7.cht
55
share/argyll/ref/CMP_Digital_Target-7.cht
56
share/argyll/ref/CMP_Digital_Target-2019.cht
57
share/argyll/ref/CMP_Digital_Target_Studio.cht
55
share/argyll/ref/ClayRGB1998.icm
58
share/argyll/ref/ClayRGB1998.icm
56
share/argyll/ref/ColorChecker.cht
59
share/argyll/ref/ColorChecker.cht
57
share/argyll/ref/ColorChecker.cie
60
share/argyll/ref/ColorChecker.cie
Lines 86-91 share/argyll/ref/FograStrip3.ti1 Link Here
86
share/argyll/ref/FograStrip3_3.ti2
89
share/argyll/ref/FograStrip3_3.ti2
87
share/argyll/ref/GTIPlus.sp
90
share/argyll/ref/GTIPlus.sp
88
share/argyll/ref/Hutchcolor.cht
91
share/argyll/ref/Hutchcolor.cht
92
share/argyll/ref/ISO12641_2_1.cht
93
share/argyll/ref/ISO12641_2_3_1.cht
94
share/argyll/ref/ISO12641_2_3_2.cht
95
share/argyll/ref/ISO12641_2_3_3.cht
89
share/argyll/ref/LaserSoftDCPro.cht
96
share/argyll/ref/LaserSoftDCPro.cht
90
share/argyll/ref/Office.sp
97
share/argyll/ref/Office.sp
91
share/argyll/ref/ProPhoto.icm
98
share/argyll/ref/ProPhoto.icm

Return to bug 240568