meson: move libsensors dependency to libgallium

This simplifies the build by removing the need to link targets against
libsensors.

Suggested-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Dylan Baker <dylan.c.baker@intel.com>
Acked-by: Eric Engestrom <eric.engestrom@imgtec.com>

diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build
index acef71bb3a88f59635cb1206ea75ac80e1c6a90b..6f1542d7adec44c03e69a9dbcc84d655dde9ba42 100644 (file)
--- a/src/gallium/auxiliary/meson.build
+++ b/src/gallium/auxiliary/meson.build
@@ -497,7 +497,7 @@ libgallium = static_library(
   c_args : [c_vis_args, c_msvc_compat_args],
   cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
   dependencies : [
-    dep_libdrm, dep_llvm, dep_unwind, dep_dl, dep_m, dep_thread,
+    dep_libdrm, dep_llvm, dep_unwind, dep_dl, dep_m, dep_thread, dep_lmsensors,
     idep_nir_headers,
   ],
   build_by_default : false,

diff --git a/src/gallium/drivers/etnaviv/meson.build b/src/gallium/drivers/etnaviv/meson.build
index 0c7dbe29a7420b323b5f16940431292467d0322f..2d091fbcbc22e09ac3f79f814c3dc622657802a9 100644 (file)
--- a/src/gallium/drivers/etnaviv/meson.build
+++ b/src/gallium/drivers/etnaviv/meson.build
@@ -97,7 +97,7 @@ etnaviv_compiler = executable(
   'etnaviv_compiler_cmdline.c',
   include_directories : [inc_include, inc_src, inc_gallium, inc_gallium_aux],
   link_with : [libmesa_util, libgallium, libetnaviv],
-  dependencies : [dep_libdrm_etnaviv, dep_lmsensors],
+  dependencies : [dep_libdrm_etnaviv],
   build_by_default : false,
 )
 

diff --git a/src/gallium/drivers/freedreno/meson.build b/src/gallium/drivers/freedreno/meson.build
index 23c85cfa71b665844f3f39482e1c803f228ba311..33a64d73aa49fb8ce0cd78380a7986ed669bbf06 100644 (file)
--- a/src/gallium/drivers/freedreno/meson.build
+++ b/src/gallium/drivers/freedreno/meson.build
@@ -239,7 +239,6 @@ ir3_compiler = executable(
     dep_libdrm,
     dep_libdrm_freedreno,
     dep_thread,
-    dep_lmsensors,
     idep_nir,
   ],
   link_with : [

diff --git a/src/gallium/drivers/nouveau/meson.build b/src/gallium/drivers/nouveau/meson.build
index 5d679e1c5a63321e6c413dc415050a0b130e1033..8ddd86579919f0c347fcf29862eebacb31e45114 100644 (file)
--- a/src/gallium/drivers/nouveau/meson.build
+++ b/src/gallium/drivers/nouveau/meson.build
@@ -217,7 +217,7 @@ nouveau_compiler = executable(
   'nouveau_compiler',
   'nouveau_compiler.c',
   include_directories : [inc_src, inc_include, inc_gallium, inc_gallium_aux],
-  dependencies : [dep_libdrm, dep_libdrm_nouveau, dep_lmsensors],
+  dependencies : [dep_libdrm, dep_libdrm_nouveau],
   link_with : [libnouveau, libgallium, libmesa_util],
   build_by_default : false,
 )

diff --git a/src/gallium/drivers/r300/meson.build b/src/gallium/drivers/r300/meson.build
index 698e4608dedfedf91a5b1ffb3bd4fd1f47b7e9cf..d181048c51d9a8efa0ab79ce5c4e39fce876bbb5 100644 (file)
--- a/src/gallium/drivers/r300/meson.build
+++ b/src/gallium/drivers/r300/meson.build
@@ -157,9 +157,7 @@ if with_tests
         include_directories('compiler'),
       ],
       link_with : [libr300, libgallium, libmesa_util],
-      dependencies : [
-        dep_m, dep_clock, dep_dl, dep_thread, dep_unwind, dep_lmsensors,
-      ],
+      dependencies : [dep_m, dep_clock, dep_dl, dep_thread, dep_unwind],
     )
   )
 endif

diff --git a/src/gallium/targets/d3dadapter9/meson.build b/src/gallium/targets/d3dadapter9/meson.build
index a04177c54c766be2f890e2b0250970f98fb52894..27a8797221575bcc1c07a7ea1dc0b853082a0118 100644 (file)
--- a/src/gallium/targets/d3dadapter9/meson.build
+++ b/src/gallium/targets/d3dadapter9/meson.build
@@ -64,7 +64,7 @@ libgallium_nine = shared_library(
     gallium_nine_link_with,
   ],
   dependencies : [
-    dep_selinux, dep_expat, dep_libdrm, dep_llvm, dep_lmsensors,
+    dep_selinux, dep_expat, dep_libdrm, dep_llvm,
     driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
     driver_i915, driver_svga,
   ],

diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
index edf8d67fe39236d22d9eb1434e50a3c821a9764d..30368c2152abd0a9bda5e5f1038164901973b266 100644 (file)
--- a/src/gallium/targets/dri/meson.build
+++ b/src/gallium/targets/dri/meson.build
@@ -66,7 +66,7 @@ libgallium_dri = shared_library(
     libpipe_loader_static, libws_null, libwsw,  gallium_dri_link_with,
   ],
   dependencies : [
-    dep_selinux, dep_expat, dep_libdrm, dep_llvm, dep_lmsensors, dep_thread,
+    dep_selinux, dep_expat, dep_libdrm, dep_llvm, dep_thread,
     driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
     driver_pl111, driver_vc4, driver_vc5, driver_freedreno, driver_etnaviv,
     driver_imx, driver_i915, driver_svga, driver_virgl, driver_swr,

diff --git a/src/gallium/targets/libgl-xlib/meson.build b/src/gallium/targets/libgl-xlib/meson.build
index 6c8d2b4bc0e11a9c9ebf61ea5e3c0104db877dc3..6884c82620369f51115f95c86b3696ac605872f1 100644 (file)
--- a/src/gallium/targets/libgl-xlib/meson.build
+++ b/src/gallium/targets/libgl-xlib/meson.build
@@ -53,10 +53,7 @@ libgl = shared_library(
     libxlib, libws_xlib, libtrace, librbug, libglapi_static,
     libgallium, libmesa_util, libmesa_gallium, gallium_xlib_link_with,
   ],
-  dependencies : [
-    dep_thread, dep_clock, dep_unwind, dep_lmsensors,
-    driver_swrast, driver_swr,
-  ],
+  dependencies : [dep_thread, dep_clock, dep_unwind, driver_swrast, driver_swr],
   install : true,
   version : '1.5.0',
 )