freondemo/gstd: Add updates from latest RR recipes

   * Updated recipes (logic) merged from latest Ridgerun recipes
   * Whitespace formatting maintained from earlier cleanup

Signed-off-by: Roger Monk <r-monk@ti.com>
Signed-off-by: Koen Kooi <k-kooi@ti.com>

6 files changed, 70 insertions, 38 deletions

diff --git a/recipes/freondemo/files/freondemo b/recipes/freondemo/files/freondemo
index 80dd36e132..bd8a3b609f 100644..100755
--- a/recipes/freondemo/files/freondemo
+++ b/recipes/freondemo/files/freondemo
@@ -1,20 +1,32 @@
 #!/bin/sh
 
 # We start a system wide gstd daemon
-gstd &
-   
-amixer -q sset 'HP DAC' 127 
+if ! pidof gstd  > /dev/null; then
+    { gstd 2>&1 | logger -t GSTD & } ; 
+fi
+
+
+amixer -q sset 'HP DAC' 127
+amixer -q sset 'Line DAC' 127
 
 #If we detect a mouse, use it, otherwise configure the touchcreen
-if [ ! -c /dev/input/mice ] && [ ! -c /dev/input/mouse0 ] ; then
-    if [ -c /dev/input/touchscreen0 ] ; then
-         export TSLIB_TSDEVICE=/dev/input/touchscreen0
-         if [ ! -f /etc/pointercal ] ; then
-             # We need to calibrate the screen
-             ts_calibrate
-         fi
-         export QWS_MOUSE_PROTO=tslib
+if ! grep -q mouse1 /proc/bus/input/devices ; then
+    if grep -q Touchscreen /proc/bus/input/devices && [ -c /dev/input/touchscreen0 ] ; then
+        export TSLIB_TSDEVICE=/dev/input/touchscreen0
+        if [ ! -f /etc/pointercal ] ; then
+            # We need to calibrate the screen
+            ts_calibrate
+        fi
+        echo -e "\nFreonDemo using touchscreen"
+        export QWS_MOUSE_PROTO=tslib:/dev/input/touchscreen0
+    else
+        echo "ERROR, no mouse or touchscreen detected for FreonDemo"
+        exit 1;
     fi
+else
+    echo -e "\nFreonDemo using mouse input"
+    export QWS_MOUSE_PROTO=MouseMan:/dev/input/mouse1
 fi
 
+#Otherwise try to use the touchscren
 /usr/libexec/FreonDemo -qws &
diff --git a/recipes/freondemo/files/freondemo.init b/recipes/freondemo/files/freondemo.init
index 5cb5281245..3b406b2968 100644
--- a/recipes/freondemo/files/freondemo.init
+++ b/recipes/freondemo/files/freondemo.init
@@ -4,7 +4,7 @@ set -e
 
 DAEMON=/usr/bin/freondemo
 NAME=freondemo
-PIDFILE=/var/run/freondemo/pid
+PIDFILE=/var/run/freondemo.pid
 DESC="Freon Demo"
 PARAMS=""
 
@@ -22,10 +22,9 @@ start_it_up()
     fi
   fi
 
-  source $SESSIONFILE
   echo -n "Starting $DESC: "
-  start-stop-daemon --start --pidfile $PIDFILE \
-    --exec $DAEMON -- $PARAMS
+  start-stop-daemon --start --exec $DAEMON -- $PARAMS
+  pidof FreonDemo > $PIDFILE
   echo "$NAME."
 }
 
