CVS commit: pkgsrc/graphics/gegl

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Nov  2 14:05:46 UTC 2019

Modified Files:
        pkgsrc/graphics/gegl: Makefile PLIST distinfo options.mk
        pkgsrc/graphics/gegl/patches: patch-gegl_gegl-config.c

Log Message:
gegl: Update to 0.4.18

GEGL-0.4.18 2019-10-27
----------------------

Build
~~~~~

Drop autotools, GEGL is now using meson, most things are working again now -
documentation/website build is a work in progress, many issues have been
fixed, more a sure to surface with this first meson only release following the
babl one.

Core
~~~~

Support ui labels and descriptions for aux pads of ops.
Guard against uint32_t overflows in memory computations, improved memory
usage stat on FreeBSD.
Added support for hygon dhyana architecture.
Added gegl_try_malloc and use it to allocate storage for tiles.
gegl-stats gained active- and assigned-threads members.

Buffer
~~~~~~

New API for aligning to regular tile grid, gegl_rectangle_align[_to_buffer]
added gegl_rectangle_xor
gegl_buffer_create_sub_bufer now always returns a new object.
Improved tile compression, more accurate accounting and avoidiance when it is
determinetal.
gegl_buffer_save : store BablSpace
take into consideration concurrent use of different tile sizes in
gegl_tile_alloc
Fast path for gegl_buffer_copy is entirely in abyss.
Improved api misuse handling in gegl_buffer_set|get
Improved consistency of results when doing COW of abyss.
Improved Gobject Intospection annotations.
Use a binary tree for tile swap, improving tile removal speed.
Avoid gegl_buffer_set avoid set_pixel fast path if level>0

Operations
~~~~~~~~~~

Dynamic computation of per-operation thread cost, making GEGL fully use available cores on more operations.

new operations:
  bayer-matrix, linear-sinusoid, color-assimilation-grid, normal-map.
new operations in workshop:
  boxblur, alpha-inpaint

pass-through for infinite planes for:
  apply-lens, polar-coordinates, whirl-pinch, convolution-matrix, maze,
  cartoon, waterpixels, tile, distance-transform, spherize, tile-paper, dither,
  mantiuk06, reinhard05, fattal02, fractal-trace, motion-blur-zoom,
  motion-blur-circular, wind, little-planet, mirrors, cubism and long-shdow.
improved property ranges/meta-data or copyright for:
  motion-blur-zoom, edge-neon, cartoon, photocopy, softglow, oilify, bump-map, remap,

convolution:
  fix source-buffer offsets of filtered-out components,
  avoiding excessive shifting.
jpg-save:
  force grayscale if incoming buffer is grayscale
sdl-display:
  port to SDL2
gamma:
  handle negative input values
apply-lens;
  enable auto threading
matting-global:
  disable auto threading, allocate less temporay memory.
maze:
  reimplemented without recursion
newsprint:
  added black pullout and per colorant pattern and period parameters, enable threading.
saturation:
  add a colormodel property which permits operating in RGB instead
of CIE Lab, enabling hue preserving saturation changes.
exr-load/exr-save:
  only use associated alpha with EXR files
ff-load:
  fix audio track decoding for pure audio files
c2g:
  fixed initialization data race and out of bounds array access when threaded.
color-enhance:
  fixed a buffer leak
perlin-noise:
  fix initialization race
domain-transform:
  faster nop for edge-preservation=1.0, support BablSpace
oilify:
  support specifying mask-radius with aux buffer
linear-gradient, readial-gradient:
  use colors in correct order.
pixelize:
  avoid potential glitches
weighted-blend:
  harmonize opencl implementation with C
edge-neon:
  performane improvements

GEGL UI
~~~~~~~

gcut video editor ui has been removed, all its functionality is latent in
the new media browser/manipulator/viewer UI.

Permit start/end times for playlist items, enabling use of folder as EDL.
Add ability loop currently shown media element.
Nearest neighbor decoding; for realtime playback of HD video content.
Frame-cache for rendered video frames (with associated PCM data)
Drag and drop from file-managers to collection view.

