diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile index 3d7680e4e8fb..e678b899ab72 100644 --- a/graphics/gegl/Makefile +++ b/graphics/gegl/Makefile @@ -1,140 +1,147 @@ # Created by: Pietro Cerutti PORTNAME= gegl -PORTVERSION= 0.4.34 -PORTREVISION= 5 +PORTVERSION= 0.4.36 CATEGORIES= graphics MASTER_SITES= GIMP MAINTAINER= gnome@FreeBSD.org COMMENT= Graph based image processing framework LICENSE= BSD3CLAUSE GPLv3+ LGPL3+ 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 \ libnsgif.so:graphics/libnsgif \ libpng.so:graphics/png USES= compiler:c++14-lang cpe gettext gnome jpeg localbase \ meson pkgconfig shebangfix uniquefiles tar:xz USE_GNOME= glib20 introspection:build USE_LDCONFIG= yes MESON_ARGS= -Ddocs=false \ -Dworkshop=false \ -Dintrospection=true \ -Dlensfun=disabled \ -Dlibjpeg=enabled \ -Dlibpng=enabled \ -Dmrg=disabled \ -Dpygobject=disabled \ -Dlua=disabled -GEGL_SHLIB= 0.433.1 +GEGL_SHLIB= 0.435.1 GEGL_VER= 0.4 PLIST_SUB+= GEGL_SHLIB=${GEGL_SHLIB} GEGL_VER=${GEGL_VER} SHEBANG_FILES= tools/xml_insert.sh 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 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 GRAPHVIZ_MESON_ENABLED= graphviz JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper JASPER_MESON_ENABLED= jasper LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 LCMS2_MESON_ENABLED= lcms OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr \ libImath.so:math/Imath OPENEXR_MESON_ENABLED= openexr 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_MESON_ENABLED= sdl2 SPIRO_DESC= Spiro support SPIRO_LIB_DEPENDS= libspiro.so:graphics/libspiro SPIRO_MESON_ENABLED= libspiro V4L_BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l V4L_MESON_ENABLED= 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_BUILD_DEPENDS= vapigen:lang/vala VAPI_MESON_ENABLED= vapigen .include .if ${PORT_OPTIONS:MPANGO} && ${PORT_OPTIONS:MCAIRO} PLIST_SUB+= PANGOCAIRO="" MESON_ARGS+= -Dpangocairo=enabled .else MESON_ARGS+= -Dpangocairo=disabled PLIST_SUB+= PANGOCAIRO="@comment " .endif .if defined(WITH_DEBUG) LDFLAGS+= -lexecinfo .endif +.if ${ARCH} == "amd64" +PLIST_SUB+= AMD64="" AARCH64="@comment " +.elif ${ARCH} == "aarch64" +PLIST_SUB+= AMD64="@comment " AARCH64="" +.else +PLIST_SUB+= AMD64="@comment " AARCH64="@comment " +.endif + post-patch: .if ${CHOSEN_COMPILER_TYPE} == clang ${REINPLACE_CMD} -e '/altivec.h/d' ${WRKSRC}/gegl/opencl/cl_platform.h .endif .include diff --git a/graphics/gegl/distinfo b/graphics/gegl/distinfo index 2a786c59220b..b68a93a0f27f 100644 --- a/graphics/gegl/distinfo +++ b/graphics/gegl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1640768817 -SHA256 (gegl-0.4.34.tar.xz) = ef63f0bca5b431c6119addd834ca7fbb507c900c4861c57b3667b6f4ccfcaaaa -SIZE (gegl-0.4.34.tar.xz) = 5647516 +TIMESTAMP = 1655194019 +SHA256 (gegl-0.4.36.tar.xz) = 6fd58a0cdcc7702258adaeffb573a389228ae8f0eff47578efda2309b61b2ca6 +SIZE (gegl-0.4.36.tar.xz) = 5680876 diff --git a/graphics/gegl/files/patch-gegl_opencl_cl_platform_h b/graphics/gegl/files/patch-gegl_opencl_cl_platform_h new file mode 100644 index 000000000000..824a5565a3d8 --- /dev/null +++ b/graphics/gegl/files/patch-gegl_opencl_cl_platform_h @@ -0,0 +1,13 @@ +Don't include altivec.h as this break the build on powerpc64. + +Index: gegl/opencl/cl_platform.h +--- gegl/opencl/cl_platform.h.orig ++++ gegl/opencl/cl_platform.h +@@ -270,7 +270,6 @@ typedef unsigned int cl_GLenum; + + /* Define basic vector types */ + #if defined( __VEC__ ) +- #include /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */ + typedef vector unsigned char __cl_uchar16; + typedef vector signed char __cl_char16; + typedef vector unsigned short __cl_ushort8; diff --git a/graphics/gegl/files/patch-operations_external_png-load_c b/graphics/gegl/files/patch-operations_external_png-load_c new file mode 100644 index 000000000000..9dbbc15e1362 --- /dev/null +++ b/graphics/gegl/files/patch-operations_external_png-load_c @@ -0,0 +1,15 @@ +../gegl-0.4.30/operations/external/png-load.c:85:9: warning: +implicit declaration of function 'strptime' is invalid in C99 [-Wimplicit-function-declaration] + +Index: operations/external/png-load.c +--- operations/external/png-load.c.orig ++++ operations/external/png-load.c +@@ -20,7 +20,7 @@ + + #include "config.h" + #ifdef HAVE_STRPTIME +-#define _XOPEN_SOURCE ++#define _XOPEN_SOURCE 700 + #include + #endif + #include diff --git a/graphics/gegl/files/patch-operations_external_tiff-load_c b/graphics/gegl/files/patch-operations_external_tiff-load_c new file mode 100644 index 000000000000..26c2caa40cdd --- /dev/null +++ b/graphics/gegl/files/patch-operations_external_tiff-load_c @@ -0,0 +1,15 @@ +../gegl-0.4.30/operations/external/tiff-load.c:99:9: warning: +implicit declaration of function 'strptime' is invalid in C99 + +Index: operations/external/tiff-load.c +--- operations/external/tiff-load.c.orig ++++ operations/external/tiff-load.c +@@ -18,7 +18,7 @@ + + #include "config.h" + #ifdef HAVE_STRPTIME +-#define _XOPEN_SOURCE ++#define _XOPEN_SOURCE 700 + #include + #endif + #include diff --git a/graphics/gegl/pkg-plist b/graphics/gegl/pkg-plist index 2088a99839ad..816b3bf3b88e 100644 --- a/graphics/gegl/pkg-plist +++ b/graphics/gegl/pkg-plist @@ -1,173 +1,188 @@ 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-enums.h include/gegl-%%GEGL_VER%%/gegl-buffer-iterator.h include/gegl-%%GEGL_VER%%/gegl-buffer-matrix2.h include/gegl-%%GEGL_VER%%/gegl-buffer-swap.h include/gegl-%%GEGL_VER%%/gegl-buffer.h include/gegl-%%GEGL_VER%%/gegl-color.h include/gegl-%%GEGL_VER%%/gegl-cpuaccel.h include/gegl-%%GEGL_VER%%/gegl-curve.h include/gegl-%%GEGL_VER%%/gegl-debug.h include/gegl-%%GEGL_VER%%/gegl-enums.h include/gegl-%%GEGL_VER%%/gegl-graph-debug.h include/gegl-%%GEGL_VER%%/gegl-init.h include/gegl-%%GEGL_VER%%/gegl-lookup.h include/gegl-%%GEGL_VER%%/gegl-math.h include/gegl-%%GEGL_VER%%/gegl-matrix.h include/gegl-%%GEGL_VER%%/gegl-memory.h include/gegl-%%GEGL_VER%%/gegl-metadata.h include/gegl-%%GEGL_VER%%/gegl-metadatahash.h include/gegl-%%GEGL_VER%%/gegl-metadatastore.h include/gegl-%%GEGL_VER%%/gegl-node.h include/gegl-%%GEGL_VER%%/gegl-op.h include/gegl-%%GEGL_VER%%/gegl-operations-util.h include/gegl-%%GEGL_VER%%/gegl-parallel.h include/gegl-%%GEGL_VER%%/gegl-paramspecs.h include/gegl-%%GEGL_VER%%/gegl-path.h include/gegl-%%GEGL_VER%%/gegl-plugin.h include/gegl-%%GEGL_VER%%/gegl-processor.h include/gegl-%%GEGL_VER%%/gegl-random.h include/gegl-%%GEGL_VER%%/gegl-rectangle.h include/gegl-%%GEGL_VER%%/gegl-scratch.h include/gegl-%%GEGL_VER%%/gegl-tile-backend.h include/gegl-%%GEGL_VER%%/gegl-tile-handler.h include/gegl-%%GEGL_VER%%/gegl-tile-source.h include/gegl-%%GEGL_VER%%/gegl-tile.h include/gegl-%%GEGL_VER%%/gegl-types.h include/gegl-%%GEGL_VER%%/gegl-utils.h include/gegl-%%GEGL_VER%%/gegl-version.h include/gegl-%%GEGL_VER%%/gegl.h include/gegl-%%GEGL_VER%%/npd/deformation.h include/gegl-%%GEGL_VER%%/npd/graphics.h include/gegl-%%GEGL_VER%%/npd/lattice_cut.h include/gegl-%%GEGL_VER%%/npd/npd.h include/gegl-%%GEGL_VER%%/npd/npd_common.h include/gegl-%%GEGL_VER%%/npd/npd_debug.h include/gegl-%%GEGL_VER%%/npd/npd_gegl.h include/gegl-%%GEGL_VER%%/npd/npd_math.h include/gegl-%%GEGL_VER%%/opencl/cl.h include/gegl-%%GEGL_VER%%/opencl/cl_d3d10.h include/gegl-%%GEGL_VER%%/opencl/cl_ext.h include/gegl-%%GEGL_VER%%/opencl/cl_gl.h include/gegl-%%GEGL_VER%%/opencl/cl_gl_ext.h include/gegl-%%GEGL_VER%%/opencl/cl_platform.h include/gegl-%%GEGL_VER%%/opencl/gegl-cl-color.h include/gegl-%%GEGL_VER%%/opencl/gegl-cl-init.h include/gegl-%%GEGL_VER%%/opencl/gegl-cl-random.h include/gegl-%%GEGL_VER%%/opencl/gegl-cl-types.h include/gegl-%%GEGL_VER%%/opencl/gegl-cl.h include/gegl-%%GEGL_VER%%/opencl/opencl.h include/gegl-%%GEGL_VER%%/operation/gegl-extension-handler.h include/gegl-%%GEGL_VER%%/operation/gegl-operation-area-filter.h include/gegl-%%GEGL_VER%%/operation/gegl-operation-composer.h include/gegl-%%GEGL_VER%%/operation/gegl-operation-composer3.h include/gegl-%%GEGL_VER%%/operation/gegl-operation-context.h include/gegl-%%GEGL_VER%%/operation/gegl-operation-filter.h include/gegl-%%GEGL_VER%%/operation/gegl-operation-handlers.h include/gegl-%%GEGL_VER%%/operation/gegl-operation-meta-json.h include/gegl-%%GEGL_VER%%/operation/gegl-operation-meta.h include/gegl-%%GEGL_VER%%/operation/gegl-operation-point-composer.h include/gegl-%%GEGL_VER%%/operation/gegl-operation-point-composer3.h include/gegl-%%GEGL_VER%%/operation/gegl-operation-point-filter.h include/gegl-%%GEGL_VER%%/operation/gegl-operation-point-render.h include/gegl-%%GEGL_VER%%/operation/gegl-operation-property-keys.h include/gegl-%%GEGL_VER%%/operation/gegl-operation-sink.h include/gegl-%%GEGL_VER%%/operation/gegl-operation-source.h include/gegl-%%GEGL_VER%%/operation/gegl-operation-temporal.h include/gegl-%%GEGL_VER%%/operation/gegl-operation.h include/gegl-%%GEGL_VER%%/sc/sc-common.h include/gegl-%%GEGL_VER%%/sc/sc-context.h include/gegl-%%GEGL_VER%%/sc/sc-outline.h include/gegl-%%GEGL_VER%%/sc/sc-sample.h %%OPENEXR%%lib/gegl-%%GEGL_VER%%/exr-load.so %%OPENEXR%%lib/gegl-%%GEGL_VER%%/exr-save.so %%FFMPEG%%lib/gegl-%%GEGL_VER%%/ff-load.so %%FFMPEG%%lib/gegl-%%GEGL_VER%%/ff-save.so lib/gegl-%%GEGL_VER%%/dropshadow2.json lib/gegl-%%GEGL_VER%%/gegl-common-cxx.so +%%AARCH64%%lib/gegl-%%GEGL_VER%%/gegl-common-cxx-arm-neon.so +%%AMD64%%lib/gegl-%%GEGL_VER%%/gegl-common-cxx-x86_64-v2.so +%%AMD64%%lib/gegl-%%GEGL_VER%%/gegl-common-cxx-x86_64-v3.so lib/gegl-%%GEGL_VER%%/gegl-common-gpl3.so +%%AARCH64%%lib/gegl-%%GEGL_VER%%/gegl-common-gpl3-arm-neon.so +%%AMD64%%lib/gegl-%%GEGL_VER%%/gegl-common-gpl3-x86_64-v2.so +%%AMD64%%lib/gegl-%%GEGL_VER%%/gegl-common-gpl3-x86_64-v3.so lib/gegl-%%GEGL_VER%%/gegl-common.so +%%AARCH64%%lib/gegl-%%GEGL_VER%%/gegl-common-arm-neon.so +%%AMD64%%lib/gegl-%%GEGL_VER%%/gegl-common-x86_64-v2.so +%%AMD64%%lib/gegl-%%GEGL_VER%%/gegl-common-x86_64-v3.so lib/gegl-%%GEGL_VER%%/gegl-core.so lib/gegl-%%GEGL_VER%%/gegl-generated.so +%%AARCH64%%lib/gegl-%%GEGL_VER%%/gegl-generated-arm-neon.so +%%AMD64%%lib/gegl-%%GEGL_VER%%/gegl-generated-x86_64-v2.so +%%AMD64%%lib/gegl-%%GEGL_VER%%/gegl-generated-x86_64-v3.so +%%AARCH64%%lib/gegl-%%GEGL_VER%%/gegl-transformops-arm-neon.so +%%AMD64%%lib/gegl-%%GEGL_VER%%/gegl-transformops-x86_64-v2.so +%%AMD64%%lib/gegl-%%GEGL_VER%%/gegl-transformops-x86_64-v3.so lib/gegl-%%GEGL_VER%%/gif-load.so lib/gegl-%%GEGL_VER%%/grey2.json %%JASPER%%lib/gegl-%%GEGL_VER%%/jp2-load.so lib/gegl-%%GEGL_VER%%/jpg-load.so lib/gegl-%%GEGL_VER%%/jpg-save.so %%LCMS2%%lib/gegl-%%GEGL_VER%%/lcms-from-profile.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-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 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 %%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 %%TIFF%%lib/gegl-%%GEGL_VER%%/tiff-load.so %%TIFF%%lib/gegl-%%GEGL_VER%%/tiff-save.so lib/gegl-%%GEGL_VER%%/transformops.so %%V4L%%lib/gegl-%%GEGL_VER%%/v4l.so %%CAIRO%%lib/gegl-%%GEGL_VER%%/vector-stroke.so %%WEBP%%lib/gegl-%%GEGL_VER%%/webp-load.so %%WEBP%%lib/gegl-%%GEGL_VER%%/webp-save.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.%%GEGL_SHLIB%% 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 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 share/locale/da/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/de/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/el/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/en_GB/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/eo/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/es/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/eu/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/fr/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/gl/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/hr/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/id/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/is/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/it/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/kab/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/nb/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/ne/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/nl/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/oc/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/pl/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/pt/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/pt_BR/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/ro/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/ru/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/sk/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/sl/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/sr@latin/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/sr/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/sv/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/tr/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/uk/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/zh_CN/LC_MESSAGES/gegl-%%GEGL_VER%%.mo %%VAPI%%share/vala/vapi/gegl-%%GEGL_VER%%.deps %%VAPI%%share/vala/vapi/gegl-%%GEGL_VER%%.vapi