git: 31f7827a68a8 - main - x11/swayimg: rename option JPEG2000 to OPENJPEG

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Sat, 20 Jun 2026 01:06:31 UTC
The branch main has been updated by jbeich:

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

commit 31f7827a68a8b5e396dbfc18c0a16a0b702ac1fa
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2026-06-20 00:58:50 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2026-06-20 01:06:16 +0000

    x11/swayimg: rename option JPEG2000 to OPENJPEG
    
    Options are named after dependencies to allow disabling globally.
    However, JPEG 2000 support can depend on either JasPer or OpenJPEG.
---
 x11/swayimg/Makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/x11/swayimg/Makefile b/x11/swayimg/Makefile
index b17c4a3c81e0..db6fc171c332 100644
--- a/x11/swayimg/Makefile
+++ b/x11/swayimg/Makefile
@@ -36,10 +36,10 @@ PLIST_FILES=	bin/${PORTNAME} \
 LIB_DEPENDS+=	libinotify.so:devel/libinotify
 .endif
 
-OPTIONS_DEFINE=	AVIF BASH EXIV2 GIF HEIF JPEG JPEG2000 JXL LIBRSVG2 \
-		OPENEXR PNG RAW SIXEL TIFF WEBP ZSH
-OPTIONS_DEFAULT=AVIF BASH DRM EXIV2 GIF HEIF JPEG JPEG2000 JXL LIBRSVG2 \
-		OPENEXR PNG RAW SIXEL TIFF WAYLAND WEBP ZSH
+OPTIONS_DEFINE=	AVIF BASH EXIV2 GIF HEIF JPEG JXL LIBRSVG2 \
+		OPENEXR OPENJPEG PNG RAW SIXEL TIFF WEBP ZSH
+OPTIONS_DEFAULT=AVIF BASH DRM EXIV2 GIF HEIF JPEG JXL LIBRSVG2 \
+		OPENEXR OPENJPEG PNG RAW SIXEL TIFF WAYLAND WEBP ZSH
 OPTIONS_MULTI=	GUI
 OPTIONS_MULTI_GUI=	DRM WAYLAND
 OPTIONS_EXCLUDE=${LIBRSVG2_DEFAULT:Mlegacy:C/.+/LIBRSVG2/}
@@ -67,9 +67,6 @@ HEIF_MESON_ENABLED=	heif
 JPEG_USES=		jpeg
 JPEG_MESON_ENABLED=	jpeg
 
-JPEG2000_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
-JPEG2000_MESON_ENABLED=	jp2
-
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 JXL_MESON_ENABLED=	jxl
 
@@ -81,6 +78,9 @@ OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr \
 			libImath.so:math/Imath
 OPENEXR_MESON_ENABLED=	exr
 
+OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
+OPENJPEG_MESON_ENABLED=	jp2
+
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_MESON_ENABLED=	png