Contributors to this release:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Abderrahim Kitouni, Alexandre Prokoudine, Asier Sarasua Garmendia, Bruce
Cowan, Debarshi Ray, Dimitris Spingos, Ell, fanjinke, Félix Piédallu,
Jan Vesely, Jordi Mas, Marco Ciampa, Martin Srebotnjak, Michael Natterer,
Michael Schumacher, Niels De Graef, Øyvind Kolås, Pawan Chitrakar,
Piotr Drąg, Rodrigo Lledó, Sabri Ünal, Schwan Carl, Shlomi Fish, Stefan Brüns,
Thomas Manni and Ting-Wei Lan.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 pkgsrc/graphics/gegl/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/graphics/gegl/PLIST
cvs rdiff -u -r1.24 -r1.25 pkgsrc/graphics/gegl/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/gegl/options.mk
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/graphics/gegl/patches/patch-gegl_gegl-config.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/gegl/Makefile
diff -u pkgsrc/graphics/gegl/Makefile:1.76 pkgsrc/graphics/gegl/Makefile:1.77
--- pkgsrc/graphics/gegl/Makefile:1.76  Sun Jul 21 22:24:05 2019
+++ pkgsrc/graphics/gegl/Makefile       Sat Nov  2 14:05:46 2019
@@ -1,47 +1,48 @@
-# $NetBSD: Makefile,v 1.76 2019/07/21 22:24:05 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2019/11/02 14:05:46 nia Exp $
 
-DISTNAME=      gegl-0.4.16
-PKGREVISION=   2
+DISTNAME=      gegl-0.4.18
 CATEGORIES=    graphics
-MASTER_SITES=  http://download.gimp.org/pub/gegl/0.4/
-EXTRACT_SUFX=  .tar.bz2
+MASTER_SITES=  https://download.gimp.org/pub/gegl/0.4/
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    adam%NetBSD.org@localhost
 HOMEPAGE=      http://gegl.org/
 COMMENT=       Graph based image processing framework
 LICENSE=       gnu-gpl-v3
 
-USE_LANGUAGES=         c c++
-USE_LIBTOOL=           yes
-USE_TOOLS+=            gmake pkg-config intltool msgfmt
-GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --disable-docs
-CONFIGURE_ENV+=                ac_cv_path_ASCIIDOC=no
-CONFIGURE_ENV+=                ac_cv_path_ENSCRIPT=no
-CONFIGURE_ENV+=                ac_cv_path_SDL_CONFIG=no
-CONFIGURE_ENV+=                ac_cv_prog_RUBY=no
-PKGCONFIG_OVERRIDE+=   gegl.pc.in
+MESON_ARGS+=   -Dintrospection=false
+MESON_ARGS+=   -Dlibv4l=disabled
+MESON_ARGS+=   -Dlibv4l2=disabled
+
+USE_LANGUAGES= c c++
+USE_TOOLS+=    pkg-config xgettext
+USE_TOOLS+=    bash
 
-.include "../../mk/bsd.prefs.mk"
+PKGCONFIG_OVERRIDE+=   gegl.pc.in
 
-PLIST_VARS+=   v4l
+PYTHON_FOR_BUILD_ONLY= tool
 
-.if ${OPSYS} == "Linux" && exists(/usr/include/linux/videodev.h)
-PLIST.v4l=     yes
-.endif
+# ../gegl/opencl/gegl-cl-color.c:32:10: fatal error: opencl/colors.cl.h: No such file or directory
+# race condition in meson?
+pre-build:
+       cd ${WRKSRC}/opencl && for file in $$(ls -1 | grep '\.cl$$'); do \
+               ${PYTHONBIN} cltostring.py "$$file" "$$file".h \
+       ; done
 
 .include "options.mk"
