From patchwork Fri Nov 4 21:40:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 14890 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 6A77DC4708A for ; Fri, 4 Nov 2022 21:41:18 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.208.1667598073379364473 for ; Fri, 04 Nov 2022 14:41:13 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id D213F40D85 for ; Fri, 4 Nov 2022 21:41:12 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vpWF224UtEwQ for ; Fri, 4 Nov 2022 21:41:12 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id BDF5040D7F for ; Fri, 4 Nov 2022 21:41:12 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 50574163677 for ; Fri, 4 Nov 2022 17:41:09 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Subject: [master/kirkstone][PATCH 01/14] img-pvr-sdk: Drop img-pvr-sdk and update matrix Date: Fri, 4 Nov 2022 21:40:59 +0000 Message-Id: <20221104214112.1221365-2-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104214112.1221365-1-denis@denix.org> References: <20221104214112.1221365-1-denis@denix.org> MIME-Version: 1.0 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, 04 Nov 2022 21:41:18 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/14098 From: Randolph Sapp The img-pvr-sdk package currently ships dated demos and pvr tools. Instead of packaging these ourselves, we should redirect users to to the latest versions published by Imagination to prevent things like PVRTune server-GUI mismatch. Matrix-gui has been updated to not depend on img-pvr-sdk demos and the img-pvr-sdk package directory and bitbake recipe has been removed. Signed-off-by: Randolph Sapp Signed-off-by: Denys Dmytriyenko --- .../packagegroup-arago-tisdk-matrix.bb | 4 - .../matrix/matrix-gui-3d-demos_2.0.bb | 49 ++--------- .../img-pvr-sdk/img-pvr-sdk_3.3.2.bb | 83 ------------------- 3 files changed, 6 insertions(+), 130 deletions(-) delete mode 100644 meta-arago-extras/recipes-graphics/img-pvr-sdk/img-pvr-sdk_3.3.2.bb diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb index 361bd04b..3d9ebdf3 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb @@ -69,10 +69,6 @@ MATRIX_TOUCH_APPS = " \ " MATRIX_GPU_DEMOS = " \ - matrix-3d-demo-chameleon \ - matrix-3d-demo-coverflow \ - matrix-3d-demo-navigation \ - matrix-3d-demo-exampleui \ matrix-3d-demo-kmscube \ " diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-3d-demos_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-3d-demos_2.0.bb index 2c2aef82..a834fbbf 100644 --- a/meta-arago-extras/recipes-core/matrix/matrix-gui-3d-demos_2.0.bb +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-3d-demos_2.0.bb @@ -16,15 +16,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" # into the same layer as libgles this may be acceptable, or perhaps # we can use an RRECOMMENDS instead. -PACKAGES = "matrix-3d-demo-chameleon \ - matrix-3d-demo-coverflow \ - matrix-3d-demo-film \ - matrix-3d-demo-lantern \ - matrix-3d-demo-skull \ - matrix-3d-demo-shaders \ - matrix-3d-demo-vase \ - matrix-3d-demo-navigation \ - matrix-3d-demo-exampleui \ +PACKAGES = " \ " PACKAGES:append:omap-a15 = " \ @@ -53,44 +45,15 @@ do_install:prepend() { 3D_DEMOS_RDEPENDS_MATRIX = "matrix-gui-apps-images matrix-gui-submenus-3d" 3D_DEMOS_RDEPENDS = "${3D_DEMOS_RDEPENDS_MATRIX}" -3D_DEMOS_RDEPENDS:omap-a15 = "${3D_DEMOS_RDEPENDS_MATRIX} img-pvr-sdk" -3D_DEMOS_RDEPENDS:ti43x = "${3D_DEMOS_RDEPENDS_MATRIX} img-pvr-sdk" -3D_DEMOS_RDEPENDS:ti33x = "${3D_DEMOS_RDEPENDS_MATRIX} img-pvr-sdk" -3D_DEMOS_RDEPENDS:k3 = "${3D_DEMOS_RDEPENDS_MATRIX} img-pvr-sdk" - -RDEPENDS:matrix-3d-demo-chameleon = "${3D_DEMOS_RDEPENDS}" -RDEPENDS:matrix-3d-demo-coverflow = "${3D_DEMOS_RDEPENDS}" -RDEPENDS:matrix-3d-demo-film = "${3D_DEMOS_RDEPENDS}" -RDEPENDS:matrix-3d-demo-lantern = "${3D_DEMOS_RDEPENDS}" -RDEPENDS:matrix-3d-demo-skull = "${3D_DEMOS_RDEPENDS}" -RDEPENDS:matrix-3d-demo-shaders = "${3D_DEMOS_RDEPENDS}" -RDEPENDS:matrix-3d-demo-vase = "${3D_DEMOS_RDEPENDS}" -RDEPENDS:matrix-3d-demo-navigation = "${3D_DEMOS_RDEPENDS}" -RDEPENDS:matrix-3d-demo-exampleui = "${3D_DEMOS_RDEPENDS}" +3D_DEMOS_RDEPENDS:omap-a15 = "${3D_DEMOS_RDEPENDS_MATRIX}" +3D_DEMOS_RDEPENDS:ti43x = "${3D_DEMOS_RDEPENDS_MATRIX}" +3D_DEMOS_RDEPENDS:ti33x = "${3D_DEMOS_RDEPENDS_MATRIX}" +3D_DEMOS_RDEPENDS:k3 = "${3D_DEMOS_RDEPENDS_MATRIX}" + RDEPENDS:matrix-3d-demo-kmscube = "${3D_DEMOS_RDEPENDS_MATRIX} kmscube" #RDEPENDS:matrix-3d-demo-kmscubevideo = "${3D_DEMOS_RDEPENDS_MATRIX} omapdrmtest" RDEPENDS:matrix-3d-demo-kmscubevideo = "${3D_DEMOS_RDEPENDS_MATRIX}" # Split the matrix files by 3d demos -FILES:matrix-3d-demo-chameleon = "${MATRIX_APP_DIR}/3d_chameleon/*" -FILES:matrix-3d-demo-coverflow = "${MATRIX_APP_DIR}/3d_coverflow/*" -FILES:matrix-3d-demo-film = "${MATRIX_APP_DIR}/3d_film/*" -FILES:matrix-3d-demo-lantern = "${MATRIX_APP_DIR}/3d_lantern/*" -FILES:matrix-3d-demo-skull = "${MATRIX_APP_DIR}/3d_skull/*" -FILES:matrix-3d-demo-shaders = "${MATRIX_APP_DIR}/3d_shaders/*" -FILES:matrix-3d-demo-vase = "${MATRIX_APP_DIR}/3d_vase/*" -FILES:matrix-3d-demo-navigation = "${MATRIX_APP_DIR}/3d_navigation/*" -FILES:matrix-3d-demo-exampleui = "${MATRIX_APP_DIR}/3d_exampleui/*" FILES:matrix-3d-demo-kmscube = "${MATRIX_APP_DIR}/3d_kmscube/*" FILES:matrix-3d-demo-kmscubevideo = "${MATRIX_APP_DIR}/3d_kmscubevideo/*" - -# Split the ${bindir} files by 3d demos -FILES:matrix-3d-demo-chameleon += "${bindir}/runOGLES2ChameleonMan.sh" -FILES:matrix-3d-demo-coverflow += "${bindir}/runOGLES2Coverflow.sh" -FILES:matrix-3d-demo-film += "${bindir}/runOGLESFilmTV.sh" -FILES:matrix-3d-demo-lantern += "${bindir}/runOGLES2MagicLantern.sh" -FILES:matrix-3d-demo-skull += "${bindir}/runOGLESEvilSkull.sh" -FILES:matrix-3d-demo-shaders += "${bindir}/runOGLES2Shaders.sh" -FILES:matrix-3d-demo-vase += "${bindir}/runOGLESVase.sh" -FILES:matrix-3d-demo-navigation += "${bindir}/runOGLES2Navigation.sh" -FILES:matrix-3d-demo-exampleui += "${bindir}/runOGLES2ExampleUI.sh" diff --git a/meta-arago-extras/recipes-graphics/img-pvr-sdk/img-pvr-sdk_3.3.2.bb b/meta-arago-extras/recipes-graphics/img-pvr-sdk/img-pvr-sdk_3.3.2.bb deleted file mode 100644 index 7cd6d8c9..00000000 --- a/meta-arago-extras/recipes-graphics/img-pvr-sdk/img-pvr-sdk_3.3.2.bb +++ /dev/null @@ -1,83 +0,0 @@ -DESCRIPTION = "Imagination PowerVR SDK binaries/examples" -LICENSE = "TI-TSPA" -LIC_FILES_CHKSUM = "file://Jacinto6-IMG-PowerVR-SDK-Manifest.pdf;md5=46bcbfc69f8837c339e15fd4a5044a8c" - -CLEANBROKEN = "1" - -BRANCH = "master" - -SRC_URI = "git://git.ti.com/git/graphics/img-pvr-sdk.git;protocol=https;branch=${BRANCH}" -SRCREV = "e52592c843ad16be31db411b85c4059d82c4a6b9" - -PR = "r19" - -COMPATIBLE_MACHINE = "omap-a15|ti43x|ti33x|k3" - -S = "${WORKDIR}/git" -SRC_DIR = "arm" -SRC_DIR:k3 = "arm64" - -do_install () { - CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership" - install -d ${D}/opt/img-powervr-sdk - cp ${CP_ARGS} ${S}/targetfs/${SRC_DIR}/PVRHub ${D}/opt/img-powervr-sdk - cp ${CP_ARGS} ${S}/targetfs/${SRC_DIR}/PVRScopeDeveloper ${D}/opt/img-powervr-sdk - - install -d ${D}${bindir}/SGX/demos/Raw/ - install -d ${D}${bindir}/SGX/demos/Wayland/ - install -d ${D}${bindir}/SGX/demos/DRM/ - - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/NullWS/OGLES2ChameleonMan ${D}${bindir}/SGX/demos/Raw/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/NullWS/OGLES2Coverflow ${D}${bindir}/SGX/demos/Raw/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/NullWS/OGLES2ExampleUI ${D}${bindir}/SGX/demos/Raw/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/NullWS/OGLES2Navigation ${D}${bindir}/SGX/demos/Raw/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/NullWS/OGLES2MagicLantern ${D}${bindir}/SGX/demos/Raw/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/NullWS/OGLES2FilmTV ${D}${bindir}/SGX/demos/Raw/ - - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OGLES2ChameleonMan ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OGLES2Coverflow ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OGLES2ExampleUI ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OGLES2Navigation ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OGLES2MagicLantern ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OGLES2FilmTV ${D}${bindir}/SGX/demos/Wayland/ - - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/DRM/OGLES2ChameleonMan ${D}${bindir}/SGX/demos/DRM/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/DRM/OGLES2Coverflow ${D}${bindir}/SGX/demos/DRM/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/DRM/OGLES2ExampleUI ${D}${bindir}/SGX/demos/DRM/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/DRM/OGLES2Navigation ${D}${bindir}/SGX/demos/DRM/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/DRM/OGLES2MagicLantern ${D}${bindir}/SGX/demos/DRM/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/DRM/OGLES2FilmTV ${D}${bindir}/SGX/demos/DRM/ -} - -do_install:append:j7 () { - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESDeferredShading ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESGaussianBlur ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESImageBasedLighting ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESIntroducingPVRCamera ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESIntroducingPVRUtils ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESIntroducingUIRenderer ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESNavigation2D ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESNavigation3D ${D}${bindir}/SGX/demos/Wayland/ - install -m 755 ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/OpenGLESParticleSystem ${D}${bindir}/SGX/demos/Wayland/ - - cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESDeferredShading ${D}${bindir}/SGX/demos/Wayland/ - cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESGaussianBlur ${D}${bindir}/SGX/demos/Wayland/ - cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESImageBasedLighting ${D}${bindir}/SGX/demos/Wayland/ - cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESIntroducingPVRCamera ${D}${bindir}/SGX/demos/Wayland/ - cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESIntroducingPVRUtils ${D}${bindir}/SGX/demos/Wayland/ - cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESIntroducingUIRenderer ${D}${bindir}/SGX/demos/Wayland/ - cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESNavigation2D ${D}${bindir}/SGX/demos/Wayland/ - cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESNavigation3D ${D}${bindir}/SGX/demos/Wayland/ - cp -r ${S}/targetfs/${SRC_DIR}/Examples/Advanced/Wayland/Assets_OpenGLESParticleSystem ${D}${bindir}/SGX/demos/Wayland/ -} - - -RDEPENDS:${PN} = "libegl" - -INHIBIT_PACKAGE_STRIP = "1" - -INSANE_SKIP:${PN} += "dev-so staticdev already-stripped ldflags file-rdeps" - -FILES:${PN} += " \ - /opt/img-powervr-sdk/* \ -"