svn commit: r520991 - in head/graphics/gegl: . files

Baptiste Daroussin bapt at FreeBSD.org
Fri Dec 27 14:38:48 UTC 2019 

Author: bapt
Date: Fri Dec 27 14:38:46 2019
New Revision: 520991
URL: https://svnweb.freebsd.org/changeset/ports/520991

Log:
  Update to 0.4.18
  
  Switch build system to meson
  Add now required bash build dependency
  Compared to previous version, this version has lua disabled as it complexify the
  and has no known use case in ports for now.
  Note that the POPPLER option has been removed, as there is no support for it upstream anymore
  along with the EXAMPLE option.
  Provide explicit values to all possible build switch to avoid unexpected extra
  dependencies automagically found.

Deleted:
  head/graphics/gegl/files/
Modified:
  head/graphics/gegl/Makefile
  head/graphics/gegl/distinfo
  head/graphics/gegl/pkg-plist

Modified: head/graphics/gegl/Makefile
==============================================================================
--- head/graphics/gegl/Makefile	Fri Dec 27 13:51:42 2019	(r520990)
+++ head/graphics/gegl/Makefile	Fri Dec 27 14:38:46 2019	(r520991)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gegl
-PORTVERSION=	0.4.16
-PORTREVISION=	5
+PORTVERSION=	0.4.18
 CATEGORIES=	graphics
 MASTER_SITES=	GIMP
 
@@ -15,41 +14,40 @@ LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYING
 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 \
 		libpng.so:graphics/png
 
-USES=		compiler:c++14-lang cpe gettext gmake gnome jpeg libtool localbase \
-		pathfix pkgconfig shebangfix uniquefiles tar:bzip2
+USES=		compiler:c++14-lang cpe gettext gnome jpeg libtool localbase \
+		meson pathfix pkgconfig shebangfix uniquefiles tar:xz
 USE_GNOME=	glib20 intltool introspection:build
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	ac_cv_header_execinfo_h=no
-CONFIGURE_ARGS=	--without-vala --disable-docs
-CONFIGURE_ARGS+=--without-mrg --without-lensfun
-INSTALL_TARGET=	install-strip
+MESON_ARGS=	-Ddocs=false \
+		-Dworkshop=false \
+		-Dintrospection=true \
+		-Dvapigen=disabled \
+		-Dlensfun=disabled \
+		-Dlibjpeg=enabled \
+		-Dlibpng=enabled \
+		-Dmrg=disabled \
+		-Dpygobject=disabled \
+		-Dvapigen=disabled \
+		-Dlua=disabled
 
-GEGL_MINOR=	416
+GEGL_MINOR=	417
 GEGL_VER=	0.4
 PLIST_SUB+=	GEGL_MINOR="${GEGL_MINOR}" GEGL_VER=${GEGL_VER}
 
-EXAMPLES=	2geglbuffer \
-		gegl-convert gegl-slicer geglbuffer-add-image \
-		geglbuffer-clock hello-world sdl-draw
-
 SHEBANG_FILES=	tools/xml_insert.sh
 
-# Fix conflicts with sysutils/coreutils
-UNIQUE_SUFFIX=	-${GEGL_VER}
-UNIQUE_SUFFIX_FILES=	bin/gcut
-
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	CAIRO ENSCRIPT FFMPEG PIXBUF GRAPHVIZ JASPER \
-		LUA OPENEXR RAW PANGO POPPLER LIBRSVG2 SDL SPIRO V4L \
-		EXAMPLES LCMS2 WEBP TIFF GEXIV2
-OPTIONS_DEFAULT=CAIRO ENSCRIPT GEXIV2 PIXBUF GRAPHVIZ JASPER LCMS2 LUA \
-		OPENEXR RAW PANGO POPPLER LIBRSVG2 SDL SPIRO V4L WEBP TIFF
+		OPENEXR RAW PANGO LIBRSVG2 SDL SPIRO V4L \
+		LCMS2 WEBP TIFF GEXIV2
+OPTIONS_DEFAULT=CAIRO ENSCRIPT GEXIV2 PIXBUF GRAPHVIZ JASPER LCMS2 \
+		OPENEXR RAW PANGO LIBRSVG2 SDL SPIRO V4L WEBP TIFF
 
 ENSCRIPT_DESC=	Enscript support
 SPIRO_DESC=	Spiro support
@@ -57,97 +55,78 @@ SPIRO_DESC=	Spiro support
 GEXIV2_DESC=	EXIF and IPTC metadata support via gexiv2
 
 PIXBUF_USE=	GNOME=gdkpixbuf2
