summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArkadiusz Hiler <arkadiusz.hiler@intel.com>2019-02-19 12:51:42 +0200
committerArkadiusz Hiler <arkadiusz.hiler@intel.com>2019-02-20 08:38:19 +0200
commitcc48c23175a8439eca797644f1ded54de3c4129b (patch)
treeec3fc31adba943db1ed7fd44addff4a12207de2b
parentc12b1f87adc4c568b21cc6ed9076b94bea46b010 (diff)
meson: Bump meson version requirement to 0.46.0
... so we can have multiple binaries with the same name. v2: Updated news (Daniel) Cc: Petri Latvala <petri.latvala@intel.com> Cc: Daniel Vetter <daniel@ffwll.ch> Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--Dockerfile.fedora2
-rw-r--r--NEWS7
-rw-r--r--meson.build2
3 files changed, 9 insertions, 2 deletions
diff --git a/Dockerfile.fedora b/Dockerfile.fedora
index 08a4bd22..29520f7b 100644
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -37,7 +37,7 @@ RUN rm -fr /tmp/peg
# Meson version switching shenanigans
WORKDIR /usr/src
-RUN curl -O https://files.pythonhosted.org/packages/c0/98/bcbda7862f8ca18dbdaa57b9c51cf7333cdc59b48278ed279217cd6ad8ff/meson-0.44.0.tar.gz
+RUN curl -O https://files.pythonhosted.org/packages/17/d0/0fe98a9557a2f07dbe6f99ef57f2bc37450b641e1f6ceae9ce04c3c845dd/meson-0.46.0.tar.gz
# Cleanup workdir
WORKDIR /
diff --git a/NEWS b/NEWS
index b974bd45..ffddc096 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Unreleased
+----------
+
+General changes:
+
+ - Bumped required meson version to 0.46. (Arkadiusz Hiler)
+
Release 1.23 (2018-07-18)
-------------------------
diff --git a/meson.build b/meson.build
index 356a5414..099db897 100644
--- a/meson.build
+++ b/meson.build
@@ -5,7 +5,7 @@ project('igt-gpu-tools', 'c',
'c_std=gnu11',
],
license : 'MIT',
- meson_version : '>=0.44.0')
+ meson_version : '>=0.46.0')
cc = meson.get_compiler('c')