Merge pull request #24 from rdkcentral/develop

Develop to main
rdkcentral · Sep 12, 2024 · 99141bb · 99141bb
2 parents b78b95c + f42ecc5
commit 99141bb
Show file tree

Hide file tree

Showing 20 changed files with 73 additions and 14 deletions.
diff --git a/conf/layer.conf b/conf/layer.conf
@@ -24,3 +24,11 @@ BBFILES += "${LAYERDIR}/meta-rdk-oss-reference/recipes-multimedia/gstreamer/gstr
             ${LAYERDIR}/meta-rdk-oss-reference/recipes-kernel/make-mod-scripts/*.bbappend \
             ${LAYERDIR}/recipes-graphics/mesa/mesa_%.bbappend \
             "
+
+# OSS layer is customising wayland and removing wayland-egl.so and PC file causing build errors.
+BBFILES += " \
+            ${LAYERDIR}/recipes-graphics/wayland/wayland-default-egl_1.18.0.bb \
+            ${LAYERDIR}/recipes-graphics/mesa/mesa_%.bbappend \
+            ${LAYERDIR}/recipes-workaround/westeros/westeros.bbappend \
+            ${LAYERDIR}/recipes-workaround/gstreamer/gstreamer1.0-plugins-base_%.bbappend \
+            "
diff --git a/recipes-graphics/wayland/files/CMakeLists.txt b/recipes-graphics/wayland/files/CMakeLists.txt
@@ -0,0 +1,26 @@
+cmake_minimum_required(VERSION 3.15)
+
+project(wayland-egl VERSION 1.18.0 DESCRIPTION "Frontend wayland-egl library")
+
+include(GNUInstallDirs)
+
+add_library(${PROJECT_NAME} SHARED wayland-egl.c)
+
+set_target_properties(${PROJECT_NAME} PROPERTIES
+    VERSION 1.0.0 SOVERSION 1)
+
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+set(prefix "/usr")
+set(exec_prefix "\${prefix}")
+set(libdir "\${exec_prefix}/lib")
+set(includedir "\${prefix}/include")
+
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/wayland-egl.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/wayland-egl.pc
+    @ONLY)
+
+# Install the pkg-config file
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/wayland-egl.pc
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
diff --git a/recipes-graphics/wayland/wayland-default-egl_1.18.0.bb b/recipes-graphics/wayland/wayland-default-egl_1.18.0.bb
@@ -0,0 +1,32 @@
+# This recipe's intended to provide only the wayland-egl.so and related pkgconfig
+# due to the non-standard wayland package delivery from OSS layer.
+# Refer: ./common/meta-rdk-oss-reference/recipes-graphics/wayland/wayland_%.bbappend
+
+HOMEPAGE = "http://wayland.freedesktop.org"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://../COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \
+                    file://../src/wayland-server.c;endline=24;md5=b8e046164a766bb1ede8ba38e9dcd7ce"
+
+DEPENDS = "wayland"
+RDEPENDS_${PN} = "wayland"
+
+SRC_URI = "https://wayland.freedesktop.org/releases/wayland-${PV}.tar.xz \
+    file://CMakeLists.txt \
+    "
+
+SRC_URI[md5sum] = "23317697b6e3ff2e1ac8c5ba3ed57b65"
+SRC_URI[sha256sum] = "4675a79f091020817a98fd0484e7208c8762242266967f55a67776936c2e294d"
+
+UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
+
+S = "${WORKDIR}/wayland-${PV}/egl"
+
+PV ?= "1.18.0"
+PR ?= "r0"
+
+inherit cmake pkgconfig
+
+do_configure_prepend() {
+    cp ${WORKDIR}/CMakeLists.txt ${S}
+}
+
diff --git a/recipes-graphics/westeros/essos.bbappend b/recipes-graphics/westeros/essos.bbappend
@@ -1 +1,5 @@
 CXXFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'enable_ermgr', ' -DUSE_ESSRMGR_UDS_IMPL', '', d)}"
+
+# wayland-egl provider for RPi is now changed from wayland to wayland-default-egl.
+DEPENDS += "wayland-default-egl"
+RDEPENDS_${PN} += "wayland-default-egl"
diff --git a/recipes-workaround/cairo/cairo_%.bbappend b/recipes-workaround/cairo/cairo_%.bbappend
diff --git a/recipes-workaround/devicesettings/devicesettings-hal-raspberrypi4_%.bbappend b/recipes-workaround/devicesettings/devicesettings-hal-raspberrypi4_%.bbappend
diff --git a/recipes-workaround/gstreamer/gstreamer1.0-libav_%.bbappend b/recipes-workaround/gstreamer/gstreamer1.0-libav_%.bbappend
diff --git a/recipes-workaround/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/recipes-workaround/gstreamer/gstreamer1.0-plugins-bad_%.bbappend
diff --git a/recipes-workaround/gstreamer/gstreamer1.0-plugins-base_%.bbappend b/recipes-workaround/gstreamer/gstreamer1.0-plugins-base_%.bbappend
@@ -1 +1,2 @@
+DEPENDS += "wayland-default-egl"
 RDEPENDS_${PN} += "wayland-default-egl"
diff --git a/recipes-workaround/gstreamer/gstreamer1.0-plugins-good_%.bbappend b/recipes-workaround/gstreamer/gstreamer1.0-plugins-good_%.bbappend
diff --git a/recipes-workaround/libepoxy/libepoxy_%.bbappend b/recipes-workaround/libepoxy/libepoxy_%.bbappend
diff --git a/recipes-workaround/librsvg/librsvg_%.bbappend b/recipes-workaround/librsvg/librsvg_%.bbappend
diff --git a/recipes-workaround/pango/pango_%.bbappend b/recipes-workaround/pango/pango_%.bbappend
diff --git a/recipes-workaround/userland/userland_git.bbappend b/recipes-workaround/userland/userland_git.bbappend
diff --git a/recipes-workaround/westeros/essos.bbappend b/recipes-workaround/westeros/essos.bbappend
diff --git a/recipes-workaround/westeros/westeros-simplebuffer.bbappend b/recipes-workaround/westeros/westeros-simplebuffer.bbappend
diff --git a/recipes-workaround/westeros/westeros-simpleshell.bbappend b/recipes-workaround/westeros/westeros-simpleshell.bbappend
diff --git a/recipes-workaround/westeros/westeros-sink.bbappend b/recipes-workaround/westeros/westeros-sink.bbappend
diff --git a/recipes-workaround/westeros/westeros-soc-drm.bbappend b/recipes-workaround/westeros/westeros-soc-drm.bbappend
diff --git a/recipes-workaround/westeros/westeros.bbappend b/recipes-workaround/westeros/westeros.bbappend
@@ -1 +1,3 @@
+# wayland-egl provider for RPi is now changed from wayland to wayland-default-egl.
+DEPENDS += "wayland-default-egl"
 RDEPENDS_${PN} += "wayland-default-egl"
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		DEPENDS += "wayland-default-egl"
		RDEPENDS_${PN} += "wayland-default-egl"