git: 1d1d7ac81d64 - main - graphics/gegl: sort out Makefile and pet portclippy

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Sat, 01 Jun 2024 23:24:24 UTC
The branch main has been updated by vvd:

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

commit 1d1d7ac81d64a108829f66e0f93f53fe46fc57c4
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2024-06-01 20:24:38 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-06-01 23:16:57 +0000

    graphics/gegl: sort out Makefile and pet portclippy
    
    Also:
    - remove unnecessary dependency from fribidi;
    - LIBRSVG2, PANGO and POPPLER used only if CAIRO is ON;
    - resurect option UMFPACK;
    - remove patch for powerpc* with altivec.
    
    PR:             279280
    Tested by:      pkubaj (build on powerpc*)
    Approved by:    fluffy (gnome, maintainer)
---
 graphics/gegl/Makefile  | 114 ++++++++++++++++++++++--------------------------
 graphics/gegl/pkg-plist |   7 +--
 2 files changed, 57 insertions(+), 64 deletions(-)

diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
index 3375c0063b1b..adfdd91f051f 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	gegl
-PORTVERSION=	0.4.48
+DISTVERSION=	0.4.48
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	GIMP
 
@@ -15,19 +16,21 @@ LICENSE_FILE_LGPL3+ =	${WRKSRC}/COPYING.LESSER
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libbabl-0.1.so:x11/babl \
 		libjson-glib-1.0.so:devel/json-glib \
-		libfribidi.so:converters/fribidi \
 		libnsgif.so:graphics/libnsgif \
 		libpng.so:graphics/png
 
-USES=		cpe gettext gnome jpeg localbase meson pkgconfig shebangfix \
+USES=		cpe gettext gnome jpeg localbase:ldflags meson pkgconfig shebangfix \
 		uniquefiles tar:xz
-.if !exists(/usr/include/omp.h)
-USES+=		compiler:gcc-c++11-lib
-.else
+.if exists(/usr/include/omp.h)
 USES+=		compiler:c++14-lang
+.else
+USES+=		compiler:gcc-c++11-lib
 .endif
 USE_GNOME=	glib20 introspection:build
 USE_LDCONFIG=	yes
+
+SHEBANG_FILES=	tools/xml_insert.sh
+
 MESON_ARGS=	-Ddocs=false \
 		-Dgi-docgen=disabled \
 		-Dworkshop=false \
@@ -47,34 +50,33 @@ GEGL_SHLIB=	0.447.1
 GEGL_VER=	0.4
 PLIST_SUB+=	GEGL_SHLIB=${GEGL_SHLIB} GEGL_VER=${GEGL_VER}
 
-SHEBANG_FILES=	tools/xml_insert.sh
+OPTIONS_DEFINE=		CAIRO ENSCRIPT FFMPEG GEXIV2 GRAPHVIZ JASPER LCMS2 LIBRSVG2 \
+			OPENEXR PANGO PIXBUF POPPLER RAW SDL SPIRO TIFF UMFPACK V4L \
+			VAPI WEBP
+OPTIONS_DEFAULT=	CAIRO ENSCRIPT FFMPEG GEXIV2 GRAPHVIZ JASPER LCMS2 LIBRSVG2 \
+			OPENEXR PANGO PIXBUF POPPLER RAW SDL SPIRO TIFF UMFPACK V4L \
+			VAPI WEBP
+OPTIONS_EXCLUDE_i386=	GEXIV2
+OPTIONS_SUB=		yes
 
-OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	CAIRO ENSCRIPT FFMPEG PIXBUF GRAPHVIZ JASPER LCMS2 \
-		OPENEXR RAW PANGO POPPLER LIBRSVG2 SDL SPIRO V4L \
-		WEBP TIFF GEXIV2 VAPI
-OPTIONS_DEFAULT=CAIRO ENSCRIPT GEXIV2 PIXBUF GRAPHVIZ JASPER LCMS2 \
-		OPENEXR RAW PANGO POPPLER LIBRSVG2 SDL SPIRO V4L WEBP TIFF VAPI
-
-PIXBUF_USE=	GNOME=gdkpixbuf2
-PIXBUF_MESON_ENABLED=	gdk-pixbuf
+ENSCRIPT_DESC=		Enscript support
+GEXIV2_DESC=		EXIF and IPTC metadata support via gexiv2
+SPIRO_DESC=		Spiro support
+UMFPACK_DESC=		UMFpack support
 
