CVS commit: pkgsrc/graphics/libvips

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Fri Oct 31 22:44:40 UTC 2025

Modified Files:
        pkgsrc/graphics/libvips: Makefile PLIST buildlink3.mk distinfo
            options.mk

Log Message:
graphics/libvips : Update to 8.17.2

Add an x11 option for building the package without dependencies that
mandate X11 (poppler, librsvg), as suggested by package maintainer.

Drop the libtiff option, it is roped in by dependencies already.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/libvips/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/libvips/PLIST \
    pkgsrc/graphics/libvips/distinfo pkgsrc/graphics/libvips/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/libvips/buildlink3.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/libvips/Makefile
diff -u pkgsrc/graphics/libvips/Makefile:1.5 pkgsrc/graphics/libvips/Makefile:1.6
--- pkgsrc/graphics/libvips/Makefile:1.5        Thu Oct 23 20:37:39 2025
+++ pkgsrc/graphics/libvips/Makefile    Fri Oct 31 22:44:40 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2025/10/23 20:37:39 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2025/10/31 22:44:40 hauke Exp $
 
-DISTNAME=              vips-8.17.1
+DISTNAME=              vips-8.17.2
 PKGNAME=               lib${DISTNAME}
-PKGREVISION=           4
 CATEGORIES=            graphics
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=libvips/}
 GITHUB_RELEASE=                v${PKGVERSION_NOREV}
@@ -13,9 +12,6 @@ HOMEPAGE=             https://libvips.github.io/lib
 COMMENT=               Demand-driven, horizontally threaded image processing lib
 LICENSE=               gnu-lgpl-v2.1
 
-# disable examples and deprecated interfaces
-MESON_ARGS+=           -Ddeprecated=false -Dexamples=false
-
 USE_TOOLS+=            pkg-config msgfmt xgettext
 USE_LANGUAGES=         c c++
 PYTHON_FOR_BUILD_ONLY= tool
@@ -26,11 +22,16 @@ PKGCONFIG_OVERRIDE_STAGE=   pre-install
 PKGCONFIG_OVERRIDE+=           output/meson-private/vips-cpp.pc
 PKGCONFIG_OVERRIDE+=           output/meson-private/vips.pc
 
+# disable examples and deprecated interfaces
+MESON_ARGS+=           -Ddeprecated=false -Dexamples=false
+
 # disable relro otherwise it'll crash on NetBSD:
 # https://github.com/libvips/libvips/issues/3977 and
 # https://mail-index.netbsd.org/netbsd-bugs/2023/12/26/msg080904.html
 RELRO_SUPPORTED=       no
 
+PRINT_PLIST_AWK+=      { gsub(/^lib\/vips-modules-.+\/vips-poppler\.so$$/, "$${PLIST.x11}&"); }
+
 .include "options.mk"
 
 .include "../../devel/meson/build.mk"
@@ -41,13 +42,12 @@ RELRO_SUPPORTED=    no
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/libheif/buildlink3.mk"
 .include "../../graphics/libjxl/buildlink3.mk"
-.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/openjpeg/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../print/poppler/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"

Index: pkgsrc/graphics/libvips/PLIST
diff -u pkgsrc/graphics/libvips/PLIST:1.1 pkgsrc/graphics/libvips/PLIST:1.2
--- pkgsrc/graphics/libvips/PLIST:1.1   Wed Aug 20 16:47:24 2025
+++ pkgsrc/graphics/libvips/PLIST       Fri Oct 31 22:44:40 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2025/08/20 16:47:24 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.2 2025/10/31 22:44:40 hauke Exp $
 bin/vips
 bin/vipsedit
 bin/vipsheader
@@ -52,19 +52,18 @@ include/vips/vips.h
 include/vips/vips8
 lib/libvips-cpp.so
 lib/libvips-cpp.so.42
-lib/libvips-cpp.so.42.19.1
+lib/libvips-cpp.so.42.19.2
 lib/libvips.so
 lib/libvips.so.42
-lib/libvips.so.42.19.1
+lib/libvips.so.42.19.2
 lib/pkgconfig/vips-cpp.pc
 lib/pkgconfig/vips.pc
-lib/vips-modules-8.17/vips-heif.${SHLIB_EXT}
-lib/vips-modules-8.17/vips-jxl.${SHLIB_EXT}
-lib/vips-modules-8.17/vips-poppler.${SHLIB_EXT}
+lib/vips-modules-8.17/vips-heif.so
+lib/vips-modules-8.17/vips-jxl.so
+${PLIST.x11}lib/vips-modules-8.17/vips-poppler.so
 man/man1/vips.1
 man/man1/vipsedit.1
 man/man1/vipsheader.1
