meson/broadcom: libbroadcom_cle also needs zlib

[mesa.git] / src / broadcom / cle / meson.build

diff --git a/src/broadcom/cle/meson.build b/src/broadcom/cle/meson.build
index 32510cee5ef6ff3af8d576b44045bf17e0a72443..a2f47625a5020c2809f350e73c5aa8c4a5681554 100644 (file)
--- a/src/broadcom/cle/meson.build
+++ b/src/broadcom/cle/meson.build
@@ -18,42 +18,46 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+# [version, cle XML version]
 v3d_versions = [
-  21,
-  33
+  [21, 21],
+  [33, 33],
+  [41, 33],
+  [42, 33]
 ]
 
 v3d_xml_files = []
-foreach v: v3d_versions
-  v3d_xml_files += 'v3d_packet_v@0@.xml'.format(v)
+v3d_xml_pack = []
+foreach _v : v3d_versions
+  v = _v[0]
+  xmlver = _v[1]
+  f = 'v3d_packet_v@0@.xml'.format(xmlver)
+  _name = 'v3d_packet_v@0@_pack.h'.format(v)
+  if not v3d_xml_files.contains(f)
+    v3d_xml_files += f
+  endif
+  v3d_xml_pack += custom_target(
+    _name,
+    input : ['gen_pack_header.py', f],
+    output : _name,
+    command : [prog_python, '@INPUT@', '@0@'.format(v)],
+    capture : true,
+  )
 endforeach
 
 v3d_xml_h = custom_target(
   'v3d_xml.h',
   input : ['../../intel/genxml/gen_zipped_file.py', v3d_xml_files],
   output : 'v3d_xml.h',
-  command : [prog_python2, '@INPUT@'],
+  command : [prog_python, '@INPUT@'],
   capture : true,
 )
 
-v3d_xml_pack = []
-foreach f : v3d_xml_files
-  _name = '@0@_pack.h'.format(f.split('.')[0])
-  _xml = custom_target(
-    _name,
-    input : ['gen_pack_header.py', f],
-    output : _name,
-    command : [prog_python2, '@INPUT@'],
-    capture : true,
-  )
-  v3d_xml_pack += _xml
-endforeach
-
 libbroadcom_cle = static_library(
   ['broadcom_cle', v3d_xml_h],
   'v3d_decoder.c',
   include_directories : [inc_common, inc_broadcom],
   c_args : [c_vis_args, no_override_init_args],
-  dependencies : [dep_libdrm, dep_valgrind],
+  dependencies : [dep_libdrm, dep_valgrind, dep_expat, dep_zlib],
   build_by_default : false,
 )