CVS commit: pkgsrc/graphics/imlib2

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Tue Feb  6 14:24:45 UTC 2024

Modified Files:
        pkgsrc/graphics/imlib2: Makefile PLIST options.mk

Log Message:
imlib2: add webp support as an option and make it default.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 pkgsrc/graphics/imlib2/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/imlib2/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/imlib2/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/imlib2/Makefile
diff -u pkgsrc/graphics/imlib2/Makefile:1.89 pkgsrc/graphics/imlib2/Makefile:1.90
--- pkgsrc/graphics/imlib2/Makefile:1.89        Sun Nov 12 13:22:02 2023
+++ pkgsrc/graphics/imlib2/Makefile     Tue Feb  6 14:24:44 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.89 2023/11/12 13:22:02 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2024/02/06 14:24:44 tsutsui Exp $
 
 DISTNAME=      imlib2-1.9.1
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/graphics/imlib2/PLIST
diff -u pkgsrc/graphics/imlib2/PLIST:1.16 pkgsrc/graphics/imlib2/PLIST:1.17
--- pkgsrc/graphics/imlib2/PLIST:1.16   Fri Jul 29 05:56:08 2022
+++ pkgsrc/graphics/imlib2/PLIST        Tue Feb  6 14:24:44 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2022/07/29 05:56:08 rin Exp $
+@comment $NetBSD: PLIST,v 1.17 2024/02/06 14:24:44 tsutsui Exp $
 ${PLIST.x11}bin/imlib2_bumpmap
 ${PLIST.x11}bin/imlib2_colorspace
 bin/imlib2_conv
@@ -25,6 +25,7 @@ lib/imlib2/loaders/png.la
 lib/imlib2/loaders/pnm.la
 lib/imlib2/loaders/tga.la
 lib/imlib2/loaders/tiff.la
+${PLIST.webp}lib/imlib2/loaders/webp.la
 lib/imlib2/loaders/xbm.la
 lib/imlib2/loaders/xpm.la
 lib/imlib2/loaders/zlib.la

Index: pkgsrc/graphics/imlib2/options.mk
diff -u pkgsrc/graphics/imlib2/options.mk:1.12 pkgsrc/graphics/imlib2/options.mk:1.13
--- pkgsrc/graphics/imlib2/options.mk:1.12      Sat May 17 09:25:01 2014
+++ pkgsrc/graphics/imlib2/options.mk   Tue Feb  6 14:24:44 2024
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.12 2014/05/17 09:25:01 adam Exp $
+# $NetBSD: options.mk,v 1.13 2024/02/06 14:24:44 tsutsui Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.imlib2
-PKG_SUPPORTED_OPTIONS= x11
-PKG_SUGGESTED_OPTIONS= x11
+PKG_SUPPORTED_OPTIONS= webp x11
+PKG_SUGGESTED_OPTIONS= webp x11
 .if ${MACHINE_ARCH} == "i386"
 PKG_SUPPORTED_OPTIONS+=        mmx
 .elif ${MACHINE_ARCH} == "x86_64" && empty(PKGSRC_COMPILER:Mclang)
@@ -26,6 +26,16 @@ CONFIGURE_ARGS+=     --enable-amd64
 CONFIGURE_ARGS+=       --disable-amd64
 .endif
 
+PLIST_VARS+=           webp
+
+.if !empty(PKG_OPTIONS:Mwebp)
+.include "../../graphics/libwebp/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-webp
+PLIST.webp=            yes
+.else
+CONFIGURE_ARGS+=       --without-webp
+.endif
+
 PLIST_VARS+=           x11
 
 .if !empty(PKG_OPTIONS:Mx11)