Index: head/graphics/imlib2/Makefile =================================================================== --- head/graphics/imlib2/Makefile (revision 528015) +++ head/graphics/imlib2/Makefile (revision 528016) @@ -1,80 +1,79 @@ # Created by: Jeremy Norris # $FreeBSD$ PORTNAME= imlib2 -PORTVERSION= 1.5.1 +PORTVERSION= 1.6.1 PORTEPOCH= 2 CATEGORIES= graphics enlightenment MASTER_SITES= SF/enlightenment/imlib2-src/${PORTVERSION} MAINTAINER= zeising@FreeBSD.org COMMENT= The next generation graphics library for Enlightenment LICENSE= imlib2 LICENSE_NAME= imlib2 license LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libfreetype.so:print/freetype2 +CONFLICTS_INSTALL= imlib2-webp + GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip USES= libtool pathfix pkgconfig tar:bzip2 CONFIGURE_ARGS= --enable-visibility-hiding --disable-static \ --with-zlib --with-bzip2 CONFIGURE_ENV= ac_cv_lib_dl_dlopen=no CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= JPEG PNG TIFF GIF ID3 X11 -OPTIONS_DEFAULT= JPEG PNG TIFF GIF ID3 X11 +OPTIONS_DEFINE= JPEG PNG TIFF GIF ID3 X11 WEBP +OPTIONS_DEFAULT= JPEG PNG TIFF GIF ID3 X11 WEBP OPTIONS_SUB= yes X11_USES= xorg X11_USE= XORG=x11,sm,xcb,xext X11_CONFIGURE_ON= --with-x --with-x-shm-fd X11_CONFIGURE_OFF= --without-x --without-x-shm-fd JPEG_USES= jpeg JPEG_CONFIGURE_ON= --with-jpeg JPEG_CONFIGURE_OFF= --without-jpeg PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CONFIGURE_ON= --with-png PNG_CONFIGURE_OFF= --without-png TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_CONFIGURE_ON= --with-tiff TIFF_CONFIGURE_OFF= --without-tiff GIF_LIB_DEPENDS= libgif.so:graphics/giflib GIF_CONFIGURE_ON= --with-gif GIF_CONFIGURE_OFF= --without-gif ID3_LIB_DEPENDS= libid3tag.so:audio/libid3tag ID3_CONFIGURE_ON= --with-id3 ID3_CONFIGURE_OFF= --without-id3 +WEBP_LIB_DEPENDS= libwebp.so:graphics/webp +WEBP_CONFIGURE_WITH= webp + .include .if ${ARCH} == "i386" && !empty(MACHINE_CPU:Mmmx) CONFIGURE_ARGS+= --enable-mmx .else CONFIGURE_ARGS+= --disable-mmx .endif .if ${ARCH} == "amd64" CONFIGURE_ARGS+= --enable-amd64 .else CONFIGURE_ARGS+= --disable-amd64 .endif - -post-patch-X11-off: - @${REINPLACE_CMD} -e '/MY_LIBS =/s/-lXext -lX11//' \ - ${WRKSRC}/src/lib/Makefile.in - @${REINPLACE_CMD} -e '/#ifndef X_DISPLAY_MISSING/,/#endif/ d' \ - ${WRKSRC}/src/lib/Imlib2.h .include Index: head/graphics/imlib2/distinfo =================================================================== --- head/graphics/imlib2/distinfo (revision 528015) +++ head/graphics/imlib2/distinfo (revision 528016) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521647711 -SHA256 (imlib2-1.5.1.tar.bz2) = fa4e57452b8843f4a70f70fd435c746ae2ace813250f8c65f977db5d7914baae -SIZE (imlib2-1.5.1.tar.bz2) = 919810 +TIMESTAMP = 1583593121 +SHA256 (imlib2-1.6.1.tar.bz2) = 4d393a77e13da883c8ee2da3b029da3570210fe37d000c9ac33d9fce751b166d +SIZE (imlib2-1.6.1.tar.bz2) = 893119 Index: head/graphics/imlib2/pkg-plist =================================================================== --- head/graphics/imlib2/pkg-plist (revision 528015) +++ head/graphics/imlib2/pkg-plist (revision 528016) @@ -1,53 +1,56 @@ bin/imlib2-config %%X11%%bin/imlib2_bumpmap %%X11%%bin/imlib2_colorspace bin/imlib2_conv %%X11%%bin/imlib2_grab +bin/imlib2_load %%X11%%bin/imlib2_poly %%X11%%bin/imlib2_show %%X11%%bin/imlib2_test %%X11%%bin/imlib2_view include/Imlib2.h lib/imlib2/filters/bumpmap.so lib/imlib2/filters/colormod.so lib/imlib2/filters/testfilter.so lib/imlib2/loaders/argb.so lib/imlib2/loaders/bmp.so lib/imlib2/loaders/bz2.so lib/imlib2/loaders/ff.so %%GIF%%lib/imlib2/loaders/gif.so +lib/imlib2/loaders/ico.so %%ID3%%lib/imlib2/loaders/id3.so %%JPEG%%lib/imlib2/loaders/jpeg.so lib/imlib2/loaders/lbm.so %%PNG%%lib/imlib2/loaders/png.so lib/imlib2/loaders/pnm.so lib/imlib2/loaders/tga.so %%TIFF%%lib/imlib2/loaders/tiff.so +%%WEBP%%lib/imlib2/loaders/webp.so lib/imlib2/loaders/xpm.so lib/imlib2/loaders/zlib.so lib/libImlib2.so lib/libImlib2.so.1 -lib/libImlib2.so.1.5.1 +lib/libImlib2.so.1.6.1 libdata/pkgconfig/imlib2.pc %%DATADIR%%/data/fonts/cinema.ttf %%DATADIR%%/data/fonts/grunge.ttf %%DATADIR%%/data/fonts/morpheus.ttf %%DATADIR%%/data/fonts/notepad.ttf %%DATADIR%%/data/images/audio.png %%DATADIR%%/data/images/bg.png %%DATADIR%%/data/images/bulb.png %%DATADIR%%/data/images/cal.png %%DATADIR%%/data/images/calc.png %%DATADIR%%/data/images/folder.png %%DATADIR%%/data/images/globe.png %%DATADIR%%/data/images/imlib2.png %%DATADIR%%/data/images/lock.png %%DATADIR%%/data/images/mail.png %%DATADIR%%/data/images/menu.png %%DATADIR%%/data/images/mush.png %%DATADIR%%/data/images/paper.png %%DATADIR%%/data/images/sh1.png %%DATADIR%%/data/images/sh2.png %%DATADIR%%/data/images/sh3.png %%DATADIR%%/data/images/stop.png %%DATADIR%%/data/images/tnt.png Index: head/graphics/imlib2-webp/Makefile =================================================================== --- head/graphics/imlib2-webp/Makefile (revision 528015) +++ head/graphics/imlib2-webp/Makefile (revision 528016) @@ -1,24 +1,26 @@ # $FreeBSD$ PORTNAME= imlib2-webp PORTVERSION= 20160601 CATEGORIES= graphics MAINTAINER= greg@unrelenting.technology COMMENT= WebP image loader plugin for Imlib 2 LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libImlib2.so:graphics/imlib2 \ libwebp.so:graphics/webp +CONFLICTS_INSTALL= imlib2 + USES= gmake pkgconfig USE_GITHUB= yes GH_ACCOUNT= gawen947 GH_TAGNAME= 79b3da58f48 MAKEFILE= makefile PLIST_FILES= lib/imlib2/loaders/webp.so .include