Tue Feb 6 14:24:45 2024 UTC (132d)
imlib2: add webp support as an option and make it default.

Bump PKGREVISION.


(tsutsui)
diff -r1.89 -r1.90 pkgsrc/graphics/imlib2/Makefile
diff -r1.16 -r1.17 pkgsrc/graphics/imlib2/PLIST
diff -r1.12 -r1.13 pkgsrc/graphics/imlib2/options.mk
cvs diff -r1.89 -r1.90 pkgsrc/graphics/imlib2/Makefile (switch to unified diff)

--- pkgsrc/graphics/imlib2/Makefile 2023/11/12 13:22:02 1.89
+++ pkgsrc/graphics/imlib2/Makefile 2024/02/06 14:24:44 1.90
@@ -1,47 +1,47 @@ @@ -1,47 +1,47 @@
1# $NetBSD: Makefile,v 1.89 2023/11/12 13:22:02 wiz Exp $ 1# $NetBSD: Makefile,v 1.90 2024/02/06 14:24:44 tsutsui Exp $
2 2
3DISTNAME= imlib2-1.9.1 3DISTNAME= imlib2-1.9.1
4PKGREVISION= 4 4PKGREVISION= 5
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://docs.enlightenment.org/api/imlib2/html/ 10HOMEPAGE= https://docs.enlightenment.org/api/imlib2/html/
11COMMENT= Image manipulation library 11COMMENT= Image manipulation library
12LICENSE= mit # with some modifications 12LICENSE= mit # with some modifications
13 13
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17 17
18PKGCONFIG_OVERRIDE= imlib2.pc.in 18PKGCONFIG_OVERRIDE= imlib2.pc.in
19 19
20LIBS.SunOS+= -lm 20LIBS.SunOS+= -lm
21 21
22.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
23 23
24.if ${OBJECT_FMT} == "SOM" 24.if ${OBJECT_FMT} == "SOM"
25SHLIB_SUFFIX= sl 25SHLIB_SUFFIX= sl
26.else 26.else
27SHLIB_SUFFIX= so 27SHLIB_SUFFIX= so
28.endif 28.endif
29 29
30.if ${SHLIB_SUFFIX} != so 30.if ${SHLIB_SUFFIX} != so
31SUBST_CLASSES+= shlib 31SUBST_CLASSES+= shlib
32SUBST_STAGE.shlib= pre-configure 32SUBST_STAGE.shlib= pre-configure
33SUBST_MESSAGE.shlib= Replacing shared library suffix 33SUBST_MESSAGE.shlib= Replacing shared library suffix
34SUBST_FILES.shlib+= src/lib/image.c 34SUBST_FILES.shlib+= src/lib/image.c
35SUBST_SED.shlib+= -e 's,"\.so",".${SHLIB_SUFFIX}",' 35SUBST_SED.shlib+= -e 's,"\.so",".${SHLIB_SUFFIX}",'
36.endif 36.endif
37 37
38.include "options.mk" 38.include "options.mk"
39 39
40.include "../../archivers/bzip2/buildlink3.mk" 40.include "../../archivers/bzip2/buildlink3.mk"
41.include "../../devel/zlib/buildlink3.mk" 41.include "../../devel/zlib/buildlink3.mk"
42.include "../../graphics/freetype2/buildlink3.mk" 42.include "../../graphics/freetype2/buildlink3.mk"
43.include "../../mk/jpeg.buildlink3.mk" 43.include "../../mk/jpeg.buildlink3.mk"
44.include "../../graphics/giflib/buildlink3.mk" 44.include "../../graphics/giflib/buildlink3.mk"
45.include "../../graphics/png/buildlink3.mk" 45.include "../../graphics/png/buildlink3.mk"
46.include "../../graphics/tiff/buildlink3.mk" 46.include "../../graphics/tiff/buildlink3.mk"
47.include "../../mk/bsd.pkg.mk" 47.include "../../mk/bsd.pkg.mk"
cvs diff -r1.16 -r1.17 pkgsrc/graphics/imlib2/PLIST (switch to unified diff)

