gentoo auto-resync : 07:01:2025 - 06:41:06

4 files changed, 97 insertions, 2 deletions

diff --git a/media-plugins/gst-plugins-webrtc/Manifest b/media-plugins/gst-plugins-webrtc/Manifest
index 79fb876d920a..6fbb3c5659e9 100644
--- a/media-plugins/gst-plugins-webrtc/Manifest
+++ b/media-plugins/gst-plugins-webrtc/Manifest
@@ -1,7 +1,10 @@
+AUX gst-plugins-webrtc-1.24.10-disable-srtp-sctp-dtls-options.patch 1800 BLAKE2B b3b1352b28dfbfa0be753dfdda777040aae27f2d5bd03e763d2febbee2758a59f426910dcc9152f5d17c742d6a0362b59ff31f35968574b9b582577ceb429c1b SHA512 99303954d3ac5e8254399c76fac75b36e65f45c008a8b8f274226abfc8cf38f5f1f8b8365b606445524e8188546ccb5876aecb47aa0f1bf59c6b4e3dee6591eb
 DIST gst-plugins-bad-1.22.11.tar.xz 5552716 BLAKE2B 2b1106f22114c6133d27c4cf8ea00af7efb60a21239b9a7655e35550ffa8401e5c04f9b4894d3ad74126ca67c3eb840b2257c86ad4f78ada208606f679e70fb4 SHA512 cf1901b4d4459be253d00bb65fdf6c86920ad4f034d91bd278509dfcb4e1729fdbedc127aebcd4470cc24c841d94e4199ef60747576b881ded6afc6d41985c70
 DIST gst-plugins-bad-1.22.12.tar.xz 5555004 BLAKE2B d15aa65ffef15e691f84882ee76ce9d3f6e2ec31a95f1c18f56ebcda93043faa11fcd0f0d4d5783fc5aaeac020fe139449651c2008b9ff56a6853d9c55bfd2f7 SHA512 3de9decfce7f16308b077ef687cebc665f9cad7ed327fc0cc816e93c0c842dfbabf673e42cf8915c83d2f80d8ba9496508bc3b94dd587c4ae39798f67682f0bb
 DIST gst-plugins-bad-1.24.10.tar.xz 7078644 BLAKE2B 928a79f10e93cad4bddfa1a8ce31ea2ea61e7e0424ed83789ed08c52d44665ce9da44a8b79c5f1b29cb69371ad220daafc741cf1c3bb3eababe0636dbd1b994d SHA512 b4f0ca2899052ba48aca2b4364479cfe580f6150e2b2b043e2a0e687409f5529f548fa06dedd73733d857c1243871426668664228d74bbdfcbd7ed35aea24189
+DIST gst-plugins-bad-1.24.11.tar.xz 7081520 BLAKE2B 5f1114eb20ff7426cd1edc568b535fcf93c5c819a04cc9d86e729ae0b5bd5984d79cd8cbf674fa0ed01c07d1faf3551b8415745b681b4941ad848869db256974 SHA512 12925f006a4a4b848fc4daf772688c8c1c0efe14aceb823954b4c05fcc2305bde1e8d9b7183a833299162de1e6ab5667d9865dee54851cc02d17cb61e72ae066
 EBUILD gst-plugins-webrtc-1.22.11.ebuild 1093 BLAKE2B dddf310ee62b065b2956e1118119b9750b4ea792ee98f69fb2464fa9ec7e227ee98f0d525b139b5468f0cbb364a1e52eb9d3cc86d7ccb98ed5a0361ff935942c SHA512 80d613c029a79c5ff37dd4501cbf903ae40369428b3f6de6596e7cf83e388885952d7ed3ad158e73eee082f9a7de8bba86e512bf0fe626119a9d6df0d4f6814e
 EBUILD gst-plugins-webrtc-1.22.12.ebuild 1093 BLAKE2B ba6d5534786bfdb2a849e4e0fd7678924f66a1ef9b8e038f127be575ad776737fdc497dba7db77d09584e84c5dc939e2cff2be2660208692fbafd6a3eda3dc6c SHA512 4846ab06c48641d58698155cb44ac494d959a5439c25f528d261ad8bc17cc7a4f590c38f9527ede65a7640a1d8e73d79ac6148727e9e02357eed25641ef73396
