Index: head/graphics/gegl/Makefile =================================================================== --- head/graphics/gegl/Makefile (revision 501285) +++ head/graphics/gegl/Makefile (revision 501286) @@ -1,149 +1,152 @@ # Created by: Pietro Cerutti # $FreeBSD$ PORTNAME= gegl -PORTVERSION= 0.4.12 -PORTREVISION= 3 +PORTVERSION= 0.4.14 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 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:c11 cpe gettext gmake gnome jpeg libtool localbase \ +USES= compiler:c++14-lang cpe gettext gmake gnome jpeg libtool localbase \ pathfix pkgconfig shebangfix uniquefiles tar:bzip2 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 -GEGL_MINOR= 412 +GEGL_MINOR= 414 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 EXIV2 FFMPEG PIXBUF GRAPHVIZ JASPER \ - LUA OPENEXR RAW PANGO LIBRSVG2 SDL SPIRO V4L \ + LUA OPENEXR RAW PANGO POPPLER LIBRSVG2 SDL SPIRO V4L \ EXAMPLES LCMS2 WEBP TIFF GEXIV2 OPTIONS_DEFAULT=CAIRO ENSCRIPT EXIV2 PIXBUF GRAPHVIZ JASPER LCMS2 LUA \ - 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_CONFIGURE_WITH= gdk-pixbuf CAIRO_USE= GNOME=cairo CAIRO_CONFIGURE_WITH= cairo PANGO_USE= GNOME=pango PANGO_CONFIGURE_WITH= 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 GRAPHVIZ_LIB_DEPENDS= libcgraph.so:graphics/graphviz GRAPHVIZ_CONFIGURE_WITH= graphviz JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper JASPER_CONFIGURE_WITH= jasper LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 LCMS2_CONFIGURE_OFF= --without-lcms LUA_USES= lua LUA_CONFIGURE_WITH= lua OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr \ libImath.so:graphics/ilmbase OPENEXR_CONFIGURE_WITH= openexr RAW_LIB_DEPENDS= libraw.so:graphics/libraw RAW_CONFIGURE_WITH= libraw LIBRSVG2_USE= GNOME=librsvg2 LIBRSVG2_CONFIGURE_OFF= --without-librsvg SDL_USE= SDL=sdl +SDL_USES= sdl SDL_CONFIGURE_WITH= sdl SPIRO_LIB_DEPENDS= libspiro.so:graphics/libspiro SPIRO_CONFIGURE_WITH= libspiro V4L_BUILD_DEPENDS= v4l_compat>=0:multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l V4L_CONFIGURE_WITH= libv4l V4L_VARS= LICENSE+=LGPL20+ WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_CONFIGURE_WITH= 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 EXIV2_LIB_DEPENDS= libexiv2.so:graphics/exiv2 EXIV2_CONFIGURE_WITH= exiv2 GEXIV2_LIB_DEPENDS= libgexiv2.so:graphics/gexiv2 GEXIV2_CONFIGURE_WITH= gexiv2 TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_CONFIGURE_WITH= libtiff .include .if ${PORT_OPTIONS:MPANGO} && ${PORT_OPTIONS:MCAIRO} PLIST_SUB+= PANGOCAIRO="" .else CONFIGURE_ARGS+=--without-pangocairo 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 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 Index: head/graphics/gegl/distinfo =================================================================== --- head/graphics/gegl/distinfo (revision 501285) +++ head/graphics/gegl/distinfo (revision 501286) @@ -1,3 +1,3 @@ -TIMESTAMP = 1543060134 -SHA256 (gegl-0.4.12.tar.bz2) = e967293eabe89257e1d511bf68435fbfd44e6e0f9ef51b86cc50781f09eb5852 -SIZE (gegl-0.4.12.tar.bz2) = 7065555 +TIMESTAMP = 1555532285 +SHA256 (gegl-0.4.14.tar.bz2) = 4c01d58599d8ddb3714effd2675ea1863272cf2d7d9ed3d32aee80c89f859901 +SIZE (gegl-0.4.14.tar.bz2) = 7209142 Index: head/graphics/gegl/files/patch-gegl_gegl-config.c =================================================================== --- head/graphics/gegl/files/patch-gegl_gegl-config.c (nonexistent) +++ head/graphics/gegl/files/patch-gegl_gegl-config.c (revision 501286) @@ -0,0 +1,70 @@ +--- gegl/gegl-config.c.orig 2019-04-17 20:23:56 UTC ++++ gegl/gegl-config.c +@@ -34,6 +34,9 @@ + #include + #endif + ++#include ++#include ++ + G_DEFINE_TYPE (GeglConfig, gegl_config, G_TYPE_OBJECT) + + static GObjectClass * parent_class = NULL; +@@ -219,8 +222,8 @@ gegl_config_class_init (GeglConfigClass *klass) + long mem_total = default_tile_cache_size; + long mem_min = 512 << 20; // 512mb + long mem_available = mem_min; ++ + #ifdef G_OS_WIN32 +-#ifdef G_OS_WIN32 + # if defined(_MSC_VER) && (_MSC_VER <= 1200) + MEMORYSTATUS memory_status; + memory_status.dwLength = sizeof (memory_status); +@@ -240,7 +243,46 @@ gegl_config_class_init (GeglConfigClass *klass) + mem_available = memory_status.ullAvailPhys; + } + # endif +-#endif ++#elif defined(__APPLE__) ++ /* get total memory from the HW_MEMSIZE */ ++ int64_t usermem; ++ size_t len = sizeof usermem; ++ static int mib[2] = { CTL_HW, HW_MEMSIZE }; ++ ++ if (sysctl (mib, 2, &usermem, &len, NULL, 0) == 0) { ++ mem_total = usermem; ++ } ++ /* and available mem from host_statistics64 */ ++ vm_size_t page_size = sysconf (_SC_PAGESIZE); ++ mach_port_t host = mach_host_self (); ++ vm_statistics64_data_t vm_stat; ++ kern_return_t kret; ++ unsigned int count = HOST_VM_INFO64_COUNT; ++ ++ kret = host_statistics64 (host, HOST_VM_INFO64, (host_info64_t)&vm_stat, &count); ++ ++ if (kret == KERN_SUCCESS) ++ { ++ mem_available = (long) (vm_stat.free_count + vm_stat.active_count ++ + vm_stat.inactive_count ++# ifdef MAC_OS_X_VERSION_10_9 ++ + vm_stat.compressor_page_count ++# endif ++ ) * page_size; ++ mach_port_deallocate (mach_task_self (), host); ++ } ++#elif defined(__FreeBSD__) ++ ++ size_t len = sizeof(unsigned int); ++ unsigned int realmem, physmem; ++ ++ if(sysctlbyname("hw.realmem", &realmem, &len, NULL, 0)) { ++ mem_total = (int64_t) realmem; ++ }; ++ ++ if (sysctlbyname("hw.physmem", &physmem, &len, NULL, 0)) { ++ mem_available = physmem; ++ } + + #else + mem_total = sysconf (_SC_PHYS_PAGES) * sysconf (_SC_PAGESIZE); Property changes on: head/graphics/gegl/files/patch-gegl_gegl-config.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/gegl/pkg-plist =================================================================== --- head/graphics/gegl/pkg-plist (revision 501285) +++ head/graphics/gegl/pkg-plist (revision 501286) @@ -1,166 +1,171 @@ 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-iterator2.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.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 %%PIXBUF%%lib/gegl-%%GEGL_VER%%/save-pixbuf.so %%SDL%%lib/gegl-%%GEGL_VER%%/sdl-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%%.0 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 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/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 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