-PIXBUF_CONFIGURE_WITH=	gdk-pixbuf
+PIXBUF_MESON_ENABLED=	gdk-pixbuf
 
 CAIRO_USE=	GNOME=cairo
-CAIRO_CONFIGURE_WITH=	cairo
+CAIRO_MESON_ENABLED=	cairo
 
 PANGO_USE=	GNOME=pango
-PANGO_CONFIGURE_WITH=	pango
+PANGO_MESON_ENABLED=	pango
 
-POPPLER_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
-POPPLER_CONFIGURE_WITH=	popplerglib
-
 ENSCRIPT_BUILD_DEPENDS=	enscript:print/enscript-a4
 
 FFMPEG_LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg
-FFMPEG_CONFIGURE_WITH=	libavformat
+FFMPEG_MESON_ENABLED=	libav
 
 GRAPHVIZ_LIB_DEPENDS=	libcgraph.so:graphics/graphviz
-GRAPHVIZ_CONFIGURE_WITH=	graphviz
+GRAPHVIZ_MESON_ENABLED=	graphviz
 
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
-JASPER_CONFIGURE_WITH=	jasper
+JASPER_MESON_ENABLED=	jasper
 
 LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
-LCMS2_CONFIGURE_OFF=	--without-lcms
+LCMS2_MESON_ENABLED=	lcms
 
-LUA_USES=		lua
-LUA_CONFIGURE_WITH=	lua
-
 OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/openexr \
 			libImath.so:graphics/ilmbase
-OPENEXR_CONFIGURE_WITH=	openexr
+OPENEXR_MESON_ENABLED=	openexr
 
 RAW_LIB_DEPENDS=	libraw.so:graphics/libraw
-RAW_CONFIGURE_WITH=	libraw
+RAW_MESON_ENABLED=	libraw
 
 LIBRSVG2_USE=		GNOME=librsvg2
-LIBRSVG2_CONFIGURE_OFF=	--without-librsvg
+LIBRSVG2_MESON_ENABLED=	librsvg
 
-SDL_USE=		SDL=sdl
+SDL_USE=		SDL=sdl2
 SDL_USES=		sdl
-SDL_CONFIGURE_WITH=	sdl
+SDL_MESON_ENABLED=	sdl2
 
 SPIRO_LIB_DEPENDS=	libspiro.so:graphics/libspiro
-SPIRO_CONFIGURE_WITH=	libspiro
+SPIRO_MESON_ENABLED=	libspiro
 
 V4L_BUILD_DEPENDS=	v4l_compat>=0:multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
-V4L_CONFIGURE_WITH=	libv4l
+V4L_MESON_ENABLED=	libv4l2
 V4L_VARS=		LICENSE+=LGPL20+
 
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
-WEBP_CONFIGURE_WITH=	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_LIB_DEPENDS=	libumfpack.so:math/suitesparse
-#UMFPACK_CONFIGURE_WITH=	umfpack
-CONFIGURE_ARGS+=	--without-umfpack
+#UMFPACK_MESON_ENABLED=	umfpack
+MESON_ARGS+=		-Dumfpack=disabled
 
 GEXIV2_LIB_DEPENDS=	libgexiv2.so:graphics/gexiv2
-GEXIV2_CONFIGURE_WITH=	gexiv2
+GEXIV2_MESON_ENABLED=	gexiv2
 
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
-TIFF_CONFIGURE_WITH=	libtiff
+TIFF_MESON_ENABLED=	libtiff
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MPANGO} && ${PORT_OPTIONS:MCAIRO}
 PLIST_SUB+=	PANGOCAIRO=""
+MESON_ARGS+=	-Dpangocairo=enabled
 .else
-CONFIGURE_ARGS+=--without-pangocairo
+MESON_ARGS+=	-Dpangocairo=disabled
 PLIST_SUB+=	PANGOCAIRO="@comment "
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e "s/lua >/lua-${LUA_VER} >/g" \
-		-e 's|\(lua\)\(5\.1\)|\1-\2|g ; s|x86_64|amd64|g' \
-		${WRKSRC}/configure
 .if ${CHOSEN_COMPILER_TYPE} == clang
 	${REINPLACE_CMD} -e '/altivec.h/d' ${WRKSRC}/gegl/opencl/cl_platform.h
 .endif
-
-post-patch-EXAMPLES-off:
-	${REINPLACE_CMD} -e 's|tools examples|tools|g' \
-		${WRKSRC}/Makefile.in
-
-post-install-EXAMPLES-on:
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/data
-	${INSTALL_DATA} ${WRKSRC}/examples/data/surfer.png ${STAGEDIR}${EXAMPLESDIR}/data
-.for ex in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/examples/${ex}.c ${STAGEDIR}${EXAMPLESDIR}
-.endfor
 
 .include <bsd.port.post.mk>

