Skip to contentSkip to conversation

weston: upgrade and add libdisplay-info recipe

PATCH Superseded Hiago De Franco 2 participants 6 messages Nov 23, 2024 – Nov 25, 2024

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 cover weston: upgrade and add libdisplay-info recipe

From: Hiago De Franco <[email protected]>

This series aims to upgrade weston from version 13.0.3 to 14.0.1.

Since commit a16598b038b2 ("backend-drm: make libdisplay-info mandatory") from Weston, libdisplay-info is now a build dependency, therefore I am also adding libdisplay-info recipe into this series.

In order to build libdisplay-info, hwdata-native is needed, which today is at meta-openembedded layer. Therefore, add this recipe to oe-core and we can later remove it from meta-oe.

v1:
- https://lore.kernel.org/all/[email protected]/

v2:
- Added hwdata recipe, with DESCRIPTION variable.
- DESCRIPTION added to libdisplay-info and SUMMARY fixed.

Hiago De Franco (3):
hwdata: add recipe from meta-openembedded
libdisplay-info: add recipe
weston: upgrade 13.0.3 -> 14.0.1

 meta/conf/distro/include/maintainers.inc      |  2 +
 ...Include-libgen.h-for-basename-signat.patch | 45 -------------------
 ...1-vnc-Allow-neatvnc-in-version-0.8.0.patch | 27 -----------
 .../{weston_13.0.3.bb => weston_14.0.1.bb}    |  8 +---
 meta/recipes-support/hwdata/hwdata_0.389.bb   | 30 +++++++++++++
 .../libdisplay-info/libdisplay-info_0.2.0.bb  | 16 +++++++
 6 files changed, 50 insertions(+), 78 deletions(-)
 delete mode 100644 meta/recipes-graphics/wayland/weston/0001-libweston-tools-Include-libgen.h-for-basename-signat.patch
 delete mode 100644 meta/recipes-graphics/wayland/weston/0001-vnc-Allow-neatvnc-in-version-0.8.0.patch
 rename meta/recipes-graphics/wayland/{weston_13.0.3.bb => weston_14.0.1.bb} (94%)
 create mode 100644 meta/recipes-support/hwdata/hwdata_0.389.bb
 create mode 100644 meta/recipes-support/libdisplay-info/libdisplay-info_0.2.0.bb
Signature · 1 line
2.39.5
#1 lore raw

PATCH v2 1/3 hwdata: add recipe from meta-openembedded

From: Hiago De Franco <[email protected]>

Add hwdata recipe from meta-openembedded to openembedded-core.

libdisplay-info is now a requirement for Weston, since commit a16598b038b2 ("backend-drm: make libdisplay-info mandatory"). However, in order to build libdisplay-info, hwdata is required. Since Weston is built inside openembedded-core, add hwdata in order to be able to upgrade Weston, so oe-core has no dependency on meta-oe.

---
 meta/conf/distro/include/maintainers.inc    |  1 +
 meta/recipes-support/hwdata/hwdata_0.389.bb | 30 +++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 meta/recipes-support/hwdata/hwdata_0.389.bb
meta/conf/distro/include/maintainers.inc +1 -0
index d61b88f7de6c..04208ebbf22b 100644
@@ -262,6 +262,7 @@ RECIPE_MAINTAINER:pn-harfbuzz = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER:pn-hdparm = "Denys Dmytriyenko <[email protected]>"
 RECIPE_MAINTAINER:pn-help2man = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER:pn-hicolor-icon-theme = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER:pn-hwdata = "Hiago De Franco <[email protected]>"
 RECIPE_MAINTAINER:pn-hwlatdetect = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER:pn-i2c-tools = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER:pn-icecc-create-env = "Joshua Watt <[email protected]>"
