summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2018-06-20 17:07:21 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-27 13:55:21 +0100
commit19c22fc08a9ca778bcf79690cf7f27c3bf372211 (patch)
tree47bd5f699d710abcee6c30f7983eae22ee0b0597 /meta/recipes-graphics
parent42dde16a5c1a45a003338253551a56b6c0b0fbf1 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-graphics/libepoxy/libepoxy/no-tests.patch33
-rw-r--r--meta/recipes-graphics/libepoxy/libepoxy_1.5.2.bb (renamed from meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb)5
2 files changed, 2 insertions, 36 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 @@
1Add option to disable tests.
2
3Upstream-Status: Submitted (https://github.com/anholt/libepoxy/pull/158)
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6diff --git a/meson.build b/meson.build
7index 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)
22diff --git a/meson_options.txt b/meson_options.txt
23index 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')
diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb b/meta/recipes-graphics/libepoxy/libepoxy_1.5.2.bb
index 5ca0868c22..106721226b 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb
+++ b/meta/recipes-graphics/libepoxy/libepoxy_1.5.2.bb
@@ -6,10 +6,9 @@ LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b" 6LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b"
7 7
8SRC_URI = "https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \ 8SRC_URI = "https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \
9 file://no-tests.patch \
10 " 9 "
11SRC_URI[md5sum] = "63fe3847789258254dcd7e3fdb9e7f5e" 10SRC_URI[md5sum] = "4a6b9e581da229dee74c2263c84b1eca"
12SRC_URI[sha256sum] = "4c94995398a6ebf691600dda2e9685a0cac261414175c2adf4645cdfab42a5d5" 11SRC_URI[sha256sum] = "a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8"
13UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases" 12UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases"
14 13
15inherit meson pkgconfig distro_features_check 14inherit meson pkgconfig distro_features_check