Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 15 Aug 2024 11:54:39 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 87ccdb191def - main - graphics/vips: Add x11 and nox11 flavors
Message-ID:  <202408151154.47FBsdk4056917@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=87ccdb191deff44cfd027ef1370a0e7b9f615d74

commit 87ccdb191deff44cfd027ef1370a0e7b9f615d74
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-08-15 09:41:31 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-08-15 10:55:27 +0000

    graphics/vips: Add x11 and nox11 flavors
---
 graphics/vips/Makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index c247570db237..e275c3d73622 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -41,6 +41,12 @@ USE_LDCONFIG=	yes
 
 PLIST_SUB=	VERSION=${PORTVERSION:R}
 
+FLAVORS=	x11 nox11
+FLAVOR?=	${FLAVORS:[1]}
+nox11_PKGNAMESUFFIX=	-nox11
+
+CONFLICTS_INSTALL=	vips vips-nox11
+
 SHEBANG_FILES=	tools/vipsprofile
 
 OPTIONS_DEFINE=	CFITSIO DOCS FFTW FONTCONFIG GIF HEIF IMAGEQUANT JPEG JXL LCMS2 LIBARCHIVE LIBEXIF LIBRSVG2 MATIO OPENEXR PANGO PNG POPPLER SPNG TIFF WEBP
@@ -66,7 +72,7 @@ FONTCONFIG_MESON_ENABLED=	fontconfig
 GIF_BUILD_DEPENDS=	cgif>=0.2.0:graphics/cgif
 GIF_LIB_DEPENDS=	libcgif.so:graphics/cgif
 GIF_MESON_ENABLED=	cgif
-GRAPHMAGICK_LIB_DEPENDS=libGraphicsMagick.so:graphics/GraphicsMagick
+GRAPHMAGICK_LIB_DEPENDS=libGraphicsMagick.so:graphics/GraphicsMagick@${FLAVOR}
 GRAPHMAGICK_MESON_ON=	-Dmagick=enabled -Dmagick-package=GraphicsMagick
 HEIF_BUILD_DEPENDS=	libheif>=1.4.0:graphics/libheif
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
@@ -75,7 +81,7 @@ HIGHWAY_BUILD_DEPENDS=	highway>=1.0.5:devel/highway
 HIGHWAY_LIB_DEPENDS=	libhwy.so:devel/highway
 HIGHWAY_MESON_ENABLED=	highway
 IMAGEMAGICK_MESON_ON=	-Dmagick=enabled -Dmagick-package=MagickCore
-IMAGEMAGICK_USES=	magick
+IMAGEMAGICK_USES=	magick:${FLAVOR}
 IMAGEQUANT_LIB_DEPENDS=	libimagequant.so:graphics/libimagequant
 IMAGEQUANT_MESON_ENABLED=	imagequant
 JPEG_BUILD_DEPENDS=	openjpeg>=2.4:graphics/openjpeg



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408151154.47FBsdk4056917>