meta/recipes-support/hwdata/hwdata_0.389.bb new file +30 -0
new file mode 100644
index 000000000000..8ab455cd2e99
@@ -0,0 +1,30 @@
+SUMMARY = "Hardware identification and configuration data"
+DESCRIPTION = "hwdata contains various hardware identification and \
+configuration data, such as the pci.ids and usb.ids databases."
+HOMEPAGE = "https://github.com/vcrhonek/hwdata"
+SECTION = "System/Base"
+
+LICENSE = "GPL-2.0-or-later | XFree86-1.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57"
+
+SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https"
+SRCREV = "5313a12eb992a354c17fc895c1d69c8c42b09a06"
+
+S = "${WORKDIR}/git"
+
+inherit allarch
+
+do_configure() {
+    ${S}/configure --datadir=${datadir} --libdir=${libdir}
+}
+
+do_compile[noexec] = "1"
+
+do_install() {
+    oe_runmake install DESTDIR=${D}
+}
+
+FILES:${PN} = "${libdir}/* \
+               ${datadir}/* "
+
+BBCLASSEXTEND += "native"
Signature · 1 line
2.39.5
#2 lore raw

PATCH v2 2/3 libdisplay-info: add recipe

In reply to Hiago De Franco

From: Hiago De Franco <[email protected]>

libdisplay-info is a EDID and DisplayID library. Goals:

- Provide a set of high-level, easy-to-use, opinionated functions as well as low-level functions to access detailed information.
- Simplicity and correctness over performance and resource usage.
- Well-tested and fuzzed.

Since commit a16598b038b2 ("backend-drm: make libdisplay-info mandatory") from Weston, this library is now mandatory in order to build weston 14.0.1 and newer.

---
 meta/conf/distro/include/maintainers.inc         |  1 +
 .../libdisplay-info/libdisplay-info_0.2.0.bb     | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 meta/recipes-support/libdisplay-info/libdisplay-info_0.2.0.bb
meta/conf/distro/include/maintainers.inc +1 -0
index 04208ebbf22b..53bb9d024e8a 100644
@@ -325,6 +325,7 @@ RECIPE_MAINTAINER:pn-libcomps = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER:pn-libconvert-asn1-perl = "Tim Orling <[email protected]>"
 RECIPE_MAINTAINER:pn-libdaemon = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER:pn-libdazzle = "Alexander Kanavin <[email protected]>"
+RECIPE_MAINTAINER:pn-libdisplay-info = "Hiago De Franco <[email protected]>"
 RECIPE_MAINTAINER:pn-libdnf = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER:pn-libdrm = "Otavio Salvador <[email protected]>"
 RECIPE_MAINTAINER:pn-libedit = "Khem Raj <[email protected]>"
meta/recipes-support/libdisplay-info/libdisplay-info_0.2.0.bb new file +16 -0
new file mode 100644
index 000000000000..629f0d420fee
@@ -0,0 +1,16 @@
+SUMMARY = "EDID and DisplayID library"
+DESCRIPTION = "The goal of this library is to provide a set of high-level, \
+easy-to-use, and opinionated functions, as well as low-level functions for \
+accessing detailed information, prioritizing simplicity and correctness over \
+performance and resource usage, while being well-tested and fuzzed."
+HOMEPAGE = "https://gitlab.freedesktop.org/emersion/libdisplay-info"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e4426409957080ee0352128354cea2de"
+DEPENDS = "hwdata-native"
+
+SRC_URI = "git://gitlab.freedesktop.org/emersion/libdisplay-info.git;branch=main;protocol=https"
+SRCREV = "66b802d05b374cd8f388dc6ad1e7ae4f08cb3300"
+
+S = "${WORKDIR}/git"
+
+inherit meson pkgconfig
Signature · 1 line
2.39.5
#3 lore raw

Re: [OE-core] [PATCH v2 2/3] libdisplay-info: add recipe

Quoted 10 lines · Hiago De Franco via lists.openembedded.org

From: Hiago De Franco <[email protected]>

libdisplay-info is a EDID and DisplayID library. Goals:

- Provide a set of high-level, easy-to-use, opinionated functions as well as low-level functions to access detailed information.
- Simplicity and correctness over performance and resource usage.
- Well-tested and fuzzed.

Quoted 5 lines

Since commit a16598b038b2 ("backend-drm: make libdisplay-info mandatory") from Weston, this library is now mandatory in order to build weston 14.0.1 and newer.

