libvips: finish package

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: libvips: finish package
From: Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Tue, 11 Feb 2025 15:10:33 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Tue Feb 11 16:10:02 2025 +0100
Changeset:	9e11422ba06d6fcf7dd1ed4fe8f117de30b0afc2

Modified Files:
	libvips/Makefile
	libvips/PLIST
	libvips/buildlink3.mk
	libvips/options.mk
Removed Files:
	libvips/TODO

Log Message:
libvips: finish package

Add lots more dependencies, so this has proper graphics support.
Fix python interpreter path.
Fix buildlink3.mk file.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9e11422ba06d6fcf7dd1ed4fe8f117de30b0afc2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libvips/Makefile      | 21 ++++++++++++++++-----
 libvips/PLIST         |  3 +++
 libvips/TODO          | 17 -----------------
 libvips/buildlink3.mk | 27 ++++++++++++++++++++-------
 libvips/options.mk    | 28 ++++------------------------
 5 files changed, 43 insertions(+), 53 deletions(-)

diffs:
diff --git a/libvips/Makefile b/libvips/Makefile
index c263c06efc..9f651dfa43 100644
--- a/libvips/Makefile
+++ b/libvips/Makefile
@@ -4,22 +4,23 @@ DISTNAME=	vips-8.16.0
 PKGNAME=	lib${DISTNAME}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libvips/}
-GITHUB_PROJECT=	libvips
 GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	base%atomicules.co.uk@localhost
 HOMEPAGE=	https://libvips.github.io/libvips/
-COMMENT=	Libvips is a demand-driven, horizontally threaded image processing 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
+REPLACE_PYTHON+=	cplusplus/gen-operators.py
+REPLACE_PYTHON+=	doc/gen-function-list.py
+REPLACE_PYTHON+=	tools/vipsprofile
 
 PKGCONFIG_OVERRIDE_STAGE=	pre-install
 PKGCONFIG_OVERRIDE+=		output/meson-private/vips-cpp.pc
@@ -33,10 +34,20 @@ RELRO_SUPPORTED=		no
 .include "options.mk"
 
 .include "../../devel/meson/build.mk"
+.include "../../lang/python/application.mk"
 .include "../../lang/python/tool.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.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/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"
-
-#Note to self: This must go last
 .include "../../mk/bsd.pkg.mk"
diff --git a/libvips/PLIST b/libvips/PLIST
index e5f432a49d..3de56b10e4 100644
--- a/libvips/PLIST
+++ b/libvips/PLIST
@@ -59,6 +59,9 @@ lib/libvips.so.42
 lib/libvips.so.42.18.0
 lib/pkgconfig/vips-cpp.pc
 lib/pkgconfig/vips.pc
+lib/vips-modules-8.16/vips-heif.so
+lib/vips-modules-8.16/vips-jxl.so
+lib/vips-modules-8.16/vips-poppler.so
 man/man1/vips.1
 man/man1/vipsedit.1
 man/man1/vipsheader.1
diff --git a/libvips/TODO b/libvips/TODO
deleted file mode 100644
index d6192daeed..0000000000
--- a/libvips/TODO
+++ /dev/null
@@ -1,17 +0,0 @@
-pkglint checks:
-
-- WARN: PLIST:6: Manual page missing for bin/shrink_width
-- WARN: PLIST:8: Manual page missing for bin/vips-8.3
-
-Makefile:
-
-- pkglint complains about comment
-- PLIST will be different if some options are enabled (e.g. -Ddeprecated=true)
-
-options.mk:
-
-- some (but not all) options added
-- some options are undocumented
-
-This package has known vulnerabilities, please investigate and fix if possible:
-  CVE-2019-6976, CVE-2019-17534, CVE-2021-27847
diff --git a/libvips/buildlink3.mk b/libvips/buildlink3.mk
index 3cb97f45ea..24558f4376 100644
--- a/libvips/buildlink3.mk
+++ b/libvips/buildlink3.mk
@@ -1,13 +1,26 @@
 # $NetBSD$
 
-BUILDLINK_TREE+=	vips
+BUILDLINK_TREE+=	libvips
 
-.if !defined(VIPS_BUILDLINK3_MK)
-VIPS_BUILDLINK3_MK:=
+.if !defined(LIBVIPS_BUILDLINK3_MK)
+LIBVIPS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.vips+=	vips>=8.2.2
-BUILDLINK_PKGSRCDIR.vips?=	../../wip/libvips
+BUILDLINK_API_DEPENDS.libvips+=	libvips>=8.16.0
+BUILDLINK_PKGSRCDIR.libvips?=	../../wip/libvips
 
-.endif	# VIPS_BUILDLINK3_MK
+#.include "../../devel/zlib/buildlink3.mk"
+#.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/png/buildlink3.mk"
+#.include "../../print/poppler/buildlink3.mk"
+#.include "../../textproc/expat/buildlink3.mk"
+#.include "../../devel/glib2/buildlink3.mk"
+#.include "../../textproc/libxml2/buildlink3.mk"
+.endif	# LIBVIPS_BUILDLINK3_MK
 
-BUILDLINK_TREE+=	-vips
+BUILDLINK_TREE+=	-libvips
diff --git a/libvips/options.mk b/libvips/options.mk
index 97e38201e6..07f60f0af8 100644
--- a/libvips/options.mk
+++ b/libvips/options.mk
@@ -1,8 +1,8 @@
 # $NetBSD$
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.vips
-PKG_SUPPORTED_OPTIONS=	jpeg png exif tiff gobject-introspection
-PKG_SUGGESTED_OPTIONS=	jpeg png
+PKG_OPTIONS_VAR=	PKG_OPTIONS.libvips
+PKG_SUPPORTED_OPTIONS=	tiff introspection
+PKG_SUGGESTED_OPTIONS=
 
 .include "../../mk/bsd.options.mk"
 
@@ -10,34 +10,14 @@ PKG_SUGGESTED_OPTIONS=	jpeg png
 # so it makes sense to explicitly disabled them
 # if they are not going to be used
 
-# libvips advises jpeg-turbo / mozjpeg
-.if !empty(PKG_OPTIONS:Mjpeg)
-.include "../../graphics/libjpeg-turbo/buildlink3.mk"
-.else
-MESON_ARGS+= -Djpeg=disabled
-.endif
-
-.if !empty(PKG_OPTIONS:Mpng)
-.include "../../graphics/png/buildlink3.mk"
-.else
-MESON_ARGS+= -Dpng=disabled
-.endif
-
-.if !empty(PKG_OPTIONS:Mexif)
-.include "../../graphics/libexif/buildlink3.mk"
-.else
-MESON_ARGS+= -Dexif=disabled
-.endif
-
 .if !empty(PKG_OPTIONS:Mtiff)
 .include "../../graphics/tiff/buildlink3.mk"
 .else
 MESON_ARGS+= -Dtiff=disabled
 .endif
 
-.if !empty(PKG_OPTIONS:Mgobject-introspection)
+.if !empty(PKG_OPTIONS:Mintrospection)
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .else
 MESON_ARGS+= -Dintrospection=disabled
 .endif
-
Prev by Date: py-ueberzug: add new package
Next by Date: libvips: fix buildlink3.mk file
Previous by Thread: py-ueberzug: add new package
Next by Thread: libvips: fix buildlink3.mk file
Indexes:
Home | Main Index | Thread Index | Old Index