-EBUILD gst-plugins-webrtc-1.24.10.ebuild 1051 BLAKE2B d12c1f3cde8e0dba4505566287a298f69727c83b39e11e035699854115171996ddd62dd65b2f1e9570f42539903f502fa6fbaa99771c564681ed443de5f69b4a SHA512 97e1d0b606a9daf4765cc49f68a0381d0f390f0611fbc8eb58f8a0abadc8f81bb33f0052ed56e627d2f25f5c9fec420d24f6151ab5b6552ec88dcb7760c2dab2
+EBUILD gst-plugins-webrtc-1.24.10-r1.ebuild 1130 BLAKE2B 7d5261ebcecf3dc879a5a5d726a65c71cdb161d6ef2d2c975f219579096f20ec0b2dd629e8388cea35189f537aa6602ea4bbf7cfc6a6ed30e94a1a3358fe6950 SHA512 fbf97b3a963832bfc780cf715ae34803c222a3a70b4592f942c98c519099da5640276a11c5fb62250fc87dc5c908f05dccb146a99b7f7079db347f6150205a28
+EBUILD gst-plugins-webrtc-1.24.11.ebuild 1130 BLAKE2B 7d5261ebcecf3dc879a5a5d726a65c71cdb161d6ef2d2c975f219579096f20ec0b2dd629e8388cea35189f537aa6602ea4bbf7cfc6a6ed30e94a1a3358fe6950 SHA512 fbf97b3a963832bfc780cf715ae34803c222a3a70b4592f942c98c519099da5640276a11c5fb62250fc87dc5c908f05dccb146a99b7f7079db347f6150205a28
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-webrtc/files/gst-plugins-webrtc-1.24.10-disable-srtp-sctp-dtls-options.patch b/media-plugins/gst-plugins-webrtc/files/gst-plugins-webrtc-1.24.10-disable-srtp-sctp-dtls-options.patch
new file mode 100644
index 000000000000..208b36f37b67
--- /dev/null
+++ b/media-plugins/gst-plugins-webrtc/files/gst-plugins-webrtc-1.24.10-disable-srtp-sctp-dtls-options.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/947523
+
+Upstream decided to auto-enable srtp, sctp and dtls options, when the
+webrtc option is enabled.  This is going to partially revert upstream
+fd4828bafe613eec33e8f3faef5ab5181a73c8b6 to fix webrtc compilation.
+
+https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/fd4828bafe613eec33e8f3faef5ab5181a73c8b6
+
+../gst-plugins-bad-1.24.10/ext/dtls/meson.build:15:33: ERROR: Feature dtls cannot be disabled: webrtc option is enabled
+../gst-plugins-bad-1.24.10/ext/sctp/meson.build:8:33: ERROR: Feature sctp cannot be disabled: webrtc option is enabled
+../gst-plugins-bad-1.24.10/ext/srtp/meson.build:10:33: ERROR: Feature srtp cannot be disabled: webrtc option is enabled
+--- a/ext/dtls/meson.build
++++ b/ext/dtls/meson.build
+@@ -12,7 +12,7 @@ dtls_sources = [
+   'gstdtlselement.c',
+ ]
+ 
+-dtls_option = get_option('dtls').enable_if(get_option('webrtc').enabled(), error_message: 'webrtc option is enabled')
++dtls_option = get_option('dtls')
+ openssl_dep = dependency('openssl', version: '>= 1.0.1', required: dtls_option)
+ libcrypto_dep = dependency('libcrypto', required: dtls_option)
+ 
+--- a/ext/sctp/meson.build
++++ b/ext/sctp/meson.build
+@@ -5,8 +5,8 @@ sctp_sources = [
+   'sctpassociation.c'
+ ]
+ 
+-sctp_option = get_option('sctp').enable_if(get_option('webrtc').enabled(), error_message: 'webrtc option is enabled')
++sctp_option = get_option('sctp')
+ if sctp_option.disabled()
+   subdir_done()
+ endif
+ 
+--- a/ext/srtp/meson.build
++++ b/ext/srtp/meson.build
+@@ -7,8 +7,8 @@ srtp_sources = [
+ ]
+ 
+ srtp_cargs = []
+-srtp_option = get_option('srtp').enable_if(get_option('webrtc').enabled(), error_message: 'webrtc option is enabled')
++srtp_option = get_option('srtp')
+ if srtp_option.disabled()
+   srtp_dep = dependency('', required : false)
+   subdir_done()
+ endif
diff --git a/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.24.10.ebuild b/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.24.10-r1.ebuild
index b3ad0ad86c6e..c5366a1409a3 100644
--- a/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.24.10.ebuild
+++ b/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.24.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,6 +19,10 @@ DEPEND="${RDEPEND}"
 GST_PLUGINS_ENABLED="webrtc webrtcdsp"
 GST_PLUGINS_BUILD_DIR="webrtc webrtcdsp"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.24.10-disable-srtp-sctp-dtls-options.patch"
+)
+
 src_prepare() {
 	default
 	gstreamer_system_package \
diff --git a/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.24.11.ebuild b/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.24.11.ebuild
new file mode 100644
index 000000000000..c5366a1409a3
--- /dev/null
+++ b/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.24.11.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer-meson
+
+DESCRIPTION="WebRTC plugins for GStreamer"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	>=media-plugins/gst-plugins-sctp-${PV}:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/webrtc-audio-processing-1.0:1[${MULTILIB_USEDEP}]
+	>=net-libs/libnice-0.1.21[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_ENABLED="webrtc webrtcdsp"
+GST_PLUGINS_BUILD_DIR="webrtc webrtcdsp"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.24.10-disable-srtp-sctp-dtls-options.patch"
+)
+
+src_prepare() {
+	default
+	gstreamer_system_package \
+		gstwebrtc_dep:gstreamer-webrtc \
+		gstsctp_dep:gstreamer-sctp \
+		gstbadaudio_dep:gstreamer-bad-audio
+}
+
+multilib_src_install() {
+	# TODO: Fix this properly, see bug #907470 and bug #909079.
+	insinto /usr/$(get_libdir)
+	doins "${BUILD_DIR}"/ext/webrtc/libgstwebrtc.so
+	doins "${BUILD_DIR}"/gst-libs/gst/webrtc/nice/libgstwebrtcnice-1.0.so*
+	insinto /usr/include/gstreamer-1.0/gst/webrtc/nice
+	doins "${S}"/gst-libs/gst/webrtc/nice/*.h
+	gstreamer_multilib_src_install
+}