MFH: r545317

graphics/argyllcms: Fix -fno-common build

Fix the build with -fno-common (default with llvm 11)
While here, remove a useless REINPLACE_CMD.

Approved by:	ports-secteam (joenum)
This commit is contained in:
Niclas Zeising 2020-08-20 19:21:40 +00:00
parent 848067739b
commit 1701f3dcbc
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2020Q3/; revision=545550
3 changed files with 42 additions and 3 deletions

View File

@ -22,9 +22,6 @@ WRKSRC= ${WRKDIR}/Argyll_V${PORTVERSION}
USES= compiler:c11 cpe jpeg ssl xorg zip
USE_XORG= x11 xau xdmcp xext xinerama xrandr xscrnsaver xxf86vm
post-patch:
@${REINPLACE_CMD} 's:711:755:g' ${WRKSRC}/Jambase
do-build:
@cd ${WRKSRC} && ${MAKE_ENV} jam -dx -q -fJambase -j${MAKE_JOBS_NUMBER}

View File

@ -0,0 +1,11 @@
--- gamut/gamut.h.orig 2020-08-19 11:32:00 UTC
+++ gamut/gamut.h
@@ -36,7 +36,7 @@
#define MAXGAMN 10 /* Maximum gamut point neighbors returned */
#define NSLOTS 6 /* Number of maximum direction slots */
-struct _vrml *wrl; /* Declared in vrml.h, which may be #included after this */
+extern struct _vrml *wrl; /* Declared in vrml.h, which may be #included after this */
/* ------------------------------------ */
#define NODE_STRUCT \

View File

@ -0,0 +1,31 @@
--- spectro/vinflate.c.orig 2020-08-19 12:08:33 UTC
+++ spectro/vinflate.c
@@ -92,7 +92,7 @@ int vinflate(void);
*/
#define WSIZE 0x8000
-unsigned int wp; /* current position in slide */
+extern unsigned int wp; /* current position in slide */
uch slide[32768];
static int vflush_output(unsigned int w) {
@@ -160,8 +160,8 @@ static ush cpdext[] = { /* Extra bits for dist
the stream.
*/
-ulg bb; /* bit buffer */
-unsigned bk; /* bits in bit buffer */
+extern ulg bb; /* bit buffer */
+extern unsigned bk; /* bits in bit buffer */
ush vmask_bits[] = {
0x0000,
@@ -239,7 +239,7 @@ int vdbits = 6; /* bits in base distance look
#define N_MAX 288 /* maximum number of codes in any set */
-unsigned hufts; /* track memory usage */
+extern unsigned hufts; /* track memory usage */
/* Given a list of code lengths and a maximum table size, make a set of
tables to decode that set of codes. Return zero on success, one if