Attachment 247797 Details for Bug 276473 – v1 (apply via "git am")

[patch] v1 (apply via "git am")

bug276473.diff (text/plain), 2.53 KB, created by Jan Beich on 2024-01-20 15:53:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2024-01-20 15:53:36 UTC

Size: 2.53 KB

patch

obsolete

>From 5064fd61846fa9009e5ba5b43051272c4e1d47df Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sat, 20 Jan 2024 16:43:43 +0100
>Subject: [PATCH 1/2] graphics/imlib2: limit CONFLICTS_INSTALL to WEBP=on
>
>PR:		276473
>Approved by:	eduardo (maintainer)
>---
> graphics/imlib2/Makefile | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
>diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
>index 7239bc32bc7c..9c10536a771e 100644
>--- a/graphics/imlib2/Makefile
>+++ b/graphics/imlib2/Makefile
>@@ -27,8 +27,6 @@ CONFIGURE_ARGS=	--disable-static \
> 
> INSTALL_TARGET=	install-strip
> 
>-CONFLICTS_INSTALL=	imlib2-webp
>-
> PLIST_SUB=	SHLIB_SHORT=${DISTVERSION:R:R} \
> 		SHLIB_VER=${DISTVERSION}
> 
>@@ -53,6 +51,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
>
>From 13a08b751c54cd58b61ab2ced8cc9959f7a683d8 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sat, 20 Jan 2024 16:43:08 +0100
>Subject: [PATCH 2/2] graphics/imlib2: enable JPEG XL by default after
> 026dc430636a
>
>PR:		276473
>Approved by:	eduardo (maintainer)
>---
> graphics/imlib2/Makefile  | 8 ++++++--
> graphics/imlib2/pkg-plist | 1 +
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
>diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
>index 9c10536a771e..f43a86187e7b 100644
>--- a/graphics/imlib2/Makefile
>+++ b/graphics/imlib2/Makefile
>@@ -30,8 +30,8 @@ INSTALL_TARGET=	install-strip
> 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
>@@ -43,6 +43,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
> 
>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

Actions: View | Diff

Attachments on bug 276473: 247797