diff options
Diffstat (limited to 'meta/recipes-graphics/waffle')
-rw-r--r-- | meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch | 40 | ||||
-rw-r--r-- | meta/recipes-graphics/waffle/waffle_1.8.0.bb (renamed from meta/recipes-graphics/waffle/waffle_1.6.1.bb) | 39 |
2 files changed, 62 insertions, 17 deletions
diff --git a/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch b/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch new file mode 100644 index 0000000000..31ac3e0dd1 --- /dev/null +++ b/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 79b9e4338f803d79449e53a40b1ecc0a5a5889e4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Tue, 26 Oct 2021 08:52:17 +0200 | ||
4 | Subject: [PATCH] waffle: do not make core protocol into the library | ||
5 | |||
6 | None of the consumers (which is just piglit) use it, and | ||
7 | this avoids host contamination from pkg-config suggesting | ||
8 | wayland.xml from the host. | ||
9 | |||
10 | Upstream-Status: Inappropriate [oe-core specific] | ||
11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
12 | --- | ||
13 | src/waffle/meson.build | 7 ------- | ||
14 | 1 file changed, 7 deletions(-) | ||
15 | |||
16 | diff --git a/src/waffle/meson.build b/src/waffle/meson.build | ||
17 | index 1cc99f6..022745a 100644 | ||
18 | --- a/src/waffle/meson.build | ||
19 | +++ b/src/waffle/meson.build | ||
20 | @@ -89,12 +89,6 @@ if build_surfaceless | ||
21 | endif | ||
22 | |||
23 | if build_wayland | ||
24 | - wl_core_proto_c = custom_target( | ||
25 | - 'wl-core-proto.c', | ||
26 | - input: wayland_core_xml, | ||
27 | - output: 'wl-core-proto.c', | ||
28 | - command: [prog_wayland_scanner, 'private-code', '@INPUT@', '@OUTPUT@'], | ||
29 | - ) | ||
30 | wl_xdg_shell_proto_c = custom_target( | ||
31 | 'wl-xdg-shell-proto.c', | ||
32 | input: wayland_xdg_shell_xml, | ||
33 | @@ -115,7 +109,6 @@ if build_wayland | ||
34 | 'wayland/wayland_wrapper.c', | ||
35 | ) | ||
36 | files_libwaffle += [ | ||
37 | - wl_core_proto_c, | ||
38 | wl_xdg_shell_proto_c, | ||
39 | wl_xdg_shell_proto_h, | ||
40 | ] | ||
diff --git a/meta/recipes-graphics/waffle/waffle_1.6.1.bb b/meta/recipes-graphics/waffle/waffle_1.8.0.bb index 07d7279c2b..ad8649b40e 100644 --- a/meta/recipes-graphics/waffle/waffle_1.6.1.bb +++ b/meta/recipes-graphics/waffle/waffle_1.8.0.bb | |||
@@ -3,27 +3,28 @@ DESCRIPTION = "A cross-platform C library that allows one to defer selection \ | |||
3 | of an OpenGL API and window system until runtime. For example, on Linux, Waffle \ | 3 | of an OpenGL API and window system until runtime. For example, on Linux, Waffle \ |
4 | enables an application to select X11/EGL with an OpenGL 3.3 core profile, \ | 4 | enables an application to select X11/EGL with an OpenGL 3.3 core profile, \ |
5 | Wayland with OpenGL ES2, and other window system / API combinations." | 5 | Wayland with OpenGL ES2, and other window system / API combinations." |
6 | HOMEPAGE = "http://www.waffle-gl.org/" | 6 | HOMEPAGE = "https://gitlab.freedesktop.org/mesa/waffle" |
7 | BUGTRACKER = "https://gitlab.freedesktop.org/mesa/waffle" | 7 | BUGTRACKER = "https://gitlab.freedesktop.org/mesa/waffle" |
8 | LICENSE = "BSD-2-Clause" | 8 | LICENSE = "BSD-2-Clause" |
9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \ | 9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \ |
10 | file://include/waffle/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf" | 10 | file://include/waffle-1/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf" |
11 | 11 | ||
12 | SRC_URI = "http://waffle-gl.org/files/release/${BPN}-${PV}/${BPN}-${PV}.tar.xz" | 12 | SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=master \ |
13 | SRC_URI[md5sum] = "c91529e579483f44fb330052872b9c73" | 13 | file://0001-waffle-do-not-make-core-protocol-into-the-library.patch \ |
14 | SRC_URI[sha256sum] = "31565649ff0e2d8dff1b8f7f2264ab7a78452063c7e04adfc4ce03e64b655080" | 14 | " |
15 | SRCREV = "580b912a30085528886603942c100c7b309b3bdb" | ||
16 | S = "${WORKDIR}/git" | ||
15 | 17 | ||
16 | UPSTREAM_CHECK_URI = "http://www.waffle-gl.org/releases.html" | 18 | inherit meson features_check lib_package bash-completion pkgconfig |
17 | 19 | ||
18 | inherit meson features_check lib_package bash-completion | 20 | DEPENDS:append = " python3" |
19 | |||
20 | DEPENDS_append = " python3" | ||
21 | 21 | ||
22 | # This should be overridden per-machine to reflect the capabilities of the GL | 22 | # This should be overridden per-machine to reflect the capabilities of the GL |
23 | # stack. | 23 | # stack. |
24 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11-egl', '', d)} \ | 24 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11-egl', '', d)} \ |
25 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ | 25 | ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ |
26 | surfaceless-egl gbm" | 26 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gbm surfaceless-egl', '', d)} \ |
27 | " | ||
27 | 28 | ||
28 | # virtual/libgl requires opengl in DISTRO_FEATURES. | 29 | # virtual/libgl requires opengl in DISTRO_FEATURES. |
29 | REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('DEPENDS', 'virtual/${MLPREFIX}libgl', 'opengl', '', d)}" | 30 | REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('DEPENDS', 'virtual/${MLPREFIX}libgl', 'opengl', '', d)}" |
@@ -31,15 +32,19 @@ REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('DEPENDS', 'virtual/${MLPREFIX | |||
31 | # I say virtual/libgl, actually wants gl.pc | 32 | # I say virtual/libgl, actually wants gl.pc |
32 | PACKAGECONFIG[glx] = "-Dglx=enabled,-Dglx=disabled,virtual/${MLPREFIX}libgl libx11" | 33 | PACKAGECONFIG[glx] = "-Dglx=enabled,-Dglx=disabled,virtual/${MLPREFIX}libgl libx11" |
33 | 34 | ||
34 | # I say virtual/libgl, actually wants wayland-egl.pc, egl.pc, and the wayland | 35 | # wants wayland-egl.pc, egl.pc, and the wayland |
35 | # DISTRO_FEATURE. | 36 | # DISTRO_FEATURE. |
36 | PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,virtual/${MLPREFIX}libgl wayland" | 37 | PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,virtual/${MLPREFIX}egl wayland wayland-native wayland-protocols" |
37 | 38 | ||
38 | # I say virtual/libgl, actually wants gbm.pc egl.pc | 39 | # wants gbm.pc egl.pc |
39 | PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/${MLPREFIX}libgl udev" | 40 | PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/${MLPREFIX}egl virtual/${MLPREFIX}libgbm libdrm" |
40 | 41 | ||
41 | # I say virtual/libgl, actually wants egl.pc | 42 | # wants egl.pc |
42 | PACKAGECONFIG[x11-egl] = "-Dx11_egl=enabled,-Dx11_egl=disabled,virtual/${MLPREFIX}libgl libxcb" | 43 | PACKAGECONFIG[x11-egl] = "-Dx11_egl=enabled,-Dx11_egl=disabled,virtual/${MLPREFIX}egl libxcb" |
43 | PACKAGECONFIG[surfaceless-egl] = "-Dsurfaceless_egl=enabled,-Dsurfaceless_egl=disabled,virtual/${MLPREFIX}libgl" | 44 | PACKAGECONFIG[surfaceless-egl] = "-Dsurfaceless_egl=enabled,-Dsurfaceless_egl=disabled,virtual/${MLPREFIX}egl" |
44 | 45 | ||
45 | # TODO: optionally build manpages and examples | 46 | # TODO: optionally build manpages and examples |
47 | |||
48 | do_install:append() { | ||
49 | rm -rf ${D}${datadir}/zsh | ||
50 | } | ||