-
-post-install:
-       cd ${DESTDIR}${PREFIX}/bin && ${MV} gcut gegl-gcut
-
-BUILDLINK_API_DEPENDS.babl+=   babl>=0.1.52
+.include "../../devel/meson/build.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.babl+=   babl>=0.1.72
 .include "../../graphics/babl/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../graphics/libwebp/buildlink3.mk"
+.include "../../lang/python/tool.mk"
 .include "../../textproc/json-glib/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/gegl/PLIST
diff -u pkgsrc/graphics/gegl/PLIST:1.23 pkgsrc/graphics/gegl/PLIST:1.24
--- pkgsrc/graphics/gegl/PLIST:1.23     Wed Jul 17 01:05:41 2019
+++ pkgsrc/graphics/gegl/PLIST  Sat Nov  2 14:05:46 2019
@@ -1,11 +1,9 @@
-@comment $NetBSD: PLIST,v 1.23 2019/07/17 01:05:41 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.24 2019/11/02 14:05:46 nia Exp $
 bin/gegl
-bin/gegl-gcut
 bin/gegl-imgcmp
 include/gegl-0.4/gegl-apply.h
 include/gegl-0.4/gegl-audio-fragment.h
 include/gegl-0.4/gegl-buffer-backend.h
-include/gegl-0.4/gegl-buffer-cl-iterator.h
 include/gegl-0.4/gegl-buffer-enums.h
 include/gegl-0.4/gegl-buffer-iterator.h
 include/gegl-0.4/gegl-buffer-matrix2.h
@@ -82,40 +80,47 @@ include/gegl-0.4/sc/sc-common.h
 include/gegl-0.4/sc/sc-context.h
 include/gegl-0.4/sc/sc-outline.h
 include/gegl-0.4/sc/sc-sample.h
-lib/gegl-0.4/exr-load.la
-lib/gegl-0.4/exr-save.la
-lib/gegl-0.4/gegl-common-cxx.la
-lib/gegl-0.4/gegl-common-gpl3.la
-lib/gegl-0.4/gegl-common.la
-lib/gegl-0.4/gegl-core.la
-lib/gegl-0.4/gegl-generated.la
-lib/gegl-0.4/gif-load.la
+lib/gegl-0.4/exr-load.so
+lib/gegl-0.4/exr-save.so
+lib/gegl-0.4/gegl-common-cxx.so
+lib/gegl-0.4/gegl-common-gpl3.so
+lib/gegl-0.4/gegl-common.so
+lib/gegl-0.4/gegl-core.so
+lib/gegl-0.4/gegl-generated.so
+lib/gegl-0.4/gif-load.so
 lib/gegl-0.4/grey2.json
