git: d301e2def883 - main - graphics/vips: Re-enable --default-library=both

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Fri, 07 Feb 2025 21:19:22 UTC
The branch main has been updated by sunpoet:

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

commit d301e2def8830e5ce99f1cfaf6e03fbfbac37373
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2025-02-07 20:13:46 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2025-02-07 21:15:52 +0000

    graphics/vips: Re-enable --default-library=both
    
    - Bump PORTREVISION for package change
    
    --default-library=both was removed in 98a26821dd3a8ca1d96ad00c466e3802def0845e
    due to an unknown bug in meson 1.6.0. It seems to be fixed in meson 1.7.0.
---
 graphics/vips/Makefile  | 5 ++---
 graphics/vips/pkg-plist | 2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index 4b40ada0e2e4..bf9ccf9fc92e 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	vips
 PORTVERSION=	8.16.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/libvips/libvips/releases/download/v${PORTVERSION}/
 
@@ -19,9 +20,7 @@ RUN_DEPENDS=	bash:shells/bash
 USES=		compiler:c++11-lang cpe gettext-tools gnome localbase meson pkgconfig python shebangfix tar:xz
 USE_GNOME=	glib20
 
-# --default-library=both is broken after https://github.com/mesonbuild/meson/commit/7b3169f46481
-# but not reproducible outside of ports/ build
-MESON_ARGS=	\
+MESON_ARGS=	--default-library=both \
 		-Danalyze=true \
 		-Dcplusplus=true \
 		-Ddeprecated=true \
diff --git a/graphics/vips/pkg-plist b/graphics/vips/pkg-plist
index e3aeab8312bd..88dec12174cf 100644
--- a/graphics/vips/pkg-plist
+++ b/graphics/vips/pkg-plist
@@ -57,9 +57,11 @@ include/vips/video.h
 include/vips/vips.h
 include/vips/vips7compat.h
 include/vips/vips8
+lib/libvips-cpp.a
 lib/libvips-cpp.so
 lib/libvips-cpp.so.42
 lib/libvips-cpp.so.42.18.0
+lib/libvips.a
 lib/libvips.so
 lib/libvips.so.42
 lib/libvips.so.42.18.0