git: 3a0552055be8 - main - graphics/vips: Update to 8.14.2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Wed, 05 Apr 2023 17:34:02 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3a0552055be8e40f60ebd5f644725c0c4a9525dc

commit 3a0552055be8e40f60ebd5f644725c0c4a9525dc
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-04-05 17:13:10 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-04-05 17:29:49 +0000

    graphics/vips: Update to 8.14.2
    
    - Update WWW and clean up pkg-descr
    - Update LICENSE_FILE
    - Remove DEBUG and X11 options
    - Add SPNG option
    
    Changes:        https://github.com/libvips/libvips/releases
---
 graphics/vips/Makefile  | 105 +++++++++++++++++++++++++++++-------------------
 graphics/vips/distinfo  |   6 +--
 graphics/vips/pkg-descr |   2 -
 graphics/vips/pkg-plist |  14 +------
 4 files changed, 68 insertions(+), 59 deletions(-)

diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index 2758122ab57b..e2fccb6ef03f 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	vips
-PORTVERSION=	8.13.3
-PORTREVISION=	4
+PORTVERSION=	8.14.2
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/libvips/libvips/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Free image processing system
-WWW=		https://libvips.github.io/libvips
+WWW=		https://libvips.github.io/libvips \
+		https://github.com/libvips/libvips
 
 LICENSE=	LGPL21
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig \
@@ -17,84 +17,105 @@ LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libharfbuzz.so:print/harfbuzz
 RUN_DEPENDS=	bash:shells/bash
 
-USES=		compiler:c++11-lang cpe gettext gmake gnome libtool localbase pathfix pkgconfig python shebangfix
+USES=		compiler:c++11-lang cpe gettext gnome localbase meson pkgconfig python shebangfix tar:xz
 USE_GNOME=	glib20
 
-CONFIGURE_ARGS=	--disable-introspection \
-		--without-doxygen \
-		--without-nifti \
-		--without-openslide \
-		--without-pdfium
-GNU_CONFIGURE=	yes
+MESON_ARGS=	--default-library=both \
+		-Danalyze=true \
+		-Dcplusplus=true \
+		-Ddeprecated=true \
+		-Ddoxygen=false \
+		-Dexamples=true \
+		-Dfontconfig=enabled \
+		-Dintrospection=false \
+		-Dmodules=disabled \
+		-Dnifti=disabled \
+		-Dnsgif=true \
+		-Dopenslide=disabled \
+		-Dpdfium=disabled \
+		-Dppm=true \
+		-Dquantizr=disabled \
+		-Dradiance=true \
+		-Dvapi=false \
+		-Dzlib=enabled
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	VERSION=${PORTVERSION:R}
 
-SHEBANG_FILES=	tools/vips-${PORTVERSION:R} tools/vipsprofile
+SHEBANG_FILES=	tools/vipsprofile
 
-OPTIONS_DEFINE=	CFITSIO DEBUG DOCS FFTW GIF GSF HEIF IMAGEQUANT JPEG JXL LCMS2 LIBEXIF LIBRSVG2 MATIO OPENEXR ORC PANGO PNG POPPLER TIFF WEBP X11
+OPTIONS_DEFINE=	CFITSIO DOCS FFTW GIF GSF HEIF IMAGEQUANT JPEG JXL LCMS2 LIBEXIF LIBRSVG2 MATIO OPENEXR ORC PANGO PNG POPPLER SPNG TIFF WEBP
 OPTIONS_RADIO=	MAGICK
 OPTIONS_RADIO_MAGICK=	IMAGEMAGICK GRAPHMAGICK
-OPTIONS_DEFAULT=CFITSIO FFTW GIF GSF HEIF IMAGEMAGICK JPEG JXL LCMS2 LIBEXIF LIBRSVG2 MATIO OPENEXR ORC PANGO PNG POPPLER TIFF WEBP X11
+OPTIONS_DEFAULT=CFITSIO FFTW GIF GSF HEIF IMAGEMAGICK JPEG JXL LCMS2 LIBEXIF LIBRSVG2 MATIO OPENEXR ORC PANGO PNG POPPLER SPNG TIFF WEBP
 GSF_DESC=	Structured file formats support
 IMAGEQUANT_DESC=Image Quantization support
 ORC_DESC=	ORC language support
 MATIO_DESC=	Matlab MAT format support
 
