From 1597297067fd14d479a2279ad1ab20082317271a Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 27 Apr 2017 12:50:13 -0400
Subject: [PATCH] meson: Build libglx.so

Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
---
 glx/meson.build                |  5 +++++
 hw/xfree86/dixmods/meson.build | 15 +++++++++++++++
 meson.build                    |  2 ++
 3 files changed, 22 insertions(+)

diff --git a/glx/meson.build b/glx/meson.build
index a29e53cfa..c5f5ecc8f 100644
--- a/glx/meson.build
+++ b/glx/meson.build
@@ -48,3 +48,8 @@ if build_glx
         ]
     )
 endif
+
+srcs_glxdri2 = ''
+if build_dri2 or build_dri3
+    srcs_glxdri2 = files('glxdri2.c')
+endif
diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
index 2b8fe1349..e2c91265d 100644
--- a/hw/xfree86/dixmods/meson.build
+++ b/hw/xfree86/dixmods/meson.build
@@ -36,3 +36,18 @@ shared_module(
     install: true,
     install_dir: module_dir,
 )
+
+if build_glx
+    shared_module(
+        'glx',
+        [ 'glxmodule.c', srcs_glxdri2 ],
+
+        include_directories: [ inc, xorg_inc, glx_inc ],
+        c_args: [ xorg_c_args, glx_align64 ],
+        dependencies: [ common_dep, dl_dep ],
+        objects: libxserver_glx.extract_all_objects(),
+
+        install: true,
+        install_dir: join_paths(module_dir, 'extensions')
+    )
+endif
diff --git a/meson.build b/meson.build
index d4443c9d7..3952b82b6 100644
--- a/meson.build
+++ b/meson.build
@@ -294,6 +294,8 @@ inc = include_directories(
     'xfixes',
 )
 
+glx_inc = include_directories('glx')
+
 serverconfigdir = join_paths(get_option('libdir'), '/xorg')
 
 # Include must come first, as it sets up dix-config.h