Import libdrm 2.4.94

3 files changed, 10 insertions, 16 deletions

diff --git a/lib/libdrm/libkms/meson.build b/lib/libdrm/libkms/meson.build
index e2adaea36..86d1a4ee6 100644
--- a/lib/libdrm/libkms/meson.build
+++ b/lib/libdrm/libkms/meson.build
@@ -41,10 +41,10 @@ if with_exynos
   libkms_include += include_directories('../exynos')
 endif
 
-libkms = library(
+libkms = shared_library(
   'kms',
   [files_libkms, config_file],
-  c_args : libdrm_c_args,
+  c_args : warn_c_args,
   include_directories : libkms_include,
   link_with : libdrm,
   version : '1.0.0',
@@ -56,26 +56,20 @@ ext_libkms = declare_dependency(
   include_directories : [libkms_include],
 )
 
-if meson.version().version_compare('>= 0.54.0')
-  meson.override_dependency('kms', ext_libkms)
-endif
-
 install_headers('libkms.h', subdir : 'libkms')
 
 pkg.generate(
-  libkms,
   name : 'libkms',
+  libraries : libkms,
   subdirs : ['libkms'],
   version : '1.0.0',
+  requires_private : 'libdrm',
   description : 'Library that abstracts away the different mm interfaces for kernel drivers',
 )
 
 test(
-  'kms-symbols-check',
-  symbols_check,
-  args : [
-    '--lib', libkms,
-    '--symbols-file', files('kms-symbols.txt'),
-    '--nm', prog_nm.path(),
-  ],
+  'kms-symbol-check',
+  prog_bash,
+  env : env_test,
+  args : [files('kms-symbol-check'), libkms]
 )
diff --git a/lib/libdrm/tests/kms/meson.build b/lib/libdrm/tests/kms/meson.build
index 91371aa0c..1f7f724d1 100644
--- a/lib/libdrm/tests/kms/meson.build
+++ b/lib/libdrm/tests/kms/meson.build
@@ -27,7 +27,7 @@ libkms_test = static_library(
   ),
   include_directories : [inc_root, inc_tests, inc_drm],
   link_with : libdrm,
-  c_args : libdrm_c_args,
+  c_args : warn_c_args,
 )
 
 kms_steal_crtc = executable(
diff --git a/lib/libdrm/tests/kmstest/meson.build b/lib/libdrm/tests/kmstest/meson.build
index 4fb870f9f..a47d49519 100644
--- a/lib/libdrm/tests/kmstest/meson.build
+++ b/lib/libdrm/tests/kmstest/meson.build
@@ -21,7 +21,7 @@
 kmstest = executable(
   'kmstest',
   files('main.c'),
-  c_args : libdrm_c_args,
+  c_args : warn_c_args,
   include_directories : [
     inc_root, inc_tests, include_directories('../../libkms'), inc_drm,
   ],