-CFITSIO_CONFIGURE_WITH=	cfitsio
 CFITSIO_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
-DEBUG_CONFIGURE_ENABLE=	debug
-DEBUG_INSTALL_TARGET_OFF=	install-strip
+CFITSIO_MESON_ENABLED=	cfitsio
 DOCS_BUILD_DEPENDS=	gtkdocize:textproc/gtk-doc
-DOCS_CONFIGURE_ENABLE=	gtk-doc gtk-doc-html
-FFTW_CONFIGURE_WITH=	fftw
+DOCS_MESON_TRUE=	gtk_doc
 FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3
-GIF_CONFIGURE_WITH=	giflib
-GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
-GRAPHMAGICK_CONFIGURE_ON=	--with-magickpackage=GraphicsMagick
+FFTW_MESON_ENABLED=	fftw
+GIF_BUILD_DEPENDS=	cgif>=0.2.0:graphics/cgif
+GIF_LIB_DEPENDS=	libcgif.so:graphics/cgif
+GIF_MESON_ENABLED=	cgif
 GRAPHMAGICK_LIB_DEPENDS=libGraphicsMagick.so:graphics/GraphicsMagick
-GSF_CONFIGURE_WITH=	gsf
+GRAPHMAGICK_MESON_ON=	-Dmagick=enabled -Dmagick-package=GraphicsMagick
+GSF_MESON_ENABLED=	gsf
 GSF_USE=		GNOME=libgsf
-HEIF_CONFIGURE_WITH=	heif
+HEIF_BUILD_DEPENDS=	libheif>=1.3.0:graphics/libheif
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
-IMAGEMAGICK_CONFIGURE_ON=	--with-magickpackage=MagickCore
+HEIF_MESON_ENABLED=	heif
+IMAGEMAGICK_MESON_ON=	-Dmagick=enabled -Dmagick-package=MagickCore
 IMAGEMAGICK_USES=	magick
-IMAGEQUANT_CONFIGURE_WITH=	imagequant
 IMAGEQUANT_LIB_DEPENDS=	libimagequant.so:graphics/libimagequant
-JPEG_CONFIGURE_WITH=	jpeg
+IMAGEQUANT_MESON_ENABLED=	imagequant
+JPEG_BUILD_DEPENDS=	openjpeg>=2.4:graphics/openjpeg
 JPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
+JPEG_MESON_ENABLED=	jpeg openjpeg
 JPEG_USES=		jpeg
-JXL_CONFIGURE_WITH=	libjxl
+JXL_BUILD_DEPENDS=	libjxl>=0.6:graphics/libjxl
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
-LCMS2_CONFIGURE_WITH=	lcms
+JXL_MESON_ENABLED=	jpeg-xl
 LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
-LIBEXIF_CONFIGURE_WITH=	libexif
+LCMS2_MESON_ENABLED=	lcms
+LIBEXIF_BUILD_DEPENDS=	libexif>=0.6:graphics/libexif
 LIBEXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
-LIBRSVG2_CONFIGURE_WITH=rsvg
+LIBEXIF_MESON_ENABLED=	exif
+LIBRSVG2_MESON_ENABLED=	rsvg
 LIBRSVG2_USE=		GNOME=cairo,librsvg2
-MATIO_CONFIGURE_WITH=	matio
 MATIO_LIB_DEPENDS=	libmatio.so:math/matio
-OPENEXR_CONFIGURE_WITH=	OpenEXR
-OPENEXR_LIB_DEPENDS=	libImath.so:math/Imath libOpenEXR.so:graphics/openexr
-ORC_CONFIGURE_WITH=	orc
+MATIO_MESON_ENABLED=	matio
+OPENEXR_BUILD_DEPENDS=	openexr>=1.2.2:graphics/openexr
+OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr
+OPENEXR_MESON_ENABLED=	openexr
+ORC_BUILD_DEPENDS=	orc>=0.4.11:devel/orc
 ORC_LIB_DEPENDS=	liborc-0.4.so:devel/orc
