Index: head/graphics/gegl/files/cpu-detection.patch =================================================================== --- head/graphics/gegl/files/cpu-detection.patch (revision 527131) +++ head/graphics/gegl/files/cpu-detection.patch (nonexistent) @@ -1,48 +0,0 @@ -From 6bcf95fd0f32cf5e8b1ddbe17b14d9ad049bded8 Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Sun, 27 Oct 2019 14:10:08 +0100 -Subject: [PATCH] meson: fix cpu detection - -Use host_machine.cpu_family() instead of cpu(). Only the former -provides a stable/defined set of values. - -Also don't error out on some arches for no good reason. - -This fixes the build on 32bit Windows. ---- - meson.build | 12 +++++------- - 1 file changed, 5 insertions(+), 7 deletions(-) - -diff --git a/meson.build b/meson.build -index af133a0f1..540498921 100644 ---- a/meson.build -+++ b/meson.build -@@ -73,23 +73,21 @@ if os_osx and cc.get_id() != 'clang' - endif - - --host_cpu = host_machine.cpu() --if host_cpu.startswith('i') and host_cpu.endswith('86') -+host_cpu_family = host_machine.cpu_family() -+if host_cpu_family == 'x86' - have_x86 = true - config.set10('ARCH_X86', true) --elif host_cpu == 'x86_64' -+elif host_cpu_family == 'x86_64' - have_x86 = true - config.set10('ARCH_X86', true) - config.set10('ARCH_X86_64', true) --elif host_cpu == 'ppc' or host_cpu == 'powerpc' -+elif host_cpu_family == 'ppc' - have_ppc = true - config.set10('ARCH_PPC', true) --elif host_cpu == 'ppc64' or host_cpu == 'powerpc64' -+elif host_cpu_family == 'ppc64' - have_ppc = true - config.set10('ARCH_PPC', true) - config.set10('ARCH_PPC64', true) --else -- error('Unknown host architecture') - endif - - ################################################################################ Property changes on: head/graphics/gegl/files/cpu-detection.patch ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/gegl/Makefile =================================================================== --- head/graphics/gegl/Makefile (revision 527131) +++ head/graphics/gegl/Makefile (revision 527132) @@ -1,135 +1,137 @@ # Created by: Pietro Cerutti # $FreeBSD$ PORTNAME= gegl -PORTVERSION= 0.4.18 -PORTREVISION= 3 +PORTVERSION= 0.4.22 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 EXTRA_PATCHES= ${PATCHDIR}/cpu-detection.patch:-p1 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 libtool localbase \ +USES= compiler:c++14-lang cpe gettext gnome jpeg localbase \ meson pathfix pkgconfig shebangfix uniquefiles tar:xz USE_GNOME= glib20 intltool introspection:build USE_LDCONFIG= yes 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= 417 +GEGL_SHLIB= 0.421.1 GEGL_VER= 0.4 -PLIST_SUB+= GEGL_MINOR="${GEGL_MINOR}" GEGL_VER=${GEGL_VER} +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 \ - OPENEXR RAW PANGO LIBRSVG2 SDL SPIRO V4L \ + OPENEXR RAW PANGO POPPLER 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 + OPENEXR RAW PANGO POPPLER LIBRSVG2 SDL SPIRO V4L WEBP TIFF -ENSCRIPT_DESC= Enscript support -SPIRO_DESC= Spiro support -#UMFPACK_DESC= UMFpack support -GEXIV2_DESC= EXIF and IPTC metadata support via gexiv2 - 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_WITH= 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= libIlmImf.so:graphics/openexr \ libImath.so:graphics/ilmbase 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 .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 post-patch: .if ${CHOSEN_COMPILER_TYPE} == clang ${REINPLACE_CMD} -e '/altivec.h/d' ${WRKSRC}/gegl/opencl/cl_platform.h .endif .include Index: head/graphics/gegl/distinfo =================================================================== --- head/graphics/gegl/distinfo (revision 527131) +++ head/graphics/gegl/distinfo (revision 527132) @@ -1,3 +1,3 @@ -TIMESTAMP = 1577439289 -SHA256 (gegl-0.4.18.tar.xz) = c946dfb45beb7fe0fb95b89a25395b449eda2b205ba3e8a1ffb1ef992d9eca64 -SIZE (gegl-0.4.18.tar.xz) = 4812756 +TIMESTAMP = 1582643758 +SHA256 (gegl-0.4.22.tar.xz) = 1888ec41dfd19fe28273795c2209efc1a542be742691561816683990dc642c61 +SIZE (gegl-0.4.22.tar.xz) = 4826748 Index: head/graphics/gegl/pkg-plist =================================================================== --- head/graphics/gegl/pkg-plist (revision 527131) +++ head/graphics/gegl/pkg-plist (revision 527132) @@ -1,161 +1,162 @@ 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-matrix.h include/gegl-%%GEGL_VER%%/gegl-memory.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-handlers.h include/gegl-%%GEGL_VER%%/operation/gegl-operation-filter.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%%/gegl-common-cxx.so lib/gegl-%%GEGL_VER%%/gegl-common-gpl3.so lib/gegl-%%GEGL_VER%%/gegl-common.so lib/gegl-%%GEGL_VER%%/gegl-core.so lib/gegl-%%GEGL_VER%%/gegl-generated.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-fill.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.0.%%GEGL_MINOR%%.1 +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/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/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/ne/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_BR/LC_MESSAGES/gegl-%%GEGL_VER%%.mo share/locale/pt/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/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