--- pkgsrc/graphics/imlib2/PLIST 2022/07/29 05:56:08 1.16
+++ pkgsrc/graphics/imlib2/PLIST 2024/02/06 14:24:44 1.17
@@ -1,54 +1,55 @@ @@ -1,54 +1,55 @@
1@comment $NetBSD: PLIST,v 1.16 2022/07/29 05:56:08 rin Exp $ 1@comment $NetBSD: PLIST,v 1.17 2024/02/06 14:24:44 tsutsui Exp $
2${PLIST.x11}bin/imlib2_bumpmap 2${PLIST.x11}bin/imlib2_bumpmap
3${PLIST.x11}bin/imlib2_colorspace 3${PLIST.x11}bin/imlib2_colorspace
4bin/imlib2_conv 4bin/imlib2_conv
5${PLIST.x11}bin/imlib2_grab 5${PLIST.x11}bin/imlib2_grab
6bin/imlib2_load 6bin/imlib2_load
7${PLIST.x11}bin/imlib2_poly 7${PLIST.x11}bin/imlib2_poly
8${PLIST.x11}bin/imlib2_show 8${PLIST.x11}bin/imlib2_show
9${PLIST.x11}bin/imlib2_test 9${PLIST.x11}bin/imlib2_test
10${PLIST.x11}bin/imlib2_view 10${PLIST.x11}bin/imlib2_view
11include/Imlib2.h 11include/Imlib2.h
12lib/imlib2/filters/bumpmap.la 12lib/imlib2/filters/bumpmap.la
13lib/imlib2/filters/colormod.la 13lib/imlib2/filters/colormod.la
14lib/imlib2/filters/testfilter.la 14lib/imlib2/filters/testfilter.la
15lib/imlib2/loaders/argb.la 15lib/imlib2/loaders/argb.la
16lib/imlib2/loaders/bmp.la 16lib/imlib2/loaders/bmp.la
17lib/imlib2/loaders/bz2.la 17lib/imlib2/loaders/bz2.la
18lib/imlib2/loaders/ff.la 18lib/imlib2/loaders/ff.la
19lib/imlib2/loaders/gif.la 19lib/imlib2/loaders/gif.la
20lib/imlib2/loaders/ico.la 20lib/imlib2/loaders/ico.la
21lib/imlib2/loaders/jpeg.la 21lib/imlib2/loaders/jpeg.la
22lib/imlib2/loaders/lbm.la 22lib/imlib2/loaders/lbm.la
23lib/imlib2/loaders/lzma.la 23lib/imlib2/loaders/lzma.la
24lib/imlib2/loaders/png.la 24lib/imlib2/loaders/png.la
25lib/imlib2/loaders/pnm.la 25lib/imlib2/loaders/pnm.la
26lib/imlib2/loaders/tga.la 26lib/imlib2/loaders/tga.la
27lib/imlib2/loaders/tiff.la 27lib/imlib2/loaders/tiff.la
 28${PLIST.webp}lib/imlib2/loaders/webp.la
28lib/imlib2/loaders/xbm.la 29lib/imlib2/loaders/xbm.la
29lib/imlib2/loaders/xpm.la 30lib/imlib2/loaders/xpm.la
30lib/imlib2/loaders/zlib.la 31lib/imlib2/loaders/zlib.la
31lib/libImlib2.la 32lib/libImlib2.la
32lib/pkgconfig/imlib2.pc 33lib/pkgconfig/imlib2.pc
33share/imlib2/data/fonts/cinema.ttf 34share/imlib2/data/fonts/cinema.ttf
34share/imlib2/data/fonts/grunge.ttf 35share/imlib2/data/fonts/grunge.ttf
35share/imlib2/data/fonts/morpheus.ttf 36share/imlib2/data/fonts/morpheus.ttf
36share/imlib2/data/fonts/notepad.ttf 37share/imlib2/data/fonts/notepad.ttf
37share/imlib2/data/images/audio.png 38share/imlib2/data/images/audio.png
38share/imlib2/data/images/bg.png 39share/imlib2/data/images/bg.png
39share/imlib2/data/images/bulb.png 40share/imlib2/data/images/bulb.png
40share/imlib2/data/images/cal.png 41share/imlib2/data/images/cal.png
41share/imlib2/data/images/calc.png 42share/imlib2/data/images/calc.png
42share/imlib2/data/images/folder.png 43share/imlib2/data/images/folder.png
43share/imlib2/data/images/globe.png 44share/imlib2/data/images/globe.png
44share/imlib2/data/images/imlib2.png 45share/imlib2/data/images/imlib2.png
45share/imlib2/data/images/lock.png 46share/imlib2/data/images/lock.png
46share/imlib2/data/images/mail.png 47share/imlib2/data/images/mail.png
47share/imlib2/data/images/menu.png 48share/imlib2/data/images/menu.png
48share/imlib2/data/images/mush.png 49share/imlib2/data/images/mush.png
49share/imlib2/data/images/paper.png 50share/imlib2/data/images/paper.png
50share/imlib2/data/images/sh1.png 51share/imlib2/data/images/sh1.png
51share/imlib2/data/images/sh2.png 52share/imlib2/data/images/sh2.png
52share/imlib2/data/images/sh3.png 53share/imlib2/data/images/sh3.png
53share/imlib2/data/images/stop.png 54share/imlib2/data/images/stop.png
54share/imlib2/data/images/tnt.png 55share/imlib2/data/images/tnt.png
cvs diff -r1.12 -r1.13 pkgsrc/graphics/imlib2/options.mk (switch to unified diff)

