From 95acd86a4aeb8d2122285dd1745c77622462d33f Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 27 Oct 2021 11:07:28 +0200 Subject: waffle: update 1.6.1 -> 1.7.0 Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni --- ...o-not-make-core-protocol-into-the-library.patch | 56 ++++++++++++++++++++++ meta/recipes-graphics/waffle/waffle_1.6.1.bb | 43 ----------------- meta/recipes-graphics/waffle/waffle_1.7.0.bb | 49 +++++++++++++++++++ 3 files changed, 105 insertions(+), 43 deletions(-) create mode 100644 meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch delete mode 100644 meta/recipes-graphics/waffle/waffle_1.6.1.bb create mode 100644 meta/recipes-graphics/waffle/waffle_1.7.0.bb (limited to 'meta') 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..24b2de5d9c --- /dev/null +++ b/meta/recipes-graphics/waffle/waffle/0001-waffle-do-not-make-core-protocol-into-the-library.patch @@ -0,0 +1,56 @@ +From 7610ec4b572d3a54d30fca6798f0c406f3fd8a46 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 26 Oct 2021 08:52:17 +0200 +Subject: [PATCH] waffle: do not make core protocol into the library + +None of the consumers (which is just piglit) use it, and +this avoids host contamination from pkg-config suggesting +wayland.xml from the host. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + meson.build | 4 ---- + src/waffle/meson.build | 7 ------- + 2 files changed, 11 deletions(-) + +diff --git a/meson.build b/meson.build +index ffc02ff..0bb6128 100644 +--- a/meson.build ++++ b/meson.build +@@ -104,10 +104,6 @@ else + dep_wayland_client = dependency( + 'wayland-client', version : '>= 1.10', required : get_option('wayland'), + ) +- if dep_wayland_client.found() +- wayland_core_xml = join_paths(dep_wayland_client.get_pkgconfig_variable('pkgdatadir'), +- 'wayland.xml') +- endif + dep_wayland_egl = dependency( + 'wayland-egl', version : '>= 9.1', required : get_option('wayland'), + ) +diff --git a/src/waffle/meson.build b/src/waffle/meson.build +index 01898c8..6245868 100644 +--- a/src/waffle/meson.build ++++ b/src/waffle/meson.build +@@ -88,12 +88,6 @@ if build_surfaceless + endif + + if build_wayland +- wl_core_proto_c = custom_target( +- 'wl-core-proto.c', +- input: wayland_core_xml, +- output: 'wl-core-proto.c', +- command: [prog_wayland_scanner, 'private-code', '@INPUT@', '@OUTPUT@'], +- ) + wl_xdg_shell_proto_c = custom_target( + 'wl-xdg-shell-proto.c', + input: wayland_xdg_shell_xml, +@@ -114,7 +108,6 @@ if build_wayland + 'wayland/wayland_wrapper.c', + ) + files_libwaffle += [ +- wl_core_proto_c, + wl_xdg_shell_proto_c, + wl_xdg_shell_proto_h, + ] diff --git a/meta/recipes-graphics/waffle/waffle_1.6.1.bb b/meta/recipes-graphics/waffle/waffle_1.6.1.bb deleted file mode 100644 index 161bbb0d26..0000000000 --- a/meta/recipes-graphics/waffle/waffle_1.6.1.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "A C library for selecting an OpenGL API and window system at runtime" -DESCRIPTION = "A cross-platform C library that allows one to defer selection \ -of an OpenGL API and window system until runtime. For example, on Linux, Waffle \ -enables an application to select X11/EGL with an OpenGL 3.3 core profile, \ -Wayland with OpenGL ES2, and other window system / API combinations." -HOMEPAGE = "https://gitlab.freedesktop.org/mesa/waffle" -BUGTRACKER = "https://gitlab.freedesktop.org/mesa/waffle" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \ - file://include/waffle/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf" - -SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=maint-1.6" -SRCREV = "d7e8c4759704b3c571fa3697c716279c26fd05eb" -S = "${WORKDIR}/git" - -inherit meson features_check lib_package bash-completion pkgconfig - -DEPENDS:append = " python3" - -# This should be overridden per-machine to reflect the capabilities of the GL -# stack. -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11-egl', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ - surfaceless-egl gbm" - -# virtual/libgl requires opengl in DISTRO_FEATURES. -REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('DEPENDS', 'virtual/${MLPREFIX}libgl', 'opengl', '', d)}" - -# I say virtual/libgl, actually wants gl.pc -PACKAGECONFIG[glx] = "-Dglx=enabled,-Dglx=disabled,virtual/${MLPREFIX}libgl libx11" - -# I say virtual/libgl, actually wants wayland-egl.pc, egl.pc, and the wayland -# DISTRO_FEATURE. -PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,virtual/${MLPREFIX}libgl wayland" - -# I say virtual/libgl, actually wants gbm.pc egl.pc -PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/${MLPREFIX}libgl udev" - -# I say virtual/libgl, actually wants egl.pc -PACKAGECONFIG[x11-egl] = "-Dx11_egl=enabled,-Dx11_egl=disabled,virtual/${MLPREFIX}libgl libxcb" -PACKAGECONFIG[surfaceless-egl] = "-Dsurfaceless_egl=enabled,-Dsurfaceless_egl=disabled,virtual/${MLPREFIX}libgl" - -# TODO: optionally build manpages and examples diff --git a/meta/recipes-graphics/waffle/waffle_1.7.0.bb b/meta/recipes-graphics/waffle/waffle_1.7.0.bb new file mode 100644 index 0000000000..846cd0d818 --- /dev/null +++ b/meta/recipes-graphics/waffle/waffle_1.7.0.bb @@ -0,0 +1,49 @@ +SUMMARY = "A C library for selecting an OpenGL API and window system at runtime" +DESCRIPTION = "A cross-platform C library that allows one to defer selection \ +of an OpenGL API and window system until runtime. For example, on Linux, Waffle \ +enables an application to select X11/EGL with an OpenGL 3.3 core profile, \ +Wayland with OpenGL ES2, and other window system / API combinations." +HOMEPAGE = "https://gitlab.freedesktop.org/mesa/waffle" +BUGTRACKER = "https://gitlab.freedesktop.org/mesa/waffle" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \ + file://include/waffle-1/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf" + +SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https \ + file://0001-waffle-do-not-make-core-protocol-into-the-library.patch \ + " +SRCREV = "905c6c10f2483adf0cbfa024e2d3c2ed541fb300" +S = "${WORKDIR}/git" + +inherit meson features_check lib_package bash-completion pkgconfig + +DEPENDS:append = " python3" + +# This should be overridden per-machine to reflect the capabilities of the GL +# stack. +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11-egl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ + surfaceless-egl gbm" + +# virtual/libgl requires opengl in DISTRO_FEATURES. +REQUIRED_DISTRO_FEATURES += "${@bb.utils.contains('DEPENDS', 'virtual/${MLPREFIX}libgl', 'opengl', '', d)}" + +# I say virtual/libgl, actually wants gl.pc +PACKAGECONFIG[glx] = "-Dglx=enabled,-Dglx=disabled,virtual/${MLPREFIX}libgl libx11" + +# I say virtual/libgl, actually wants wayland-egl.pc, egl.pc, and the wayland +# DISTRO_FEATURE. +PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,virtual/${MLPREFIX}libgl wayland wayland-native" + +# I say virtual/libgl, actually wants gbm.pc egl.pc +PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/${MLPREFIX}libgl udev" + +# I say virtual/libgl, actually wants egl.pc +PACKAGECONFIG[x11-egl] = "-Dx11_egl=enabled,-Dx11_egl=disabled,virtual/${MLPREFIX}libgl libxcb" +PACKAGECONFIG[surfaceless-egl] = "-Dsurfaceless_egl=enabled,-Dsurfaceless_egl=disabled,virtual/${MLPREFIX}libgl" + +# TODO: optionally build manpages and examples + +do_install:append() { + sed -i -e "s,${WORKDIR},,g" ${D}/${libdir}/cmake/Waffle/WaffleConfig.cmake +} -- cgit 1.2.3-korg