drm: Branch 'master' - 2 commits

 freedreno/meson.build |    2 +-
 meson.build           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5df936718df62a8d1f696ff0f5fe7984aa35150b
Author: Dylan Baker <[email protected]>
Date:   Fri Jan 12 11:53:39 2018 -0800

    meson: set the minimum version correctly
    
    Currently we ask for 0.42, but we actually require 0.43 because we pass
    file objects as arguments to tests. If someone needs version 0.42 it
    wouldn't be hard, just a lot of replacing files() with strings.
    
    Signed-off-by: Dylan Baker <[email protected]>
    Reviewed-by: Emil Velikov <[email protected]>
    Reviewed-by: Eric Engestrom <[email protected]>

diff --git a/meson.build b/meson.build
index 05566081..d7a50cf9 100644
--- a/meson.build
+++ b/meson.build
@@ -23,7 +23,7 @@ project(
   ['c'],
   version : '2.4.89',
   license : 'MIT',
-  meson_version : '>= 0.42',
+  meson_version : '>= 0.43',
   default_options : ['buildtype=debugoptimized', 'c_std=gnu99'],
 )
 
commit 7e28d73af018d02b5e1827769d61e04f73e50d69
Author: Dylan Baker <[email protected]>
Date:   Fri Jan 12 11:51:17 2018 -0800

    meson: set proper pkg-config version for libdrm_freedreno
    
    Copy and paste error from exynos.
    
    Signed-off-by: Dylan Baker <[email protected]>
    Reviewed-by: Emil Velikov <[email protected]>
    Reviewed-by: Eric Engestrom <[email protected]>

diff --git a/freedreno/meson.build b/freedreno/meson.build
index b4035e19..de6a413f 100644
--- a/freedreno/meson.build
+++ b/freedreno/meson.build
@@ -64,7 +64,7 @@ pkg.generate(
   name : 'libdrm_freedreno',
   libraries : libdrm_freedreno,
   subdirs : ['.', 'libdrm', 'freedreno'],
-  version : '0.7',
+  version : meson.project_version(),
   requires_private : 'libdrm',
   description : 'Userspace interface to freedreno kernel DRM services',
 )

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
--