Upgrade to upstream version 0.4.36

The lib32-ffmpeg build-time dependency version is fixed as 2:4.4
temporarily because the 5.0 release has removed some required functions
and fields.

This issue is reported to upstream at
https://gitlab.gnome.org/GNOME/gegl/-/issues/301

10 files changed, 155 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3c45472f68b7..b64f446e4997 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Feb  4 14:14:33 UTC 2022
+# Fri Mar  4 16:29:09 UTC 2022
 pkgbase = lib32-gegl
 	pkgdesc = Graph based image processing framework (32-bit)
-	pkgver = 0.4.34
+	pkgver = 0.4.36
 	pkgrel = 1
 	url = https://www.gegl.org/
 	arch = x86_64
@@ -20,7 +20,7 @@ pkgbase = lib32-gegl
 	makedepends = gobject-introspection
 	makedepends = lib32-sdl2
 	makedepends = python-gobject
-	depends = gegl>=0.4.34
+	depends = gegl>=0.4.36
 	depends = lib32-babl
 	depends = lib32-libspiro
 	depends = lib32-json-glib
@@ -34,12 +34,30 @@ pkgbase = lib32-gegl
 	depends = lib32-luajit
 	depends = lib32-jasper
 	depends = lib32-suitesparse
-	depends = lib32-ffmpeg
-	source = git+https://gitlab.gnome.org/GNOME/gegl.git#commit=9aaf6b3525f3917c2d6add866afd33e4ee28510b
+	depends = lib32-ffmpeg=2:4.4
+	depends = lib32-libffmpeg=2:4.4
+	depends = ffmpeg4.4
+	source = git+https://gitlab.gnome.org/GNOME/gegl.git#commit=31763e39265adab1142418f6d5cedbd4d3581e06
 	source = x86-linux-gnu
+	source = libavcodec.pc
+	source = libavdevice.pc
+	source = libavfilter.pc
+	source = libavformat.pc
+	source = libavutil.pc
+	source = libpostproc.pc
+	source = libswresample.pc
+	source = libswscale.pc
 	source = sdl2.pc
 	sha512sums = SKIP
 	sha512sums = 0d1cd8d934db76b93ecb85d41badd95800a7bf9b80dfe80c91d457cc778a4604bd0015ef1a05056990d9d80a5a32d23c05d06a2a5102714d2dd01b97947dc5f8
+	sha512sums = 69a2cff0db30b445dbf8adf80b7b63b5f28631bf02f43c3ed0d02e11d162a6f01b9a661a760af6542b21c1d393a61d317ad430c835a54353a778a22279bbc0bd
+	sha512sums = 2874ebb198713a34f0859659c6e62872c8a5b87e25b61567395a4bb02530d321ddb0dd90cd00870c2ae0254ac797a835f8b4a70ba59aef55a2daa2d7ffb7e04c
+	sha512sums = a4bee13b833b10c14032bbabcf2956e99ea998081020ef1e5228d9417d4c58fd69106d59c56dc26089529c2b9ab41cb6038947df2c325bda4479161e4f181543
+	sha512sums = ecdf5a5bb36d5f5fabd26f44530664dfd65528e320642ebc0e2bb8d00d4849f0b3a6939693bf926d7f92a0b7cb868638c02ca21016e4f9cd0a9605fbe6693b03
+	sha512sums = 19e2f5c180b74bbe267f4ce48f8be35d893d17c9f9d86d15e35a271e2b522fa9e1b26255fef27f10dbcca3678d499c7b9080823bfc63ee28c8159722d7f11a24
+	sha512sums = 73de53df341355ea7a616eb8f81b301ac2273c24ba39973b26ae5793f82c1e1f10b9f615159a04b7c662251402c6b74d5cd4a237676bf0205f7a73bacb868e96
+	sha512sums = d7497b7f4a009dd3219c0d2b5d6e67e8bb5bea3fb7efa63192d1b7853d48785ba94f6c0bd89756941e7bac992f5b9cadd0717386f73bf5c4529066c1f607d3df
+	sha512sums = 17bc7a78872deef6f5cc5fe8110535070d5eecd6cd67f261c512d8b6922c0ab29e7b3ff0d4708db4c0643dd9e98e673cd745cfab6f6615ddf40f9eb7f47fec9d
 	sha512sums = 00767b84218d5105d4e3f88f1e43d284ba7f3fbd81204f303e0c245a5d5859f812b32bc61b3faaacb97d7ee7fc509b365bcaa167c849c61f3d95621ca0f8fa51
 
 pkgname = lib32-gegl
