drm: Branch 'master' - 4 commits

 amdgpu/amdgpu-symbol-check       |    2 +-
 amdgpu/meson.build               |    4 ++--
 etnaviv/etnaviv-symbol-check     |    2 +-
 etnaviv/meson.build              |    5 +++--
 exynos/exynos-symbol-check       |    2 +-
 exynos/meson.build               |    4 ++--
 freedreno/freedreno-symbol-check |    2 +-
 freedreno/meson.build            |    4 ++--
 intel/intel-symbol-check         |    2 +-
 intel/meson.build                |   22 ++++++++--------------
 libkms/kms-symbol-check          |    2 +-
 libkms/meson.build               |    4 ++--
 meson.build                      |    8 ++++----
 nouveau/meson.build              |    4 ++--
 nouveau/nouveau-symbol-check     |    2 +-
 omap/meson.build                 |    4 ++--
 omap/omap-symbol-check           |    2 +-
 radeon/meson.build               |    4 ++--
 radeon/radeon-symbol-check       |    2 +-
 tegra/meson.build                |    4 ++--
 tegra/tegra-symbol-check         |    2 +-
 21 files changed, 41 insertions(+), 46 deletions(-)

New commits:
commit dddeff5028e1f3f34f67846c12876cd189c61bd1
Author: Eric Engestrom <[email protected]>
Date:   Fri Oct 4 09:37:31 2019 +0100

    *-symbols-check: let meson figure out how to execute the scripts
    
    Signed-off-by: Eric Engestrom <[email protected]>