diff --git a/recipes/freondemo/freondemo-media-files.bb b/recipes/freondemo/freondemo-media-files.bb
new file mode 100644
index 0000000000..e17d06bfd6
--- /dev/null
+++ b/recipes/freondemo/freondemo-media-files.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "FreonDemo: Media files to include on freondemo"
+HOMEPAGE = "http://sourceforge.net/projects/freondemo"
+LICENSE = "Unknown"
+SECTION = "multimedia"
+PRIORITY = "optional"
+
+PV = "1.0"
+PR = "r2"
+
+SRC_URI = "http://downloads.sourceforge.net/project/freondemo/media_files.tar.gz;name=freonmediafiles"
+SRC_URI[freonmediafiles.md5sum] = "ffc705fc5581c584d88bd88a8b9caedf"
+
+S = "${WORKDIR}"
+
+inherit base
+
+do_install() {
+    mkdir -p ${D}/${datadir}/mediafiles
+    cp -R ${S}/*.m4a ${D}/${datadir}/mediafiles
+    cp -R ${S}/*.m4v ${D}/${datadir}/mediafiles
+    cp -R ${S}/*.aac ${D}/${datadir}/mediafiles
+    cp -R ${S}/*.license ${D}/${datadir}/mediafiles
+}
+
+FILES_${PN} += "${datadir}/mediafiles"
diff --git a/recipes/freondemo/freondemo_git.bb b/recipes/freondemo/freondemo_git.bb
index ae943a7149..679c08f644 100644
--- a/recipes/freondemo/freondemo_git.bb
+++ b/recipes/freondemo/freondemo_git.bb
@@ -1,18 +1,19 @@
 DESCRIPTION = "FreonDemo: a QT based demo for OMAP L138 EVM board"
 HOMEPAGE = "http://sourceforge.net/projects/freondemo"
-MAINTAINER = "http://sourceforge.net/projects/freondemo"
 LICENSE = "BSD"
 SECTION = "multimedia"
 PRIORITY = "optional"
 
-DEPENDS = "dbus gstd"
-RDEPENDS_${PN} = "gstd alsa-utils-amixer gst-ipcsink"
-RRECOMMENDS_${PN} = "qt4-embedded-plugin-mousedriver-tslib gstreamer-ti"
+inherit qt4e update-rc.d
+
+DEPENDS += "dbus gstd"
+RDEPENDS_${PN} = "gstd alsa-utils-amixer gst-ipcsink dbus"
+RRECOMMENDS_${PN} = "qt4-embedded-plugin-mousedriver-tslib gstreamer-ti freondemo-media-files"
 
-SRCREV = "19c4e201aa978d2b40793b9fa76cc4ddbff50016"
+SRCREV = "e652aa92a99b2aa7c9919299761499b413a348d5"
 
 PV = "1.0"
-PR = "r7"
+PR = "r18"
 PR_append = "+gitr${SRCREV}"
 
 SRC_URI = "git://freondemo.git.sourceforge.net/gitroot/freondemo/freondemo;protocol=git \
@@ -21,8 +22,6 @@ SRC_URI = "git://freondemo.git.sourceforge.net/gitroot/freondemo/freondemo;proto
            "
 S = "${WORKDIR}/git"
 
-inherit qt4e update-rc.d
-
 do_install() {
     install -d ${D}/${libexecdir}
     install -d ${D}/${bindir}
diff --git a/recipes/freondemo/gst-ipcsink_git.bb b/recipes/freondemo/gst-ipcsink_git.bb
index e8a184ccd6..508ad37475 100755..100644
--- a/recipes/freondemo/gst-ipcsink_git.bb
+++ b/recipes/freondemo/gst-ipcsink_git.bb
@@ -1,25 +1,23 @@
 DESCRIPTION = "gst-ipcsink: custom gstreamer element for IPC video sink"
 HOMEPAGE = "http://sourceforge.net/projects/freondemo"
-MAINTAINER = "http://sourceforge.net/projects/freondemo"
 LICENSE = "BSD"
 SECTION = "multimedia"
 PRIORITY = "optional"
 
+inherit autotools
+
 DEPENDS = "gstreamer gst-plugins-base"
 
-SRCREV=7e38d82d1207bb75f235f5643c4c2d15591e9b3c
+SRCREV = "7e38d82d1207bb75f235f5643c4c2d15591e9b3c"
 
 PV = "1.0"
 PR = "r0"
-PR_append= "+gitr${SRCREV}"
-
-inherit autotools
+PR_append = "+gitr${SRCREV}"
 
 SRC_URI = "git://freondemo.git.sourceforge.net/gitroot/freondemo/gst-ipcsink;protocol=git"
+
 S = "${WORKDIR}/git"
 
 FILES_${PN} += "${libdir}/gstreamer-0.10/*.so ${sysconfdir}"
 FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.a ${libdir}/gstreamer-0.10/*.la"
 FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
-
-
diff --git a/recipes/gstd/gstd_git.bb b/recipes/gstd/gstd_git.bb
index 143b4b60d5..e2ecb89891 100644
--- a/recipes/gstd/gstd_git.bb
+++ b/recipes/gstd/gstd_git.bb
@@ -1,26 +1,25 @@
-DESCRIPTION = "Gstd: a Gstreamer-based streaming server"
+DESCRIPTION = "gstd: a Gstreamer-based streaming server"
 HOMEPAGE = "http://sourceforge.net/projects/harrier/"
-MAINTAINER = "harrier-devel@lists.sourceforge.net"
 LICENSE = "BSD"
 SECTION = "multimedia"
 PRIORITY = "optional"
 
+inherit autotools pkgconfig
+
 DEPENDS = "dbus dbus-glib gstreamer"
-RDEPENDS = "gst-plugins-base"
+RDEPENDS_${PN} = "dbus dbus-glib gstreamer gst-plugins-base"
+RRECOMENDS_${PN} = "gstreamer-ti"
 
-SRCREV = "7ba92f30db6f72531554a7b0335e757182c60020"
+SRCREV = "f3e22c93f4fd7ca47d6309b8450788127550ecb9"
 
 PV = "1.0"
-PR = "r7"
+PR = "r13"
 PR_append = "+gitr${SRCREV}"
 
 SRC_URI = "git://gstd.git.sourceforge.net/gitroot/gstd/gstd;protocol=git \
            "
-
 S = "${WORKDIR}/git"
 
-inherit autotools pkgconfig
-
 # We don't want to run autoconf or automake, unless you have 
 # automake > 1.11 with vala support
 do_configure() {