-CAIRO_USE=	GNOME=cairo
+CAIRO_USE=		GNOME=cairo
 CAIRO_MESON_ENABLED=	cairo
 
-PANGO_USE=	GNOME=pango
-PANGO_MESON_ENABLED=	pango
-
-POPPLER_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
-POPPLER_MESON_ENABLED=	poppler
-
-ENSCRIPT_DESC=		Enscript support
 ENSCRIPT_BUILD_DEPENDS=	enscript:print/enscript-a4
 
 FFMPEG_LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg
 FFMPEG_MESON_ENABLED=	libav
 
-GRAPHVIZ_LIB_DEPENDS=	libcgraph.so:graphics/graphviz
+GEXIV2_LIB_DEPENDS=	libgexiv2.so:graphics/gexiv2
+GEXIV2_MESON_ENABLED=	gexiv2
+
+GRAPHVIZ_BUILD_DEPENDS=	dot:graphics/graphviz
+GRAPHVIZ_RUN_DEPENDS=	dot:graphics/graphviz
 GRAPHVIZ_MESON_ENABLED=	graphviz
 
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
@@ -83,58 +85,53 @@ JASPER_MESON_ENABLED=	jasper
 LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
 LCMS2_MESON_ENABLED=	lcms
 
+LIBRSVG2_IMPLIES=	CAIRO
+LIBRSVG2_USE=		GNOME=librsvg2
+LIBRSVG2_MESON_ENABLED=	librsvg
+
 OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr \
 			libImath.so:math/Imath
 OPENEXR_MESON_ENABLED=	openexr
 
+PANGO_IMPLIES=		CAIRO
+PANGO_USE=		GNOME=pango
+PANGO_MESON_ENABLED=	pango pangocairo
+
+PIXBUF_USE=		GNOME=gdkpixbuf2
+PIXBUF_MESON_ENABLED=	gdk-pixbuf
+
+POPPLER_IMPLIES=	CAIRO
+POPPLER_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
+POPPLER_MESON_ENABLED=	poppler
+
 RAW_LIB_DEPENDS=	libraw.so:graphics/libraw
 RAW_MESON_ENABLED=	libraw
 
-LIBRSVG2_USE=		GNOME=librsvg2
-LIBRSVG2_MESON_ENABLED=	librsvg
-
-SDL_USE=		SDL=sdl2
 SDL_USES=		sdl
+SDL_USE=		SDL=sdl2
 SDL_MESON_ENABLED=	sdl2
 
-SPIRO_DESC=		Spiro support
 SPIRO_LIB_DEPENDS=	libspiro.so:graphics/libspiro
 SPIRO_MESON_ENABLED=	libspiro
 
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
+TIFF_MESON_ENABLED=	libtiff
+
+UMFPACK_LIB_DEPENDS=	libumfpack.so:math/suitesparse-umfpack
+UMFPACK_MESON_ENABLED=	umfpack
+
 V4L_BUILD_DEPENDS=	v4l_compat>=0:multimedia/v4l_compat
-V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
+V4L_RUN_DEPENDS=	libv4l>0:multimedia/libv4l
 V4L_MESON_ENABLED=	libv4l libv4l2
 V4L_VARS=		LICENSE+=LGPL20+
 
-WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
-WEBP_MESON_ENABLED=	webp
-
-# UMFPACK has two "problems"
-# 1) it build with port gcc 2) needed libs aren't recorded in the libraries.
-#UMFPACK_DESC=		UMFpack support
-#UMFPACK_LIB_DEPENDS=	libumfpack.so:math/suitesparse
-#UMFPACK_MESON_ENABLED=	umfpack
-MESON_ARGS+=		-Dumfpack=disabled
-
-GEXIV2_DESC=		EXIF and IPTC metadata support via gexiv2
-GEXIV2_LIB_DEPENDS=	libgexiv2.so:graphics/gexiv2
-GEXIV2_MESON_ENABLED=	gexiv2
-
-TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
-TIFF_MESON_ENABLED=	libtiff
-
 VAPI_USES=		vala:build
 VAPI_MESON_ENABLED=	vapigen
 
-.include <bsd.port.pre.mk>
+WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
+WEBP_MESON_ENABLED=	webp
 
-.if ${PORT_OPTIONS:MPANGO} && ${PORT_OPTIONS:MCAIRO}
-PLIST_SUB+=	PANGOCAIRO=""
-MESON_ARGS+=	-Dpangocairo=enabled
-.else
-MESON_ARGS+=	-Dpangocairo=disabled
-PLIST_SUB+=	PANGOCAIRO="@comment "
-.endif
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_DEBUG)
 LDFLAGS+=	-lexecinfo
@@ -148,9 +145,4 @@ PLIST_SUB+=	AMD64="@comment " ARM=""
 PLIST_SUB+=	AMD64="@comment " ARM="@comment "
 .endif
 
-post-patch:
-.if ${CHOSEN_COMPILER_TYPE} == clang
-	${REINPLACE_CMD} -e '/altivec.h/d' ${WRKSRC}/gegl/opencl/cl_platform.h
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/graphics/gegl/pkg-plist b/graphics/gegl/pkg-plist
index 572b9285a6f1..d4499d3cf4ca 100644
--- a/graphics/gegl/pkg-plist
+++ b/graphics/gegl/pkg-plist
@@ -115,10 +115,11 @@ lib/gegl-%%GEGL_VER%%/grey2.json
 lib/gegl-%%GEGL_VER%%/jpg-load.so
 lib/gegl-%%GEGL_VER%%/jpg-save.so
 %%LCMS2%%lib/gegl-%%GEGL_VER%%/lcms-from-profile.so
+%%UMFPACK%%lib/gegl-%%GEGL_VER%%/matting-levin.so
 %%CAIRO%%lib/gegl-%%GEGL_VER%%/npd.so
 lib/gegl-%%GEGL_VER%%/npy-save.so
 %%CAIRO%%lib/gegl-%%GEGL_VER%%/path.so
-%%POPPLER%%lib/gegl-%%GEGL_VER%%/pdf-load.so
+%%CAIRO%%%%POPPLER%%lib/gegl-%%GEGL_VER%%/pdf-load.so
 %%PIXBUF%%lib/gegl-%%GEGL_VER%%/pixbuf-load.so
 %%PIXBUF%%lib/gegl-%%GEGL_VER%%/pixbuf-save.so
 lib/gegl-%%GEGL_VER%%/png-load.so
@@ -131,8 +132,8 @@ lib/gegl-%%GEGL_VER%%/rgbe-save.so
 %%SDL%%lib/gegl-%%GEGL_VER%%/sdl2-display.so
 lib/gegl-%%GEGL_VER%%/seamless-clone-compose.so
 lib/gegl-%%GEGL_VER%%/seamless-clone.so
-%%LIBRSVG2%%lib/gegl-%%GEGL_VER%%/svg-load.so
-%%PANGOCAIRO%%lib/gegl-%%GEGL_VER%%/text.so
+%%CAIRO%%%%LIBRSVG2%%lib/gegl-%%GEGL_VER%%/svg-load.so
+%%CAIRO%%%%PANGO%%lib/gegl-%%GEGL_VER%%/text.so
 %%TIFF%%lib/gegl-%%GEGL_VER%%/tiff-load.so
 %%TIFF%%lib/gegl-%%GEGL_VER%%/tiff-save.so
 lib/gegl-%%GEGL_VER%%/transformops.so