diff options
author | Maxin B. John <maxin.john@intel.com> | 2018-06-20 17:07:21 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-27 13:55:21 +0100 |
commit | 19c22fc08a9ca778bcf79690cf7f27c3bf372211 (patch) | |
tree | 47bd5f699d710abcee6c30f7983eae22ee0b0597 /meta/recipes-graphics/libepoxy/libepoxy | |
parent | 42dde16a5c1a45a003338253551a56b6c0b0fbf1 (diff) | |
download | poky-19c22fc08a9ca778bcf79690cf7f27c3bf372211.tar.gz |
libepoxy: upgrade 1.5.0 -> 1.5.2
Remove upstreamed patch:
no-tests.patch
(From OE-Core rev: ec9fcdf14d3e2aefc5af1e53a69f056db6ea83f5)
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/libepoxy/libepoxy')
-rw-r--r-- | meta/recipes-graphics/libepoxy/libepoxy/no-tests.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/meta/recipes-graphics/libepoxy/libepoxy/no-tests.patch b/meta/recipes-graphics/libepoxy/libepoxy/no-tests.patch deleted file mode 100644 index d2b6c1a254..0000000000 --- a/meta/recipes-graphics/libepoxy/libepoxy/no-tests.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | Add option to disable tests. | ||
2 | |||
3 | Upstream-Status: Submitted (https://github.com/anholt/libepoxy/pull/158) | ||
4 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
5 | |||
6 | diff --git a/meson.build b/meson.build | ||
7 | index b2ebaef..9632c7a 100644 | ||
8 | --- a/meson.build | ||
9 | +++ b/meson.build | ||
10 | @@ -242,7 +242,10 @@ libepoxy_inc = [ | ||
11 | |||
12 | subdir('include/epoxy') | ||
13 | subdir('src') | ||
14 | -subdir('test') | ||
15 | + | ||
16 | +if get_option('tests') | ||
17 | + subdir('test') | ||
18 | +endif | ||
19 | |||
20 | if get_option('docs') | ||
21 | doxygen = find_program('doxygen', required: false) | ||
22 | diff --git a/meson_options.txt b/meson_options.txt | ||
23 | index b5d7c98..dc30e68 100644 | ||
24 | --- a/meson_options.txt | ||
25 | +++ b/meson_options.txt | ||
26 | @@ -15,3 +15,7 @@ option('x11', | ||
27 | type: 'boolean', | ||
28 | value: true, | ||
29 | description: 'Enable X11 support (GLX or EGL-X11)') | ||
30 | +option('tests', | ||
31 | + type: 'boolean', | ||
32 | + value: true, | ||
33 | + description: 'Build the test suite') | ||