svn commit: r528016 - in head/graphics: imlib2 imlib2-webp

[Niclas Zeising]

Author: zeising
Date: Sun Mar  8 10:16:13 2020
New Revision: 528016
URL: https://svnweb.freebsd.org/changeset/ports/528016

Log:
  graphics/imlib2: Update to 1.6.1
  
  Update graphics/imlbi2 to 1.6.1.
  This adds a new webp image loader.
  Register conflicts between graphics/imlib2 and  graphics/imlib2-webp
  The ICO loader has moved here from graphics/imlib2_loader

Modified:
  head/graphics/imlib2-webp/Makefile
  head/graphics/imlib2/Makefile
  head/graphics/imlib2/distinfo
  head/graphics/imlib2/pkg-plist

Modified: head/graphics/imlib2-webp/Makefile
==============================================================================
--- head/graphics/imlib2-webp/Makefile	Sun Mar  8 10:13:03 2020	(r528015)
+++ head/graphics/imlib2-webp/Makefile	Sun Mar  8 10:16:13 2020	(r528016)
@@ -13,6 +13,8 @@ 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

Modified: head/graphics/imlib2/Makefile
==============================================================================
--- head/graphics/imlib2/Makefile	Sun Mar  8 10:13:03 2020	(r528015)
+++ head/graphics/imlib2/Makefile	Sun Mar  8 10:16:13 2020	(r528016)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	imlib2
-PORTVERSION=	1.5.1
+PORTVERSION=	1.6.1
 PORTEPOCH=	2
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	SF/enlightenment/imlib2-src/${PORTVERSION}
@@ -17,6 +17,8 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-se
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2
 
+CONFLICTS_INSTALL=	imlib2-webp
+
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
@@ -28,8 +30,8 @@ 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
@@ -57,6 +59,9 @@ 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 <bsd.port.options.mk>
 
 .if ${ARCH} == "i386" && !empty(MACHINE_CPU:Mmmx)
@@ -70,11 +75,5 @@ 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 <bsd.port.mk>

Modified: head/graphics/imlib2/distinfo
==============================================================================
--- head/graphics/imlib2/distinfo	Sun Mar  8 10:13:03 2020	(r528015)
+++ head/graphics/imlib2/distinfo	Sun Mar  8 10:16:13 2020	(r528016)
@@ -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

Modified: head/graphics/imlib2/pkg-plist
==============================================================================
--- head/graphics/imlib2/pkg-plist	Sun Mar  8 10:13:03 2020	(r528015)
+++ head/graphics/imlib2/pkg-plist	Sun Mar  8 10:16:13 2020	(r528016)
@@ -3,6 +3,7 @@ bin/imlib2-config
 %%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
@@ -16,6 +17,7 @@ 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
@@ -23,11 +25,12 @@ lib/imlib2/loaders/lbm.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