This puts a small tool into the same package as the library, so library package renaming doesn’t happen. Can you inherit lib_package so the small tool (di-edid-decode) goes into libdisplay-info-bin?

Thanks,
Ross

#4 lore raw

Re: [OE-core] [PATCH v2 2/3] libdisplay-info: add recipe

Quoted 11 lines · Ross Burton
Quoted 10 lines · Hiago De Franco via lists.openembedded.org

From: Hiago De Franco <[email protected]>

libdisplay-info is a EDID and DisplayID library. Goals:

- Provide a set of high-level, easy-to-use, opinionated functions as well as low-level functions to access detailed information.
- Simplicity and correctness over performance and resource usage.
- Well-tested and fuzzed.

Quoted 7 lines
Quoted 5 lines

Since commit a16598b038b2 ("backend-drm: make libdisplay-info mandatory") from Weston, this library is now mandatory in order to build weston 14.0.1 and newer.

This puts a small tool into the same package as the library, so library package renaming doesn’t happen. Can you inherit lib_package so the small tool (di-edid-decode) goes into libdisplay-info-bin?

Sure, thanks. I will prepare a v3.

Quoted 4 lines

Thanks,
Ross

Cheers,

Hiago.

#5 lore raw

PATCH v2 3/3 weston: upgrade 13.0.3 -> 14.0.1

In reply to Hiago De Franco

From: Hiago De Franco <[email protected]>

Key changes are:

- Patches have been removed since they were merged upstream and are no longer needed on 14.0.1.
- Since commit a16598b038b2 ("backend-drm: make libdisplay-info mandatory") from Weston, libdisplay-info is now a build dependency.
- Since commit f271dd34b617 ("compositor: delete cms-static and cms-colord plugins") from Weston, "deprecated-color-management-colord" has been removed, therefore remove the "colord" PACKAGECONFIG.

---
 ...Include-libgen.h-for-basename-signat.patch | 45 -------------------
 ...1-vnc-Allow-neatvnc-in-version-0.8.0.patch | 27 -----------
 .../{weston_13.0.3.bb => weston_14.0.1.bb}    |  8 +---
 3 files changed, 2 insertions(+), 78 deletions(-)
 delete mode 100644 meta/recipes-graphics/wayland/weston/0001-libweston-tools-Include-libgen.h-for-basename-signat.patch
 delete mode 100644 meta/recipes-graphics/wayland/weston/0001-vnc-Allow-neatvnc-in-version-0.8.0.patch
 rename meta/recipes-graphics/wayland/{weston_13.0.3.bb => weston_14.0.1.bb} (94%)
