git: d63636286ec9 - main - graphics/vips: Adjust HIGHWAY option

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Mon, 27 Nov 2023 12:21:49 UTC
The branch main has been updated by sunpoet:

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

commit d63636286ec9e9b40503e72f0a2da891b4ffc078
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-11-27 11:25:49 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-11-27 12:19:29 +0000

    graphics/vips: Adjust HIGHWAY option
    
    - Add SIMD radio group
    - Move HIGHWAY option to SIMD group
    - Add ORC option to SIMD group
    
    HIGHWAY is preferred by upstream. When highway is unavailable, it falls back to
    liborc path.
    
    PR:             275352
    Reported by:    Marian Cerny <majo-bugs.freebsd.org@cerny.sk>
---
 graphics/vips/Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index 96635c3a37d1..a450953d4e96 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -42,15 +42,17 @@ PLIST_SUB=	VERSION=${PORTVERSION:R}
 
 SHEBANG_FILES=	tools/vipsprofile
 
-OPTIONS_DEFINE=	CFITSIO DOCS FFTW FONTCONFIG GIF HEIF HIGHWAY IMAGEQUANT JPEG JXL LCMS2 LIBARCHIVE LIBEXIF LIBRSVG2 MATIO OPENEXR PANGO PNG POPPLER SPNG TIFF WEBP
-OPTIONS_RADIO=	MAGICK
+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 GRAPHMAGICK
+OPTIONS_RADIO_SIMD=	HIGHWAY ORC
 OPTIONS_DEFAULT=CFITSIO FFTW FONTCONFIG GIF HEIF HIGHWAY IMAGEMAGICK JPEG JXL LCMS2 LIBARCHIVE LIBEXIF LIBRSVG2 MATIO OPENEXR PANGO PNG POPPLER SPNG TIFF WEBP
 FONTCONFIG_IMPLIES=	PANGO
 LIBARCHIVE_DESC=Save image pyramid via libarchive
-HIGHWAY_DESC=	SIMD support via Highway
+HIGHWAY_DESC=	SIMD support via Highway (preferred)
 IMAGEQUANT_DESC=Image Quantization support
 MATIO_DESC=	Matlab MAT format support
+ORC_DESC=	Accelerate loops with ORC
 
 CFITSIO_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 CFITSIO_MESON_ENABLED=	cfitsio
@@ -97,6 +99,9 @@ MATIO_MESON_ENABLED=	matio
 OPENEXR_BUILD_DEPENDS=	openexr>=1.2.2:graphics/openexr
 OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr
 OPENEXR_MESON_ENABLED=	openexr
+ORC_BUILD_DEPENDS=	orc>=0.4.31:devel/orc
+ORC_LIB_DEPENDS=	liborc-0.4.so:devel/orc
+ORC_MESON_ENABLED=	orc
 PANGO_MESON_ENABLED=	pangocairo
 PANGO_USE=		GNOME=pango
 PNG_BUILD_DEPENDS=	png>=1.2.9:graphics/png