-${PLIST.jasper}lib/gegl-0.4/jp2-load.la
-lib/gegl-0.4/jpg-load.la
-lib/gegl-0.4/jpg-save.la
-lib/gegl-0.4/lcms-from-profile.la
-lib/gegl-0.4/npd.la
-lib/gegl-0.4/npy-save.la
-lib/gegl-0.4/path.la
-lib/gegl-0.4/pixbuf.la
-lib/gegl-0.4/png-load.la
-lib/gegl-0.4/png-save.la
-lib/gegl-0.4/ppm-load.la
-lib/gegl-0.4/ppm-save.la
-lib/gegl-0.4/rgbe-load.la
-lib/gegl-0.4/rgbe-save.la
-lib/gegl-0.4/save-pixbuf.la
-lib/gegl-0.4/seamless-clone-compose.la
-lib/gegl-0.4/seamless-clone.la
-${PLIST.svg}lib/gegl-0.4/svg-load.la
-lib/gegl-0.4/text.la
-lib/gegl-0.4/transformops.la
-lib/gegl-0.4/vector-fill.la
-lib/gegl-0.4/vector-stroke.la
-lib/libgegl-0.4.la
-lib/libgegl-npd-0.4.la
-lib/libgegl-sc-0.4.la
+${PLIST.jasper}lib/gegl-0.4/jp2-load.so
+lib/gegl-0.4/jpg-load.so
+lib/gegl-0.4/jpg-save.so
+lib/gegl-0.4/lcms-from-profile.so
+lib/gegl-0.4/npd.so
+lib/gegl-0.4/npy-save.so
+lib/gegl-0.4/path.so
+lib/gegl-0.4/pixbuf-load.so
+lib/gegl-0.4/pixbuf-save.so
+lib/gegl-0.4/png-load.so
+lib/gegl-0.4/png-save.so
+lib/gegl-0.4/ppm-load.so
+lib/gegl-0.4/ppm-save.so
+lib/gegl-0.4/rgbe-load.so
+lib/gegl-0.4/rgbe-save.so
+lib/gegl-0.4/sdl2-display.so
+lib/gegl-0.4/seamless-clone-compose.so
+lib/gegl-0.4/seamless-clone.so
+${PLIST.svg}lib/gegl-0.4/svg-load.so
+lib/gegl-0.4/text.so
+lib/gegl-0.4/tiff-load.so
+lib/gegl-0.4/tiff-save.so
+lib/gegl-0.4/transformops.so
+lib/gegl-0.4/vector-fill.so
+lib/gegl-0.4/vector-stroke.so
+lib/gegl-0.4/webp-load.so
+lib/gegl-0.4/webp-save.so
+lib/libgegl-0.4.so
+lib/libgegl-0.4.so.0
+lib/libgegl-0.4.so.0.417.1
+lib/libgegl-npd-0.4.so
+lib/libgegl-sc-0.4.so
 lib/pkgconfig/gegl-0.4.pc
 lib/pkgconfig/gegl-sc-0.4.pc
 share/locale/bs/LC_MESSAGES/gegl-0.4.mo
@@ -136,6 +141,7 @@ share/locale/ko/LC_MESSAGES/gegl-0.4.mo
 share/locale/lv/LC_MESSAGES/gegl-0.4.mo
 share/locale/mr/LC_MESSAGES/gegl-0.4.mo
 share/locale/nb/LC_MESSAGES/gegl-0.4.mo
+share/locale/ne/LC_MESSAGES/gegl-0.4.mo
 share/locale/oc/LC_MESSAGES/gegl-0.4.mo
 share/locale/pl/LC_MESSAGES/gegl-0.4.mo
 share/locale/pt/LC_MESSAGES/gegl-0.4.mo

Index: pkgsrc/graphics/gegl/distinfo
diff -u pkgsrc/graphics/gegl/distinfo:1.24 pkgsrc/graphics/gegl/distinfo:1.25
--- pkgsrc/graphics/gegl/distinfo:1.24  Tue Jun 18 14:26:59 2019
+++ pkgsrc/graphics/gegl/distinfo       Sat Nov  2 14:05:46 2019
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.24 2019/06/18 14:26:59 ryoon Exp $
+$NetBSD: distinfo,v 1.25 2019/11/02 14:05:46 nia Exp $
 
-SHA1 (gegl-0.4.16.tar.bz2) = 49c2ce5a03137c6717056776559be015fb40c1df
-RMD160 (gegl-0.4.16.tar.bz2) = afbf13eb80749842548c73c1dbda349f7b257463
-SHA512 (gegl-0.4.16.tar.bz2) = 38eacbd53d9993ca99d061bf6f80553a86ff06bf42d1710403ac5f15629ccc9b1f4395ee7700a04cebc954ed7fe8745c5bef85453c9c56d89681dd53a1552b27
-Size (gegl-0.4.16.tar.bz2) = 7304904 bytes
-SHA1 (patch-gegl_gegl-config.c) = 25b2552180319c16b06251ac7d24924d09f1f5f1
+SHA1 (gegl-0.4.18.tar.xz) = fbb7415f8f9df63cd738f7ef51ef0f0ff65ecfbb
+RMD160 (gegl-0.4.18.tar.xz) = c33c56c7b839b508f9f89a1bf4ae51ccd6758ca2
+SHA512 (gegl-0.4.18.tar.xz) = e79874cd50e9f0c27c7dc9d9b952545c31d0a48e2b158aa54b92c3e933267877222f86ede7256f2528f18985dc85d6eadbcd809f7a3563efc4449ec7634f15fd
+Size (gegl-0.4.18.tar.xz) = 4812756 bytes
+SHA1 (patch-gegl_gegl-config.c) = a8e1f5f5394a33be2bcdcb05ec7654d06f7ad4bc