Modified: head/graphics/gegl/distinfo
==============================================================================
--- head/graphics/gegl/distinfo	Fri Dec 27 13:51:42 2019	(r520990)
+++ head/graphics/gegl/distinfo	Fri Dec 27 14:38:46 2019	(r520991)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562677461
-SHA256 (gegl-0.4.16.tar.bz2) = 0112df690301d9eb993cc48965fc71b7751c9021a4f4ee08fcae366c326b5e5a
-SIZE (gegl-0.4.16.tar.bz2) = 7304904
+TIMESTAMP = 1577439289
+SHA256 (gegl-0.4.18.tar.xz) = c946dfb45beb7fe0fb95b89a25395b449eda2b205ba3e8a1ffb1ef992d9eca64
+SIZE (gegl-0.4.18.tar.xz) = 4812756

Modified: head/graphics/gegl/pkg-plist
==============================================================================
--- head/graphics/gegl/pkg-plist	Fri Dec 27 13:51:42 2019	(r520990)
+++ head/graphics/gegl/pkg-plist	Fri Dec 27 14:38:46 2019	(r520991)
@@ -1,10 +1,8 @@
-bin/gcut
 bin/gegl
 bin/gegl-imgcmp
 include/gegl-%%GEGL_VER%%/gegl-apply.h
 include/gegl-%%GEGL_VER%%/gegl-audio-fragment.h
 include/gegl-%%GEGL_VER%%/gegl-buffer-backend.h
-include/gegl-%%GEGL_VER%%/gegl-buffer-cl-iterator.h
 include/gegl-%%GEGL_VER%%/gegl-buffer-enums.h
 include/gegl-%%GEGL_VER%%/gegl-buffer-iterator.h
 include/gegl-%%GEGL_VER%%/gegl-buffer-matrix2.h
@@ -99,8 +97,8 @@ lib/gegl-%%GEGL_VER%%/jpg-save.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
-%%PIXBUF%%lib/gegl-%%GEGL_VER%%/pixbuf.so
+%%PIXBUF%%lib/gegl-%%GEGL_VER%%/pixbuf-load.so
+%%PIXBUF%%lib/gegl-%%GEGL_VER%%/pixbuf-save.so
 lib/gegl-%%GEGL_VER%%/png-load.so
 lib/gegl-%%GEGL_VER%%/png-save.so
 lib/gegl-%%GEGL_VER%%/ppm-load.so
@@ -108,8 +106,7 @@ lib/gegl-%%GEGL_VER%%/ppm-save.so
 %%RAW%%lib/gegl-%%GEGL_VER%%/raw-load.so
 lib/gegl-%%GEGL_VER%%/rgbe-load.so
 lib/gegl-%%GEGL_VER%%/rgbe-save.so
-%%PIXBUF%%lib/gegl-%%GEGL_VER%%/save-pixbuf.so
-%%SDL%%lib/gegl-%%GEGL_VER%%/sdl-display.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
@@ -125,19 +122,11 @@ lib/gegl-%%GEGL_VER%%/transformops.so
 lib/girepository-1.0/Gegl-%%GEGL_VER%%.typelib
 lib/libgegl-%%GEGL_VER%%.so
 lib/libgegl-%%GEGL_VER%%.so.0
-lib/libgegl-%%GEGL_VER%%.so.0.%%GEGL_MINOR%%.0
+lib/libgegl-%%GEGL_VER%%.so.0.%%GEGL_MINOR%%.1
 lib/libgegl-npd-%%GEGL_VER%%.so
 lib/libgegl-sc-%%GEGL_VER%%.so
 libdata/pkgconfig/gegl-%%GEGL_VER%%.pc
 libdata/pkgconfig/gegl-sc-%%GEGL_VER%%.pc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/2geglbuffer.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/surfer.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gegl-convert.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gegl-slicer.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geglbuffer-add-image.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geglbuffer-clock.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello-world.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sdl-draw.c
 share/gir-1.0/Gegl-%%GEGL_VER%%.gir
 share/locale/bs/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/ca/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
@@ -156,6 +145,7 @@ share/locale/it/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/ko/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/lv/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/mr/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
+share/locale/ne/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/nb/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/oc/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
 share/locale/pl/LC_MESSAGES/gegl-%%GEGL_VER%%.mo

More information about the svn-ports-all mailing list