meta/recipes-graphics/wayland/weston/0001-libweston-tools-Include-libgen.h-for-basename-signat.patch deleted +0 -45
deleted file mode 100644
index 2a833ee973c6..000000000000
@@ -1,45 +0,0 @@
-From 1a2a87013eb6af8e5267ecaf61e17b65a31dc662 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Thu, 14 Dec 2023 09:13:54 -0800
-Subject: [PATCH] libweston,tools: Include libgen.h for basename signature
-
-Latest musl has removed the declaration from string.h [1] as it only
-implements POSIX version alone and string.h in glibc implements GNU
-version of basename. This now results in compile errors on musl.
-
-This might be a warning with older compilers but it is error with
-Clang-17+ as it treats -Wimplicit-function-declaration as error
-
-[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/1420]
-Signed-off-by: Khem Raj <[email protected]>
----
- libweston/backend-drm/libbacklight.c | 1 +
- tools/zunitc/src/zunitc_impl.c       | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/libweston/backend-drm/libbacklight.c b/libweston/backend-drm/libbacklight.c
-index ca7f2d6..74690fa 100644
---- a/libweston/backend-drm/libbacklight.c
-+++ b/libweston/backend-drm/libbacklight.c
-@@ -41,6 +41,7 @@
- #include <drm.h>
- #include <fcntl.h>
- #include <malloc.h>
-+#include <libgen.h>
- #include <string.h>
- #include <errno.h>
- 
-diff --git a/tools/zunitc/src/zunitc_impl.c b/tools/zunitc/src/zunitc_impl.c
-index 18f0301..9b460fa 100644
---- a/tools/zunitc/src/zunitc_impl.c
-+++ b/tools/zunitc/src/zunitc_impl.c
-@@ -27,6 +27,7 @@
- 
- #include <errno.h>
- #include <fcntl.h>
-+#include <libgen.h>
- #include <stdarg.h>
- #include <stdbool.h>
- #include <stdio.h>
meta/recipes-graphics/wayland/weston/0001-vnc-Allow-neatvnc-in-version-0.8.0.patch deleted +0 -27
deleted file mode 100644
index 4ac1c075fdce..000000000000
@@ -1,27 +0,0 @@
-From 534cfa08ea0a0c2646b4aec20b16bf95f6d0aae6 Mon Sep 17 00:00:00 2001
-From: Lukasz Czechowski <[email protected]>
-Date: Mon, 3 Jun 2024 13:39:27 +0200
-Subject: [PATCH] vnc: Allow neatvnc in version 0.8.0
-
-Neat VNC 0.8.0 does not introduce any changes that breaks API used
-by VNC backend, so it is safe to extend compatibility.
-
-Upstream-Status: Backport [05e5405651054c580b248c4ab2791ed8d66369e3]
-Signed-off-by: Lukasz Czechowski <[email protected]>
----
- libweston/backend-vnc/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libweston/backend-vnc/meson.build b/libweston/backend-vnc/meson.build
-index b7b6916..39b15cf 100644
---- a/libweston/backend-vnc/meson.build
-+++ b/libweston/backend-vnc/meson.build
-@@ -3,7 +3,7 @@ if not get_option('backend-vnc')
- endif
- 
- config_h.set('BUILD_VNC_COMPOSITOR', '1')
--dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.8.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep'])
-+dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.9.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep'])
- if not dep_neatvnc.found()
- 	error('VNC backend requires neatvnc which was not found. Or, you can use \'-Dbackend-vnc=false\'.')
- endif
meta/recipes-graphics/wayland/weston_14.0.1.bb renamed from meta/recipes-graphics/wayland/weston_13.0.3.bb +2 -6
similarity index 94%
rename from meta/recipes-graphics/wayland/weston_13.0.3.bb
rename to meta/recipes-graphics/wayland/weston_14.0.1.bb
index 471dc52bb361..50749d7d153c 100644
@@ -7,15 +7,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
                     "
 
 SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \
-           file://0001-libweston-tools-Include-libgen.h-for-basename-signat.patch \
-           file://0001-vnc-Allow-neatvnc-in-version-0.8.0.patch \
            file://weston.png \
            file://weston.desktop \
            file://xwayland.weston-start \
            file://systemd-notify.weston-start \
            "
 
-SRC_URI[sha256sum] = "27f68d96e3b97d98daadef13a202356524924fa381418fa6716b9136ef099093"
+SRC_URI[sha256sum] = "a8150505b126a59df781fe8c30c8e6f87da7013e179039eb844a5bbbcc7c79b3"
 
 UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/weston/-/tags"
 UPSTREAM_CHECK_REGEX = "releases/(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
@@ -27,7 +25,7 @@ inherit meson pkgconfig useradd
 require ${THISDIR}/required-distro-features.inc
 
 DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0"
-DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native"
+DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native libdisplay-info"
 
 LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'lto', '-Wl,-z,undefs', '', d)}"
 
@@ -75,8 +73,6 @@ PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp"
 PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd dbus"
 # Weston with Xwayland support (requires X11 and Wayland)
 PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcb libxcursor xcb-util-cursor xwayland"
-# colord CMS support
-PACKAGECONFIG[colord] = "-Ddeprecated-color-management-colord=true,-Ddeprecated-color-management-colord=false,colord"
 # Clients support
 PACKAGECONFIG[clients] = "-Dsimple-clients=${SIMPLECLIENTS} -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false"
 # Virtual remote output with GStreamer on DRM backend
Signature · 1 line
2.39.5