| 1 |
From 62e5d649b71cf30cb252c85b9495f7c3399a0ede Mon Sep 17 00:00:00 2001 |
| 2 |
From: Emil Velikov <emil.velikov@collabora.com> |
| 3 |
Date: Wed, 12 Dec 2018 17:47:36 +0000 |
| 4 |
Subject: [PATCH 34/78] TODO: glx: meson: build dri based glx tests, only with |
| 5 |
-Dglx=dri |
| 6 |
|
| 7 |
The library itself (libGL) is only built when -Dglx=dri, yet it's |
| 8 |
accompanying tests are build even with -Dglx=xlib. |
| 9 |
|
| 10 |
Adjust the guards, so we don't build the tests when they are not |
| 11 |
applicable |
| 12 |
|
| 13 |
v2: |
| 14 |
- Reword commit message (Dylan) |
| 15 |
- Drop build_by_default hunk (Dylan) |
| 16 |
|
| 17 |
Fixes: a47c525f328 ("meson: build glx") |
| 18 |
Signed-off-by: Emil Velikov <emil.velikov@collabora.com> |
| 19 |
Reviewed-by: Dylan Baker <dylan@pnwbakers.com> |
| 20 |
(cherry picked from commit 9527f9ea2611b0793377016c8c16ec58ded7f287) |
| 21 |
--- |
| 22 |
src/glx/meson.build | 33 +++++++++++++++------------------ |
| 23 |
src/meson.build | 2 +- |
| 24 |
2 files changed, 16 insertions(+), 19 deletions(-) |
| 25 |
|
| 26 |
diff --git a/src/glx/meson.build b/src/glx/meson.build |
| 27 |
index f3bbcb433a..6bd3e46265 100644 |
| 28 |
--- a/src/glx/meson.build |
| 29 |
+++ b/src/glx/meson.build |
| 30 |
@@ -150,26 +150,23 @@ libglx = static_library( |
| 31 |
extra_libs_libglx, |
| 32 |
], |
| 33 |
dependencies : [dep_libdrm, dep_dri2proto, dep_glproto, dep_x11, dep_glvnd], |
| 34 |
- build_by_default : false, |
| 35 |
) |
| 36 |
|
| 37 |
-if with_glx == 'dri' |
| 38 |
- libgl = shared_library( |
| 39 |
- gl_lib_name, |
| 40 |
- [], |
| 41 |
- include_directories : [inc_common, inc_glapi, inc_loader, inc_gl_internal], |
| 42 |
- link_with : [libglapi_static, libglapi], |
| 43 |
- link_whole : libglx, |
| 44 |
- link_args : [ld_args_bsymbolic, ld_args_gc_sections, extra_ld_args_libgl], |
| 45 |
- dependencies : [ |
| 46 |
- dep_libdrm, dep_dl, dep_m, dep_thread, dep_x11, dep_xcb_glx, dep_xcb, |
| 47 |
- dep_x11_xcb, dep_xcb_dri2, dep_xext, dep_xfixes, dep_xdamage, dep_xxf86vm, |
| 48 |
- extra_deps_libgl, |
| 49 |
- ], |
| 50 |
- version : gl_lib_version, |
| 51 |
- install : true, |
| 52 |
- ) |
| 53 |
-endif |
| 54 |
+libgl = shared_library( |
| 55 |
+ gl_lib_name, |
| 56 |
+ [], |
| 57 |
+ include_directories : [inc_common, inc_glapi, inc_loader, inc_gl_internal], |
| 58 |
+ link_with : [libglapi_static, libglapi], |
| 59 |
+ link_whole : libglx, |
| 60 |
+ link_args : [ld_args_bsymbolic, ld_args_gc_sections, extra_ld_args_libgl], |
| 61 |
+ dependencies : [ |
| 62 |
+ dep_libdrm, dep_dl, dep_m, dep_thread, dep_x11, dep_xcb_glx, dep_xcb, |
| 63 |
+ dep_x11_xcb, dep_xcb_dri2, dep_xext, dep_xfixes, dep_xdamage, dep_xxf86vm, |
| 64 |
+ extra_deps_libgl, |
| 65 |
+ ], |
| 66 |
+ version : gl_lib_version, |
| 67 |
+ install : true, |
| 68 |
+) |
| 69 |
|
| 70 |
if with_tests |
| 71 |
subdir('tests') |
| 72 |
diff --git a/src/meson.build b/src/meson.build |
| 73 |
index 0d0ecf2c53..3b91c6a88c 100644 |
| 74 |
--- a/src/meson.build |
| 75 |
+++ b/src/meson.build |
| 76 |
@@ -71,7 +71,7 @@ subdir('loader') |
| 77 |
if with_platform_haiku |
| 78 |
subdir('hgl') |
| 79 |
endif |
| 80 |
-if with_glx != 'disabled' |
| 81 |
+if with_glx == 'dri' |
| 82 |
subdir('glx') |
| 83 |
endif |
| 84 |
if with_gbm |
| 85 |
-- |
| 86 |
2.20.1 |
| 87 |
|
Parent Directory
| 
Revision Log