Index: pkgsrc/graphics/gegl/options.mk
diff -u pkgsrc/graphics/gegl/options.mk:1.2 pkgsrc/graphics/gegl/options.mk:1.3
--- pkgsrc/graphics/gegl/options.mk:1.2 Tue Jul 16 15:34:25 2019
+++ pkgsrc/graphics/gegl/options.mk     Sat Nov  2 14:05:46 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2019/07/16 15:34:25 nia Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/02 14:05:46 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gegl
 PKG_SUPPORTED_OPTIONS= svg jasper
@@ -10,6 +10,8 @@ PLIST_VARS+=  svg
 .if !empty(PKG_OPTIONS:Msvg)
 .include "../../graphics/librsvg/buildlink3.mk"
 PLIST.svg=     yes
+.else
+MESON_ARGS+=   -Dlibrsvg=disabled
 .endif
 
 PLIST_VARS+=   jasper
@@ -17,5 +19,5 @@ PLIST_VARS+=  jasper
 .include "../../graphics/jasper/buildlink3.mk"
 PLIST.jasper=  yes
 .else
-CONFIGURE_ARGS+=       --without-jasper
+MESON_ARGS+=   -Djasper=disabled
 .endif

Index: pkgsrc/graphics/gegl/patches/patch-gegl_gegl-config.c
diff -u pkgsrc/graphics/gegl/patches/patch-gegl_gegl-config.c:1.2 pkgsrc/graphics/gegl/patches/patch-gegl_gegl-config.c:1.3
--- pkgsrc/graphics/gegl/patches/patch-gegl_gegl-config.c:1.2   Tue Jun 18 14:26:59 2019
+++ pkgsrc/graphics/gegl/patches/patch-gegl_gegl-config.c       Sat Nov  2 14:05:46 2019
@@ -1,15 +1,17 @@
-$NetBSD: patch-gegl_gegl-config.c,v 1.2 2019/06/18 14:26:59 ryoon Exp $
+$NetBSD: patch-gegl_gegl-config.c,v 1.3 2019/11/02 14:05:46 nia Exp $
 
---- gegl/gegl-config.c.orig    2019-05-07 20:32:27.000000000 +0000
+Support NetBSD.
+
+--- gegl/gegl-config.c.orig    2019-10-26 23:01:07.000000000 +0000
 +++ gegl/gegl-config.c
-@@ -280,7 +280,11 @@ gegl_config_class_init (GeglConfigClass 
+@@ -319,7 +319,11 @@ gegl_config_class_init (GeglConfigClass 
      }
  #else
-     mem_total = sysconf (_SC_PHYS_PAGES) * sysconf (_SC_PAGESIZE);
-+#if defined(_SC_AVPHYS_PAGES)
-     mem_available = sysconf (_SC_AVPHYS_PAGES) * sysconf (_SC_PAGESIZE);
+     mem_total = (uint64_t) sysconf (_SC_PHYS_PAGES) * sysconf (_SC_PAGESIZE);
++#ifdef _SC_AVPHYS_PAGES
+     mem_available = (uint64_t) sysconf (_SC_AVPHYS_PAGES) * sysconf (_SC_PAGESIZE);
 +#else
-+    mem_available = sysconf (_SC_PHYS_PAGES) * sysconf (_SC_PAGESIZE);
++    mem_available = (uint64_t) sysconf (_SC_PHYS_PAGES) * sysconf (_SC_PAGESIZE);
 +#endif
  #endif