summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-08-06 12:44:36 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-07 16:08:15 +0100
commit48a979be5415aeb7163a6854330238bd8c61cfc7 (patch)
treed1b331bd4a0bfa2129ac2bcdacaef9bb9e8db16b
parent58beb4fd3d5509a336eeebbc1354687b746589e8 (diff)
downloadpoky-48a979be5415aeb7163a6854330238bd8c61cfc7.tar.gz
waffle: upgrade 1.5.2 -> 1.6.0
Switch to Meson instead of CMake. Add PACKAGECONFIG for surfaceless-egl. Inherit bash-completion for the new wlinfo completion script. (From OE-Core rev: 96decf673992b1cd1eebac45a5cd534eef27ebd7) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/waffle/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch54
-rw-r--r--meta/recipes-graphics/waffle/waffle_1.6.0.bb (renamed from meta/recipes-graphics/waffle/waffle_1.5.2.bb)23
2 files changed, 12 insertions, 65 deletions
diff --git a/meta/recipes-graphics/waffle/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch b/meta/recipes-graphics/waffle/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch
deleted file mode 100644
index a0c826ed93..0000000000
--- a/meta/recipes-graphics/waffle/waffle/0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1From 3b9b8f5f6d1b99af43e95ec0868404e552a85b73 Mon Sep 17 00:00:00 2001
2From: Emil Velikov <emil.l.velikov@gmail.com>
3Date: Thu, 19 Mar 2015 22:26:11 +0000
4Subject: [PATCH] third_party/threads: Use PTHREAD_MUTEX_RECURSIVE by default
5
6PTHREAD_MUTEX_RECURSIVE_NP was used for compatibility with old glibc.
7Although due to the_GNU_SOURCES define the portable,
8PTHREAD_MUTEX_RECURSIVE will be available for Linuxes since at least
91998. Simplify things giving us compatibility with musl which
10apparently does not provide the non-portable define.
11
12Inspired by almost identical commit in mesa aead7fe2e2b(c11/threads: Use
13PTHREAD_MUTEX_RECURSIVE by default) by Felix Janda.
14
15Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
16Reviewed-by: Chad Versace <chad.versace@intel.com>
17---
18Upstream-Status: Backport
19
20 third_party/threads/threads_posix.c | 10 ++++------
21 1 file changed, 4 insertions(+), 6 deletions(-)
22
23diff --git a/third_party/threads/threads_posix.c b/third_party/threads/threads_posix.c
24index 5835e43..e122bf9 100644
25--- a/third_party/threads/threads_posix.c
26+++ b/third_party/threads/threads_posix.c
27@@ -26,6 +26,9 @@
28 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
29 * DEALINGS IN THE SOFTWARE.
30 */
31+
32+#define _GNU_SOURCE
33+
34 #include <stdlib.h>
35 #ifndef assert
36 #include <assert.h>
37@@ -150,13 +153,8 @@ int mtx_init(mtx_t *mtx, int type)
38 && type != (mtx_try|mtx_recursive))
39 return thrd_error;
40 pthread_mutexattr_init(&attr);
41- if ((type & mtx_recursive) != 0) {
42-#if defined(__linux__) || defined(__linux)
43- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
44-#else
45+ if ((type & mtx_recursive) != 0)
46 pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
47-#endif
48- }
49 pthread_mutex_init(mtx, &attr);
50 pthread_mutexattr_destroy(&attr);
51 return thrd_success;
52--
532.5.2
54
diff --git a/meta/recipes-graphics/waffle/waffle_1.5.2.bb b/meta/recipes-graphics/waffle/waffle_1.6.0.bb
index 31572f25f7..8a1d5748f6 100644
--- a/meta/recipes-graphics/waffle/waffle_1.5.2.bb
+++ b/meta/recipes-graphics/waffle/waffle_1.6.0.bb
@@ -3,34 +3,35 @@ LICENSE = "BSD-2-Clause"
3LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \ 3LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \
4 file://include/waffle/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf" 4 file://include/waffle/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf"
5 5
6SRC_URI = "http://waffle-gl.org/files/release/${BPN}-${PV}/${BPN}-${PV}.tar.xz \ 6SRC_URI = "http://waffle-gl.org/files/release/${BPN}-${PV}/${BPN}-${PV}.tar.xz"
7 file://0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch \ 7SRC_URI[md5sum] = "61bfc1a478e840825f33ddb4057115e7"
8 " 8SRC_URI[sha256sum] = "d9c899f710c50cfdd00f5f4cdfeaef0687d8497362239bdde93bed6c909c81d7"
9SRC_URI[md5sum] = "c669c91bf2f7e13a5d781c3dbb30fd8c"
10SRC_URI[sha256sum] = "d2c096cf654bf0061323a4b9231a1ef5b749a1e5c7c5bfe067e964219c2a851c"
11 9
12UPSTREAM_CHECK_URI = "http://www.waffle-gl.org/releases.html" 10UPSTREAM_CHECK_URI = "http://www.waffle-gl.org/releases.html"
13 11
14inherit cmake distro_features_check lib_package 12inherit meson distro_features_check lib_package bash-completion
15 13
16# This should be overridden per-machine to reflect the capabilities of the GL 14# This should be overridden per-machine to reflect the capabilities of the GL
17# stack. 15# stack.
18PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11-egl', '', d)} \ 16PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11-egl', '', d)} \
19 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ 17 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
20 gbm" 18 surfaceless-egl gbm"
21 19
22# virtual/libgl requires opengl in DISTRO_FEATURES. 20# virtual/libgl requires opengl in DISTRO_FEATURES.
23REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('DEPENDS', 'virtual/${MLPREFIX}libgl', 'opengl', '', d)}" 21REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('DEPENDS', 'virtual/${MLPREFIX}libgl', 'opengl', '', d)}"
24 22
25# I say virtual/libgl, actually wants gl.pc 23# I say virtual/libgl, actually wants gl.pc
26PACKAGECONFIG[glx] = "-Dwaffle_has_glx=1,-Dwaffle_has_glx=0,virtual/${MLPREFIX}libgl libx11" 24PACKAGECONFIG[glx] = "-Dglx=enabled,-Dglx=disabled,virtual/${MLPREFIX}libgl libx11"
27 25
28# I say virtual/libgl, actually wants wayland-egl.pc, egl.pc, and the wayland 26# I say virtual/libgl, actually wants wayland-egl.pc, egl.pc, and the wayland
29# DISTRO_FEATURE. 27# DISTRO_FEATURE.
30PACKAGECONFIG[wayland] = "-Dwaffle_has_wayland=1,-Dwaffle_has_wayland=0,virtual/${MLPREFIX}libgl wayland" 28PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,virtual/${MLPREFIX}libgl wayland"
31 29
32# I say virtual/libgl, actually wants gbm.pc egl.pc 30# I say virtual/libgl, actually wants gbm.pc egl.pc
33PACKAGECONFIG[gbm] = "-Dwaffle_has_gbm=1,-Dwaffle_has_gbm=0,virtual/${MLPREFIX}libgl udev" 31PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/${MLPREFIX}libgl udev"
34 32
35# I say virtual/libgl, actually wants egl.pc 33# I say virtual/libgl, actually wants egl.pc
36PACKAGECONFIG[x11-egl] = "-Dwaffle_has_x11_egl=1,-Dwaffle_has_x11_egl=0,virtual/${MLPREFIX}libgl libxcb" 34PACKAGECONFIG[x11-egl] = "-Dx11_egl=enabled,-Dx11_egl=disabled,virtual/${MLPREFIX}libgl libxcb"
35PACKAGECONFIG[surfaceless-egl] = "-Dsurfaceless_egl=enabled,-Dsurfaceless_egl=disabled,virtual/${MLPREFIX}libgl"
36
37# TODO: optionally build manpages and examples