[PATCH 1/4] dual-camera-demo: Updated dual camera demo that supports DRM and Qt 4 / Qt 5

[PATCH 1/4] dual-camera-demo: Updated dual camera demo that supports DRM and Qt 4 / Qt 5

[Franklin S. Cooper Jr]

From: "Franklin S. Cooper Jr" <fcooper@ti.com>

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../dual-camera-demo/dual-camera-demo_1.0.bb       |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb
index d21a0e5..643daab 100644
--- a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb
+++ b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb
@@ -4,12 +4,13 @@ SECTION = "multimedia"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c7ca707704d3354a64feeb4f19f52eb5"
 
+DEPENDS += "libdrm"
 require recipes-core/matrix/matrix-gui-paths.inc
 
-PR = "r4"
+PR = "r5"
 
-BRANCH = "master"
-SRCREV = "255808485bfd9bebd7f13ecd48704b6cc9ae0d69"
+BRANCH = "drm"
+SRCREV = "0c48cb66cc995420dfec2f1fd620c8977f0170aa"
 
 SRC_URI = "git://gitorious.org/dual-camera-demo/dual-camera-demo.git;protocol=git;branch=${BRANCH}"
 
@@ -17,6 +18,8 @@ S = "${WORKDIR}/git"
 
 inherit qt-provider
 
