Import Mesa 18.3.2

2 files changed, 31 insertions, 0 deletions

diff --git a/lib/mesa/src/gallium/winsys/nouveau/drm/Makefile.am b/lib/mesa/src/gallium/winsys/nouveau/drm/Makefile.am
index 9c94ea481..992fa25cc 100644
--- a/lib/mesa/src/gallium/winsys/nouveau/drm/Makefile.am
+++ b/lib/mesa/src/gallium/winsys/nouveau/drm/Makefile.am
@@ -31,3 +31,5 @@ AM_CFLAGS = \
 noinst_LTLIBRARIES = libnouveaudrm.la
 
 libnouveaudrm_la_SOURCES = $(C_SOURCES)
+
+EXTRA_DIST = meson.build
diff --git a/lib/mesa/src/gallium/winsys/nouveau/drm/meson.build b/lib/mesa/src/gallium/winsys/nouveau/drm/meson.build
new file mode 100644
index 000000000..cf661971f
--- /dev/null
+++ b/lib/mesa/src/gallium/winsys/nouveau/drm/meson.build
@@ -0,0 +1,29 @@
+# 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.
+
+libnouveauwinsys = static_library(
+  'nouveauwinsys',
+  files('nouveau_drm_public.h', 'nouveau_drm_winsys.c'),
+  include_directories : [
+    inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_drivers,
+  ],
+  c_args : [c_vis_args],
+  dependencies : [dep_libdrm_nouveau],
+)