From d451a11b214a7191a6997edef009dd4a50e8e841 Mon Sep 17 00:00:00 2001
From: Dylan Baker <dylan@pnwbakers.com>
Date: Fri, 29 Sep 2017 20:03:20 -0700
Subject: [PATCH] meson: Build gallium pipe-loader

Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
---
 src/gallium/auxiliary/meson.build             |  2 +
 src/gallium/auxiliary/pipe-loader/meson.build | 63 +++++++++++++++++++
 src/gallium/meson.build                       |  2 +
 3 files changed, 67 insertions(+)
 create mode 100644 src/gallium/auxiliary/pipe-loader/meson.build

diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build
index bb7c0506d84..778b4ce4ac2 100644
--- a/src/gallium/auxiliary/meson.build
+++ b/src/gallium/auxiliary/meson.build
@@ -18,6 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+inc_gallium_aux = include_directories('.')
+
 files_libgallium = files(
   'cso_cache/cso_cache.c',
   'cso_cache/cso_cache.h',
diff --git a/src/gallium/auxiliary/pipe-loader/meson.build b/src/gallium/auxiliary/pipe-loader/meson.build
new file mode 100644
index 00000000000..c84fc9ddce8
--- /dev/null
+++ b/src/gallium/auxiliary/pipe-loader/meson.build
@@ -0,0 +1,63 @@
+# Copyright © 2017 Dylan Baker
+
+# 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_pipe_loader = files(
+  'pipe_loader.c',
+  'pipe_loader.h',
+  'pipe_loader_priv.h',
+  'pipe_loader_sw.c',
+  'driinfo_gallium.h',
+)
+
+if dep_libdrm.found()
+  files_pipe_loader += files('pipe_loader_drm.c')
+endif
+
+libpipe_loader_static = static_library(
+  'pipe_loader_static',
+  files_pipe_loader,
+  include_directories : [
+    inc_util, inc_loader, inc_gallium, inc_include, inc_src, inc_gallium_aux,
+    inc_gallium_winsys,
+  ],
+  c_args : [
+    c_vis_args, '-DHAVE_PIPE_LOADER_DRI', '-DGALLIUM_STATIC_TARGETS=1'
+  ],
+  link_with : [libloader, libxmlconfig],
+  dependencies : [dep_libdrm],
+  build_by_default : false,
+)
+
+libpipe_loader_dynamic = static_library(
+  'pipe_loader_dynamic',
+  files_pipe_loader,
+  include_directories : [
+    inc_util, inc_loader, inc_gallium, inc_include, inc_src, inc_gallium_aux,
+    inc_gallium_winsys,
+  ],
+  c_args : [
+    c_vis_args, '-DHAVE_PIPE_LOADER_DRI', '-DPIPE_SEARCH_DIR="@0@"'.format(
+      join_paths(get_option('libdir'), 'gallium-pipe')
+    )
+  ],
+  link_with : [libloader, libxmlconfig],
+  dependencies : [dep_libdrm],
+  build_by_default : false,
+)
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index a9c36973ca1..50708d146fc 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -19,5 +19,7 @@
 # SOFTWARE.
 
 inc_gallium = include_directories('include')
+inc_gallium_winsys = include_directories('winsys')
 
 subdir('auxiliary')
+subdir('auxiliary/pipe-loader')
-- 
2.30.2