diff --git a/amdgpu/meson.build b/amdgpu/meson.build
index 7c8ccc7e..8168993a 100644
--- a/amdgpu/meson.build
+++ b/amdgpu/meson.build
@@ -59,7 +59,7 @@ ext_libdrm_amdgpu = declare_dependency(
 
 test(
   'amdgpu-symbol-check',
-  prog_bash,
+  find_program('amdgpu-symbol-check'),
   env : env_test,
-  args : [files('amdgpu-symbol-check'), libdrm_amdgpu]
+  args : libdrm_amdgpu,
 )
diff --git a/etnaviv/meson.build b/etnaviv/meson.build
index 515a4ed0..1ecf2940 100644
--- a/etnaviv/meson.build
+++ b/etnaviv/meson.build
@@ -54,6 +54,7 @@ ext_libdrm_etnaviv = declare_dependency(
 
 test(
   'etnaviv-symbol-check',
-  prog_bash,
-  args : [files('etnaviv-symbol-check'), libdrm_etnaviv]
+  find_program('etnaviv-symbol-check'),
+  env : env_test,
+  args : libdrm_etnaviv,
 )
diff --git a/exynos/meson.build b/exynos/meson.build
index bdfc3fc6..0136cb2a 100644
--- a/exynos/meson.build
+++ b/exynos/meson.build
@@ -48,7 +48,7 @@ pkg.generate(
 
 test(
   'exynos-symbol-check',
-  prog_bash,
+  find_program('exynos-symbol-check'),
   env : env_test,
-  args : [files('exynos-symbol-check'), libdrm_exynos]
+  args : libdrm_exynos,
 )
diff --git a/freedreno/meson.build b/freedreno/meson.build
index c9aba060..5d8d8e9b 100644
--- a/freedreno/meson.build
+++ b/freedreno/meson.build
@@ -71,7 +71,7 @@ pkg.generate(
 
 test(
   'freedreno-symbol-check',
-  prog_bash,
+  find_program('freedreno-symbol-check'),
   env : env_test,
-  args : [files('freedreno-symbol-check'), libdrm_freedreno]
+  args : libdrm_freedreno,
 )
diff --git a/intel/meson.build b/intel/meson.build
index 3d6bbac6..355bf35d 100644
--- a/intel/meson.build
+++ b/intel/meson.build
@@ -64,43 +64,37 @@ test_decode = executable(
 
 test(
   'gen4-3d.batch',
-  prog_bash,
-  args : files('tests/gen4-3d.batch.sh'),
+  find_program('tests/gen4-3d.batch.sh'),
   workdir : meson.current_build_dir(),
 )
 test(
   'gen45-3d.batch',
-  prog_bash,
-  args : files('tests/gm45-3d.batch.sh'),
+  find_program('tests/gm45-3d.batch.sh'),
   workdir : meson.current_build_dir(),
 )
 test(
   'gen5-3d.batch',
-  prog_bash,
-  args : files('tests/gen5-3d.batch.sh'),
+  find_program('tests/gen5-3d.batch.sh'),
   workdir : meson.current_build_dir(),
 )
 test(
   'gen6-3d.batch',
-  prog_bash,
-  args : files('tests/gen6-3d.batch.sh'),
+  find_program('tests/gen6-3d.batch.sh'),
   workdir : meson.current_build_dir(),
 )
 test(
   'gen7-3d.batch',
-  prog_bash,
-  args : files('tests/gen7-3d.batch.sh'),
+  find_program('tests/gen7-3d.batch.sh'),
   workdir : meson.current_build_dir(),
 )
 test(
   'gen7-2d-copy.batch',
-  prog_bash,
-  args : files('tests/gen7-2d-copy.batch.sh'),
+  find_program('tests/gen7-2d-copy.batch.sh'),
   workdir : meson.current_build_dir(),
 )
 test(
   'intel-symbol-check',
-  prog_bash,
+  find_program('intel-symbol-check'),
   env : env_test,
-  args : [files('intel-symbol-check'), libdrm_intel]
+  args : libdrm_intel,
 )
diff --git a/libkms/meson.build b/libkms/meson.build
index dc931608..04f018af 100644
--- a/libkms/meson.build
+++ b/libkms/meson.build
@@ -69,7 +69,7 @@ pkg.generate(
 
 test(
   'kms-symbol-check',
-  prog_bash,
+  find_program('kms-symbol-check'),
   env : env_test,
-  args : [files('kms-symbol-check'), libkms]
+  args : libkms,
 )
diff --git a/meson.build b/meson.build
index 072cb469..2323cc60 100644
--- a/meson.build
+++ b/meson.build
@@ -256,9 +256,6 @@ if prog_xslt.found()
 endif
 with_man_pages = with_man_pages != 'false' and prog_xslt.found() and prog_sed.found()
 
-# Used for tests
-prog_bash = find_program('bash')
-
 config.set10('HAVE_VISIBILITY',
   cc.compiles('''int foo_hidden(void) __attribute__((visibility(("hidden"))));''',
               name : 'compiler supports __attribute__(("hidden"))'))
diff --git a/nouveau/meson.build b/nouveau/meson.build
index 0c1498d7..56e952ca 100644
--- a/nouveau/meson.build
+++ b/nouveau/meson.build
@@ -53,7 +53,7 @@ pkg.generate(
 
 test(
   'nouveau-symbol-check',
-  prog_bash,
+  find_program('nouveau-symbol-check'),
   env : env_test,
-  args : [files('nouveau-symbol-check'), libdrm_nouveau]
+  args : libdrm_nouveau,
 )
diff --git a/omap/meson.build b/omap/meson.build
index 54698c6a..f3ea36db 100644
--- a/omap/meson.build
+++ b/omap/meson.build
@@ -48,7 +48,7 @@ pkg.generate(
 
 test(
   'omap-symbol-check',
-  prog_bash,
+  find_program('omap-symbol-check'),
   env : env_test,
-  args : [files('omap-symbol-check'), libdrm_omap]
+  args : libdrm_omap,
 )
diff --git a/radeon/meson.build b/radeon/meson.build
index 1fc5282c..662b5bce 100644
--- a/radeon/meson.build
+++ b/radeon/meson.build
@@ -58,7 +58,7 @@ pkg.generate(
 
 test(
   'radeon-symbol-check',
-  prog_bash,
+  find_program('radeon-symbol-check'),
   env : env_test,
-  args : [files('radeon-symbol-check'), libdrm_radeon]
+  args : libdrm_radeon,
 )
diff --git a/tegra/meson.build b/tegra/meson.build
index 4bc454b6..ce56ddcf 100644
--- a/tegra/meson.build
+++ b/tegra/meson.build
@@ -47,7 +47,7 @@ pkg.generate(
 
 test(
   'tegra-symbol-check',
-  prog_bash,
+  find_program('tegra-symbol-check'),
   env : env_test,
-  args : [files('tegra-symbol-check'), libdrm_tegra]
+  args : libdrm_tegra,
 )
commit 9b1e0842538626303e3873c8bff4a483da1374e7
Author: Emil Velikov <[email protected]>
Date:   Sun Jun 16 14:23:41 2019 +0100

    *-symbols-check: use normal shell over bash
    
    None of the tests are bash specific. Tested with bash, zsh, dash, mksh
    and ksh.
    
    Signed-off-by: Emil Velikov <[email protected]>
    Tested-by: Niclas Zeising <[email protected]>
    Reviewed-by: Niclas Zeising <[email protected]>
    Reviewed-by: Eric Engestrom <[email protected]>

diff --git a/amdgpu/amdgpu-symbol-check b/amdgpu/amdgpu-symbol-check
index 5ce15f46..ea83850d 100755
--- a/amdgpu/amdgpu-symbol-check
+++ b/amdgpu/amdgpu-symbol-check
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set -u
 
diff --git a/etnaviv/etnaviv-symbol-check b/etnaviv/etnaviv-symbol-check
index 6f6a7a28..b3f3dda7 100755
--- a/etnaviv/etnaviv-symbol-check
+++ b/etnaviv/etnaviv-symbol-check
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set -u
 
diff --git a/exynos/exynos-symbol-check b/exynos/exynos-symbol-check
index 49d611e6..d2c362e1 100755
--- a/exynos/exynos-symbol-check
+++ b/exynos/exynos-symbol-check
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set -u
 
diff --git a/freedreno/freedreno-symbol-check b/freedreno/freedreno-symbol-check
index 978026c0..987e38fa 100755
--- a/freedreno/freedreno-symbol-check
+++ b/freedreno/freedreno-symbol-check
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set -u
 
diff --git a/intel/intel-symbol-check b/intel/intel-symbol-check
index de377bef..2f355321 100755
--- a/intel/intel-symbol-check
+++ b/intel/intel-symbol-check
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set -u
 
diff --git a/libkms/kms-symbol-check b/libkms/kms-symbol-check
index 30f444f7..7d3426f6 100755
--- a/libkms/kms-symbol-check
+++ b/libkms/kms-symbol-check
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set -u
 
diff --git a/nouveau/nouveau-symbol-check b/nouveau/nouveau-symbol-check
index 6296244c..36703a3e 100755
--- a/nouveau/nouveau-symbol-check
+++ b/nouveau/nouveau-symbol-check
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set -u
 
diff --git a/omap/omap-symbol-check b/omap/omap-symbol-check
index 16da3c40..21522ba0 100755
--- a/omap/omap-symbol-check
+++ b/omap/omap-symbol-check
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set -u
 
diff --git a/radeon/radeon-symbol-check b/radeon/radeon-symbol-check
index da605bb8..7b69f9a4 100755
--- a/radeon/radeon-symbol-check
+++ b/radeon/radeon-symbol-check
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set -u
 
diff --git a/tegra/tegra-symbol-check b/tegra/tegra-symbol-check
index 8539b95b..a74d9749 100755
--- a/tegra/tegra-symbol-check
+++ b/tegra/tegra-symbol-check
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set -u
 
commit 4083e8f2c65989461f5a62ed7b295c8c04032664
Author: Niclas Zeising <[email protected]>
Date:   Sun Jun 16 14:23:43 2019 +0100

    meson.build: Fix header detection on FreeBSD
    
    FreeBSD requires sys/types.h for sys/sysctl.h, add it as part of the
    includes when checking for headers.
    Instead of splitting out the check for sys/sysctl.h from the other
    header checks, just add sys/types.h to all header checks.
    
    v2 [Emil]
     - add inline comment
     - drop bash/sh hunk
    
    Signed-off-by: Emil Velikov <[email protected]>
    Signed-off-by: Niclas Zeising <[email protected]>
    Reviewed-by: Eric Engestrom <[email protected]>

diff --git a/meson.build b/meson.build
index 9de2a716..072cb469 100644
--- a/meson.build
+++ b/meson.build
@@ -179,9 +179,12 @@ else
   dep_rt = []
 endif
 dep_m = cc.find_library('m', required : false)
+# From Niclas Zeising:
+# FreeBSD requires sys/types.h for sys/sysctl.h, add it as part of the
+# includes when checking for headers.
 foreach header : ['sys/sysctl.h', 'sys/select.h', 'alloca.h']
   config.set('HAVE_' + header.underscorify().to_upper(),
-    cc.compiles('#include <@0@>'.format(header), name : '@0@ works'.format(header)))
+    cc.compiles('#include <sys/types.h>\n#include <@0@>'.format(header), name : '@0@ works'.format(header)))
 endforeach
 if (cc.has_header_symbol('sys/sysmacros.h', 'major') and
   cc.has_header_symbol('sys/sysmacros.h', 'minor') and
commit 7e46f4dc80f74a7709397135e90de72cfe675ffe
Author: Niclas Zeising <[email protected]>
Date:   Sun Jun 16 14:23:40 2019 +0100

    meson.build: Fix typo
    
    Reviewed-by: Emil Velikov <[email protected]>
    Reviewed-by: Eric Engestrom <[email protected]>

diff --git a/meson.build b/meson.build
index 99fd0cb8..9de2a716 100644
--- a/meson.build
+++ b/meson.build
@@ -253,7 +253,7 @@ if prog_xslt.found()
 endif
 with_man_pages = with_man_pages != 'false' and prog_xslt.found() and prog_sed.found()
 
-# Used for tets
+# Used for tests
 prog_bash = find_program('bash')
 
 config.set10('HAVE_VISIBILITY',


--