git: 6a20affd2bba - main - multimedia/gstreamer1-plugins-bad: Tame webrtcdsp plugin

From: Jason E. Hale <jhale_at_FreeBSD.org>
Date: Fri, 15 Aug 2025 02:38:48 UTC
The branch main has been updated by jhale:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6a20affd2bbaafcf34df59653eac473f0c2b9f88

commit 6a20affd2bbaafcf34df59653eac473f0c2b9f88
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2025-08-15 02:35:28 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2025-08-15 02:38:39 +0000

    multimedia/gstreamer1-plugins-bad: Tame webrtcdsp plugin
    
    Despite beinging disabled through meson arguments, the webrtcdsp
    plugin tries to build if audio/webrtc-audio-processing[2] is installed.
    
    Reported by:    fluffy
---
 .../files/patch-ext_webrtcdsp_meson.build                  | 14 ++++++++++++--
 .../files/patch-gst-libs_gst_cuda_meson.build              |  4 ++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-ext_webrtcdsp_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-ext_webrtcdsp_meson.build
index a9f29c42b14b..3d1e42eb7034 100644
--- a/multimedia/gstreamer1-plugins-bad/files/patch-ext_webrtcdsp_meson.build
+++ b/multimedia/gstreamer1-plugins-bad/files/patch-ext_webrtcdsp_meson.build
@@ -1,6 +1,16 @@
---- ext/webrtcdsp/meson.build.orig	2025-03-11 20:14:44 UTC
+--- ext/webrtcdsp/meson.build.orig	2025-08-07 18:06:46 UTC
 +++ ext/webrtcdsp/meson.build
-@@ -49,7 +49,7 @@ if webrtc_dep.found()
+@@ -43,13 +43,17 @@ endif
+                           required : get_option('webrtcdsp'))
+ endif
+ 
++if get_option('webrtcdsp').disabled()
++  subdir_done()
++endif
++
+ if webrtc_dep.found()
+   gstwebrtcdsp = library('gstwebrtcdsp',
+     webrtc_sources,
      cpp_args : gst_plugins_bad_args,
      link_args : noseh_link_args,
      include_directories : [configinc],
diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_cuda_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_cuda_meson.build
index 83836091813e..4c5d0a5ae805 100644
--- a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_cuda_meson.build
+++ b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_cuda_meson.build
@@ -1,11 +1,11 @@
---- gst-libs/gst/cuda/meson.build.orig	2025-03-11 20:14:44 UTC
+--- gst-libs/gst/cuda/meson.build.orig	2025-08-07 18:06:46 UTC
 +++ gst-libs/gst/cuda/meson.build
 @@ -1,3 +1,4 @@
 +if get_option('cuda').enabled()
  cuda_sources = files([
    'gstcudabufferpool.cpp',
    'gstcudacontext.cpp',
-@@ -217,3 +218,4 @@ meson.override_dependency(pkg_name, gstcuda_dep)
+@@ -214,3 +215,4 @@ meson.override_dependency(pkg_name, gstcuda_dep)
    sources: gen_sources)
  
  meson.override_dependency(pkg_name, gstcuda_dep)