ti-sgx-ddk-um: libgbm is now part of this project
PATCH 1/5 ti-sgx-ddk-um: libgbm is now part of this project
The GBM library is tightly coupled with the system graphics systems, other hardware GPU vendors (including our Rogue DDK) and Mesa all deploy a version of the library as part of their GPU driver. We SGX does the same. This should ease integration for us as we now don't rely on a separate project for this library and our deployment strategy can match across Mesa/RGX recipes, allowing for better re-use of common components.
--- recipes-graphics/gbm/libgbm_10.0.0.bb | 23 -------------- .../libgles/ti-sgx-ddk-um_1.17.4948957.bb | 30 +++++++++---------- 2 files changed, 14 insertions(+), 39 deletions(-) delete mode 100644 recipes-graphics/gbm/libgbm_10.0.0.bb
recipes-graphics/gbm/libgbm_10.0.0.bb deleted +0 -23
@@ -1,23 +0,0 @@ -SUMMARY = "Userspace interface for the kernel GBM services" -HOMEPAGE = "http://git.ti.com/glsdk/libgbm.git" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://gbm.c;beginline=1;endline=26;md5=b871c7f2f477df29ee4c0ec437b187f7" - -DEPENDS = "libdrm udev" - -PROVIDES += "virtual/libgbm" - -inherit autotools pkgconfig - -BRANCH = "next" - -SRCREV = "96f37555c7e82a417b02051661377b10e6b3966e" - -SRC_URI = "git://git.ti.com/glsdk/libgbm.git;protocol=git;branch=${BRANCH} \ - file://0001-gbm.c-include-sys-sysmacros.h-for-minor-major-in-new.patch" - -S = "${WORKDIR}/git" - -COMPATIBLE_HOST ?= "null" -COMPATIBLE_HOST_ti-soc = "(.*)"
recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb +14 -16
@@ -10,7 +10,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" BRANCH = "ti-img-sgx/thud/${PV}" SRC_URI = "git://git.ti.com/graphics/omap5-sgx-ddk-um-linux.git;protocol=git;branch=${BRANCH}" -SRCREV = "9e63d5ac0b40d6a70463173c597122b6645c8a95" +SRCREV = "87d7e5c1e4db1bab048939c9719059d549c1e8dd" TARGET_PRODUCT_omap-a15 = "jacinto6evm" TARGET_PRODUCT_ti33x = "ti335x"
@@ -22,23 +22,23 @@ INITSCRIPT_PARAMS = "defaults 8" inherit update-rc.d -PR = "r33" -PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2 omap5-sgx-ddk-um-linux" +PR = "r34" +PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2 virtual/libgbm omap5-sgx-ddk-um-linux" -DEPENDS += "libdrm udev libgbm wayland libffi" -RDEPENDS_${PN} += "libdrm libudev libgbm wayland libffi libdrm-omap" +DEPENDS += "libdrm udev wayland libffi" +RDEPENDS_${PN} += "libdrm libudev wayland libffi libdrm-omap" -RPROVIDES_${PN} = "libegl libgles1 libgles2 omap5-sgx-ddk-um-linux" -RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev omap5-sgx-ddk-um-linux-dev" -RPROVIDES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg omap5-sgx-ddk-um-linux-dbg" +RPROVIDES_${PN} = "libegl libgles1 libgles2 libgbm omap5-sgx-ddk-um-linux" +RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev omap5-sgx-ddk-um-linux-dev" +RPROVIDES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg omap5-sgx-ddk-um-linux-dbg" -RREPLACES_${PN} = "libegl libgles1 libgles2 omap5-sgx-ddk-um-linux" -RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev omap5-sgx-ddk-um-linux-dev" -RREPLACES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg omap5-sgx-ddk-um-linux-dbg" +RREPLACES_${PN} = "libegl libgles1 libgles2 libgbm omap5-sgx-ddk-um-linux" +RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev omap5-sgx-ddk-um-linux-dev" +RREPLACES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg omap5-sgx-ddk-um-linux-dbg" -RCONFLICTS_${PN} = "libegl libgles1 libgles2 omap5-sgx-ddk-um-linux" -RCONFLICTS_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev omap5-sgx-ddk-um-linux-dev" -RCONFLICTS_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg omap5-sgx-ddk-um-linux-dbg" +RCONFLICTS_${PN} = "libegl libgles1 libgles2 libgbm omap5-sgx-ddk-um-linux" +RCONFLICTS_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev omap5-sgx-ddk-um-linux-dev" +RCONFLICTS_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg omap5-sgx-ddk-um-linux-dbg" # The actual SONAME is libGLESv2.so.2, so need to explicitly specify RPROVIDES for .so.1 here RPROVIDES_${PN} += "libGLESv2.so.1"
@@ -47,8 +47,6 @@ S = "${WORKDIR}/git" do_install () { oe_runmake install DESTDIR=${D} TARGET_PRODUCT=${TARGET_PRODUCT} - mkdir -p ${D}${libdir}/gbm - ln -sf ../libpvrGBMWSEGL.so.${PV} ${D}${libdir}/gbm/gbm_pvr.so ln -sf libGLESv2.so.${PV} ${D}${libdir}/libGLESv2.so.1 rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc
Signature · 1 line
2.17.1
PATCH 2/5 ti-sgx-ddk-um: Add expat as runtime dependency
Although not needed for the IMG default EGL implementation libexpat is needed when using the Mesa EGL version.
While here s/libudev/udev as 'libudev' is package shipped as part of the eudev project, but we use systemd, so we actually depend on 'udev'.
Move the PACKAGE_ARCH and PR defines to a more natural spot that also lines up with the RGX version of recipe for easier diffs.
One thing we could have done is remove the DEPENDS line. We do not have any build dependencies as these are pre-made library binaries, but I use the package rootfs generated by bitbake to build the binaries locally, so leave it for now.
--- recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb +4 -4
@@ -3,9 +3,10 @@ HOMEPAGE = "https://git.ti.com/graphics/omap5-sgx-ddk-um-linux" LICENSE = "TI-TSPA" LIC_FILES_CHKSUM = "file://TI-Linux-Graphics-DDK-UM-Manifest.doc;md5=b17390502bc89535c86cfbbae961a2a8" +PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k3" -PACKAGE_ARCH = "${MACHINE_ARCH}" +PR = "r34" BRANCH = "ti-img-sgx/thud/${PV}"
@@ -22,11 +23,10 @@ INITSCRIPT_PARAMS = "defaults 8" inherit update-rc.d -PR = "r34" PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2 virtual/libgbm omap5-sgx-ddk-um-linux" -DEPENDS += "libdrm udev wayland libffi" -RDEPENDS_${PN} += "libdrm libudev wayland libffi libdrm-omap" +DEPENDS += "libdrm udev wayland libffi expat" +RDEPENDS_${PN} += "libdrm libdrm-omap udev wayland libffi expat" RPROVIDES_${PN} = "libegl libgles1 libgles2 libgbm omap5-sgx-ddk-um-linux" RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev omap5-sgx-ddk-um-linux-dev"
Signature · 1 line
2.17.1
PATCH 3/5 ti-sgx-ddk-um: Add wayland-protocols as build dependency
In reply to Andrew F. DavisAlthough not needed for the IMG default EGL implementation this is needed when building the Mesa EGL version of the DDK.
--- recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb +2 -2
@@ -25,8 +25,8 @@ inherit update-rc.d PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2 virtual/libgbm omap5-sgx-ddk-um-linux" -DEPENDS += "libdrm udev wayland libffi expat" -RDEPENDS_${PN} += "libdrm libdrm-omap udev wayland libffi expat" +DEPENDS += "libdrm udev wayland wayland-protocols libffi expat" +RDEPENDS_${PN} += "libdrm libdrm-omap udev wayland wayland-protocols libffi expat" RPROVIDES_${PN} = "libegl libgles1 libgles2 libgbm omap5-sgx-ddk-um-linux" RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev omap5-sgx-ddk-um-linux-dev"
Signature · 1 line
2.17.1
PATCH 4/5 ti-sgx-ddk-um: Drop omap5-sgx-ddk-um-linux package
In reply to Andrew F. DavisNo one in-tree depends on this anymore. This used to be the name of the package so this was kept here for several years for backwards compatibility. Remove this from PROVIDES.
--- .../libgles/ti-sgx-ddk-um_1.17.4948957.bb | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb +10 -10
@@ -23,22 +23,22 @@ INITSCRIPT_PARAMS = "defaults 8" inherit update-rc.d -PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2 virtual/libgbm omap5-sgx-ddk-um-linux" +PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2 virtual/libgbm" DEPENDS += "libdrm udev wayland wayland-protocols libffi expat" RDEPENDS_${PN} += "libdrm libdrm-omap udev wayland wayland-protocols libffi expat" -RPROVIDES_${PN} = "libegl libgles1 libgles2 libgbm omap5-sgx-ddk-um-linux" -RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev omap5-sgx-ddk-um-linux-dev" -RPROVIDES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg omap5-sgx-ddk-um-linux-dbg" +RPROVIDES_${PN} = "libegl libgles1 libgles2 libgbm" +RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev" +RPROVIDES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg" -RREPLACES_${PN} = "libegl libgles1 libgles2 libgbm omap5-sgx-ddk-um-linux" -RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev omap5-sgx-ddk-um-linux-dev" -RREPLACES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg omap5-sgx-ddk-um-linux-dbg" +RREPLACES_${PN} = "libegl libgles1 libgles2 libgbm" +RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev" +RREPLACES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg" -RCONFLICTS_${PN} = "libegl libgles1 libgles2 libgbm omap5-sgx-ddk-um-linux" -RCONFLICTS_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev omap5-sgx-ddk-um-linux-dev" -RCONFLICTS_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg omap5-sgx-ddk-um-linux-dbg" +RCONFLICTS_${PN} = "libegl libgles1 libgles2 libgbm" +RCONFLICTS_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev" +RCONFLICTS_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg" # The actual SONAME is libGLESv2.so.2, so need to explicitly specify RPROVIDES for .so.1 here RPROVIDES_${PN} += "libGLESv2.so.1"
Signature · 1 line
2.17.1
Re: [thud/master][PATCH 4/5] ti-sgx-ddk-um: Drop omap5-sgx-ddk-um-linux package
Andrew,
I remember some of the other recipes (eg kmscube, omapdrmtest) in meta-ti / meta-arago that depended on omap5-sgx-ddk-um-linux.
We cleaned up some of those dependencies while adding J7. Not sure if all of them have been covered. Have you confirmed?
Regards,
Anand
________________________________
From: Davis, Andrew
Sent: Thursday, September 5, 2019 10:08:46 PM
To: Dmytriyenko, Denys; Tammana, Gowtham; Balagopalakrishnan, Anand; Ruei, Eric
Cc: [email protected]; Davis, Andrew
Subject: [meta-ti][thud/master][PATCH 4/5] ti-sgx-ddk-um: Drop omap5-sgx-ddk-um-linux package
No one in-tree depends on this anymore. This used to be the name of the package so this was kept here for several years for backwards compatibility. Remove this from PROVIDES.
--- .../libgles/ti-sgx-ddk-um_1.17.4948957.bb | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb +10 -10
@@ -23,22 +23,22 @@ INITSCRIPT_PARAMS = "defaults 8" inherit update-rc.d -PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2 virtual/libgbm omap5-sgx-ddk-um-linux" +PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2 virtual/libgbm" DEPENDS += "libdrm udev wayland wayland-protocols libffi expat" RDEPENDS_${PN} += "libdrm libdrm-omap udev wayland wayland-protocols libffi expat" -RPROVIDES_${PN} = "libegl libgles1 libgles2 libgbm omap5-sgx-ddk-um-linux" -RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev omap5-sgx-ddk-um-linux-dev" -RPROVIDES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg omap5-sgx-ddk-um-linux-dbg" +RPROVIDES_${PN} = "libegl libgles1 libgles2 libgbm" +RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev" +RPROVIDES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg" -RREPLACES_${PN} = "libegl libgles1 libgles2 libgbm omap5-sgx-ddk-um-linux" -RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev omap5-sgx-ddk-um-linux-dev" -RREPLACES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg omap5-sgx-ddk-um-linux-dbg" +RREPLACES_${PN} = "libegl libgles1 libgles2 libgbm" +RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev" +RREPLACES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg" -RCONFLICTS_${PN} = "libegl libgles1 libgles2 libgbm omap5-sgx-ddk-um-linux" -RCONFLICTS_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev omap5-sgx-ddk-um-linux-dev" -RCONFLICTS_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg omap5-sgx-ddk-um-linux-dbg" +RCONFLICTS_${PN} = "libegl libgles1 libgles2 libgbm" +RCONFLICTS_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev" +RCONFLICTS_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg" # The actual SONAME is libGLESv2.so.2, so need to explicitly specify RPROVIDES for .so.1 here RPROVIDES_${PN} += "libGLESv2.so.1"
--
2.17.1
Re: [thud/master][PATCH 4/5] ti-sgx-ddk-um: Drop omap5-sgx-ddk-um-linux package
Anand,
Nothing uses omap5-sgx-ddk-um-linux and hasn't been for few years now.
Those recipes you mention used ti-sgx-ddk-um dependency directly for some time, but were update earlier to depend on virtual egl and/or libgles providers.
Also, please mind the public mailing list. Thanks.
Signature · 1 line
Denys
Quoted 84 lines · Anand
Andrew,
I remember some of the other recipes (eg kmscube, omapdrmtest) in meta-ti
/ meta-arago that depended on omap5-sgx-ddk-um-linux.
We cleaned up some of those dependencies while adding J7. Not sure if all
of them have been covered. Have you confirmed?
Regards,
Anand
----------------------------------------------------------------------
From: Davis, Andrew
Sent: Thursday, September 5, 2019 10:08:46 PM
To: Dmytriyenko, Denys; Tammana, Gowtham; Balagopalakrishnan, Anand; Ruei,
Eric
Cc: [email protected]; Davis, Andrew
Subject: [meta-ti][thud/master][PATCH 4/5] ti-sgx-ddk-um: Drop
omap5-sgx-ddk-um-linux package
No one in-tree depends on this anymore. This used to be the name of the
package so this was kept here for several years for backwards
compatibility. Remove this from PROVIDES.
Signed-off-by: Andrew F. Davis <[email protected]>
---
.../libgles/ti-sgx-ddk-um_1.17.4948957.bb | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb
b/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb
index 0695ca0a..53d2829e 100644
--- a/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb
+++ b/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb
@@ -23,22 +23,22 @@ INITSCRIPT_PARAMS = "defaults 8"
inherit update-rc.d
-PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2 virtual/libgbm
omap5-sgx-ddk-um-linux"
+PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2
virtual/libgbm"
DEPENDS += "libdrm udev wayland wayland-protocols libffi expat"
RDEPENDS_${PN} += "libdrm libdrm-omap udev wayland wayland-protocols
libffi expat"
-RPROVIDES_${PN} = "libegl libgles1 libgles2 libgbm
omap5-sgx-ddk-um-linux"
-RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev
omap5-sgx-ddk-um-linux-dev"
-RPROVIDES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg
omap5-sgx-ddk-um-linux-dbg"
+RPROVIDES_${PN} = "libegl libgles1 libgles2 libgbm"
+RPROVIDES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev"
+RPROVIDES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg"
-RREPLACES_${PN} = "libegl libgles1 libgles2 libgbm
omap5-sgx-ddk-um-linux"
-RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev
omap5-sgx-ddk-um-linux-dev"
-RREPLACES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg
omap5-sgx-ddk-um-linux-dbg"
+RREPLACES_${PN} = "libegl libgles1 libgles2 libgbm"
+RREPLACES_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev"
+RREPLACES_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg"
-RCONFLICTS_${PN} = "libegl libgles1 libgles2 libgbm
omap5-sgx-ddk-um-linux"
-RCONFLICTS_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev
omap5-sgx-ddk-um-linux-dev"
-RCONFLICTS_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg
omap5-sgx-ddk-um-linux-dbg"
+RCONFLICTS_${PN} = "libegl libgles1 libgles2 libgbm"
+RCONFLICTS_${PN}-dev = "libegl-dev libgles1-dev libgles2-dev libgbm-dev"
+RCONFLICTS_${PN}-dbg = "libegl-dbg libgles1-dbg libgles2-dbg libgbm-dbg"
# The actual SONAME is libGLESv2.so.2, so need to explicitly specify
RPROVIDES for .so.1 here
RPROVIDES_${PN} += "libGLESv2.so.1"
--
2.17.1PATCH 5/5 ti-sgx-ddk-um: Remove the removing of wayland-egl.pc
In reply to Andrew F. DavisThis file was shipped as part of the DDK, but was also supplied by libwayland so it was deleted here. This file has been removed from the DDK, so deleting the file manually here is no longer needed.
--- recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb | 2 -- 1 file changed, 2 deletions(-)
recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb +0 -2
@@ -49,8 +49,6 @@ do_install () { oe_runmake install DESTDIR=${D} TARGET_PRODUCT=${TARGET_PRODUCT} ln -sf libGLESv2.so.${PV} ${D}${libdir}/libGLESv2.so.1 - rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc - chown -R root:root ${D} }
Signature · 1 line
2.17.1