meson: default to gpl=disabled for gst-plugins-bad and -ugly

This will only affect individual/tarball module builds, as the
options yield to the parent project which was set to gpl=disabled
by default already. We kept it as auto in the original commit
to accommodate the need to update cerbero as well, which had to
be done separately after the initial commit.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1217>

diff --git a/subprojects/gst-plugins-bad/meson_options.txt b/subprojects/gst-plugins-bad/meson_options.txt
index 42ed7fc..4686492 100644 (file)
--- a/subprojects/gst-plugins-bad/meson_options.txt
+++ b/subprojects/gst-plugins-bad/meson_options.txt
@@ -192,7 +192,7 @@ option('mfx_api', type : 'combo', choices : ['MSDK', 'oneVPL', 'auto'], value :
        description : 'Select MFX API to build against')
 
 # License-related feature options
-option('gpl', type: 'feature', value: 'auto', yield: true, # FIXME: disable by default
+option('gpl', type: 'feature', value: 'disabled', yield: true,
   description: 'Allow build plugins that have (A)GPL-licensed dependencies')
 
 # Common feature options

diff --git a/subprojects/gst-plugins-ugly/meson_options.txt b/subprojects/gst-plugins-ugly/meson_options.txt
index 74c3115..6bdcaf2 100644 (file)
--- a/subprojects/gst-plugins-ugly/meson_options.txt
+++ b/subprojects/gst-plugins-ugly/meson_options.txt
@@ -19,7 +19,7 @@ option('sidplay', type : 'feature', value : 'auto', description : 'Commodore 64
 option('x264', type : 'feature', value : 'auto', description : 'H.264 video encoder plugin based on libx264 (GPL - only built if gpl option is also enabled!)')
 
 # License-related feature options
-option('gpl', type: 'feature', value: 'auto', yield: true, # FIXME: disable by default
+option('gpl', type: 'feature', value: 'disabled', yield: true,
   description: 'Allow build plugins that have GPL-licensed dependencies')
 
 # Common feature options