-man/man1/vipsprofile.1
 man/man1/vipsthumbnail.1
 share/locale/de/LC_MESSAGES/vips8.17.mo
 share/locale/en_GB/LC_MESSAGES/vips8.17.mo
Index: pkgsrc/graphics/libvips/distinfo
diff -u pkgsrc/graphics/libvips/distinfo:1.1 pkgsrc/graphics/libvips/distinfo:1.2
--- pkgsrc/graphics/libvips/distinfo:1.1        Wed Aug 20 16:47:24 2025
+++ pkgsrc/graphics/libvips/distinfo    Fri Oct 31 22:44:40 2025
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1 2025/08/20 16:47:24 schmonz Exp $
+$NetBSD: distinfo,v 1.2 2025/10/31 22:44:40 hauke Exp $
 
-BLAKE2s (vips-8.17.1.tar.xz) = 207eb0a2cf9a02de68ee47be4380fdb2d0760ced1eb2c87e8cf94ae103b1a1bf
-SHA512 (vips-8.17.1.tar.xz) = 04962e7d3fb8956c986f3aed7a10c4927195bc555a22c805a5b190c257e9e8b0fe97eddd0eb44e0e7d9047ba5671e96ac88f50a2597caa4f78c84ce1091541ff
-Size (vips-8.17.1.tar.xz) = 29529248 bytes
+BLAKE2s (vips-8.17.2.tar.xz) = 0fdc56f85aa064c7a6a339c221c06460fa8eadfaf0378885769a62b6f47a099b
+SHA512 (vips-8.17.2.tar.xz) = ad35fa05ce441ab788f78e1b0b9c5db8f1e66f1295bbb78f7614560e4c37cdd0641de026b9f4cb04e7a5eaece53342dcad497f4b985d22763f5d38cbcec1bd92
+Size (vips-8.17.2.tar.xz) = 29525672 bytes
Index: pkgsrc/graphics/libvips/options.mk
diff -u pkgsrc/graphics/libvips/options.mk:1.1 pkgsrc/graphics/libvips/options.mk:1.2
--- pkgsrc/graphics/libvips/options.mk:1.1      Wed Aug 20 16:47:24 2025
+++ pkgsrc/graphics/libvips/options.mk  Fri Oct 31 22:44:40 2025
@@ -1,23 +1,29 @@
-# $NetBSD: options.mk,v 1.1 2025/08/20 16:47:24 schmonz Exp $
+# $NetBSD: options.mk,v 1.2 2025/10/31 22:44:40 hauke Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.libvips
-PKG_SUPPORTED_OPTIONS= tiff introspection
-PKG_SUGGESTED_OPTIONS=
+PKG_SUPPORTED_OPTIONS= introspection x11
+PKG_SUGGESTED_OPTIONS= x11
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=   x11
+
 # meson will find libs if they are installed,
-# so it makes sense to explicitly disabled them
+# so it makes sense to explicitly disable them
 # if they are not going to be used
 
-.if !empty(PKG_OPTIONS:Mtiff)
-.include "../../graphics/tiff/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mintrospection)
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .else
-MESON_ARGS+= -Dtiff=disabled
+MESON_ARGS+=   -Dintrospection=disabled
 .endif
 
-.if !empty(PKG_OPTIONS:Mintrospection)
-.include "../../devel/gobject-introspection/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mx11)
+PLIST.x11=     yes
+.include "../../graphics/librsvg/buildlink3.mk"
+.include "../../print/poppler/buildlink3.mk"
 .else
-MESON_ARGS+= -Dintrospection=disabled
+MESON_ARGS+=   -Drsvg=disabled
+MESON_ARGS+=   -Dpoppler=disabled
+MESON_ARGS+=   -Dpoppler-module=disabled
 .endif

Index: pkgsrc/graphics/libvips/buildlink3.mk
diff -u pkgsrc/graphics/libvips/buildlink3.mk:1.3 pkgsrc/graphics/libvips/buildlink3.mk:1.4
--- pkgsrc/graphics/libvips/buildlink3.mk:1.3   Thu Oct 23 20:37:39 2025
+++ pkgsrc/graphics/libvips/buildlink3.mk       Fri Oct 31 22:44:40 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2025/10/23 20:37:39 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2025/10/31 22:44:40 hauke Exp $
 
 BUILDLINK_TREE+=       libvips
 
@@ -11,7 +11,6 @@ BUILDLINK_PKGSRCDIR.libvips?= ../../grap
 
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/libjxl/buildlink3.mk"
-.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .endif # LIBVIPS_BUILDLINK3_MK