From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B9FA915812D for ; Mon, 06 Jan 2025 02:41:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AF8BAE077A; Mon, 06 Jan 2025 02:41:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 03345E077A for ; Mon, 06 Jan 2025 02:41:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA1BC33BE00 for ; Mon, 06 Jan 2025 02:41:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 40A25D81 for ; Mon, 06 Jan 2025 02:41:40 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1736131270.374d171b762a34a257b194de865c334572a70dd8.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-webrtc/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-plugins/gst-plugins-webrtc/files/gst-plugins-webrtc-1.24.10-disable-srtp-sctp-dtls-options.patch X-VCS-Directories: media-plugins/gst-plugins-webrtc/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 374d171b762a34a257b194de865c334572a70dd8 X-VCS-Branch: master Date: Mon, 06 Jan 2025 02:41:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f997e8ab-89f8-40a5-b9a1-0425aa9ff379 X-Archives-Hash: a21823ff9a50cebac362a2c6aba9fbf0 commit: 374d171b762a34a257b194de865c334572a70dd8 Author: Matthew White inventati org> AuthorDate: Mon Jan 6 01:40:30 2025 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jan 6 02:41:10 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=374d171b media-plugins/gst-plugins-webrtc: fix typo in patch file Change 'srtp_option -> sctp_option' in ext/sctp/meson.build, and reuse the 'srtp_option' variable in ext/srtp/meson.build. Package-Manager: portage-3.0.66.1-r1 Signed-off-by: Matthew White inventati.org> Closes: https://github.com/gentoo/gentoo/pull/39998 Signed-off-by: Sam James gentoo.org> .../gst-plugins-webrtc-1.24.10-disable-srtp-sctp-dtls-options.patch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 index 46e58707140b..208b36f37b67 100644 --- 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 @@ -27,9 +27,8 @@ https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/fd4828bafe613eec33e8 ] -sctp_option = get_option('sctp').enable_if(get_option('webrtc').enabled(), error_message: 'webrtc option is enabled') --if sctp_option.disabled() +sctp_option = get_option('sctp') -+if srtp_option.disabled() + if sctp_option.disabled() subdir_done() endif @@ -40,9 +39,8 @@ https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/fd4828bafe613eec33e8 srtp_cargs = [] -srtp_option = get_option('srtp').enable_if(get_option('webrtc').enabled(), error_message: 'webrtc option is enabled') --if srtp_option.disabled() +srtp_option = get_option('srtp') -+if get_option('srtp').disabled() + if srtp_option.disabled() srtp_dep = dependency('', required : false) subdir_done() endif