Date: Thu, 13 May 2021 13:44:38 GMT From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 10c60788587e - main - graphics/cimg: temporarily disable libboard Message-ID: <202105131344.14DDicrL080875@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=10c60788587e664aa6164bcb667b50a6ad37a59d commit 10c60788587e664aa6164bcb667b50a6ad37a59d Author: Thierry Thomas <thierry@FreeBSD.org> AuthorDate: 2021-05-13 13:41:20 +0000 Commit: Thierry Thomas <thierry@FreeBSD.org> 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) \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105131344.14DDicrL080875>