gegl: fix build with ffmpeg 5

3 files changed, 19 insertions, 18 deletions

diff --git a/gegl/.footprint b/gegl/.footprint
index de720b215..daed566da 100644
--- a/gegl/.footprint
+++ b/gegl/.footprint
@@ -8,17 +8,16 @@ drwxr-xr-x	root/root	usr/include/gegl-0.4/
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-audio-fragment.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-buffer-backend.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-buffer-enums.h
--rw-r--r--	root/root	usr/include/gegl-0.4/gegl-buffer.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-buffer-iterator.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-buffer-matrix2.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-buffer-swap.h
+-rw-r--r--	root/root	usr/include/gegl-0.4/gegl-buffer.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-color.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-cpuaccel.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-curve.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-debug.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-enums.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-graph-debug.h
--rw-r--r--	root/root	usr/include/gegl-0.4/gegl.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-init.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-lookup.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-math.h
@@ -28,8 +27,8 @@ drwxr-xr-x	root/root	usr/include/gegl-0.4/
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-metadatahash.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-metadatastore.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-node.h
--rw-r--r--	root/root	usr/include/gegl-0.4/gegl-operations-util.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-op.h
+-rw-r--r--	root/root	usr/include/gegl-0.4/gegl-operations-util.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-parallel.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-paramspecs.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-path.h
@@ -39,53 +38,54 @@ drwxr-xr-x	root/root	usr/include/gegl-0.4/
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-rectangle.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-scratch.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-tile-backend.h
--rw-r--r--	root/root	usr/include/gegl-0.4/gegl-tile.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-tile-handler.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-tile-source.h
+-rw-r--r--	root/root	usr/include/gegl-0.4/gegl-tile.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-types.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-utils.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/gegl-version.h
+-rw-r--r--	root/root	usr/include/gegl-0.4/gegl.h
 drwxr-xr-x	root/root	usr/include/gegl-0.4/npd/
 -rw-r--r--	root/root	usr/include/gegl-0.4/npd/deformation.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/npd/graphics.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/npd/lattice_cut.h
+-rw-r--r--	root/root	usr/include/gegl-0.4/npd/npd.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/npd/npd_common.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/npd/npd_debug.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/npd/npd_gegl.h
--rw-r--r--	root/root	usr/include/gegl-0.4/npd/npd.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/npd/npd_math.h
 drwxr-xr-x	root/root	usr/include/gegl-0.4/opencl/
+-rw-r--r--	root/root	usr/include/gegl-0.4/opencl/cl.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/opencl/cl_d3d10.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/opencl/cl_ext.h
--rw-r--r--	root/root	usr/include/gegl-0.4/opencl/cl_gl_ext.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/opencl/cl_gl.h
--rw-r--r--	root/root	usr/include/gegl-0.4/opencl/cl.h
+-rw-r--r--	root/root	usr/include/gegl-0.4/opencl/cl_gl_ext.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/opencl/cl_platform.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/opencl/gegl-cl-color.h
--rw-r--r--	root/root	usr/include/gegl-0.4/opencl/gegl-cl.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/opencl/gegl-cl-init.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/opencl/gegl-cl-random.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/opencl/gegl-cl-types.h
+-rw-r--r--	root/root	usr/include/gegl-0.4/opencl/gegl-cl.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/opencl/opencl.h
 drwxr-xr-x	root/root	usr/include/gegl-0.4/operation/
 -rw-r--r--	root/root	usr/include/gegl-0.4/operation/gegl-extension-handler.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/operation/gegl-operation-area-filter.h
--rw-r--r--	root/root	usr/include/gegl-0.4/operation/gegl-operation-composer3.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/operation/gegl-operation-composer.h
+-rw-r--r--	root/root	usr/include/gegl-0.4/operation/gegl-operation-composer3.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/operation/gegl-operation-context.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/operation/gegl-operation-filter.h
--rw-r--r--	root/root	usr/include/gegl-0.4/operation/gegl-operation.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/operation/gegl-operation-handlers.h
--rw-r--r--	root/root	usr/include/gegl-0.4/operation/gegl-operation-meta.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/operation/gegl-operation-meta-json.h
--rw-r--r--	root/root	usr/include/gegl-0.4/operation/gegl-operation-point-composer3.h
+-rw-r--r--	root/root	usr/include/gegl-0.4/operation/gegl-operation-meta.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/operation/gegl-operation-point-composer.h
+-rw-r--r--	root/root	usr/include/gegl-0.4/operation/gegl-operation-point-composer3.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/operation/gegl-operation-point-filter.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/operation/gegl-operation-point-render.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/operation/gegl-operation-property-keys.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/operation/gegl-operation-sink.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/operation/gegl-operation-source.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/operation/gegl-operation-temporal.h
+-rw-r--r--	root/root	usr/include/gegl-0.4/operation/gegl-operation.h
 drwxr-xr-x	root/root	usr/include/gegl-0.4/sc/
 -rw-r--r--	root/root	usr/include/gegl-0.4/sc/sc-common.h
 -rw-r--r--	root/root	usr/include/gegl-0.4/sc/sc-context.h
