Browse Source

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>
Maxin B. John 7 năm trước cách đây
mục cha
commit
19c22fc08a

+ 0 - 33
meta/recipes-graphics/libepoxy/libepoxy/no-tests.patch

@@ -1,33 +0,0 @@
-Add option to disable tests.
-
-Upstream-Status: Submitted (https://github.com/anholt/libepoxy/pull/158)
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-diff --git a/meson.build b/meson.build
-index b2ebaef..9632c7a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -242,7 +242,10 @@ libepoxy_inc = [
- 
- subdir('include/epoxy')
- subdir('src')
--subdir('test')
-+
-+if get_option('tests')
-+  subdir('test')
-+endif
- 
- if get_option('docs')
-   doxygen = find_program('doxygen', required: false)
-diff --git a/meson_options.txt b/meson_options.txt
-index b5d7c98..dc30e68 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -15,3 +15,7 @@ option('x11',
-        type: 'boolean',
-        value: true,
-        description: 'Enable X11 support (GLX or EGL-X11)')
-+option('tests',
-+       type: 'boolean',
-+       value: true,
-+       description: 'Build the test suite')

+ 2 - 3
meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb → meta/recipes-graphics/libepoxy/libepoxy_1.5.2.bb

@@ -6,10 +6,9 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b"
 
 SRC_URI = "https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \
-           file://no-tests.patch \
            "
-SRC_URI[md5sum] = "63fe3847789258254dcd7e3fdb9e7f5e"
-SRC_URI[sha256sum] = "4c94995398a6ebf691600dda2e9685a0cac261414175c2adf4645cdfab42a5d5"
+SRC_URI[md5sum] = "4a6b9e581da229dee74c2263c84b1eca"
+SRC_URI[sha256sum] = "a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8"
 UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases"
 
 inherit meson pkgconfig distro_features_check