From ce352b5538d6177e3a320770c90bed117718d25b Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 29 Apr 2024 14:14:31 +0200 Subject: [PATCH] build: Move GStreamer dependency checks Put them where all the other checks go so that it's easy for people reading build files to see what GTK depends on. Also reindent properly. --- meson.build | 34 ++++++++++++++++++++-------------- modules/media/meson.build | 7 ------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/meson.build b/meson.build index 539e9f5296..9d6997c783 100644 --- a/meson.build +++ b/meson.build @@ -411,21 +411,27 @@ if win32_enabled pangowin32_dep = dependency('pangowin32') endif -pangocairo_dep = dependency('pangocairo', version: pango_req) -pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req, - default_options: ['png=enabled', 'jpeg=enabled', 'builtin_loaders=png,jpeg', 'man=false']) -png_dep = dependency('libpng', 'png') -tiff_dep = dependency('libtiff-4', 'tiff') -jpeg_dep = dependency('libjpeg', 'jpeg') +pangocairo_dep = dependency('pangocairo', version: pango_req) +pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req, + default_options: ['png=enabled', 'jpeg=enabled', 'builtin_loaders=png,jpeg', 'man=false']) +png_dep = dependency('libpng', 'png') +tiff_dep = dependency('libtiff-4', 'tiff') +jpeg_dep = dependency('libjpeg', 'jpeg') -epoxy_dep = dependency('epoxy', version: epoxy_req) -xkbdep = dependency('xkbcommon', version: xkbcommon_req, required: wayland_enabled) -graphene_dep = dependency('graphene-gobject-1.0', version: graphene_req, - default_options: ['tests=false', 'gobject_types=true']) -iso_codes_dep = dependency('iso-codes', required: false) -gi_dep = dependency('gobject-introspection-1.0', version: introspection_req, - required: get_option('introspection').enabled() and - get_option('build-tests')) +epoxy_dep = dependency('epoxy', version: epoxy_req) +xkbdep = dependency('xkbcommon', version: xkbcommon_req, required: wayland_enabled) +graphene_dep = dependency('graphene-gobject-1.0', version: graphene_req, + default_options: ['tests=false', 'gobject_types=true']) +iso_codes_dep = dependency('iso-codes', required: false) +gi_dep = dependency('gobject-introspection-1.0', version: introspection_req, + required: get_option('introspection').enabled() and + get_option('build-tests')) +gstplayer_dep = dependency('gstreamer-player-1.0', version: gstreamer_req, + required: get_option('media-gstreamer')) +gstgl_dep = dependency('gstreamer-gl-1.0', version: gstreamer_req, + required: get_option('media-gstreamer')) +gstallocators_dep = dependency('gstreamer-allocators-1.0', version: gstreamer_req, + required: get_option('media-gstreamer')) fontconfig_dep = [] # only used in x11 backend diff --git a/modules/media/meson.build b/modules/media/meson.build index cbafb7bee1..4b401fae9d 100644 --- a/modules/media/meson.build +++ b/modules/media/meson.build @@ -5,13 +5,6 @@ media_backends = [] extra_c_args = ['-DGTK_COMPILATION'] extra_c_args += common_cflags -gstplayer_dep = dependency('gstreamer-player-1.0', version: gstreamer_req, - required: get_option('media-gstreamer')) -gstgl_dep = dependency('gstreamer-gl-1.0', version: gstreamer_req, - required: get_option('media-gstreamer')) -gstallocators_dep = dependency('gstreamer-allocators-1.0', version: gstreamer_req, - required: get_option('media-gstreamer')) - if gstplayer_dep.found() and gstgl_dep.found() and gstallocators_dep.found() extra_win_cflags = []