From owner-svn-ports-branches@freebsd.org Thu Aug 20 19:21:41 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C1FD03C5F7C; Thu, 20 Aug 2020 19:21:41 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BXZJj4qmcz3bpJ; Thu, 20 Aug 2020 19:21:41 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8A516193BD; Thu, 20 Aug 2020 19:21:41 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07KJLfmK083829; Thu, 20 Aug 2020 19:21:41 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07KJLfMn083826; Thu, 20 Aug 2020 19:21:41 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <202008201921.07KJLfMn083826@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Thu, 20 Aug 2020 19:21:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r545550 - in branches/2020Q3/graphics/argyllcms: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in branches/2020Q3/graphics/argyllcms: . files X-SVN-Commit-Revision: 545550 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Aug 2020 19:21:41 -0000 Author: zeising Date: Thu Aug 20 19:21:40 2020 New Revision: 545550 URL: https://svnweb.freebsd.org/changeset/ports/545550 Log: 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) Added: branches/2020Q3/graphics/argyllcms/files/patch-gamut_gamut.h - copied unchanged from r545317, head/graphics/argyllcms/files/patch-gamut_gamut.h branches/2020Q3/graphics/argyllcms/files/patch-spectro_vinflate.c - copied unchanged from r545317, head/graphics/argyllcms/files/patch-spectro_vinflate.c Modified: branches/2020Q3/graphics/argyllcms/Makefile Directory Properties: branches/2020Q3/ (props changed) Modified: branches/2020Q3/graphics/argyllcms/Makefile ============================================================================== --- branches/2020Q3/graphics/argyllcms/Makefile Thu Aug 20 19:07:19 2020 (r545549) +++ branches/2020Q3/graphics/argyllcms/Makefile Thu Aug 20 19:21:40 2020 (r545550) @@ -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} Copied: branches/2020Q3/graphics/argyllcms/files/patch-gamut_gamut.h (from r545317, head/graphics/argyllcms/files/patch-gamut_gamut.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/graphics/argyllcms/files/patch-gamut_gamut.h Thu Aug 20 19:21:40 2020 (r545550, copy of r545317, head/graphics/argyllcms/files/patch-gamut_gamut.h) @@ -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 \ Copied: branches/2020Q3/graphics/argyllcms/files/patch-spectro_vinflate.c (from r545317, head/graphics/argyllcms/files/patch-spectro_vinflate.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/graphics/argyllcms/files/patch-spectro_vinflate.c Thu Aug 20 19:21:40 2020 (r545550, copy of r545317, head/graphics/argyllcms/files/patch-spectro_vinflate.c) @@ -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