[gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-webrtc/files/

[gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-webrtc/files/

[Sam James]

commit:     f0b8e8de39b31cb13635336e7bd122790ad32f61
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  6 01:16:36 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 01:21:41 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0b8e8de

media-plugins/gst-plugins-webrtc: simplify webrtc-only patch

Bug: https://bugs.gentoo.org/947523
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...tc-1.24.10-disable-srtp-sctp-dtls-options.patch | 68 ++++++----------------
 1 file changed, 17 insertions(+), 51 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 d3386feb7d1f..46e58707140b 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
@@ -1,3 +1,5 @@
+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.
@@ -5,78 +7,42 @@ 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
-
-diff -Nuar a/ext/dtls/meson.build b/ext/dtls/meson.build
---- a/ext/dtls/meson.build	2025-01-05 20:40:34.043318811 +0000
-+++ b/ext/dtls/meson.build	2025-01-05 20:41:23.503318674 +0000
-@@ -12,9 +12,8 @@
+--- 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')
--openssl_dep = dependency('openssl', version: '>= 1.0.1', required: dtls_option)
--libcrypto_dep = dependency('libcrypto', required: dtls_option)
-+openssl_dep = dependency('openssl', version : '>= 1.0.1', required : get_option('dtls'))
-+libcrypto_dep = dependency('libcrypto', required : get_option('dtls'))
++dtls_option = get_option('dtls')
+ openssl_dep = dependency('openssl', version: '>= 1.0.1', required: dtls_option)
+ libcrypto_dep = dependency('libcrypto', required: dtls_option)
  
- if openssl_dep.found() and libcrypto_dep.found()
-   gstdtls = library('gstdtls',
-
-diff -Nuar a/ext/sctp/meson.build b/ext/sctp/meson.build
---- a/ext/sctp/meson.build	2025-01-05 20:48:48.867317441 +0000
-+++ b/ext/sctp/meson.build	2025-01-05 20:50:03.807317233 +0000
-@@ -5,8 +5,7 @@
+--- 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')
 -if sctp_option.disabled()
-+if get_option('sctp').disabled()
++sctp_option = get_option('sctp')
++if srtp_option.disabled()
    subdir_done()
  endif
  
-@@ -24,7 +23,7 @@
-   found_system_usrsctp = sctp_dep.found() and sctp_header
- 
-   if get_option('sctp-internal-usrsctp').disabled() and not found_system_usrsctp
--    if sctp_option.enabled()
-+    if get_option('sctp').enabled()
-       error('sctp plugin enabled but could not find libusrsctp or usrsctp.h, and internal libusrsctp disabled')
-     else
-       message('Could not find libusrsctp or usrsctp.h, and internal libusrsctp disabled - not building sctp plugin')
-@@ -38,7 +37,7 @@
-   subdir('usrsctp')
-   sctp_dep = usrsctp_dep
-   sctp_header = true
--  if sctp_option.enabled() and not sctp_dep.found()
-+  if get_option('sctp').enabled() and not sctp_dep.found()
-     error('sctp plugin enabled but could not find system libusrsctp or configure internal libusrsctp')
-   endif
- endif
-
-diff -Nuar a/ext/srtp/meson.build b/ext/srtp/meson.build
---- a/ext/srtp/meson.build	2025-01-05 20:53:34.863316649 +0000
-+++ b/ext/srtp/meson.build	2025-01-05 20:54:09.979316551 +0000
-@@ -7,8 +7,7 @@
+--- 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')
 -if srtp_option.disabled()
++srtp_option = get_option('srtp')
 +if get_option('srtp').disabled()
    srtp_dep = dependency('', required : false)
    subdir_done()
  endif
-@@ -22,7 +21,7 @@
-     srtp_dep = cc.find_library('srtp', required : false)
-   endif
- endif
--if not srtp_dep.found() and srtp_option.enabled()
-+if not srtp_dep.found() and get_option('srtp').enabled()
-   error('srtp plugin enabled but libsrtp not found')
- endif
- 

[gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-webrtc/files/

[Sam James]

commit:     374d171b762a34a257b194de865c334572a70dd8
Author:     Matthew White <mehw.is.me <AT> inventati <DOT> org>
AuthorDate: Mon Jan  6 01:40:30 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <mehw.is.me <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/39998
Signed-off-by: Sam James <sam <AT> 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