diff --git a/PKGBUILD b/PKGBUILD
index 0f8ecc66fe72..db95c567315f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgname=lib32-gegl
 _pkgbase=gegl
-pkgver=0.4.34
-_commit=9aaf6b3525f3917c2d6add866afd33e4ee28510b # tags/GEGL_0_4_34
+pkgver=0.4.36
+_commit=31763e39265adab1142418f6d5cedbd4d3581e06  # tags/GEGL_0_4_36
 pkgrel=1
 pkgdesc="Graph based image processing framework (32-bit)"
 arch=('x86_64')
@@ -17,15 +17,32 @@ depends=("gegl>=$pkgver"
          'lib32-librsvg' 'lib32-libtiff'
          'lib32-lensfun' 'lib32-luajit'
          'lib32-jasper'
-         'lib32-suitesparse' 'lib32-ffmpeg')
+         'lib32-suitesparse'
+         'lib32-ffmpeg=2:4.4' 'lib32-libffmpeg=2:4.4' 'ffmpeg4.4')
 makedepends=('intltool' 'ruby' 'mesa' 'glu' 'exiv2' 'meson' 'vala'
              'xorgproto' 'shared-mime-info' 'gobject-introspection'
              'lib32-sdl2' 'python-gobject')
 source=("git+https://gitlab.gnome.org/GNOME/$_pkgbase.git#commit=$_commit"
         "x86-linux-gnu"
+        "libavcodec.pc"
+        "libavdevice.pc"
+        "libavfilter.pc"
+        "libavformat.pc"
+        "libavutil.pc"
+        "libpostproc.pc"
+        "libswresample.pc"
+        "libswscale.pc"
         "sdl2.pc")
 sha512sums=('SKIP'
             '0d1cd8d934db76b93ecb85d41badd95800a7bf9b80dfe80c91d457cc778a4604bd0015ef1a05056990d9d80a5a32d23c05d06a2a5102714d2dd01b97947dc5f8'
+            '69a2cff0db30b445dbf8adf80b7b63b5f28631bf02f43c3ed0d02e11d162a6f01b9a661a760af6542b21c1d393a61d317ad430c835a54353a778a22279bbc0bd'
+            '2874ebb198713a34f0859659c6e62872c8a5b87e25b61567395a4bb02530d321ddb0dd90cd00870c2ae0254ac797a835f8b4a70ba59aef55a2daa2d7ffb7e04c'
+            'a4bee13b833b10c14032bbabcf2956e99ea998081020ef1e5228d9417d4c58fd69106d59c56dc26089529c2b9ab41cb6038947df2c325bda4479161e4f181543'
+            'ecdf5a5bb36d5f5fabd26f44530664dfd65528e320642ebc0e2bb8d00d4849f0b3a6939693bf926d7f92a0b7cb868638c02ca21016e4f9cd0a9605fbe6693b03'
+            '19e2f5c180b74bbe267f4ce48f8be35d893d17c9f9d86d15e35a271e2b522fa9e1b26255fef27f10dbcca3678d499c7b9080823bfc63ee28c8159722d7f11a24'
+            '73de53df341355ea7a616eb8f81b301ac2273c24ba39973b26ae5793f82c1e1f10b9f615159a04b7c662251402c6b74d5cd4a237676bf0205f7a73bacb868e96'
+            'd7497b7f4a009dd3219c0d2b5d6e67e8bb5bea3fb7efa63192d1b7853d48785ba94f6c0bd89756941e7bac992f5b9cadd0717386f73bf5c4529066c1f607d3df'
+            '17bc7a78872deef6f5cc5fe8110535070d5eecd6cd67f261c512d8b6922c0ab29e7b3ff0d4708db4c0643dd9e98e673cd745cfab6f6615ddf40f9eb7f47fec9d'
             '00767b84218d5105d4e3f88f1e43d284ba7f3fbd81204f303e0c245a5d5859f812b32bc61b3faaacb97d7ee7fc509b365bcaa167c849c61f3d95621ca0f8fa51')
 
 prepare() {
diff --git a/libavcodec.pc b/libavcodec.pc
new file mode 100644
index 000000000000..2b970f5ea5eb
--- /dev/null
+++ b/libavcodec.pc
@@ -0,0 +1,14 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib32
+includedir=/usr/include/ffmpeg4.4
+
+Name: libavcodec
+Description: FFmpeg codec library
+Version: 58.134.100
+Requires: 
+Requires.private: libswresample >= 3.9.100, libavutil >= 56.70.100
+Conflicts:
+Libs: -L${libdir}  -lavcodec 
+Libs.private: -L/usr/lib32 -lvpx -lm -L/usr/lib32 -lvpx -lm -L/usr/lib32 -lvpx -lm -L/usr/lib32 -lvpx -lm -L/usr/lib32 -lwebpmux -lwebp -pthread -lm -llzma -L/usr/lib32 -ldav1d -lopencore-amrwb -L/usr/lib32 -lrsvg-2 -lm -lgio-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lglib-2.0 -lcairo -L/usr/lib32 -lz -L/usr/lib32 -laom -lgsm -lmp3lame -lm -lopencore-amrnb -L/usr/lib32 -lopenjp2 -L/usr/lib32 -lopus -L/usr/lib32 -lspeex -ltheoraenc -ltheoradec -logg -L/usr/lib32 -lvorbis -L/usr/lib32 -lvorbisenc -L/usr/lib32 -lwebp -L/usr/lib32 -lx264 -L/usr/lib32 -lx265 -lxvidcore -L/usr/lib32 -lva
+Cflags: -I${includedir}
diff --git a/libavdevice.pc b/libavdevice.pc
new file mode 100644
index 000000000000..b9fa22208ca5
--- /dev/null
+++ b/libavdevice.pc
@@ -0,0 +1,14 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib32
+includedir=/usr/include/ffmpeg4.4
+
+Name: libavdevice
+Description: FFmpeg device handling library
+Version: 58.13.100
+Requires: 
+Requires.private: libavfilter >= 7.110.100, libswscale >= 5.9.100, libpostproc >= 55.9.100, libavformat >= 58.76.100, libavcodec >= 58.134.100, libswresample >= 3.9.100, libavutil >= 56.70.100
+Conflicts:
+Libs: -L${libdir}  -lavdevice 
+Libs.private: -lm -lraw1394 -lavc1394 -lrom1394 -liec61883 -L/usr/lib32 -ljack -L/usr/lib32 -ldrm -L/usr/lib32 -lxcb -L/usr/lib32 -lxcb-shm -L/usr/lib32 -lxcb-shape -L/usr/lib32 -lxcb-xfixes -L/usr/lib32 -lasound -L/usr/lib32 -lpulse -pthread -L/usr/lib32 -pthread -lSDL2 -L/usr/lib32 -lv4l2 -lXv -lX11 -lXext
+Cflags: -I${includedir}
diff --git a/libavfilter.pc b/libavfilter.pc
new file mode 100644
index 000000000000..5b16887499b2
--- /dev/null
+++ b/libavfilter.pc
@@ -0,0 +1,14 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib32
+includedir=/usr/include/ffmpeg4.4
+
+Name: libavfilter
+Description: FFmpeg audio/video filtering library
+Version: 7.110.100
+Requires: 
+Requires.private: libswscale >= 5.9.100, libpostproc >= 55.9.100, libavformat >= 58.76.100, libavcodec >= 58.134.100, libswresample >= 3.9.100, libavutil >= 56.70.100
+Conflicts:
+Libs: -L${libdir}  -lavfilter 
+Libs.private: -lm -L/usr/lib32 -lfribidi -L/usr/lib32 -lvmaf -pthread -L/usr/lib32 -lass -L/usr/lib32 -lva -L/usr/lib32 -lfontconfig -lfreetype -L/usr/lib32 -lfreetype
+Cflags: -I${includedir}
diff --git a/libavformat.pc b/libavformat.pc
new file mode 100644
index 000000000000..32e3462c7246
--- /dev/null
+++ b/libavformat.pc
@@ -0,0 +1,14 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib32
+includedir=/usr/include/ffmpeg4.4
+
+Name: libavformat
+Description: FFmpeg container format library
+Version: 58.76.100
+Requires: 
+Requires.private: libavcodec >= 58.134.100, libswresample >= 3.9.100, libavutil >= 56.70.100
+Conflicts:
+Libs: -L${libdir}  -lavformat 
+Libs.private: -lm -L/usr/lib32 -lxml2 -lbz2 -L/usr/lib32 -lmodplug -L/usr/lib32 -lbluray -lgmp -L/usr/lib32 -lz -L/usr/lib32 -lgnutls -L/usr/lib32 -lsrt
+Cflags: -I${includedir}
diff --git a/libavutil.pc b/libavutil.pc
new file mode 100644
index 000000000000..3c35bd2b35c0
--- /dev/null
+++ b/libavutil.pc
@@ -0,0 +1,14 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib32
+includedir=/usr/include/ffmpeg4.4
+
+Name: libavutil
+Description: FFmpeg utility library
+Version: 56.70.100
+Requires: 
+Requires.private: 
+Conflicts:
+Libs: -L${libdir}  -lavutil 
+Libs.private: -pthread -L/usr/lib32 -lva-drm -lva -L/usr/lib32 -lva-x11 -lva -lvdpau -lX11 -lm -L/usr/lib32 -ldrm -L/usr/lib32 -lva -lXv -lX11 -lXext
+Cflags: -I${includedir}
diff --git a/libpostproc.pc b/libpostproc.pc
new file mode 100644
index 000000000000..a6c78d6fb6d3
--- /dev/null
+++ b/libpostproc.pc
@@ -0,0 +1,14 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib32
+includedir=/usr/include/ffmpeg4.4
+
+Name: libpostproc
+Description: FFmpeg postprocessing library
+Version: 55.9.100
+Requires: 
+Requires.private: libavutil >= 56.70.100
+Conflicts:
+Libs: -L${libdir}  -lpostproc 
+Libs.private: -lm
+Cflags: -I${includedir}
diff --git a/libswresample.pc b/libswresample.pc
new file mode 100644
index 000000000000..14a82de16b24
--- /dev/null
+++ b/libswresample.pc
@@ -0,0 +1,14 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib32
+includedir=/usr/include/ffmpeg4.4
+
+Name: libswresample
+Description: FFmpeg audio resampling library
+Version: 3.9.100
+Requires: 
+Requires.private: libavutil >= 56.70.100
+Conflicts:
+Libs: -L${libdir}  -lswresample 
+Libs.private: -lm
+Cflags: -I${includedir}
diff --git a/libswscale.pc b/libswscale.pc
new file mode 100644
index 000000000000..112e09923beb
--- /dev/null
+++ b/libswscale.pc
@@ -0,0 +1,14 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib32
+includedir=/usr/include/ffmpeg4.4
+
+Name: libswscale
+Description: FFmpeg image rescaling library
+Version: 5.9.100
+Requires: 
+Requires.private: libavutil >= 56.70.100
+Conflicts:
+Libs: -L${libdir}  -lswscale 
+Libs.private: -lm
+Cflags: -I${includedir}