--- pkgsrc/graphics/imlib2/options.mk 2014/05/17 09:25:01 1.12
+++ pkgsrc/graphics/imlib2/options.mk 2024/02/06 14:24:44 1.13
@@ -1,37 +1,47 @@ @@ -1,37 +1,47 @@
1# $NetBSD: options.mk,v 1.12 2014/05/17 09:25:01 adam Exp $ 1# $NetBSD: options.mk,v 1.13 2024/02/06 14:24:44 tsutsui Exp $
2 2
3.include "../../mk/bsd.prefs.mk" 3.include "../../mk/bsd.prefs.mk"
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.imlib2 5PKG_OPTIONS_VAR= PKG_OPTIONS.imlib2
6PKG_SUPPORTED_OPTIONS= x11 6PKG_SUPPORTED_OPTIONS= webp x11
7PKG_SUGGESTED_OPTIONS= x11 7PKG_SUGGESTED_OPTIONS= webp x11
8.if ${MACHINE_ARCH} == "i386" 8.if ${MACHINE_ARCH} == "i386"
9PKG_SUPPORTED_OPTIONS+= mmx 9PKG_SUPPORTED_OPTIONS+= mmx
10.elif ${MACHINE_ARCH} == "x86_64" && empty(PKGSRC_COMPILER:Mclang) 10.elif ${MACHINE_ARCH} == "x86_64" && empty(PKGSRC_COMPILER:Mclang)
11PKG_SUPPORTED_OPTIONS+= imlib2-amd64 11PKG_SUPPORTED_OPTIONS+= imlib2-amd64
12PKG_SUGGESTED_OPTIONS+= imlib2-amd64 12PKG_SUGGESTED_OPTIONS+= imlib2-amd64
13.endif 13.endif
14 14
15.include "../../mk/bsd.options.mk" 15.include "../../mk/bsd.options.mk"
16 16
17.if !empty(PKG_OPTIONS:Mmmx) 17.if !empty(PKG_OPTIONS:Mmmx)
18CONFIGURE_ARGS+= --enable-mmx 18CONFIGURE_ARGS+= --enable-mmx
19.else 19.else
20CONFIGURE_ARGS+= --disable-mmx 20CONFIGURE_ARGS+= --disable-mmx
21.endif 21.endif
22 22
23.if !empty(PKG_OPTIONS:Mimlib2-amd64) 23.if !empty(PKG_OPTIONS:Mimlib2-amd64)
24CONFIGURE_ARGS+= --enable-amd64 24CONFIGURE_ARGS+= --enable-amd64
25.else 25.else
26CONFIGURE_ARGS+= --disable-amd64 26CONFIGURE_ARGS+= --disable-amd64
27.endif 27.endif
28 28
 29PLIST_VARS+= webp
 30
 31.if !empty(PKG_OPTIONS:Mwebp)
 32.include "../../graphics/libwebp/buildlink3.mk"
 33CONFIGURE_ARGS+= --with-webp
 34PLIST.webp= yes
 35.else
 36CONFIGURE_ARGS+= --without-webp
 37.endif
 38
29PLIST_VARS+= x11 39PLIST_VARS+= x11
30 40
31.if !empty(PKG_OPTIONS:Mx11) 41.if !empty(PKG_OPTIONS:Mx11)
32.include "../../x11/libX11/buildlink3.mk" 42.include "../../x11/libX11/buildlink3.mk"
33.include "../../x11/libXext/buildlink3.mk" 43.include "../../x11/libXext/buildlink3.mk"
34PLIST.x11= yes 44PLIST.x11= yes
35.else 45.else
36CONFIGURE_ARGS+= --without-x 46CONFIGURE_ARGS+= --without-x
37.endif 47.endif