diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-01-11 19:29:20 +0530 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2019-01-14 12:10:46 +0000 |
commit | a5c4dbaf3a03a7dda99470a13f0b12fd6cc68f54 (patch) | |
tree | a19e489cb0574254ef94bc116296fa472dc8cd18 /recipes | |
parent | c2839dfcf108abb11991815bc185364b27ca7c7e (diff) |
Auto-detect and disable gtk-doc and example options
Instead of doing it per-recipe, auto-detect `gtk_doc` and `examples`
options for Meson recipes and always pass `--disable-gtk-doc` for
Autotools recipes.
Diffstat (limited to 'recipes')
-rw-r--r-- | recipes/build-tools/glib-tools.recipe | 2 | ||||
-rw-r--r-- | recipes/build-tools/orc.recipe | 3 | ||||
-rw-r--r-- | recipes/glib.recipe | 3 | ||||
-rw-r--r-- | recipes/gst-editing-services-1.0.recipe | 3 | ||||
-rw-r--r-- | recipes/gst-plugins-bad-1.0.recipe | 4 | ||||
-rw-r--r-- | recipes/gst-plugins-base-1.0.recipe | 12 | ||||
-rw-r--r-- | recipes/gst-plugins-good-1.0.recipe | 34 | ||||
-rw-r--r-- | recipes/gst-plugins-ugly-1.0.recipe | 6 | ||||
-rw-r--r-- | recipes/gst-rtsp-server-1.0.recipe | 1 | ||||
-rw-r--r-- | recipes/gst-validate.recipe | 1 | ||||
-rw-r--r-- | recipes/gstreamer-1.0.recipe | 1 | ||||
-rw-r--r-- | recipes/orc.recipe | 3 |
12 files changed, 43 insertions, 30 deletions
diff --git a/recipes/build-tools/glib-tools.recipe b/recipes/build-tools/glib-tools.recipe index 89c6e2db..5d19ce27 100644 --- a/recipes/build-tools/glib-tools.recipe +++ b/recipes/build-tools/glib-tools.recipe @@ -9,7 +9,7 @@ class Recipe(recipe.Recipe): tarball_checksum = '40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d' licenses = [License.LGPLv2Plus] btype = BuildType.MESON - meson_options = {'gtk_doc': 'false', 'internal_pcre': 'true', 'libmount': 'false', + meson_options = {'internal_pcre': 'true', 'libmount': 'false', 'dtrace': 'false', 'iconv': 'libc', 'selinux' : 'false'} deps = ['libffi', 'zlib'] patches = ['../glib/glib-2.57-meson-backported-fixes.patch', diff --git a/recipes/build-tools/orc.recipe b/recipes/build-tools/orc.recipe index 402e97db..e74bd13d 100644 --- a/recipes/build-tools/orc.recipe +++ b/recipes/build-tools/orc.recipe @@ -9,8 +9,7 @@ class Recipe(recipe.Recipe): btype = BuildType.MESON licenses = [License.BSD_like] deps = ['meson'] - meson_options = {'benchmarks': 'disabled', 'examples': 'disabled', - 'gtk_doc': 'disabled', 'tests': 'disabled', + meson_options = {'benchmarks': 'disabled', 'tests': 'disabled', 'tools': 'enabled', 'orc-test': 'enabled'} files_libs = ['liborc-0.4', 'liborc-test-0.4'] diff --git a/recipes/glib.recipe b/recipes/glib.recipe index a0f2fa82..9f65ec89 100644 --- a/recipes/glib.recipe +++ b/recipes/glib.recipe @@ -28,8 +28,7 @@ class Recipe(recipe.Recipe): tarball_checksum = '40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d' licenses = [License.LGPLv2Plus] btype = BuildType.MESON - meson_options = {'gtk_doc': 'false', 'internal_pcre': 'true', 'libmount': 'false', - 'dtrace': 'false'} + meson_options = {'internal_pcre': 'true', 'libmount': 'false', 'dtrace': 'false'} deps = ['libffi', 'zlib'] patches = ["glib/0003-Add-support-for-loading-GIO-modules-from-the-distro-.patch", diff --git a/recipes/gst-editing-services-1.0.recipe b/recipes/gst-editing-services-1.0.recipe index b27b3117..01c96b78 100644 --- a/recipes/gst-editing-services-1.0.recipe +++ b/recipes/gst-editing-services-1.0.recipe @@ -6,9 +6,6 @@ class Recipe(custom.GStreamer): btype = BuildType.MESON url = 'https://gstreamer.freedesktop.org/src/%(name)s/gstreamer-editing-services-%(version)s.tar.xz' tarball_dirname = 'gstreamer-editing-services-%(version)s' - # Explicitly enable plugins that we provide dependencies for to ensure that - # we error out if they weren't found. - meson_options = {'examples': 'disabled', 'gtk_doc': 'disabled'} deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'gst-plugins-good-1.0', 'gst-validate'] files_bins = ['ges-launch-1.0'] diff --git a/recipes/gst-plugins-bad-1.0.recipe b/recipes/gst-plugins-bad-1.0.recipe index 24d82643..d95dac59 100644 --- a/recipes/gst-plugins-bad-1.0.recipe +++ b/recipes/gst-plugins-bad-1.0.recipe @@ -6,9 +6,7 @@ class Recipe(custom.GStreamer): btype = BuildType.MESON # Explicitly enable plugins that we provide dependencies for to ensure that # we error out if they weren't found. - meson_options = {'examples': 'disabled', - 'gtk_doc': 'disabled', - # enabled plugins + meson_options = {# enabled plugins 'assrender': 'enabled', 'bz2': 'enabled', 'closedcaption': 'enabled', diff --git a/recipes/gst-plugins-base-1.0.recipe b/recipes/gst-plugins-base-1.0.recipe index cf27daf9..3a20ce4f 100644 --- a/recipes/gst-plugins-base-1.0.recipe +++ b/recipes/gst-plugins-base-1.0.recipe @@ -4,9 +4,15 @@ class Recipe(custom.GStreamer): name = 'gst-plugins-base-1.0' btype = BuildType.MESON - meson_options = {'examples': 'disabled', 'gtk_doc': 'disabled', 'gl': 'enabled', - 'pango': 'enabled', 'opus': 'enabled', 'vorbis': 'enabled', - 'ogg': 'enabled', 'theora': 'enabled', 'libvisual': 'enabled', + meson_options = {# enabled plugins + 'gl': 'enabled', + 'libvisual': 'enabled', + 'ogg': 'enabled', + 'opus': 'enabled', + 'pango': 'enabled', + 'theora': 'enabled', + 'vorbis': 'enabled', + # disabled plugins 'tremor': 'disabled'} deps = ['glib', 'gstreamer-1.0', 'libxml2', 'libogg', 'pango', 'libtheora', 'libvisual', 'libvorbis', 'zlib', 'orc', 'opus', 'graphene', diff --git a/recipes/gst-plugins-good-1.0.recipe b/recipes/gst-plugins-good-1.0.recipe index aeb710ce..485b947d 100644 --- a/recipes/gst-plugins-good-1.0.recipe +++ b/recipes/gst-plugins-good-1.0.recipe @@ -3,15 +3,31 @@ class Recipe(custom.GStreamer): name = 'gst-plugins-good-1.0' btype = BuildType.MESON - meson_options = {'examples': 'disabled', 'oss': 'disabled', 'oss4': 'disabled', - 'dv1394': 'disabled', 'aalib': 'disabled', 'libcaca': 'disabled', - 'jack': 'disabled', 'shout2': 'disabled', 'twolame': 'disabled', - 'qt5': 'disabled', 'gtk3': 'disabled', - 'speex': 'enabled', 'dv': 'enabled', 'taglib': 'enabled', - 'cairo': 'enabled', 'flac': 'enabled', 'gdk-pixbuf': 'enabled', - 'jpeg': 'enabled', 'lame': 'enabled', 'mpg123': 'enabled', - 'png': 'enabled', 'soup': 'enabled', 'vpx': 'enabled', - 'wavpack': 'enabled'} + meson_options = {# enabled plugins + 'cairo': 'enabled', + 'dv': 'enabled', + 'flac': 'enabled', + 'gdk-pixbuf': 'enabled', + 'jpeg': 'enabled', + 'lame': 'enabled', + 'mpg123': 'enabled', + 'png': 'enabled', + 'soup': 'enabled', + 'speex': 'enabled', + 'taglib': 'enabled', + 'vpx': 'enabled', + 'wavpack': 'enabled', + # disabled plugins + 'aalib': 'disabled', + 'dv1394': 'disabled', + 'gtk3': 'disabled', + 'jack': 'disabled', + 'libcaca': 'disabled', + 'oss': 'disabled', + 'oss4': 'disabled', + 'qt5': 'disabled', + 'shout2': 'disabled', + 'twolame': 'disabled',} deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'libjpeg-turbo', 'libpng', 'speex', 'gdk-pixbuf', 'libsoup', 'mpg123', 'lame', 'orc', 'wavpack', 'flac', 'taglib', 'bzip2', 'zlib', diff --git a/recipes/gst-plugins-ugly-1.0.recipe b/recipes/gst-plugins-ugly-1.0.recipe index ef9522f2..b91389e0 100644 --- a/recipes/gst-plugins-ugly-1.0.recipe +++ b/recipes/gst-plugins-ugly-1.0.recipe @@ -4,8 +4,10 @@ class Recipe(custom.GStreamer): name = 'gst-plugins-ugly-1.0' btype = BuildType.MESON - meson_options = {'examples': 'disabled', 'gtk_doc': 'disabled', 'a52dec': 'enabled', - 'dvdread': 'enabled', 'amrnb': 'enabled', 'amrwbdec': 'enabled', + meson_options = {'a52dec': 'enabled', + 'amrnb': 'enabled', + 'amrwbdec': 'enabled', + 'dvdread': 'enabled', 'x264': 'enabled'} deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'a52dec', 'opencore-amr', 'libdvdread', 'x264'] diff --git a/recipes/gst-rtsp-server-1.0.recipe b/recipes/gst-rtsp-server-1.0.recipe index f8ef6212..d0aa1c3e 100644 --- a/recipes/gst-rtsp-server-1.0.recipe +++ b/recipes/gst-rtsp-server-1.0.recipe @@ -3,7 +3,6 @@ class Recipe(custom.GStreamer): name = 'gst-rtsp-server-1.0' btype = BuildType.MESON - meson_options = {'examples': 'disabled', 'gtk_doc': 'disabled'} deps = ['gstreamer-1.0', 'gst-plugins-base-1.0' ] files_devel = ['include/gstreamer-1.0/gst/rtsp-server', 'lib/pkgconfig/gstreamer-rtsp-server-1.0.pc'] diff --git a/recipes/gst-validate.recipe b/recipes/gst-validate.recipe index ee847f1f..1ab6f8d9 100644 --- a/recipes/gst-validate.recipe +++ b/recipes/gst-validate.recipe @@ -4,7 +4,6 @@ from cerbero.utils import shell class Recipe(custom.GStreamer): name = 'gst-validate' btype = BuildType.MESON - meson_options = {'gtk_doc': 'disabled'} # gst-validate tarball has a different layout than the git repo, just always build from git stype = SourceType.GIT remotes = {'origin': 'https://gitlab.freedesktop.org/gstreamer/gst-devtools'} diff --git a/recipes/gstreamer-1.0.recipe b/recipes/gstreamer-1.0.recipe index fabf45aa..3382e38a 100644 --- a/recipes/gstreamer-1.0.recipe +++ b/recipes/gstreamer-1.0.recipe @@ -4,7 +4,6 @@ import shutil class Recipe(custom.GStreamer): name = 'gstreamer-1.0' btype = BuildType.MESON - meson_options = {'examples': 'disabled', 'gtk_doc': 'disabled'} deps = ['glib'] files_bins = ['gst-inspect-1.0', diff --git a/recipes/orc.recipe b/recipes/orc.recipe index 1f0aba6d..ca5c61f6 100644 --- a/recipes/orc.recipe +++ b/recipes/orc.recipe @@ -8,8 +8,7 @@ class Recipe(recipe.Recipe): commit = 'origin/master' btype = BuildType.MESON licenses = [License.BSD_like] - meson_options = {'benchmarks': 'disabled', 'examples': 'disabled', - 'gtk_doc': 'disabled', 'tests': 'disabled', + meson_options = {'benchmarks': 'disabled', 'tests': 'disabled', 'tools': 'enabled', 'orc-test': 'enabled'} files_libs = ['liborc-0.4'] |