summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2024-01-20 16:09:48 +0000
committerNuno Teixeira <eduardo@FreeBSD.org>2024-01-20 16:09:48 +0000
commit6c7466cb7f3c9d5e52f356847bf0ee8cbb619252 (patch)
treedc3d024a9367305f10b3f244e13f5cb518cfc602
parentnet/gitup: Update to 0.99 (diff)
graphics/imlib2: enable JPEG XL by default
Already default upstream via auto-detection. Adjust conflicts per options. PR: 276473
-rw-r--r--graphics/imlib2/Makefile12
-rw-r--r--graphics/imlib2/pkg-plist1
2 files changed, 9 insertions, 4 deletions
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 7239bc32bc7c..e6b0b91ce6b6 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,5 +1,6 @@
PORTNAME= imlib2
DISTVERSION= 1.12.1
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= graphics enlightenment
MASTER_SITES= SF/enlightenment/imlib2-src/${DISTVERSION}
@@ -27,13 +28,11 @@ CONFIGURE_ARGS= --disable-static \
INSTALL_TARGET= install-strip
-CONFLICTS_INSTALL= imlib2-webp
-
PLIST_SUB= SHLIB_SHORT=${DISTVERSION:R:R} \
SHLIB_VER=${DISTVERSION}
-OPTIONS_DEFINE= GIF ID3 JPEG PNG TIFF WEBP X11
-OPTIONS_DEFAULT= GIF ID3 JPEG PNG TIFF WEBP X11
+OPTIONS_DEFINE= GIF ID3 JPEG JXL PNG TIFF WEBP X11
+OPTIONS_DEFAULT= GIF ID3 JPEG JXL PNG TIFF WEBP X11
OPTIONS_SUB= yes
GIF_LIB_DEPENDS= libgif.so:graphics/giflib
@@ -45,6 +44,10 @@ ID3_CONFIGURE_WITH= id3
JPEG_USES= jpeg
JPEG_CONFIGURE_WITH= jpeg
+JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl
+JXL_CONFIGURE_WITH= jxl
+JXL_CONFLICTS_INSTALL= imlib2-jxl
+
PNG_LIB_DEPENDS= libpng16.so:graphics/png
PNG_CONFIGURE_WITH= png
@@ -53,6 +56,7 @@ TIFF_CONFIGURE_WITH= tiff
WEBP_LIB_DEPENDS= libwebpdemux.so:graphics/webp
WEBP_CONFIGURE_WITH= webp
+WEBP_CONFLICTS_INSTALL= imlib2-webp
X11_USES= xorg
X11_USE= XORG=sm,x11,xcb,xext
diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist
index a3460a4cc2f0..0fc4ea4a4b38 100644
--- a/graphics/imlib2/pkg-plist
+++ b/graphics/imlib2/pkg-plist
@@ -21,6 +21,7 @@ lib/imlib2/loaders/ff.so
lib/imlib2/loaders/ico.so
%%ID3%%lib/imlib2/loaders/id3.so
%%JPEG%%lib/imlib2/loaders/jpeg.so
+%%JXL%%lib/imlib2/loaders/jxl.so
lib/imlib2/loaders/lbm.so
lib/imlib2/loaders/lzma.so
%%PNG%%lib/imlib2/loaders/png.so