Re: UPDATE: libvips

On 2022/12/30 13:27, mgraves@brainfat.net wrote:
> Thank you for the feedback. Here is an updated version of the patch. I
> believe I have taken care of all the errors that were noted.
>
> I have had no luck with 'make port-lib-depends-check' or 'show-reverse-deps' in
> finding any other ports that depend on this library. Though I still
> may not be searching correctly.
>
> I have also tried to contact the maintainer twice. Once on 12/14/2022
> and again 12/21/2022 with no response.
>
> Please let me know if any additional correction need to be made to this
> patch.

As I said in my previous mail, it needs all of the optional libraries
either disabling with CONFIGURE_ARGS, or adding as a dependency.

...snip...
:: but basically, run configure --help and add the various other new
:: --without-XXX lines to CONFIGURE_ARGS.
...snip...

I've done that in the diff below, but note that they switched from
giflib to libcgif which we don't have in ports, so that might be a
problem if someone is actually using libvips with gif files.

(Also I have no opinion on whether it actually makes sense to include
openjp2 support, I kept that enabled as in your diff).


Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/libvips/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 5 Nov 2022 17:06:27 -0000 1.3
+++ Makefile 3 Jan 2023 13:10:07 -0000
@@ -1,14 +1,13 @@
COMMENT = fast image processing library with low memory needs

-VERSION = 8.9.2
+VERSION = 8.13.0
DISTNAME = vips-${VERSION}
PKGNAME = lib${DISTNAME}
-REVISION = 0

CATEGORIES = graphics

-SHARED_LIBS += vips 0.0
-SHARED_LIBS += vips-cpp 0.0
+SHARED_LIBS += vips 1.0 # 57.0
+SHARED_LIBS += vips-cpp 1.0 # 57.0

HOMEPAGE = https://libvips.github.io/libvips/

@@ -17,8 +16,8 @@ MAINTAINER = Stephane Guedon <stephane@2
# LGPLv2+
PERMIT_PACKAGE = Yes

-WANTLIB += ${COMPILER_LIBCXX} c expat ffi gif glib-2.0 gmodule-2.0
-WANTLIB += gobject-2.0 gthread-2.0 iconv intl jpeg lzma m pcre2-8
+WANTLIB += ${COMPILER_LIBCXX} c expat ffi glib-2.0 gio-2.0 gmodule-2.0
+WANTLIB += gobject-2.0 openjp2 iconv intl jpeg lzma m pcre2-8
WANTLIB += png tiff webp webpdemux webpmux z zstd

MASTER_SITES = https://github.com/libvips/libvips/releases/download/v${VERSION}/
@@ -26,9 +25,9 @@ MASTER_SITES = https://github.com/libvip
LIB_DEPENDS += archivers/xz \
archivers/zstd \
devel/glib2 \
- graphics/giflib \
graphics/jpeg \
graphics/libwebp \
+ graphics/openjp2 \
graphics/png \
graphics/tiff

@@ -36,33 +35,40 @@ USE_GMAKE = Yes
COMPILER = base-clang ports-gcc
CONFIGURE_STYLE = gnu

-CONFIGURE_ARGS += --disable-gtk-doc \
- --disable-gtk-doc-html \
- --disable-introspection \
- --with-analyze \
- --with-giflib \
- --with-png \
- --with-tiff \
- --with-ppm \
- --with-radiance \
- --with-jpeg \
- --with-libwebp \
+# follow configure --help ordering to assist keeping in-sync with updates
+CONFIGURE_ARGS += --disable-introspection \
+ --without-gsf \
+ --without-fftw \
--without-magick \
- --without-matio \
- --without-nifti \
- --without-openslide \
--without-orc \
- --without-pangoft2 \
+ --without-lcms \
+ --without-OpenEXR \
+ --without-nifti \
+ --with-x \
+ --without-libjxl \
+ --with-libopenjp2 \
+ --without-heif \
--without-pdfium \
--without-poppler \
--without-rsvg \
- --without-OpenEXR \
- --without-lcms \
- --without-libexif \
- --without-gsf \
- --without-heif \
- --without-imagequant \
+ --with-zlib \
+ --without-openslide \
+ --without-matio \
+ --without-nsgif \
+ --with-ppm \
+ --with-analyze \
+ --with-radiance \
--without-cfitsio \
- --without-fftw
+ --with-libwebp \
+ --without-pangocairo \
+ --with-fontconfig \
+ --with-tiff \
+ --without-libspng \
+ --with-png \
+ --without-imagequant \
+ --without-quantizr \
+ --with-jpeg \
+ --without-libexif \
+ --without-cgif

.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/libvips/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 15 May 2020 07:58:41 -0000 1.1.1.1
+++ distinfo 3 Jan 2023 13:10:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (vips-8.9.2.tar.gz) = roSRsRVs0uucu6ov1sqh3J7T3tC3BEPSjNf+p5irKic=
-SIZE (vips-8.9.2.tar.gz) = 17238831
+SHA256 (vips-8.13.0.tar.gz) = t+HVDc9XEWW+7NNq3s5uymcBwqnhMcZ1FD2LlBjb3YE=
+SIZE (vips-8.13.0.tar.gz) = 17892132
Index: patches/patch-libvips_include_vips_dispatch_h
===================================================================
RCS file: patches/patch-libvips_include_vips_dispatch_h
diff -N patches/patch-libvips_include_vips_dispatch_h
--- patches/patch-libvips_include_vips_dispatch_h 11 Mar 2022 19:22:46 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-From cfe50903dffd576f6c25b0f24882b38a38085644 Mon Sep 17 00:00:00 2001
-From: John Cupitt <jcupitt@gmail.com>
-Date: Tue, 9 Feb 2021 16:07:51 +0000
-Subject: [PATCH] don't put glib includes inside extern "C" blocks
-
-Index: libvips/include/vips/dispatch.h
---- libvips/include/vips/dispatch.h.orig
-+++ libvips/include/vips/dispatch.h
-@@ -33,11 +33,12 @@
- #ifndef IM_DISPATCH_H
- #define IM_DISPATCH_H
-
-+#include <glib-object.h>
-+
- #ifdef __cplusplus
- extern "C" {
-