git: fb92fe7e6178 - main - Revert "graphics/vips: Add x11 and nox11 flavors"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 23 Sep 2025 06:50:48 UTC
The branch main has been updated by mikael:
URL: https://cgit.FreeBSD.org/ports/commit/?id=fb92fe7e6178a1e3d04393068a505d4dfb978661
commit fb92fe7e6178a1e3d04393068a505d4dfb978661
Author: Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2025-09-08 07:02:26 +0000
Commit: Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2025-09-23 06:50:02 +0000
Revert "graphics/vips: Add x11 and nox11 flavors"
This reverts commit 87ccdb191deff44cfd027ef1370a0e7b9f615d74.
This breaks building leaf port without x11 (redmine in particular)
PR: 282726
Approved by: maintainer timeout (6+ months)
---
graphics/vips/Makefile | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index 9a422eb33653..97f2c4f9ffd8 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -41,12 +41,6 @@ USE_LDCONFIG= yes
PLIST_SUB= VERSION=${PORTVERSION:R}
-FLAVORS= x11 nox11
-FLAVOR?= ${FLAVORS:[1]}
-nox11_PKGNAMESUFFIX= -nox11
-
-CONFLICTS_INSTALL= vips vips-nox11
-
OPTIONS_DEFINE= CFITSIO DOCS FFTW FONTCONFIG GIF HEIF IMAGEQUANT JPEG JXL LCMS2 LIBARCHIVE LIBEXIF LIBRSVG2 MATIO OPENEXR PANGO PNG POPPLER SPNG TIFF WEBP
OPTIONS_RADIO= MAGICK SIMD
OPTIONS_RADIO_MAGICK= IMAGEMAGICK GRAPHICSMAGICK
@@ -74,7 +68,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
-GRAPHICSMAGICK_LIB_DEPENDS= libGraphicsMagick.so:graphics/GraphicsMagick@${FLAVOR}
+GRAPHICSMAGICK_LIB_DEPENDS= libGraphicsMagick.so:graphics/GraphicsMagick
GRAPHICSMAGICK_MESON_ON=-Dmagick=enabled -Dmagick-package=GraphicsMagick
HEIF_BUILD_DEPENDS= libheif>=1.4.0:graphics/libheif
HEIF_LIB_DEPENDS= libheif.so:graphics/libheif
@@ -83,7 +77,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:${FLAVOR}
+IMAGEMAGICK_USES= magick
IMAGEQUANT_LIB_DEPENDS= libimagequant.so:graphics/libimagequant
IMAGEQUANT_MESON_ENABLED= imagequant
JPEG_BUILD_DEPENDS= openjpeg>=2.4:graphics/openjpeg