From owner-dev-commits-ports-all@freebsd.org Thu May 13 13:44:38 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 8F671641AA0; Thu, 13 May 2021 13:44:38 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FgtF23g1Zz4vvF; Thu, 13 May 2021 13:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7074F1FC99; Thu, 13 May 2021 13:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14DDic0I080876; Thu, 13 May 2021 13:44:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14DDicrL080875; Thu, 13 May 2021 13:44:38 GMT (envelope-from git) Date: Thu, 13 May 2021 13:44:38 GMT Message-Id: <202105131344.14DDicrL080875@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 10c60788587e - main - graphics/cimg: temporarily disable libboard MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10c60788587e664aa6164bcb667b50a6ad37a59d Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 May 2021 13:44:38 -0000 The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=10c60788587e664aa6164bcb667b50a6ad37a59d commit 10c60788587e664aa6164bcb667b50a6ad37a59d Author: Thierry Thomas AuthorDate: 2021-05-13 13:41:20 +0000 Commit: Thierry Thomas CommitDate: 2021-05-13 13:41:20 +0000 graphics/cimg: temporarily disable libboard ATM CImg does not build against ImageMagick (GraphicsMagick is OK), and since libboard is built against ImageMagick this causes an error. Reported by: pkg-fallout --- graphics/cimg/Makefile | 4 ++-- graphics/cimg/files/patch-examples__Makefile | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile index 3f084382634a..84c3e96b8271 100644 --- a/graphics/cimg/Makefile +++ b/graphics/cimg/Makefile @@ -3,7 +3,7 @@ PORTNAME= cimg DISTVERSIONPREFIX= v. DISTVERSION= 2.9.7 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 3 CATEGORIES= graphics devel @@ -44,7 +44,7 @@ USES+= blaslapack .endif REINPLACE_ARGS= -i "" -LIB_DEPENDS+= libboard.so:graphics/libboard +#LIB_DEPENDS+= libboard.so:graphics/libboard . if !defined(WITH_DEBUG) LIB_DEPENDS+= libcurl.so:ftp/curl \ diff --git a/graphics/cimg/files/patch-examples__Makefile b/graphics/cimg/files/patch-examples__Makefile index 01f6af383905..a681c8e1c8f7 100644 --- a/graphics/cimg/files/patch-examples__Makefile +++ b/graphics/cimg/files/patch-examples__Makefile @@ -74,7 +74,7 @@ # Flags to enable native support for compressed .cimgz files, using the Zlib library. # ( http://www.zlib.net/ ) -@@ -288,15 +288,15 @@ endif +@@ -288,17 +288,17 @@ endif # Flags to enable the use of LAPACK routines for matrix computation # ( http://www.netlib.org/lapack/ ) @@ -90,10 +90,14 @@ # ( https://github.com/c-koi/libboard ) BOARD_DEFINE = -Dcimg_use_board -BOARD_INCDIR = -I/usr/include/board +-BOARD_CFLAGS = $(BOARD_DEFINE) $(BOARD_INCDIR) +-BOARD_LIBS = -lboard +BOARD_INCDIR = -I$(LOCALBASE)/include/board - BOARD_CFLAGS = $(BOARD_DEFINE) $(BOARD_INCDIR) - BOARD_LIBS = -lboard ++#BOARD_CFLAGS = $(BOARD_DEFINE) $(BOARD_INCDIR) ++#BOARD_LIBS = -lboard + # Flags to compile GIMP plug-ins. + ifeq ($(MSYSTEM),MINGW32) @@ -368,6 +368,7 @@ $(TIFF_LIBS) \ $(HEIF_LIBS) \ $(LAPACK_LIBS) \