@@ -126,9 +126,9 @@ drwxr-xr-x	root/root	usr/lib/gegl-0.4/
 -rwxr-xr-x	root/root	usr/lib/gegl-0.4/vector-stroke.so
 drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/Gegl-0.4.typelib
--rwxr-xr-x	root/root	usr/lib/libgegl-0.4.so.0.433.1
-lrwxrwxrwx	root/root	usr/lib/libgegl-0.4.so.0 -> libgegl-0.4.so.0.433.1
 lrwxrwxrwx	root/root	usr/lib/libgegl-0.4.so -> libgegl-0.4.so.0
+lrwxrwxrwx	root/root	usr/lib/libgegl-0.4.so.0 -> libgegl-0.4.so.0.433.1
+-rwxr-xr-x	root/root	usr/lib/libgegl-0.4.so.0.433.1
 -rwxr-xr-x	root/root	usr/lib/libgegl-npd-0.4.so
 -rwxr-xr-x	root/root	usr/lib/libgegl-sc-0.4.so
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
diff --git a/gegl/.signature b/gegl/.signature
index 535adfa22..0189e9d04 100644
--- a/gegl/.signature
+++ b/gegl/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/fN9PIVEoPrc5DjezaH91lH1SZogIp1r2JG9l6e6KAGL4zOMBiJyaXAKHOlBaCsAFZj9LM7fVoKaO7mb0++Cvgs=
-SHA256 (Pkgfile) = 7aaee38c899b3ab437a73da0dd7bfe229865a2deee96386c3c4937b32b1c30bb
-SHA256 (.footprint) = eb678944f1d5b9f1d67cc24c93c341b69c122e3d28bc839543193c304883dc12
+RWSE3ohX2g5d/ffJz/oLLkfgj5MaqYhS/JYNQBUCWVVUWpnosqfarTYFEx3gHx3tfqsmYT+tye7aNb31tQBnq0S+EeHDlriacQU=
+SHA256 (Pkgfile) = 9494c210f5435c3848004037d46724224752f0189668f27c24ba6dfd00b9f5f5
+SHA256 (.footprint) = 20bcaf417a0e74879bf8564c30fd802d721c87d4fa41f4d52e66530aa72cf7d8
 SHA256 (gegl-0.4.34.tar.xz) = ef63f0bca5b431c6119addd834ca7fbb507c900c4861c57b3667b6f4ccfcaaaa
diff --git a/gegl/Pkgfile b/gegl/Pkgfile
index e2b232148..46458359a 100644
--- a/gegl/Pkgfile
+++ b/gegl/Pkgfile
@@ -2,7 +2,7 @@
 # URL: https://gegl.org/
 # Maintainer: Tim Biermann, tbier at posteo dot de
 # Depends on: babl gexiv2 json-glib librsvg poppler-glib graphviz
-# Optional: asciidoc ffmpeg gtk-doc jasper lcms2 ruby libsdl2 libspiro libwebp umfpack v4l-utils vala lensfun libopenraw libumfpack luajit openexr
+# Optional: asciidoc ffmpeg4 gtk-doc jasper lcms2 ruby libsdl2 libspiro libwebp umfpack v4l-utils vala lensfun libopenraw libumfpack luajit openexr
 
 name=gegl
 version=0.4.34
@@ -11,6 +11,7 @@ source=(https://download.gimp.org/pub/$name/${version%.*}/$name-$version.tar.xz)
 
 build() {
   prt-get isinst vala || PKGMK_GEGL+=' -D vapigen=disabled'
+  prt-get isinst ffmpeg && export PKG_CONFIG_PATH='/usr/lib/ffmpeg4/pkgconfig'
   meson setup build $name-$version $PKGMK_GEGL \
     --prefix=/usr \
     --buildtype=plain \