media-libs/gstreamer: add 1.22.10, drop 1.22.3 (security)

- eclass / gst-plugins-good: Add "soup" option in the special cases
- gst-plugins-good: Backport fix against tests being enabled on libsoup
  presence automagic-style
  <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6058>

Closes: https://bugs.gentoo.org/836163
Closes: https://bugs.gentoo.org/908978
Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Signed-off-by: Mart Raudsepp <leio@gentoo.org>

3 files changed, 74 insertions, 5 deletions

diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index 06d2c58ba58e..cb1792d93f32 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -1,3 +1,3 @@
 DIST gst-plugins-good-1.20.5.tar.xz 3439904 BLAKE2B 682f8577ad048d5db5a3517fa2d3615ea902507b9aedf45da9b12e77d993e2200fd85014fd0ed9a602dfae2a1cfc420158d7d309a4b4106ac1e7b3165ef73ec9 SHA512 d8a4f4605f1da9199a6fa3cde065f5d4c550772cf085e9e05ed5ff6e44b0375d72f473a9c73346ce329f924a0b58e386358f5045ac0bee767117ef28a9f1b394
 DIST gst-plugins-good-1.20.6.tar.xz 3438312 BLAKE2B dcb948a6ec357fe5bac3c5bcdf395dcec05634421d8bea125c89a4d47362a848890d451379b714f754094d763f68311a26b519ff503298aed3d04e6655c8588a SHA512 ee2463aa339baa2b8e52bba200c919871c4ce459b18ac74f998429ef55a41b34afdd2ba28b00810a5e508233ad79e6286d6b08c4755a29d0a2628ccf50bcedbf
-DIST gst-plugins-good-1.22.3.tar.xz 2826224 BLAKE2B 5e1c19442ca25e81312f34c91c5154022b253b2223dcea8fb8f0351dc4d465663323aa69b534c1bd47b68ace9d33722923ffedef6b8e663beac37b2d8cf23877 SHA512 915352911f0ee2b1b15ff83514c6ca7e1ca8c2f122eac0c4c47539e8dcc2233a6f8478e083555af8b254d9a541923aa74e106a404b56fb8a732ea53421c3d6ca
+DIST gst-plugins-good-1.22.10.tar.xz 2840828 BLAKE2B 1535c22e056ad924b2ebdd0ec57853731a2a415d9e22af7366ace984a45a147f12a9fc54503fba0637d3e55f8858015c05f5b18008712ad95388d197cdeaf49b SHA512 cf2e28b1f726d39239d701804fb2faa0eeba7908c2995bec2b368d8b2ea45f349b458a30fe8638145600b0ede65dc096d4352f3c49e6affa2443e71479a8a59e
diff --git a/media-libs/gst-plugins-good/files/gst-plugins-good-1.22.9-soup-tests-automagic.patch b/media-libs/gst-plugins-good/files/gst-plugins-good-1.22.9-soup-tests-automagic.patch
new file mode 100644
index 000000000000..84df443927db
--- /dev/null
+++ b/media-libs/gst-plugins-good/files/gst-plugins-good-1.22.9-soup-tests-automagic.patch
@@ -0,0 +1,71 @@
+From 63322705c878dd391f0fa4c13dd3737d7f1c1aed Mon Sep 17 00:00:00 2001
+From: Nirbheek Chauhan <nirbheek@centricular.com>
+Date: Mon, 5 Feb 2024 22:39:29 +0530
+Subject: [PATCH] good/tests: Don't enable soup tests if soup is disabled
+
+Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3268
+
+Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6058>
+---
+ .../gst-plugins-good/tests/check/meson.build  | 24 ++++++++++++-------
+ 1 file changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/tests/check/meson.build b/tests/check/meson.build
+index 3a4b5c99a67..0871323abcf 100644
+--- a/tests/check/meson.build
++++ b/tests/check/meson.build
+@@ -128,12 +128,6 @@ endif
+ # FIXME: valgrind elements/rtp-payloading - needs fixing
+ # elements/videocrop should be disabled since it takes way too long in valgrind
+ 
+-libsoup2_dep = dependency('libsoup-2.4', version : '>=2.48',
+-                          required : false, fallback : ['libsoup', 'libsoup_dep'],
+-                          default_options: ['sysprof=disabled'])
+-libsoup3_dep = dependency('libsoup-3.0', required : false,
+-                           fallback : ['libsoup3', 'libsoup_dep'])
+-
+ # FIXME: unistd dependency or not tested yet on windows
+ if host_machine.system() != 'windows'
+   good_tests += [
+@@ -145,8 +139,6 @@ if host_machine.system() != 'windows'
+     [ 'elements/jpegdec', not jpeglib.found() ],
+     [ 'elements/jpegenc', not jpeglib.found() ],
+     [ 'elements/mpg123audiodec', not mpg123_dep.found(), [gstfft_dep]],
+-    [ 'elements/souphttpsrc', not libsoup2_dep.found(), [libsoup2_dep], [], 'elements/souphttpsrc2'],
+-    [ 'elements/souphttpsrc', not libsoup3_dep.found(), [libsoup3_dep], [], 'elements/souphttpsrc3'],
+     [ 'elements/id3v2mux', not taglib_dep.found() ],
+     [ 'elements/apev2mux', not taglib_dep.found() ],
+     [ 'elements/vp8enc', not vpx_dep.found() or not have_vp8_encoder ],
+@@ -159,6 +151,20 @@ if host_machine.system() != 'windows'
+   ]
+ endif
+ 
++if get_option('soup').allowed()
++  libsoup3_dep = dependency('libsoup-3.0', required : false,
++                             fallback : ['libsoup3', 'libsoup_dep'])
++  libsoup2_dep = dependency('libsoup-2.4', version : '>=2.48',
++                            required : false, fallback : ['libsoup', 'libsoup_dep'],
++                            default_options: ['sysprof=disabled'])
++
++  if libsoup3_dep.found()
++    good_tests += [['elements/souphttpsrc', false, [libsoup3_dep], []]]
++  elif libsoup2_dep.found()
++    good_tests += [['elements/souphttpsrc', false, [libsoup2_dep], []]]
++  endif
++endif
++
+ test_defines = [
+   '-UG_DISABLE_ASSERT',
+   '-UG_DISABLE_CAST_CHECKS',
+@@ -204,7 +210,7 @@ test_deps = [gst_dep, gstbase_dep, gstnet_dep, gstcheck_dep, gstaudio_dep,
+ # FIXME: add valgrind suppression common/gst.supp gst-plugins-good.supp
+ foreach t : good_tests
+   fname = '@0@.c'.format(t.get(0))
+-  test_name = t.get(4, t.get(0)).underscorify()
++  test_name = t.get(0).underscorify()
+   extra_sources = t.get(3, [ ])
+   extra_deps = t.get(2, [ ])
+   skip_test = t.get(1, false)
+-- 
+GitLab
+
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.22.3-r2.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.22.10.ebuild
index aedf63adee75..69efc3d2564f 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.22.3-r2.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.22.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,9 +26,7 @@ BDEPEND=""
 
 DOCS=( AUTHORS ChangeLog NEWS README.md RELEASE )
 
-# Fixes backported to 1.20.1, to be removed in 1.20.2+
-PATCHES=(
-)
+PATCHES=( "${FILESDIR}/gst-plugins-good-1.22.9-soup-tests-automagic.patch" )
 
 multilib_src_configure() {
 	GST_PLUGINS_NOAUTO="bz2"