-PANGO_CONFIGURE_WITH=	pangoft2
+ORC_MESON_ENABLED=	orc
+PANGO_MESON_ENABLED=	pangocairo
 PANGO_USE=		GNOME=pango
-PNG_CONFIGURE_WITH=	png
+PNG_BUILD_DEPENDS=	png>=1.2.9:graphics/png
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
-POPPLER_CONFIGURE_WITH=	poppler
+PNG_MESON_ENABLED=	png
 POPPLER_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
+POPPLER_MESON_ENABLED=	poppler
 POPPLER_USE=		GNOME=cairo
-TIFF_CONFIGURE_WITH=	tiff
+SPNG_BUILD_DEPENDS=	libspng>=0.7:graphics/libspng
+SPNG_LIB_DEPENDS=	libspng.so:graphics/libspng
+SPNG_MESON_ENABLED=	spng
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
-WEBP_CONFIGURE_WITH=	libwebp
+TIFF_MESON_ENABLED=	tiff
+WEBP_BUILD_DEPENDS=	webp>=0.6:graphics/webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
-X11_CONFIGURE_WITH=	x
+WEBP_MESON_ENABLED=	webp
 
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MGRAPHMAGICK} && !${PORT_OPTIONS:MIMAGEMAGICK}
-CONFIGURE_ARGS+=--without-magick
+MESON_ARGS+=	-Dmagick=disabled
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/vips/distinfo b/graphics/vips/distinfo
index fa85bf181356..b6ac0b4707a9 100644
--- a/graphics/vips/distinfo
+++ b/graphics/vips/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669057547
-SHA256 (vips-8.13.3.tar.gz) = 4eff5cdc8dbe1a05a926290a99014e20ba386f5dcca38d9774bef61413435d4c
-SIZE (vips-8.13.3.tar.gz) = 17954634
+TIMESTAMP = 1679498538
+SHA256 (vips-8.14.2.tar.xz) = 27dad021f0835a5ab14e541d02abd41e4c3bd012d2196438df5a9e754984f7ce
+SIZE (vips-8.14.2.tar.xz) = 18693660
diff --git a/graphics/vips/pkg-descr b/graphics/vips/pkg-descr
index 8f62e669ceb6..10df84388138 100644
--- a/graphics/vips/pkg-descr
+++ b/graphics/vips/pkg-descr
@@ -5,5 +5,3 @@ retouching, but it's great (much better than programs like Photoshop, I
 think) at all the other things you use photoshop for. It's particularly
 good with large images (ie. images larger than the amount of RAM in your
 machine), and for working with colour.
-
-See also: https://github.com/libvips/libvips
diff --git a/graphics/vips/pkg-plist b/graphics/vips/pkg-plist
index 0837aa92d1c2..62f947aba1b5 100644
--- a/graphics/vips/pkg-plist
+++ b/graphics/vips/pkg-plist
@@ -1,10 +1,4 @@
-bin/batch_crop
-bin/batch_image_convert
-bin/batch_rubber_sheet
-bin/light_correct
-bin/shrink_width
 bin/vips
-bin/vips-%%VERSION%%
 bin/vipsedit
 bin/vipsheader
 bin/vipsprofile
@@ -66,17 +60,13 @@ include/vips/vips8
 lib/libvips-cpp.a
 lib/libvips-cpp.so
 lib/libvips-cpp.so.42
-lib/libvips-cpp.so.42.15.3
+lib/libvips-cpp.so.42.16.2
 lib/libvips.a
 lib/libvips.so
 lib/libvips.so.42
-lib/libvips.so.42.15.3
+lib/libvips.so.42.16.2
 libdata/pkgconfig/vips-cpp.pc
 libdata/pkgconfig/vips.pc
-man/man1/batch_crop.1.gz
-man/man1/batch_image_convert.1.gz
-man/man1/batch_rubber_sheet.1.gz
-man/man1/light_correct.1.gz
 man/man1/vips.1.gz
 man/man1/vipsedit.1.gz
 man/man1/vipsheader.1.gz