From patchwork Fri Jun 2 03:58:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 25032 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12F77C7EE2D for ; Fri, 2 Jun 2023 03:59:20 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web10.4889.1685678355183863805 for ; Thu, 01 Jun 2023 20:59:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=dQVqinY4; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: rs@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 3523xCEY102765; Thu, 1 Jun 2023 22:59:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1685678352; bh=Ew0e1lj8jb/xCafJ+Kvw5IABFjq4AdpnVbHys7OVMT8=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=dQVqinY4Qqve5DtwDBkMUqeqpHPU0NHm2C7pQSA9nRonuqA03twHAoT2u8jesIu0j ViQxY27h6waMgU8Miy8bNGaoU3hB55FDvWySRf95EzdKCoAQ/0hdxfJpBSHmG/C44S /iE8PvxcM+t+uzzfiLDXlPxka7ya/7GacnXX5ZWY= Received: from DFLE112.ent.ti.com (dfle112.ent.ti.com [10.64.6.33]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 3523xCJT003319 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 1 Jun 2023 22:59:12 -0500 Received: from DFLE115.ent.ti.com (10.64.6.36) by DFLE112.ent.ti.com (10.64.6.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Thu, 1 Jun 2023 22:59:12 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE115.ent.ti.com (10.64.6.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Thu, 1 Jun 2023 22:59:11 -0500 Received: from rs-desk.dhcp.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 3523xBow061674; Thu, 1 Jun 2023 22:59:11 -0500 From: To: , , , CC: , Randolph Sapp Subject: [meta-ti][master/kirkstone][PATCHv3 2/2] ti-img-rogue-umlibs: bump version and explicitly package Date: Thu, 1 Jun 2023 22:58:57 -0500 Message-ID: <20230602035857.771739-3-rs@ti.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230602035857.771739-1-rs@ti.com> References: <20230602035857.771739-1-rs@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 02 Jun 2023 03:59:20 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16651 From: Randolph Sapp Bump the version and explicitly package all Khronos APIs separately. This should be nice for those folks that want a headless opencl system for tinkering and such. This version includes experimental GEM support (for applications like Chromium that like to poke at the render node) and a new Vulkan ICD loader interface for better support with the Vulkan ICD loaders present in Yocto. This lifts a method from mesa used to force a common naming convention for Vulkan, OpenCL, and OpenGLES libs to make things a little easier to follow. Without it the target package names get scrambled based on the shared object name. Signed-off-by: Randolph Sapp --- .../ti-img-rogue-driver_23.1.6404501.bb | 2 +- .../ti-img-rogue-umlibs_23.1.6404501.bb | 88 +++++++++++++------ 2 files changed, 64 insertions(+), 26 deletions(-) diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.1.6404501.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.1.6404501.bb index 76e3d801..1a08a441 100644 --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.1.6404501.bb +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.1.6404501.bb @@ -22,7 +22,7 @@ SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https; S = "${WORKDIR}/git" -SRCREV = "93c66ec66136654849809132b86d3b880ee96ed6" +SRCREV = "ebddb087ef140ca83e4c30d66580b0bb33b003fd" TARGET_PRODUCT:j721e = "j721e_linux" TARGET_PRODUCT:j721s2 = "j721s2_linux" diff --git a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.1.6404501.bb b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.1.6404501.bb index f22cd1d1..26090038 100644 --- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.1.6404501.bb +++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.1.6404501.bb @@ -12,7 +12,7 @@ PR = "r2" BRANCH = "linuxws/kirkstone/k6.1/${PV}" SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}" -SRCREV = "452b0f50d2984171c81d5a0d3b22198177d919ad" +SRCREV = "bfacba50b004d0e93ee1f8b42d2217131453f5fd" S = "${WORKDIR}/git/targetfs/${TARGET_PRODUCT}/${PVR_WS}/${PVR_BUILD}" TARGET_PRODUCT:j721e = "j721e_linux" @@ -22,52 +22,90 @@ TARGET_PRODUCT:am62xx = "am62_linux" PVR_BUILD = "release" PVR_WS = "lws-generic" -RDEPENDS:${PN} += "mesa-megadriver libdrm ti-img-rogue-driver" +RDEPENDS:${PN} = " \ + libdrm \ + ti-img-rogue-driver \ + ${PN}-firmware \ +" do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then mv ${D}/lib/firmware ${D}${nonarch_base_libdir} rmdir ${D}/lib fi - if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'false', 'true', d)}; then - rm -rf ${D}${libdir}/libVK_IMG.so* - fi - rm -rf "${D}/etc/init.d" } PACKAGES = " \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "${PN}-vulkan", "", d)} \ + libgles1-rogue libgles1-rogue-dev \ + libgles2-rogue libgles2-rogue-dev \ + libgles3-rogue libgles3-rogue-dev \ + libvk-rogue libvk-rogue-dev \ + libopencl-rogue libopencl-rogue-dev \ + libopencl-rogue-tools \ ${PN}-tools \ ${PN}-firmware \ ${PN} \ " -FILES:${PN}-vulkan = " \ - ${datadir}/vulkan \ - ${libdir}/libVK_IMG.so* \ -" -RDEPENDS:${PN}-vulkan += " \ - mesa-vulkan-drivers \ - libdrm \ - ti-img-rogue-driver \ - libx11-xcb \ - wayland \ -" -INSANE_SKIP:${PN}-vulkan += " \ - already-stripped \ - dev-so \ -" +# Inject variables so that packages don't get Debian-renamed (which would +# remove the -rogue suffix), but don't RPROVIDEs/RCONFLICTs on the generic +# libgl name to prevent colliding with swrast libs +python __anonymous() { + suffix = "" + if "-native" in d.getVar("PN"): + suffix = "-native" + for p in (("vulkan", "libvk",), + ("gles", "libgles1", "libglesv1-cm1"), + ("gles", "libgles2", "libglesv2-2"), + ("gles", "libgles3",), + ("opencl", "libopencl",)): + mlprefix = d.getVar("MLPREFIX") + fullp = mlprefix + p[1] + "-rogue" + suffix + mlprefix = d.getVar("MLPREFIX") + pkgs = " " + " ".join(mlprefix + x + suffix for x in p[1:]) + d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1") + d.appendVar("RRECOMMENDS:" + fullp, " ${MLPREFIX}ti-img-rogue-umlibs" + suffix) + + # For -dev, the first element is both the Debian and original name + fullp = mlprefix + p[1] + "-rogue-dev" + suffix + pkgs = " " + mlprefix + p[1] + "-dev" + suffix + d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1") +} + +# gles specific shared objects +FILES:libgles1-rogue = "${libdir}/libGLESv1*.so.*" +FILES:libgles1-rogue-dev = "${libdir}/libGLESv1*.so" +FILES:libgles2-rogue = "${libdir}/libGLESv2*.so.*" +FILES:libgles2-rogue-dev = "${libdir}/libGLESv2*.so" +RDEPENDS:libgles1-rogue += "mesa-megadriver" +RDEPENDS:libgles2-rogue += "mesa-megadriver" +RDEPENDS:libgles3-rogue-dev += "libgles2-rogue-dev" + +# vulkan specific shared objects and configs +FILES:libvk-rogue = "${libdir}/libVK_IMG.so.* ${datadir}/vulkan" +FILES:libvk-rogue-dev = "${libdir}/libVK_IMG.so" +RDEPENDS:libvk-rogue += "vulkan-loader libx11-xcb wayland libdrm" + +# opencl specific shared objects and configs +FILES:libopencl-rogue = "${libdir}/libPVROCL.so.* ${sysconfdir}/OpenCL" +FILES:libopencl-rogue-dev = "${libdir}/libPVROCL.so" +RDEPENDS:libopencl-rogue += "opencl-icd-loader" +RRECOMMENDS:libopencl-rogue += "libopencl-rogue-tools" +FILES:libopencl-rogue-tools += "${bindir}/ocl*" +# optional tools and tests FILES:${PN}-tools = "${bindir}/" -RDEPENDS:${PN}-tools = "python3-core" +RDEPENDS:${PN}-tools = "python3-core ${PN}" +# required firmware FILES:${PN}-firmware = "${base_libdir}/firmware/*" INSANE_SKIP:${PN}-firmware += "arch" RRECOMMENDS:${PN} += " \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "${PN}-vulkan", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "libgles1-rogue libgles2-rogue", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "vulkan x11 wayland", "libvk-rogue", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "opencl", "libopencl-rogue", "", d)} \ ${PN}-tools \ " -RDEPENDS:${PN} += " ${PN}-firmware" INSANE_SKIP:${PN} += "already-stripped dev-so"