Attachment 213279 Details for Bug 240568 – argyll.patch - 2.1.2

[patch] argyll.patch - 2.1.2

argyll.patch (text/plain), 5.70 KB, created by Val Packett on 2020-04-11 11:33:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Val Packett

Created: 2020-04-11 11:33:51 UTC

Size: 5.70 KB

patch

obsolete

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

Actions: View | Diff

Attachments on bug 240568: 207471 | 207475 | 207476 | 212881 | 213279