X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=meson.build;h=4e1990eb6001488a1820af1b61d0d9191d29d6fc;hb=1b259f1ae798099de280dd0ee10018d1fd54be04;hp=ff529d339226ebfa426eef0f9332a4bf2222609e;hpb=5157a4276500c77e2210e853b262be1d1b30aedf;p=mesa.git

diff --git a/meson.build b/meson.build
index ff529d33922..4e1990eb600 100644
--- a/meson.build
+++ b/meson.build
@@ -107,7 +107,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
 # Only build shared_glapi if at least one OpenGL API is enabled
 with_shared_glapi = get_option('shared-glapi') and with_any_opengl
 
-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly', 'linux'].contains(host_machine.system())
+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux'].contains(host_machine.system())
 
 dri_drivers = get_option('dri-drivers')
 if dri_drivers.contains('auto')
@@ -746,7 +746,11 @@ if with_platform_haiku
   pre_args += '-DHAVE_HAIKU_PLATFORM'
 endif
 
-prog_python = import('python3').find_python()
+if meson.version().version_compare('>=0.50')
+  prog_python = import('python').find_installation('python3')
+else
+  prog_python = import('python3').find_python()
+endif
 has_mako = run_command(
   prog_python, '-c',
   '''
@@ -832,7 +836,7 @@ if cc.compiles('__uint128_t foo(void) { return 0; }',
 endif
 
 # TODO: this is very incomplete
-if ['linux', 'cygwin', 'gnu'].contains(host_machine.system())
+if ['linux', 'cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system())
   pre_args += '-D_GNU_SOURCE'
 endif
 
@@ -1161,7 +1165,7 @@ _drm_amdgpu_ver = '2.4.97'
 _drm_radeon_ver = '2.4.71'
 _drm_nouveau_ver = '2.4.66'
 _drm_intel_ver = '2.4.75'
-_drm_ver = '2.4.75'
+_drm_ver = '2.4.81'
 
 _libdrm_checks = [
   ['intel', with_dri_i915 or with_gallium_i915],
@@ -1544,8 +1548,8 @@ lines = ['',
                                                     with_gles2 ? 'yes' : 'no'),
 ]
 
-lines += ''
 if with_osmesa != 'none'
+  lines += ''
   suffix = ''
   if with_osmesa == 'gallium'
     suffix = '(Gallium)'
@@ -1555,8 +1559,8 @@ else
   lines += 'OSMesa:          no'
 endif
 
-lines += ''
 if with_dri
+  lines += ''
   lines += 'DRI platform:    ' + with_dri_platform
   if dri_drivers.length() != 0 and dri_drivers != ['']
     lines += 'DRI drivers:     ' + ' '.join(dri_drivers)
@@ -1566,8 +1570,8 @@ if with_dri
   lines += 'DRI driver dir:  ' + dri_drivers_path
 endif
 
-lines += ''
 if with_glx != 'disabled'
+  lines += ''
   if with_glx == 'dri'
     lines += 'GLX:             DRI-based'
   elif with_glx == 'xlib'