Hi Andrew,
On 11/03/24 19:42, Andrew Davis via lists.yoctoproject.org wrote:
On 3/7/24 5: 43 PM, Ryan Eatmon via lists. yoctoproject. org wrote: >
> > On 3/5/2024 1: 11 PM, Andrew Davis wrote: >> This demo has not
been maintained for years and is no longer functional. >> Remove this
demo. >> >>
ZjQcmQRYFpfptBannerStart
This message was sent from outside of Texas Instruments.
Do not click links or open attachments unless you recognize the source
of this email and know the content is safe.
ZjQcmQRYFpfptBannerEnd
On 3/7/24 5:43 PM, Ryan Eatmon via lists.yoctoproject.org wrote:
>
>
> On 3/5/2024 1:11 PM, Andrew Davis wrote:
>> This demo has not been maintained for years and is no longer functional.
>> Remove this demo.
>>
>> Signed-off-by: Andrew Davis <[email protected]>
>> ---
>> .../dual-camera-demo/desc_dual-camera.html | 7 ---
>> .../dual-camera-demo/dual-camera.desktop | 10 ----
>> .../dual-camera-demo/dual_camera_qt4.sh | 10 ----
>> .../dual-camera-demo/dual_camera_qt5.sh | 13 -----
>> .../dual-camera-demo/dual-camera-demo_1.0.bb | 47 -------------------
>> .../packagegroup-arago-tisdk-multimedia.bb | 3 --
>> 6 files changed, 90 deletions(-)
>> delete mode 100644
meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo/desc_dual-camera.html
>> delete mode 100644
meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo/dual-camera.desktop
>> delete mode 100644
meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo/dual_camera_qt4.sh
>> delete mode 100644
meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh
>> delete mode 100644
meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo_1.0.bb
>>
>> diff --git
a/meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo/desc_dual-camera.html
b/meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo/desc_dual-camera.html
>> deleted file mode 100644
>> index e3269600..00000000
>> ---
a/meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo/desc_dual-camera.html
>> +++ /dev/null
>> @@ -1,7 +0,0 @@
>> -<h1> Dual Camera Demo </h1>
>> -
>> -<p> This example demonstrates the dual camera capabilities of the VPFE and DSS.
If used on an AM437x GP EVM, two camera displays will be available. Otherwise, one camera feed
will be displayed. </p>
>> -<p>
>> -<span style="color:red">NOTE: Please make sure the camera module is inserted into
AM437x GP EVM header for dual camera functionality. </span>
>> -</p>
>> -
>> diff --git
a/meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo/dual-camera.desktop
b/meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo/dual-camera.desktop
>> deleted file mode 100644
>> index e3544883..00000000
>> ---
a/meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo/dual-camera.desktop
>> +++ /dev/null
>> @@ -1,10 +0,0 @@
>> -#!/usr/bin/env xdg-open
>> -[Desktop Entry]
>> -Name=Dual Camera Demo
>> -GenericName=Demo App
>> -Icon=/usr/share/matrix-gui-2.0/apps/images/multimedia-icon.png
>> -Type=Application
>> -Exec=dual_camera.sh
>> -Categories=camera
>> -ProgramType=gui
>>
-X-MATRIX-Description=/usr/share/matrix-gui-2.0/apps/dual-camera/desc_dual-camera.html
>> diff --git
a/meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo/dual_camera_qt4.sh
b/meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo/dual_camera_qt4.sh
>> deleted file mode 100644
>> index 6d9675db..00000000
>> ---
a/meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo/dual_camera_qt4.sh
>> +++ /dev/null
>> @@ -1,10 +0,0 @@
>> -#!/bin/sh
>> -
>> -/etc/init.d/matrix-gui-2.0 stop
>> -
>> -export TSLIB_TSDEVICE=/dev/input/touchscreen0
>> -export QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0
>> -
>> -dual_camera -qws
>> -
>> -/etc/init.d/matrix-gui-2.0 start
>> diff --git
a/meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh
b/meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh
>> deleted file mode 100644
>> index f01bea34..00000000
>> ---
a/meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh
>> +++ /dev/null
>> @@ -1,13 +0,0 @@
>> -#!/bin/sh
>> -
>> -/etc/init.d/weston stop
>> -sleep 1
>> -
>> -echo 0 > /sys/class/graphics/fbcon/cursor_blink
>> -
>> -dual_camera -platform linuxfb
>> -
>> -echo 1 > /sys/class/graphics/fbcon/cursor_blink
>> -
>> -/etc/init.d/weston start
>> -sleep 1
>> diff --git
a/meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo_1.0.bb
b/meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo_1.0.bb
>> deleted file mode 100644
>> index 157e5602..00000000
>> --- a/meta-arago-demos/recipes-apps/dual-camera-demo/dual-camera-demo_1.0.bb
>> +++ /dev/null
>> @@ -1,47 +0,0 @@
>> -DESCRIPTION = "Qt Dual Camera Demo"
>> -HOMEPAGE =
"https://urldefense.com/v3/__https://gitorious.org/dual-camera-demo/__;!!G3vK!XIwUB9AcCoLgn1SKzdjIk0gtHTi7RM93ptuS8EA8RBZ-cQpwsCrTcMN0P1xl43SV5lb2m3bZR2fpJfFeEekGXXHOH84b$"
>> -SECTION = "multimedia"
>> -LICENSE = "GPL-2.0-only"
>> -LIC_FILES_CHKSUM = "file://LICENSE;md5=c7ca707704d3354a64feeb4f19f52eb5"
>> -
>> -DEPENDS += "libdrm cmem"
>> -require recipes-core/matrix/matrix-gui-paths.inc
>> -
>> -PR = "r20"
>> -
>> -BRANCH = "master"
>> -SRCREV = "3188b1eacb14dda0dcf3a58877962d86687b6d20"
>> -
>> -SRC_URI =
"git://git.ti.com/git/sitara-linux/dual-camera-demo.git;protocol=https;branch=${BRANCH}
\
>> - file://desc_dual-camera.html \
>> - file://dual_camera_qt5.sh \
>> - file://dual_camera_qt4.sh \
>> - file://dual-camera.desktop \
>> -"
>> -
>> -S = "${WORKDIR}/git"
>> -
>> -inherit qt5
>> -
>> -export SDK_PATH_TARGET='${STAGING_DIR_HOST}'
>> -
>> -# use the make targets already created in the Makefile.build files
>> -do_install() {
>> - install -d ${D}/usr/bin
>> - install -d ${D}${MATRIX_APP_DIR}/dual-camera
>> - install dual_camera ${D}/usr/bin/dual_camera
>> - install ${WORKDIR}/dual_camera_qt5.sh ${D}/usr/bin/dual_camera.sh
>> - install ${WORKDIR}/desc_dual-camera.html
${D}/${MATRIX_APP_DIR}/dual-camera
>> - install ${WORKDIR}/dual-camera.desktop
${D}/${MATRIX_APP_DIR}/dual-camera
>> -}
>> -
>> -PACKAGES += "matrix-gui-apps-dual-camera"
>> -
>> -RDEPENDS:${PN} += "libdrm libdrm-omap"
>> -
>> -RDEPENDS:matrix-gui-apps-dual-camera = "matrix-gui-apps-images
matrix-gui-submenus-camera ${PN}"
>> -
>> -# Add the matrix directory to the FILES
>> -FILES:${PN} = "/usr/bin/*"
>> -
>> -FILES:matrix-gui-apps-dual-camera = "${MATRIX_APP_DIR}/*"
>> diff --git
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
>> index b4148882..ba9ac544 100644
>> ---
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
>> +++
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
>> @@ -14,16 +14,13 @@ MULTIMEDIA = " \
>> MULTIMEDIA:omapl138 = ""
>> -DUAL_CAMERA_DEMO = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl',
'dual-camera-demo', '', d)}"
>> IMAGE_GALLERY_DEMO = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl',
'image-gallery', '', d)}"
>> MULTIMEDIA:append:ti43x = " \
>> - ${DUAL_CAMERA_DEMO} \
>> ${IMAGE_GALLERY_DEMO} \
>> "
>> MULTIMEDIA:append:omap-a15 = " \
>> - ${DUAL_CAMERA_DEMO} \
>> ${IMAGE_GALLERY_DEMO} \
>> "
>
>
> No joy. There is another reference to the recipe:
>
> ERROR: Nothing RPROVIDES 'matrix-gui-apps-dual-camera' (but /scratch/jenkins_builds/arago-master-wip/build/sources/meta-arago/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb RDEPENDS on or otherwise requires it)
>
> Please submit a v2 and remove that from the RDEPENDS as well.
>
Sure, v2 sent.
Side question, "matrix gui" is starting to become a broken demo graveyard, do
we have plans to check on all the demos and remove/fix broken ones. Or is it
time
to simply remove matrix demo launcher from Arago?..
Andrew
There was a patch sent by Kartheek last year to remove Matrix demo for
all k3 platforms & maintain it only for legacy devices[1].
But that had to be reverted[2] just because we have some dependencies in
test farm that uses runLmDDRBandwidth.sh script shipped
by Matrix Demo. So, someone has to re-work on removing this test-farm
dependency on Matrix Demo if we are planning to remove it
entirely from Arago.
I agree that as Matrix Demo is no longer maintained by anyone it has
started becoming a broken demo.
If there's no one maintaining it then it's better we drop it as shipping
an OOB Demo without anyone maintaining &
validating it looks inappropriate!
Btw, the Processor SDK layer of both Jacinto & Sitara already removes
Matrix Demo in their layer[3]. So, anyone building
tisdk-default-image using Processor SDK oe-config file or using
tisdk-default-image from Processor SDK ti.com page
won't even have Matrix Demo in filesystem. The default OOB from
Processor SDK Layer in almost all k3 platforms is ti-apps-laumcher.
[1]:
https://git.yoctoproject.org/meta-arago/commit/?h=kirkstone-next&id=35387dd8dbc438b759d8de1ae195664272af9cd3
[2]:
https://git.yoctoproject.org/meta-arago/commit/?h=kirkstone-next&id=82f586255afad791d71d77bdd221b5281ed33bb6
[3]:
https://git.ti.com/cgit/ti-sdk-linux/meta-tisdk/tree/recipes-core/images/tisdk-default-image.bbappend?h=kirkstone#n9
Regards,
Chirag
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#15234):
https://lists.yoctoproject.org/g/meta-arago/message/15234
Mute This Topic: https://lists.yoctoproject.org/mt/104751769/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-