meson: build gbm

This doesn't include egl support, just dri support.

v2: - when gbm is set to 'auto', only build if a dri driver is also
      enabled
    - Fix conditional to check for x11 modules with vulkan as well as
      with dri drivers
v3: - Set pkgconfig libraries.private value

Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/meson.build b/meson.build
index 716976ccfc67cb9fdb5a0cfb6bac3aa1913bf021..79ee1a334593312ba231a6bd9fea17327284f8ce 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -101,12 +101,15 @@ pre_args += '-DHAVE_LIBDRM'
 with_dri2 = with_dri_platform == 'drm' and dep_libdrm.found()
 with_dri3 = get_option('dri3')
 if with_dri3 == 'auto'
-  if host_machine.system() == 'linux'
+  if host_machine.system() == 'linux' and with_dri2
     with_dri3 = true
   else
     with_dri3 = false
  endif
 elif with_dri3 == 'yes'
+  if not with_dri2
+    error('dri3 support requires libdrm')
+  endif
   with_dri3 = true
 else
   with_dri3 = false
@@ -122,6 +125,18 @@ if _platforms != ''
   with_platform_wayland = _split.contains('wayland')
 endif
 
+with_gbm = get_option('gbm')
+if with_gbm == 'auto' and with_dri  # TODO: or gallium
+  with_gbm = host_machine.system() == 'linux'
+elif with_gbm == 'yes'
+  if not ['linux', 'bsd'].contains(host_machine.system())
+    error('GBM only supports unix-like platforms')
+  endif
+  with_gbm = true
+else
+  with_gbm = false
+endif
+
 with_glx = get_option('glx')
 if with_glx != 'disabled'
   pre_args += '-DGLX_USE_TLS'

diff --git a/meson_options.txt b/meson_options.txt
index 37b511acd299b6d31a485b9451390dddb35ab77c..6dde267de959aa117b3b8fc4706948f7921b8145 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -40,6 +40,8 @@ option('gles2', type : 'boolean', value : true,
        description : 'Build support for OpenGL ES 2.x and 3.x')
 option('opengl', type : 'boolean', value : true,
        description : 'Build support for OpenGL (all versions)')
+option('gbm', type : 'combo', value : 'auto', choices : ['auto', 'yes', 'no'],
+       description : 'Build support for gbm platform')
 option('glx', type : 'combo', value : 'auto', choices : ['auto', 'disabled', 'dri', 'xlib', 'gallium-xlib'],
        description : 'Build support for GLX platform')
 option('glvnd', type : 'boolean', value : false,

diff --git a/src/gbm/meson.build b/src/gbm/meson.build
new file mode 100644 (file)
index 0000000..f9665aa
--- /dev/null
+++ b/src/gbm/meson.build
@@ -0,0 +1,67 @@
+# Copyright © 2017 Intel Corporation
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+files_gbm = files(
+  'main/backend.c',
+  'main/backend.h',
+  'main/gbm.c',
+  'main/gbm.h',
+  'main/gbmint.h',
+)
+deps_gbm = []
+args_gbm = []
+links_gbm = []
+
+if with_dri2
+  files_gbm += files('backends/dri/gbm_dri.c', 'backends/dri/gbm_driint.h')
+  deps_gbm += [dep_libdrm, dep_thread]
+  args_gbm += '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_driver_dir)
+endif
+
+# TODO: wayland support (requires egl)
+
+libgbm = shared_library(
+  'gbm',
+  files_gbm,
+  include_directories : [
+    include_directories('main'), inc_include, inc_src, inc_loader],
+  c_args : args_gbm,
+  link_args : [ld_args_gc_sections],
+  link_with : [libloader, libmesa_util, libxmlconfig],
+  dependencies : [deps_gbm, dep_dl],
+  version : '1.0',
+  install : true,
+)
+
+install_headers('main/gbm.h')
+
+pkg.generate(
+  name : 'gbm',
+  filebase : 'gbm',
+  description : 'Mesa gbm library',
+  version : meson.project_version(),
+  libraries : libgbm,
+  libraries_private : '-ldl',  # FIXME: autotools lists this a incomplete
+)
+
+if with_tests
+  gbm_symbols_check = find_program('gbm-symbols-check')
+  test('gbm-symbols-check', gbm_symbols_check)
+endif

diff --git a/src/meson.build b/src/meson.build
index f49ad9e0e7ea2b71ba0409c172f1e008514caa32..544d831ea638d12d5c7e91404918376074e031a3 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -54,6 +54,8 @@ subdir('intel')
 subdir('mesa')
 subdir('loader')
 subdir('glx')
-# TODO: dri_glx
+if with_gbm
+  subdir('gbm')
+endif
 # TODO: egl
 # TODO: gallium