From 2c870bbe20ccaed9d8c85bb3144075025d3c9a01 Mon Sep 17 00:00:00 2001
From: Joshua Ashton <joshua@froggi.es>
Date: Fri, 25 Nov 2022 06:37:19 +0000
Subject: [PATCH] build: Add dependency on libdisplay-info

Add a dependency on https://gitlab.freedesktop.org/emersion/libdisplay-info/
to be used for parsing EDIDs for KHR_display HDR support.

Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35461>
---
 meson.build                      | 11 +++++++++++
 meson.options                    |  6 ++++++
 subprojects/libdisplay-info.wrap |  5 +++++
 3 files changed, 22 insertions(+)
 create mode 100644 subprojects/libdisplay-info.wrap

diff --git a/meson.build b/meson.build
index c454547b07a..811c4910897 100644
--- a/meson.build
+++ b/meson.build
@@ -1558,6 +1558,17 @@ if dep_zlib.found()
   pre_args += '-DHAVE_ZLIB'
 endif
 
+if host_machine.system() == 'windows'
+  dep_display_info = null_dep
+else
+  dep_display_info = dependency('libdisplay-info', version : '>= 0.1.1',
+                                fallback : ['libdisplay-info', 'di_dep'],
+                                required : get_option('display-info'))
+  if dep_display_info.found()
+    pre_args += '-DHAVE_LIBDISPLAY_INFO'
+  endif
+endif
+
 dep_zstd = dependency('libzstd', required : get_option('zstd'))
 if dep_zstd.found()
   pre_args += '-DHAVE_ZSTD'
diff --git a/meson.options b/meson.options
index 51a644ad310..8a0c9d6b9dc 100644
--- a/meson.options
+++ b/meson.options
@@ -609,6 +609,12 @@ option(
    description : 'Use ZLIB to build driver. Default: enabled'
 )
 
+option(
+   'display-info',
+   type : 'feature',
+   description : 'Use libdisplay-info to build driver.'
+)
+
 option(
   'sse2',
   type : 'boolean',
diff --git a/subprojects/libdisplay-info.wrap b/subprojects/libdisplay-info.wrap
new file mode 100644
index 00000000000..cf3cf1e6529
--- /dev/null
+++ b/subprojects/libdisplay-info.wrap
@@ -0,0 +1,5 @@
+[wrap-git]
+directory = libdisplay-info
+
+url = https://gitlab.freedesktop.org/emersion/libdisplay-info
+revision = 92b031749c0fe84ef5cdf895067b84a829920e25