+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
@@ -28,6 +31,8 @@ do_install() {
 
 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
-- 
1.7.9.5

[PATCH 2/4] packagegroup-arago-tisdk-*: Add back dual camera demo that supports Qt and 3.14

[Franklin S. Cooper Jr]

From: "Franklin S. Cooper Jr" <fcooper@ti.com>

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../packagegroup-arago-tisdk-addons.bb             |    6 +++---
 ...packagegroup-arago-tisdk-multimedia-sdk-host.bb |    7 +++++--
 .../packagegroup-arago-tisdk-multimedia.bb         |    6 +++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
index 6d98ba6..c6b07a9 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task to install additional utilities/demos for SDKs"
 LICENSE = "MIT"
-PR = "r19"
+PR = "r20"
 
 inherit packagegroup
 
@@ -39,8 +39,8 @@ UTILS_append_dra7xx = " canutils"
 UTILS_append_omap-a15 = " parted"
 
 UTILS_append_ti33x = " switch-config"
-UTILS_append_ti43x = " switch-config"
-UTILS_append_omap-a15 = " switch-config"
+UTILS_append_ti43x = " switch-config libdrm-omap"
+UTILS_append_omap-a15 = " switch-config libdrm-omap"
 
 RDEPENDS_${PN} = "\
     ${UTILS} \
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
index 94fd786..8f7c4fe 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task to add multimedia related sources into the SDK"
 LICENSE = "MIT"
-PR = "r6"
+PR = "r7"
 
 inherit packagegroup
 
@@ -16,7 +16,10 @@ MULTIMEDIA_append_am3517-evm = " \
     av-examples-src \
 "
 
-MULTIMEDIA_append_ti43x = ""
+MULTIMEDIA_append_ti43x = " \
+    dual-camera-demo-src \
+    image-gallery-src \
+"
 
 #Demo doesn't work on 3.14
 # ${@base_conditional('QT_PROVIDER', 'qt5', '', 'dual-camera-demo-src image-gallery-src', d)}
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 81d5ee1..dd495f8 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
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task to add multimedia related packages"
 LICENSE = "MIT"
-PR = "r10"
+PR = "r11"
 
 inherit packagegroup
 
@@ -17,10 +17,10 @@ MULTIMEDIA_append_ti33x = " \
 "
 
 MULTIMEDIA_append_ti43x = " \
+    dual-camera-demo \
+    image-gallery \
     amsdk-av-files \
 "
-# demo doesn't work on 3.14
-# ${@base_conditional('QT_PROVIDER', 'qt5', '', 'dual-camera-demo image-gallery', d)}
 
 MULTIMEDIA_append_omap-a15 = " \
     amsdk-av-files \
-- 
1.7.9.5

Re: [PATCH 2/4] packagegroup-arago-tisdk-*: Add back dual camera demo that supports Qt and 3.14

[Denys Dmytriyenko]

On Fri, Feb 20, 2015 at 04:56:33PM -0600, Franklin S. Cooper Jr wrote:
> From: "Franklin S. Cooper Jr" <fcooper@ti.com>
> 
> Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> ---
>  .../packagegroup-arago-tisdk-addons.bb             |    6 +++---
>  ...packagegroup-arago-tisdk-multimedia-sdk-host.bb |    7 +++++--
>  .../packagegroup-arago-tisdk-multimedia.bb         |    6 +++---
>  3 files changed, 11 insertions(+), 8 deletions(-)
> 
> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
> index 6d98ba6..c6b07a9 100644
> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
> @@ -1,6 +1,6 @@
>  DESCRIPTION = "Task to install additional utilities/demos for SDKs"
>  LICENSE = "MIT"
> -PR = "r19"
> +PR = "r20"
>  
>  inherit packagegroup
>  
> @@ -39,8 +39,8 @@ UTILS_append_dra7xx = " canutils"
>  UTILS_append_omap-a15 = " parted"
>  
>  UTILS_append_ti33x = " switch-config"
> -UTILS_append_ti43x = " switch-config"
> -UTILS_append_omap-a15 = " switch-config"
> +UTILS_append_ti43x = " switch-config libdrm-omap"
> +UTILS_append_omap-a15 = " switch-config libdrm-omap"

Any particular reason to add libdrm dependency in this packagegroup? It should 
be taken care of by DEPENDS and RDEPENDS of the actual package - i.e. dual-cam


>  RDEPENDS_${PN} = "\
>      ${UTILS} \
> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
> index 94fd786..8f7c4fe 100644
> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
> @@ -1,6 +1,6 @@
>  DESCRIPTION = "Task to add multimedia related sources into the SDK"
>  LICENSE = "MIT"
> -PR = "r6"
> +PR = "r7"
>  
>  inherit packagegroup
>  
> @@ -16,7 +16,10 @@ MULTIMEDIA_append_am3517-evm = " \
>      av-examples-src \
>  "
>  
> -MULTIMEDIA_append_ti43x = ""
> +MULTIMEDIA_append_ti43x = " \
> +    dual-camera-demo-src \
> +    image-gallery-src \
> +"
>  
>  #Demo doesn't work on 3.14
>  # ${@base_conditional('QT_PROVIDER', 'qt5', '', 'dual-camera-demo-src image-gallery-src', d)}
> 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 81d5ee1..dd495f8 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
> @@ -1,6 +1,6 @@
>  DESCRIPTION = "Task to add multimedia related packages"
>  LICENSE = "MIT"
> -PR = "r10"
> +PR = "r11"
>  
>  inherit packagegroup
>  
> @@ -17,10 +17,10 @@ MULTIMEDIA_append_ti33x = " \
>  "
>  
>  MULTIMEDIA_append_ti43x = " \
> +    dual-camera-demo \
> +    image-gallery \
>      amsdk-av-files \
>  "
> -# demo doesn't work on 3.14
> -# ${@base_conditional('QT_PROVIDER', 'qt5', '', 'dual-camera-demo image-gallery', d)}
>  
>  MULTIMEDIA_append_omap-a15 = " \
>      amsdk-av-files \
> -- 
> 1.7.9.5
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [PATCH 2/4] packagegroup-arago-tisdk-*: Add back dual camera demo that supports Qt and 3.14

[Cooper Jr., Franklin]

Devices like am57 should include those packages even though they aren't supported by  the dual camera demo.

And for am437 it's just to insure those libraries r included incase the demo is unused for what ever reason in the future. 


> On Feb 23, 2015, at 3:17 PM, Dmytriyenko, Denys <denys@ti.com> wrote:
> 
>> On Fri, Feb 20, 2015 at 04:56:33PM -0600, Franklin S. Cooper Jr wrote:
>> From: "Franklin S. Cooper Jr" <fcooper@ti.com>
>> 
>> Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
>> ---
>> .../packagegroup-arago-tisdk-addons.bb             |    6 +++---
>> ...packagegroup-arago-tisdk-multimedia-sdk-host.bb |    7 +++++--
>> .../packagegroup-arago-tisdk-multimedia.bb         |    6 +++---
>> 3 files changed, 11 insertions(+), 8 deletions(-)
>> 
>> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
>> index 6d98ba6..c6b07a9 100644
>> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
>> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
>> @@ -1,6 +1,6 @@
>> DESCRIPTION = "Task to install additional utilities/demos for SDKs"
>> LICENSE = "MIT"
>> -PR = "r19"
>> +PR = "r20"
>> 
>> inherit packagegroup
>> 
>> @@ -39,8 +39,8 @@ UTILS_append_dra7xx = " canutils"
>> UTILS_append_omap-a15 = " parted"
>> 
>> UTILS_append_ti33x = " switch-config"
>> -UTILS_append_ti43x = " switch-config"
>> -UTILS_append_omap-a15 = " switch-config"
>> +UTILS_append_ti43x = " switch-config libdrm-omap"
>> +UTILS_append_omap-a15 = " switch-config libdrm-omap"
> 
> Any particular reason to add libdrm dependency in this packagegroup? It should 
> be taken care of by DEPENDS and RDEPENDS of the actual package - i.e. dual-cam
> 
> 
>> RDEPENDS_${PN} = "\
>>     ${UTILS} \
>> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
>> index 94fd786..8f7c4fe 100644
>> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
>> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
>> @@ -1,6 +1,6 @@
>> DESCRIPTION = "Task to add multimedia related sources into the SDK"
>> LICENSE = "MIT"
>> -PR = "r6"
>> +PR = "r7"
>> 
>> inherit packagegroup
>> 
>> @@ -16,7 +16,10 @@ MULTIMEDIA_append_am3517-evm = " \
>>     av-examples-src \
>> "
>> 
>> -MULTIMEDIA_append_ti43x = ""
>> +MULTIMEDIA_append_ti43x = " \
>> +    dual-camera-demo-src \
>> +    image-gallery-src \
>> +"
>> 
>> #Demo doesn't work on 3.14
>> # ${@base_conditional('QT_PROVIDER', 'qt5', '', 'dual-camera-demo-src image-gallery-src', d)}
>> 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 81d5ee1..dd495f8 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
>> @@ -1,6 +1,6 @@
>> DESCRIPTION = "Task to add multimedia related packages"
>> LICENSE = "MIT"
>> -PR = "r10"
>> +PR = "r11"
>> 
>> inherit packagegroup
>> 
>> @@ -17,10 +17,10 @@ MULTIMEDIA_append_ti33x = " \
>> "
>> 
>> MULTIMEDIA_append_ti43x = " \
>> +    dual-camera-demo \
>> +    image-gallery \
>>     amsdk-av-files \
>> "
>> -# demo doesn't work on 3.14
>> -# ${@base_conditional('QT_PROVIDER', 'qt5', '', 'dual-camera-demo image-gallery', d)}
>> 
>> MULTIMEDIA_append_omap-a15 = " \
>>     amsdk-av-files \
>> -- 
>> 1.7.9.5
>> 
>> _______________________________________________
>> meta-arago mailing list
>> meta-arago@arago-project.org
>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Re: [PATCH 2/4] packagegroup-arago-tisdk-*: Add back dual camera demo that supports Qt and 3.14

[Denys Dmytriyenko]

In general, it's not advised to pull in library dependencies explicitly, when 
they can be resolved implicitly. Even when installing a package that depends 
on a library not currently installed, it will be pulled in and installed 
automatically as a dependency by opkg.

An exception can be made when the library is expected to be used by a 3rd 
party application or demo that has no recipe and is not installed as an IPK 
binary package... So, I'm fine with this case, I guess.

-- 
Denys


On Mon, Feb 23, 2015 at 04:25:47PM -0500, Cooper Jr., Franklin wrote:
> Devices like am57 should include those packages even though they aren't 
> supported by the dual camera demo.
> 
> And for am437 it's just to insure those libraries r included incase the demo 
> is unused for what ever reason in the future.
> 
> 
> > On Feb 23, 2015, at 3:17 PM, Dmytriyenko, Denys <denys@ti.com> wrote:
> > 
> >> On Fri, Feb 20, 2015 at 04:56:33PM -0600, Franklin S. Cooper Jr wrote:
> >> From: "Franklin S. Cooper Jr" <fcooper@ti.com>
> >> 
> >> Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
> >> ---
> >> .../packagegroup-arago-tisdk-addons.bb             |    6 +++---
> >> ...packagegroup-arago-tisdk-multimedia-sdk-host.bb |    7 +++++--
> >> .../packagegroup-arago-tisdk-multimedia.bb         |    6 +++---
> >> 3 files changed, 11 insertions(+), 8 deletions(-)
> >> 
> >> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
> >> index 6d98ba6..c6b07a9 100644
> >> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
> >> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
> >> @@ -1,6 +1,6 @@
> >> DESCRIPTION = "Task to install additional utilities/demos for SDKs"
> >> LICENSE = "MIT"
> >> -PR = "r19"
> >> +PR = "r20"
> >> 
> >> inherit packagegroup
> >> 
> >> @@ -39,8 +39,8 @@ UTILS_append_dra7xx = " canutils"
> >> UTILS_append_omap-a15 = " parted"
> >> 
> >> UTILS_append_ti33x = " switch-config"
> >> -UTILS_append_ti43x = " switch-config"
> >> -UTILS_append_omap-a15 = " switch-config"
> >> +UTILS_append_ti43x = " switch-config libdrm-omap"
> >> +UTILS_append_omap-a15 = " switch-config libdrm-omap"
> > 
> > Any particular reason to add libdrm dependency in this packagegroup? It should 
> > be taken care of by DEPENDS and RDEPENDS of the actual package - i.e. dual-cam
> > 
> > 
> >> RDEPENDS_${PN} = "\
> >>     ${UTILS} \
> >> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
> >> index 94fd786..8f7c4fe 100644
> >> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
> >> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia-sdk-host.bb
> >> @@ -1,6 +1,6 @@
> >> DESCRIPTION = "Task to add multimedia related sources into the SDK"
> >> LICENSE = "MIT"
> >> -PR = "r6"
> >> +PR = "r7"
> >> 
> >> inherit packagegroup
> >> 
> >> @@ -16,7 +16,10 @@ MULTIMEDIA_append_am3517-evm = " \
> >>     av-examples-src \
> >> "
> >> 
> >> -MULTIMEDIA_append_ti43x = ""
> >> +MULTIMEDIA_append_ti43x = " \
> >> +    dual-camera-demo-src \
> >> +    image-gallery-src \
> >> +"
> >> 
> >> #Demo doesn't work on 3.14
> >> # ${@base_conditional('QT_PROVIDER', 'qt5', '', 'dual-camera-demo-src image-gallery-src', d)}
> >> 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 81d5ee1..dd495f8 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
> >> @@ -1,6 +1,6 @@
> >> DESCRIPTION = "Task to add multimedia related packages"
> >> LICENSE = "MIT"
> >> -PR = "r10"
> >> +PR = "r11"
> >> 
> >> inherit packagegroup
> >> 
> >> @@ -17,10 +17,10 @@ MULTIMEDIA_append_ti33x = " \
> >> "
> >> 
> >> MULTIMEDIA_append_ti43x = " \
> >> +    dual-camera-demo \
> >> +    image-gallery \
> >>     amsdk-av-files \
> >> "
> >> -# demo doesn't work on 3.14
> >> -# ${@base_conditional('QT_PROVIDER', 'qt5', '', 'dual-camera-demo image-gallery', d)}
> >> 
> >> MULTIMEDIA_append_omap-a15 = " \
> >>     amsdk-av-files \
> >> -- 
> >> 1.7.9.5
> >> 
> >> _______________________________________________
> >> meta-arago mailing list
> >> meta-arago@arago-project.org
> >> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

[PATCH 3/4] ti-tisdk-makefile: Add back dual-camera demo

[Franklin S. Cooper Jr]

From: "Franklin S. Cooper Jr" <fcooper@ti.com>

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb     |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
index 170eeba..578dcf3 100644
--- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
+++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb
@@ -36,7 +36,7 @@ SRC_URI = "\
     file://Makefile_cryptodev \
 "
 
-PR = "r38"
+PR = "r39"
 
 MAKEFILES_COMMON = "linux \
                     matrix-gui \
@@ -76,6 +76,8 @@ MAKEFILES_append_ti43x = " u-boot-spl \
                            linux-dtbs \
                            wireless \
                            cryptodev \
+                           dual-camera-demo \
+                           image-gallery \
 "
 
 MAKEFILES_append_dra7xx = " cryptodev"
-- 
1.7.9.5

[PATCH 4/4] dual-camera-demo: Move Matrix files to the recipe instead of the git repository

[Franklin S. Cooper Jr]

From: "Franklin S. Cooper Jr" <fcooper@ti.com>

* Dual camera demo requires a bit more work to run then other demos and it
  is dependent on what is running on the filesystem.
* Pull these files into a recipe since it will make things alot easier to fix
  incase filesystem changes breaks things.

Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
---
 .../dual-camera-demo/desc_dual-camera.html         |    7 +++++++
 .../dual-camera-demo/dual-camera.desktop           |   10 ++++++++++
 .../dual-camera-demo/dual_camera_qt4.sh            |   11 +++++++++++
 .../dual-camera-demo/dual_camera_qt5.sh            |    8 ++++++++
 .../dual-camera-demo/dual-camera-demo_1.0.bb       |   16 ++++++++++++----
 5 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/desc_dual-camera.html
 create mode 100644 meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual-camera.desktop
 create mode 100644 meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual_camera_qt4.sh
 create mode 100644 meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh

diff --git a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/desc_dual-camera.html b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/desc_dual-camera.html
new file mode 100644
index 0000000..e326960
--- /dev/null
+++ b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/desc_dual-camera.html
@@ -0,0 +1,7 @@
+<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-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual-camera.desktop b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual-camera.desktop
new file mode 100644
index 0000000..e354488
--- /dev/null
+++ b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual-camera.desktop
@@ -0,0 +1,10 @@
+#!/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-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual_camera_qt4.sh b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual_camera_qt4.sh
new file mode 100644
index 0000000..7a3e497
--- /dev/null
+++ b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual_camera_qt4.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+/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-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh
new file mode 100644
index 0000000..cd137d5
--- /dev/null
+++ b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+/etc/init.d/matrix-gui-2.0 stop
+
+dual_camera
+
+/etc/init.d/matrix-gui-2.0 start
+
diff --git a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb
index 643daab..7893d01 100644
--- a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb
+++ b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb
@@ -7,15 +7,22 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c7ca707704d3354a64feeb4f19f52eb5"
 DEPENDS += "libdrm"
 require recipes-core/matrix/matrix-gui-paths.inc
 
-PR = "r5"
+PR = "r6"
 
 BRANCH = "drm"
 SRCREV = "0c48cb66cc995420dfec2f1fd620c8977f0170aa"
 
-SRC_URI = "git://gitorious.org/dual-camera-demo/dual-camera-demo.git;protocol=git;branch=${BRANCH}"
+SRC_URI = "git://gitorious.org/dual-camera-demo/dual-camera-demo.git;protocol=git;branch=${BRANCH} \
+           file://desc_dual-camera.html \
+           file://dual_camera_qt5.sh \
+           file://dual_camera_qt4.sh \
+           file://dual-camera.desktop \
+"
 
 S = "${WORKDIR}/git"
 
+DEMO_SCRIPT = "${@base_conditional('QT_PROVIDER', 'qt5', 'dual_camera_qt5.sh', 'dual_camera_qt4.sh', d)}"
+
 inherit qt-provider
 
 export SDK_PATH_TARGET='${STAGING_DIR_HOST}'
@@ -25,8 +32,9 @@ do_install() {
     install -d ${D}/usr/bin
     install -d ${D}${MATRIX_APP_DIR}/dual-camera
     install dual_camera ${D}/usr/bin/dual_camera
-    install dual_camera.sh ${D}/usr/bin/dual_camera.sh
-    install matrix/* ${D}/${MATRIX_APP_DIR}/dual-camera
+    install ${WORKDIR}/${DEMO_SCRIPT} ${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"
-- 
1.7.9.5