* [PATCHv2 1/3] matrix-gui-common: update to latest sources
@ 2010-09-23 19:41 Chase Maupin
2010-09-23 19:41 ` [PATCHv2 2/3] matrix-gui-e: updating to latest source revision Chase Maupin
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Chase Maupin @ 2010-09-23 19:41 UTC (permalink / raw)
To: openembedded-devel; +Cc: Jeff Lance
From: Jeff Lance <j-lance1@ti.com>
* Updated to use repository revision 131
* This includes platform support
* Removed the browser binary
* Copy files based on PLATFORM
* Bumped SRCREV to 136 in version 2 of this patch
Signed-off-by: Chase Maupin <chase.maupin@ti.com>
Signed-off-by: Jeff Lance <j-lance1@ti.com>
---
recipes/ti/matrix-gui-common/browser | 20 ----------------
recipes/ti/matrix-gui-common_svn.bb | 42 +++++++++++++---------------------
2 files changed, 16 insertions(+), 46 deletions(-)
delete mode 100644 recipes/ti/matrix-gui-common/browser
diff --git a/recipes/ti/matrix-gui-common/browser b/recipes/ti/matrix-gui-common/browser
deleted file mode 100644
index b5202d5..0000000
--- a/recipes/ti/matrix-gui-common/browser
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-BROWSERDIR=""
-BROWSERAPP="browser"
-
-#Check if DISPLAY is set. If so we assume we are running in X11
-#and will call the X11 version of the browser if it exists.
-if [ "$DISPLAY" == "" ]
-then
- BROWSERDIR="/usr/bin/qtopia/demos/browser"
-else
- BROWSERDIR="/usr/bin/qt4/demos/browser"
-fi
-
-if [ -e "$BROWSERDIR/$BROWSERAPP" ]
-then
- cd $BROWSERDIR
- ./$BROWSERAPP
-fi
-
diff --git a/recipes/ti/matrix-gui-common_svn.bb b/recipes/ti/matrix-gui-common_svn.bb
index 43d6b0c..89126a2 100644
--- a/recipes/ti/matrix-gui-common_svn.bb
+++ b/recipes/ti/matrix-gui-common_svn.bb
@@ -4,44 +4,34 @@ LICENSE = "BSD"
SECTION = "multimedia"
PRIORITY = "optional"
-SRCREV = "58"
-PV = "1.0"
-PR = "r1+svnr${SRCPV}"
+SRCREV = "136"
+PV = "1.1"
+PR = "r3+svnr${SRCPV}"
+
+PLATFORM_dm365 = "dm365"
+PLATFORM_da850-omapl138-evm = "omapl138"
+PLATFORM_omap3evm = "omap3530"
+PLATFORM_dm37x-evm = "dm3730"
+PLATFORM_am37x-evm = "am3715"
+PLATFORM_beagleboard = "am3715"
+PLATFORM ?= "<UNDEFINED>"
#Checkout the project repository to get access to the scripts and data
#files.
-SRC_URI = "svn://gforge.ti.com/svn/matrix_gui/;module=trunk;proto=https;user=anonymous;pswd='' \
- file://browser \
-"
+SRC_URI = "svn://gforge.ti.com/svn/matrix_gui/;module=trunk;proto=https;user=anonymous;pswd='' "
S = "${WORKDIR}/trunk"
-MATRIX_EXTRA_BINS = " \
- memInfo \
- networkSettings \
- runOGLES2Coverflow \
- runOGLES2Shaders \
- runOGLESChameleonMan \
- runOGLESVase \
- setopp1 \
- setopp2 \
- setopp3 \
- setopp4 \
- standby \
- sysSettings \
- taskInfo \
-"
+PACKAGE_ARCH = ${MACHINE_ARCH}
do_install() {
install -d ${D}/${bindir}
- for i in ${MATRIX_EXTRA_BINS}; do
- install -m 0755 ${S}/bin/${i} ${D}/${bindir}
- done
- install -m 0755 ${WORKDIR}/browser ${D}/${bindir}
+ install -m 0755 ${S}/${PLATFORM}/bin/* ${D}/${bindir}/
install -d ${D}/${datadir}/matrix/html
- install -m 0644 ${S}/*.html ${D}/${datadir}/matrix/html/
+ install -m 0644 ${S}/${PLATFORM}/html/* ${D}/${datadir}/matrix/html
install -d ${D}/${datadir}/matrix/images
install -m 0644 ${S}/images/*.png ${D}/${datadir}/matrix/images/
+
}
FILES_${PN} += "${datadir}/matrix/*"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCHv2 2/3] matrix-gui-e: updating to latest source revision
2010-09-23 19:41 [PATCHv2 1/3] matrix-gui-common: update to latest sources Chase Maupin
@ 2010-09-23 19:41 ` Chase Maupin
2010-09-23 21:55 ` Denys Dmytriyenko
2010-09-23 19:41 ` [PATCHv3 3/3] matrix-gui: updating to use " Chase Maupin
2010-09-23 21:55 ` [PATCHv2 1/3] matrix-gui-common: update to latest sources Denys Dmytriyenko
2 siblings, 1 reply; 6+ messages in thread
From: Chase Maupin @ 2010-09-23 19:41 UTC (permalink / raw)
To: openembedded-devel; +Cc: Jeff Lance
From: Jeff Lance <j-lance1@ti.com>
* Updated recipe to use the latest source revision 131
* Included platform support
* Removed init files from OE repository since they are now part
of the matrix repository.
* Bumped SRCREV to 136 in version 2 of this patch
Signed-off-by: Chase Maupin <chase.maupin@ti.com>
Signed-off-by: Jeff Lance <j-lance1@ti.com>
---
recipes/ti/matrix-gui-e/dm365-evm/init | 29 --------------------------
recipes/ti/matrix-gui-e/init | 35 --------------------------------
recipes/ti/matrix-gui-e_svn.bb | 25 ++++++++++++++++------
3 files changed, 18 insertions(+), 71 deletions(-)
delete mode 100755 recipes/ti/matrix-gui-e/dm365-evm/init
delete mode 100755 recipes/ti/matrix-gui-e/init
diff --git a/recipes/ti/matrix-gui-e/dm365-evm/init b/recipes/ti/matrix-gui-e/dm365-evm/init
deleted file mode 100755
index d860ad9..0000000
--- a/recipes/ti/matrix-gui-e/dm365-evm/init
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh
-matrixgui="/usr/bin/matrix_guiE"
-GUI_OPTS="-qws -geometry 720x480+0+10 -display transformed:Rot0 /usr/share/matrix/html/menu_main.html"
-
-test -x "$matrixgui" || exit 0
-
-case "$1" in
- start)
-
- chvt 4
-
- # switch to component 480p mode
- echo 480P-60 > /sys/class/davinci_display/ch0/mode
- echo COMPONENT > /sys/class/davinci_display/ch0/output
- echo -n "Starting Matrix GUI application"
- start-stop-daemon --start --quiet --background --pidfile /var/run/matrix-gui-e.pid --exec $matrixgui -- $GUI_OPTS
- echo "."
- ;;
- stop)
- echo -n "Stopping Matrix GUI application"
- start-stop-daemon --stop --quiet --pidfile /var/run/matrix-gui-e.pid
- echo "."
- ;;
- *)
- echo "Usage: /etc/init.d/matrix-gui-e {start|stop}"
- exit 1
-esac
-
-exit 0
diff --git a/recipes/ti/matrix-gui-e/init b/recipes/ti/matrix-gui-e/init
deleted file mode 100755
index 266fdca..0000000
--- a/recipes/ti/matrix-gui-e/init
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-
-matrixgui="/usr/bin/matrix_guiE"
-GUI_OPTS="-qws -display transformed:Rot90 /usr/share/matrix/html/menu_main.html"
-
-test -x "$matrixgui" || exit 0
-
-export TSLIB_TSDEVICE=/dev/input/touchscreen0
-export QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0
-
-case "$1" in
- start)
-
- chvt 4
-
- if [ ! -f /etc/pointercal ] ; then
- echo -n "Calibrating touchscreen (first time only)"
- ts_calibrate
- echo "."
- fi
- echo -n "Starting Matrix GUI application"
- start-stop-daemon --start --quiet --background --pidfile /var/run/matrix-gui-e.pid --exec $matrixgui -- $GUI_OPTS
- echo "."
- ;;
- stop)
- echo -n "Stopping Matrix GUI application"
- start-stop-daemon --stop --quiet --pidfile /var/run/matrix-gui-e.pid
- echo "."
- ;;
- *)
- echo "Usage: /etc/init.d/matrix-gui-e {start|stop}"
- exit 1
-esac
-
-exit 0
diff --git a/recipes/ti/matrix-gui-e_svn.bb b/recipes/ti/matrix-gui-e_svn.bb
index 35abd25..5570d92 100644
--- a/recipes/ti/matrix-gui-e_svn.bb
+++ b/recipes/ti/matrix-gui-e_svn.bb
@@ -4,13 +4,19 @@ LICENSE = "BSD"
SECTION = "multimedia"
PRIORITY = "optional"
-SRCREV = "58"
-PV = "1.0"
-PR = "r16+svnr${SRCPV}"
+SRCREV = "136"
+PV = "1.1"
+PR = "r18+svnr${SRCPV}"
-SRC_URI = "svn://gforge.ti.com/svn/matrix_gui/;module=trunk;proto=https;user=anonymous;pswd='' \
- file://init \
-"
+PLATFORM_dm365 = "dm365"
+PLATFORM_da850-omapl138-evm = "omapl138"
+PLATFORM_omap3evm = "omap3530"
+PLATFORM_dm37x-evm = "dm3730"
+PLATFORM_am37x-evm = "am3715"
+PLATFORM_beagleboard = "am3715"
+PLATFORM ?= "<UNDEFINED>"
+
+SRC_URI = "svn://gforge.ti.com/svn/matrix_gui/;module=trunk;proto=https;user=anonymous;pswd='' "
S = "${WORKDIR}/trunk"
@@ -18,13 +24,18 @@ INITSCRIPT_NAME = "matrix-gui-e"
INITSCRIPT_PARAMS = "defaults 99"
#INITSCRIPT_PARAMS = "start 99 3 . stop 99 3 ."
+CXXFLAGS_da850-omapl138-evm_append = " -DPlatform_omapl138 "
+CXXFLAGS_dm365_append = " -DPlatform_dm365 "
+PACKAGE_ARCH = ${MACHINE_ARCH}
+
inherit qt4e update-rc.d
do_install() {
install -d ${D}/${bindir}
install -m 0755 ${S}/matrix_gui ${D}/${bindir}/matrix_guiE
install -d ${D}${sysconfdir}/init.d/
- install -c -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/matrix-gui-e
+ install -c -m 0755 ${S}/${PLATFORM}/etc/init ${D}${sysconfdir}/init.d/matrix-gui-e
+
}
RRECOMMENDS_${PN} = "qt4-embedded-plugin-mousedriver-tslib qt4-embedded-fonts"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCHv3 3/3] matrix-gui: updating to use latest source revision
2010-09-23 19:41 [PATCHv2 1/3] matrix-gui-common: update to latest sources Chase Maupin
2010-09-23 19:41 ` [PATCHv2 2/3] matrix-gui-e: updating to latest source revision Chase Maupin
@ 2010-09-23 19:41 ` Chase Maupin
2010-09-23 21:56 ` Denys Dmytriyenko
2010-09-23 21:55 ` [PATCHv2 1/3] matrix-gui-common: update to latest sources Denys Dmytriyenko
2 siblings, 1 reply; 6+ messages in thread
From: Chase Maupin @ 2010-09-23 19:41 UTC (permalink / raw)
To: openembedded-devel; +Cc: Jeff Lance
From: Jeff Lance <j-lance1@ti.com>
* Use latest source revision 131
* Add platform support for multiple platforms
* Remove un-used files from SRC_URI and repository.
* init files are now part of the matrix repository
* matrix-gui.desktop is now part of the matrix repository
* the cursor override patch is now in the matrix sources
* Bumped SRCREV to 136 in version 3 of this patch
Signed-off-by: Chase Maupin <chase.maupin@ti.com>
Signed-off-by: Jeff Lance <j-lance1@ti.com>
---
.../0001-Disable-cursor-override-for-X11.patch | 27 ------------------
recipes/ti/matrix-gui/dm365-evm/init | 26 -----------------
recipes/ti/matrix-gui/init | 24 ----------------
recipes/ti/matrix-gui/matrix-gui.desktop | 7 ----
recipes/ti/matrix-gui_svn.bb | 30 ++++++++++++-------
5 files changed, 19 insertions(+), 95 deletions(-)
delete mode 100644 recipes/ti/matrix-gui/0001-Disable-cursor-override-for-X11.patch
delete mode 100644 recipes/ti/matrix-gui/dm365-evm/init
delete mode 100644 recipes/ti/matrix-gui/init
delete mode 100644 recipes/ti/matrix-gui/matrix-gui.desktop
diff --git a/recipes/ti/matrix-gui/0001-Disable-cursor-override-for-X11.patch b/recipes/ti/matrix-gui/0001-Disable-cursor-override-for-X11.patch
deleted file mode 100644
index 61eba44..0000000
--- a/recipes/ti/matrix-gui/0001-Disable-cursor-override-for-X11.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b0e91f703ffdcc73f854a672ec16ebbf21293c9c Mon Sep 17 00:00:00 2001
-From: Chase Maupin <chase.maupin@ti.com>
-Date: Mon, 24 May 2010 12:51:49 -0500
-Subject: [PATCH] Disable cursor override for X11
-
-* Disable the cursor override option for using the matrix_gui
- program with X11.
----
- main.cpp | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/main.cpp b/main.cpp
-index 978e327..1f55e94 100644
---- a/main.cpp
-+++ b/main.cpp
-@@ -43,7 +43,7 @@ int main(int argc, char * argv[])
- {
- QApplication matrix(argc, argv);
- QApplication::setStyle(new CustomStyle);
-- QApplication::setOverrideCursor(QCursor(Qt::BlankCursor));
-+// QApplication::setOverrideCursor(QCursor(Qt::BlankCursor));
-
- // Create a new window to display a web page.
- MainWindow * pWindow = new MainWindow(0, QString(argv[1]), true);
---
-1.6.0.4
-
diff --git a/recipes/ti/matrix-gui/dm365-evm/init b/recipes/ti/matrix-gui/dm365-evm/init
deleted file mode 100644
index 3aadc1e..0000000
--- a/recipes/ti/matrix-gui/dm365-evm/init
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh
-matrixgui="/usr/bin/matrix_gui"
-GUI_OPTS="-geometry 720x480+0+10 -display transformed:Rot0 /usr/share/matrix/html/menu_main.html"
-
-test -x "$matrixgui" || exit 0
-
-case "$1" in
- start)
- # switch to component 480p mode
- echo 480P-60 > /sys/class/davinci_display/ch0/mode
- echo COMPONENT > /sys/class/davinci_display/ch0/output
- echo -n "Starting Matrix GUI application"
- start-stop-daemon --start --quiet --background --pidfile /var/run/matrix-gui.pid --exec $matrixgui -- $GUI_OPTS
- echo "."
- ;;
- stop)
- echo -n "Stopping Matrix GUI application"
- start-stop-daemon --stop --quiet --pidfile /var/run/matrix-gui.pid
- echo "."
- ;;
- *)
- echo "Usage: /etc/init.d/matrix-gui {start|stop}"
- exit 1
-esac
-
-exit 0
diff --git a/recipes/ti/matrix-gui/init b/recipes/ti/matrix-gui/init
deleted file mode 100644
index 40b6512..0000000
--- a/recipes/ti/matrix-gui/init
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-
-matrixgui="/usr/bin/matrix_gui"
-GUI_OPTS="/usr/share/matrix/html/menu_main.html"
-
-test -x "$matrixgui" || exit 0
-
-case "$1" in
- start)
- echo -n "Starting Matrix GUI application"
- start-stop-daemon --start --quiet --background --pidfile /var/run/matrix-gui.pid --exec $matrixgui -- $GUI_OPTS
- echo "."
- ;;
- stop)
- echo -n "Stopping Matrix GUI application"
- start-stop-daemon --stop --quiet --pidfile /var/run/matrix-gui.pid
- echo "."
- ;;
- *)
- echo "Usage: /etc/init.d/matrix-gui {start|stop}"
- exit 1
-esac
-
-exit 0
diff --git a/recipes/ti/matrix-gui/matrix-gui.desktop b/recipes/ti/matrix-gui/matrix-gui.desktop
deleted file mode 100644
index 52b5831..0000000
--- a/recipes/ti/matrix-gui/matrix-gui.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Matrix GUI
-Comment=Start the Matrix GUI application
-Exec=/usr/bin/matrix_gui /usr/share/matrix/html/menu_main.html
-Terminal=false
-Type=Application
-X-GNOME-Autostart-enabled=true
diff --git a/recipes/ti/matrix-gui_svn.bb b/recipes/ti/matrix-gui_svn.bb
index 4bfe7c2..f52294d 100644
--- a/recipes/ti/matrix-gui_svn.bb
+++ b/recipes/ti/matrix-gui_svn.bb
@@ -4,27 +4,35 @@ LICENSE = "BSD"
SECTION = "multimedia"
PRIORITY = "optional"
-SRCREV = "58"
-PV = "1.0"
-PR = "r14+svnr${SRCPV}"
+SRCREV = "136"
+PV = "1.1"
+PR = "r16+svnr${SRCPV}"
-SRC_URI = "svn://gforge.ti.com/svn/matrix_gui/;module=trunk;proto=https;user=anonymous;pswd='' \
- file://0001-Disable-cursor-override-for-X11.patch \
- file://init \
- file://matrix-gui.desktop \
-"
+PLATFORM_dm365 = "dm365"
+PLATFORM_da850-omapl138-evm = "omapl138"
+PLATFORM_omap3evm = "omap3530"
+PLATFORM_dm37x-evm = "dm3730"
+PLATFORM_am37x-evm = "am3715"
+PLATFORM_beagleboard = "am3715"
+PLATFORM ?= "<UNDEFINED>"
+
+SRC_URI = "svn://gforge.ti.com/svn/matrix_gui/;module=trunk;proto=https;user=anonymous;pswd='' "
S = "${WORKDIR}/trunk"
+CXXFLAGS_da850-omapl138-evm_append = " -DPlatform_omapl138 "
+CXXFLAGS_dm365_append = " -DPlatform_dm365 "
+PACKAGE_ARCH = ${MACHINE_ARCH}
+
inherit qt4x11
do_install() {
install -d ${D}/${bindir}
install -m 0755 ${S}/matrix_gui ${D}/${bindir}
install -d ${D}${sysconfdir}/init.d/
- install -c -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/matrix-gui
- install -d ${D}/${sysconfdir}/xdg/autostart
- install -m 0755 ${WORKDIR}/matrix-gui.desktop ${D}/${sysconfdir}/xdg/autostart
+ install -c -m 0755 ${S}/${PLATFORM}/etc/x11/init ${D}${sysconfdir}/init.d/matrix-gui
+ install -d ${D}/${sysconfdir}/xdg/autostart
+ install -m 0755 ${S}/${PLATFORM}/etc/x11/matrix-gui.desktop ${D}/${sysconfdir}/xdg/autostart
}
FILES_${PN}-autostart = "${sysconfdir}/xdg/autostart/matrix-gui.desktop"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCHv2 1/3] matrix-gui-common: update to latest sources
2010-09-23 19:41 [PATCHv2 1/3] matrix-gui-common: update to latest sources Chase Maupin
2010-09-23 19:41 ` [PATCHv2 2/3] matrix-gui-e: updating to latest source revision Chase Maupin
2010-09-23 19:41 ` [PATCHv3 3/3] matrix-gui: updating to use " Chase Maupin
@ 2010-09-23 21:55 ` Denys Dmytriyenko
2 siblings, 0 replies; 6+ messages in thread
From: Denys Dmytriyenko @ 2010-09-23 21:55 UTC (permalink / raw)
To: openembedded-devel
On Thu, Sep 23, 2010 at 02:41:35PM -0500, Chase Maupin wrote:
> From: Jeff Lance <j-lance1@ti.com>
>
> * Updated to use repository revision 131
> * This includes platform support
> * Removed the browser binary
> * Copy files based on PLATFORM
> * Bumped SRCREV to 136 in version 2 of this patch
>
> Signed-off-by: Chase Maupin <chase.maupin@ti.com>
> Signed-off-by: Jeff Lance <j-lance1@ti.com>
I'll keep acking it as long as you keep resubmitting... :)
Acked-by: Denys Dmytriyenko <denis@denix.org>
> ---
> recipes/ti/matrix-gui-common/browser | 20 ----------------
> recipes/ti/matrix-gui-common_svn.bb | 42 +++++++++++++---------------------
> 2 files changed, 16 insertions(+), 46 deletions(-)
> delete mode 100644 recipes/ti/matrix-gui-common/browser
>
> diff --git a/recipes/ti/matrix-gui-common/browser b/recipes/ti/matrix-gui-common/browser
> deleted file mode 100644
> index b5202d5..0000000
> --- a/recipes/ti/matrix-gui-common/browser
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -#!/bin/sh
> -
> -BROWSERDIR=""
> -BROWSERAPP="browser"
> -
> -#Check if DISPLAY is set. If so we assume we are running in X11
> -#and will call the X11 version of the browser if it exists.
> -if [ "$DISPLAY" == "" ]
> -then
> - BROWSERDIR="/usr/bin/qtopia/demos/browser"
> -else
> - BROWSERDIR="/usr/bin/qt4/demos/browser"
> -fi
> -
> -if [ -e "$BROWSERDIR/$BROWSERAPP" ]
> -then
> - cd $BROWSERDIR
> - ./$BROWSERAPP
> -fi
> -
> diff --git a/recipes/ti/matrix-gui-common_svn.bb b/recipes/ti/matrix-gui-common_svn.bb
> index 43d6b0c..89126a2 100644
> --- a/recipes/ti/matrix-gui-common_svn.bb
> +++ b/recipes/ti/matrix-gui-common_svn.bb
> @@ -4,44 +4,34 @@ LICENSE = "BSD"
> SECTION = "multimedia"
> PRIORITY = "optional"
>
> -SRCREV = "58"
> -PV = "1.0"
> -PR = "r1+svnr${SRCPV}"
> +SRCREV = "136"
> +PV = "1.1"
> +PR = "r3+svnr${SRCPV}"
> +
> +PLATFORM_dm365 = "dm365"
> +PLATFORM_da850-omapl138-evm = "omapl138"
> +PLATFORM_omap3evm = "omap3530"
> +PLATFORM_dm37x-evm = "dm3730"
> +PLATFORM_am37x-evm = "am3715"
> +PLATFORM_beagleboard = "am3715"
> +PLATFORM ?= "<UNDEFINED>"
>
> #Checkout the project repository to get access to the scripts and data
> #files.
> -SRC_URI = "svn://gforge.ti.com/svn/matrix_gui/;module=trunk;proto=https;user=anonymous;pswd='' \
> - file://browser \
> -"
> +SRC_URI = "svn://gforge.ti.com/svn/matrix_gui/;module=trunk;proto=https;user=anonymous;pswd='' "
>
> S = "${WORKDIR}/trunk"
>
> -MATRIX_EXTRA_BINS = " \
> - memInfo \
> - networkSettings \
> - runOGLES2Coverflow \
> - runOGLES2Shaders \
> - runOGLESChameleonMan \
> - runOGLESVase \
> - setopp1 \
> - setopp2 \
> - setopp3 \
> - setopp4 \
> - standby \
> - sysSettings \
> - taskInfo \
> -"
> +PACKAGE_ARCH = ${MACHINE_ARCH}
>
> do_install() {
> install -d ${D}/${bindir}
> - for i in ${MATRIX_EXTRA_BINS}; do
> - install -m 0755 ${S}/bin/${i} ${D}/${bindir}
> - done
> - install -m 0755 ${WORKDIR}/browser ${D}/${bindir}
> + install -m 0755 ${S}/${PLATFORM}/bin/* ${D}/${bindir}/
> install -d ${D}/${datadir}/matrix/html
> - install -m 0644 ${S}/*.html ${D}/${datadir}/matrix/html/
> + install -m 0644 ${S}/${PLATFORM}/html/* ${D}/${datadir}/matrix/html
> install -d ${D}/${datadir}/matrix/images
> install -m 0644 ${S}/images/*.png ${D}/${datadir}/matrix/images/
> +
> }
>
> FILES_${PN} += "${datadir}/matrix/*"
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCHv2 2/3] matrix-gui-e: updating to latest source revision
2010-09-23 19:41 ` [PATCHv2 2/3] matrix-gui-e: updating to latest source revision Chase Maupin
@ 2010-09-23 21:55 ` Denys Dmytriyenko
0 siblings, 0 replies; 6+ messages in thread
From: Denys Dmytriyenko @ 2010-09-23 21:55 UTC (permalink / raw)
To: openembedded-devel
On Thu, Sep 23, 2010 at 02:41:36PM -0500, Chase Maupin wrote:
> From: Jeff Lance <j-lance1@ti.com>
>
> * Updated recipe to use the latest source revision 131
> * Included platform support
> * Removed init files from OE repository since they are now part
> of the matrix repository.
> * Bumped SRCREV to 136 in version 2 of this patch
>
> Signed-off-by: Chase Maupin <chase.maupin@ti.com>
> Signed-off-by: Jeff Lance <j-lance1@ti.com>
Acked-by: Denys Dmytriyenko <denis@denix.org>
> ---
> recipes/ti/matrix-gui-e/dm365-evm/init | 29 --------------------------
> recipes/ti/matrix-gui-e/init | 35 --------------------------------
> recipes/ti/matrix-gui-e_svn.bb | 25 ++++++++++++++++------
> 3 files changed, 18 insertions(+), 71 deletions(-)
> delete mode 100755 recipes/ti/matrix-gui-e/dm365-evm/init
> delete mode 100755 recipes/ti/matrix-gui-e/init
>
> diff --git a/recipes/ti/matrix-gui-e/dm365-evm/init b/recipes/ti/matrix-gui-e/dm365-evm/init
> deleted file mode 100755
> index d860ad9..0000000
> --- a/recipes/ti/matrix-gui-e/dm365-evm/init
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -#! /bin/sh
> -matrixgui="/usr/bin/matrix_guiE"
> -GUI_OPTS="-qws -geometry 720x480+0+10 -display transformed:Rot0 /usr/share/matrix/html/menu_main.html"
> -
> -test -x "$matrixgui" || exit 0
> -
> -case "$1" in
> - start)
> -
> - chvt 4
> -
> - # switch to component 480p mode
> - echo 480P-60 > /sys/class/davinci_display/ch0/mode
> - echo COMPONENT > /sys/class/davinci_display/ch0/output
> - echo -n "Starting Matrix GUI application"
> - start-stop-daemon --start --quiet --background --pidfile /var/run/matrix-gui-e.pid --exec $matrixgui -- $GUI_OPTS
> - echo "."
> - ;;
> - stop)
> - echo -n "Stopping Matrix GUI application"
> - start-stop-daemon --stop --quiet --pidfile /var/run/matrix-gui-e.pid
> - echo "."
> - ;;
> - *)
> - echo "Usage: /etc/init.d/matrix-gui-e {start|stop}"
> - exit 1
> -esac
> -
> -exit 0
> diff --git a/recipes/ti/matrix-gui-e/init b/recipes/ti/matrix-gui-e/init
> deleted file mode 100755
> index 266fdca..0000000
> --- a/recipes/ti/matrix-gui-e/init
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -#! /bin/sh
> -
> -matrixgui="/usr/bin/matrix_guiE"
> -GUI_OPTS="-qws -display transformed:Rot90 /usr/share/matrix/html/menu_main.html"
> -
> -test -x "$matrixgui" || exit 0
> -
> -export TSLIB_TSDEVICE=/dev/input/touchscreen0
> -export QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0
> -
> -case "$1" in
> - start)
> -
> - chvt 4
> -
> - if [ ! -f /etc/pointercal ] ; then
> - echo -n "Calibrating touchscreen (first time only)"
> - ts_calibrate
> - echo "."
> - fi
> - echo -n "Starting Matrix GUI application"
> - start-stop-daemon --start --quiet --background --pidfile /var/run/matrix-gui-e.pid --exec $matrixgui -- $GUI_OPTS
> - echo "."
> - ;;
> - stop)
> - echo -n "Stopping Matrix GUI application"
> - start-stop-daemon --stop --quiet --pidfile /var/run/matrix-gui-e.pid
> - echo "."
> - ;;
> - *)
> - echo "Usage: /etc/init.d/matrix-gui-e {start|stop}"
> - exit 1
> -esac
> -
> -exit 0
> diff --git a/recipes/ti/matrix-gui-e_svn.bb b/recipes/ti/matrix-gui-e_svn.bb
> index 35abd25..5570d92 100644
> --- a/recipes/ti/matrix-gui-e_svn.bb
> +++ b/recipes/ti/matrix-gui-e_svn.bb
> @@ -4,13 +4,19 @@ LICENSE = "BSD"
> SECTION = "multimedia"
> PRIORITY = "optional"
>
> -SRCREV = "58"
> -PV = "1.0"
> -PR = "r16+svnr${SRCPV}"
> +SRCREV = "136"
> +PV = "1.1"
> +PR = "r18+svnr${SRCPV}"
>
> -SRC_URI = "svn://gforge.ti.com/svn/matrix_gui/;module=trunk;proto=https;user=anonymous;pswd='' \
> - file://init \
> -"
> +PLATFORM_dm365 = "dm365"
> +PLATFORM_da850-omapl138-evm = "omapl138"
> +PLATFORM_omap3evm = "omap3530"
> +PLATFORM_dm37x-evm = "dm3730"
> +PLATFORM_am37x-evm = "am3715"
> +PLATFORM_beagleboard = "am3715"
> +PLATFORM ?= "<UNDEFINED>"
> +
> +SRC_URI = "svn://gforge.ti.com/svn/matrix_gui/;module=trunk;proto=https;user=anonymous;pswd='' "
>
> S = "${WORKDIR}/trunk"
>
> @@ -18,13 +24,18 @@ INITSCRIPT_NAME = "matrix-gui-e"
> INITSCRIPT_PARAMS = "defaults 99"
> #INITSCRIPT_PARAMS = "start 99 3 . stop 99 3 ."
>
> +CXXFLAGS_da850-omapl138-evm_append = " -DPlatform_omapl138 "
> +CXXFLAGS_dm365_append = " -DPlatform_dm365 "
> +PACKAGE_ARCH = ${MACHINE_ARCH}
> +
> inherit qt4e update-rc.d
>
> do_install() {
> install -d ${D}/${bindir}
> install -m 0755 ${S}/matrix_gui ${D}/${bindir}/matrix_guiE
> install -d ${D}${sysconfdir}/init.d/
> - install -c -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/matrix-gui-e
> + install -c -m 0755 ${S}/${PLATFORM}/etc/init ${D}${sysconfdir}/init.d/matrix-gui-e
> +
> }
>
> RRECOMMENDS_${PN} = "qt4-embedded-plugin-mousedriver-tslib qt4-embedded-fonts"
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCHv3 3/3] matrix-gui: updating to use latest source revision
2010-09-23 19:41 ` [PATCHv3 3/3] matrix-gui: updating to use " Chase Maupin
@ 2010-09-23 21:56 ` Denys Dmytriyenko
0 siblings, 0 replies; 6+ messages in thread
From: Denys Dmytriyenko @ 2010-09-23 21:56 UTC (permalink / raw)
To: openembedded-devel
On Thu, Sep 23, 2010 at 02:41:37PM -0500, Chase Maupin wrote:
> From: Jeff Lance <j-lance1@ti.com>
>
> * Use latest source revision 131
> * Add platform support for multiple platforms
> * Remove un-used files from SRC_URI and repository.
> * init files are now part of the matrix repository
> * matrix-gui.desktop is now part of the matrix repository
> * the cursor override patch is now in the matrix sources
> * Bumped SRCREV to 136 in version 3 of this patch
>
> Signed-off-by: Chase Maupin <chase.maupin@ti.com>
> Signed-off-by: Jeff Lance <j-lance1@ti.com>
Acked-by: Denys Dmytriyenko <denis@denix.org>
> ---
> .../0001-Disable-cursor-override-for-X11.patch | 27 ------------------
> recipes/ti/matrix-gui/dm365-evm/init | 26 -----------------
> recipes/ti/matrix-gui/init | 24 ----------------
> recipes/ti/matrix-gui/matrix-gui.desktop | 7 ----
> recipes/ti/matrix-gui_svn.bb | 30 ++++++++++++-------
> 5 files changed, 19 insertions(+), 95 deletions(-)
> delete mode 100644 recipes/ti/matrix-gui/0001-Disable-cursor-override-for-X11.patch
> delete mode 100644 recipes/ti/matrix-gui/dm365-evm/init
> delete mode 100644 recipes/ti/matrix-gui/init
> delete mode 100644 recipes/ti/matrix-gui/matrix-gui.desktop
>
> diff --git a/recipes/ti/matrix-gui/0001-Disable-cursor-override-for-X11.patch b/recipes/ti/matrix-gui/0001-Disable-cursor-override-for-X11.patch
> deleted file mode 100644
> index 61eba44..0000000
> --- a/recipes/ti/matrix-gui/0001-Disable-cursor-override-for-X11.patch
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -From b0e91f703ffdcc73f854a672ec16ebbf21293c9c Mon Sep 17 00:00:00 2001
> -From: Chase Maupin <chase.maupin@ti.com>
> -Date: Mon, 24 May 2010 12:51:49 -0500
> -Subject: [PATCH] Disable cursor override for X11
> -
> -* Disable the cursor override option for using the matrix_gui
> - program with X11.
> ----
> - main.cpp | 2 +-
> - 1 files changed, 1 insertions(+), 1 deletions(-)
> -
> -diff --git a/main.cpp b/main.cpp
> -index 978e327..1f55e94 100644
> ---- a/main.cpp
> -+++ b/main.cpp
> -@@ -43,7 +43,7 @@ int main(int argc, char * argv[])
> - {
> - QApplication matrix(argc, argv);
> - QApplication::setStyle(new CustomStyle);
> -- QApplication::setOverrideCursor(QCursor(Qt::BlankCursor));
> -+// QApplication::setOverrideCursor(QCursor(Qt::BlankCursor));
> -
> - // Create a new window to display a web page.
> - MainWindow * pWindow = new MainWindow(0, QString(argv[1]), true);
> ---
> -1.6.0.4
> -
> diff --git a/recipes/ti/matrix-gui/dm365-evm/init b/recipes/ti/matrix-gui/dm365-evm/init
> deleted file mode 100644
> index 3aadc1e..0000000
> --- a/recipes/ti/matrix-gui/dm365-evm/init
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -#! /bin/sh
> -matrixgui="/usr/bin/matrix_gui"
> -GUI_OPTS="-geometry 720x480+0+10 -display transformed:Rot0 /usr/share/matrix/html/menu_main.html"
> -
> -test -x "$matrixgui" || exit 0
> -
> -case "$1" in
> - start)
> - # switch to component 480p mode
> - echo 480P-60 > /sys/class/davinci_display/ch0/mode
> - echo COMPONENT > /sys/class/davinci_display/ch0/output
> - echo -n "Starting Matrix GUI application"
> - start-stop-daemon --start --quiet --background --pidfile /var/run/matrix-gui.pid --exec $matrixgui -- $GUI_OPTS
> - echo "."
> - ;;
> - stop)
> - echo -n "Stopping Matrix GUI application"
> - start-stop-daemon --stop --quiet --pidfile /var/run/matrix-gui.pid
> - echo "."
> - ;;
> - *)
> - echo "Usage: /etc/init.d/matrix-gui {start|stop}"
> - exit 1
> -esac
> -
> -exit 0
> diff --git a/recipes/ti/matrix-gui/init b/recipes/ti/matrix-gui/init
> deleted file mode 100644
> index 40b6512..0000000
> --- a/recipes/ti/matrix-gui/init
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -#! /bin/sh
> -
> -matrixgui="/usr/bin/matrix_gui"
> -GUI_OPTS="/usr/share/matrix/html/menu_main.html"
> -
> -test -x "$matrixgui" || exit 0
> -
> -case "$1" in
> - start)
> - echo -n "Starting Matrix GUI application"
> - start-stop-daemon --start --quiet --background --pidfile /var/run/matrix-gui.pid --exec $matrixgui -- $GUI_OPTS
> - echo "."
> - ;;
> - stop)
> - echo -n "Stopping Matrix GUI application"
> - start-stop-daemon --stop --quiet --pidfile /var/run/matrix-gui.pid
> - echo "."
> - ;;
> - *)
> - echo "Usage: /etc/init.d/matrix-gui {start|stop}"
> - exit 1
> -esac
> -
> -exit 0
> diff --git a/recipes/ti/matrix-gui/matrix-gui.desktop b/recipes/ti/matrix-gui/matrix-gui.desktop
> deleted file mode 100644
> index 52b5831..0000000
> --- a/recipes/ti/matrix-gui/matrix-gui.desktop
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -[Desktop Entry]
> -Name=Matrix GUI
> -Comment=Start the Matrix GUI application
> -Exec=/usr/bin/matrix_gui /usr/share/matrix/html/menu_main.html
> -Terminal=false
> -Type=Application
> -X-GNOME-Autostart-enabled=true
> diff --git a/recipes/ti/matrix-gui_svn.bb b/recipes/ti/matrix-gui_svn.bb
> index 4bfe7c2..f52294d 100644
> --- a/recipes/ti/matrix-gui_svn.bb
> +++ b/recipes/ti/matrix-gui_svn.bb
> @@ -4,27 +4,35 @@ LICENSE = "BSD"
> SECTION = "multimedia"
> PRIORITY = "optional"
>
> -SRCREV = "58"
> -PV = "1.0"
> -PR = "r14+svnr${SRCPV}"
> +SRCREV = "136"
> +PV = "1.1"
> +PR = "r16+svnr${SRCPV}"
>
> -SRC_URI = "svn://gforge.ti.com/svn/matrix_gui/;module=trunk;proto=https;user=anonymous;pswd='' \
> - file://0001-Disable-cursor-override-for-X11.patch \
> - file://init \
> - file://matrix-gui.desktop \
> -"
> +PLATFORM_dm365 = "dm365"
> +PLATFORM_da850-omapl138-evm = "omapl138"
> +PLATFORM_omap3evm = "omap3530"
> +PLATFORM_dm37x-evm = "dm3730"
> +PLATFORM_am37x-evm = "am3715"
> +PLATFORM_beagleboard = "am3715"
> +PLATFORM ?= "<UNDEFINED>"
> +
> +SRC_URI = "svn://gforge.ti.com/svn/matrix_gui/;module=trunk;proto=https;user=anonymous;pswd='' "
>
> S = "${WORKDIR}/trunk"
>
> +CXXFLAGS_da850-omapl138-evm_append = " -DPlatform_omapl138 "
> +CXXFLAGS_dm365_append = " -DPlatform_dm365 "
> +PACKAGE_ARCH = ${MACHINE_ARCH}
> +
> inherit qt4x11
>
> do_install() {
> install -d ${D}/${bindir}
> install -m 0755 ${S}/matrix_gui ${D}/${bindir}
> install -d ${D}${sysconfdir}/init.d/
> - install -c -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/matrix-gui
> - install -d ${D}/${sysconfdir}/xdg/autostart
> - install -m 0755 ${WORKDIR}/matrix-gui.desktop ${D}/${sysconfdir}/xdg/autostart
> + install -c -m 0755 ${S}/${PLATFORM}/etc/x11/init ${D}${sysconfdir}/init.d/matrix-gui
> + install -d ${D}/${sysconfdir}/xdg/autostart
> + install -m 0755 ${S}/${PLATFORM}/etc/x11/matrix-gui.desktop ${D}/${sysconfdir}/xdg/autostart
> }
>
> FILES_${PN}-autostart = "${sysconfdir}/xdg/autostart/matrix-gui.desktop"
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-09-23 22:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-23 19:41 [PATCHv2 1/3] matrix-gui-common: update to latest sources Chase Maupin
2010-09-23 19:41 ` [PATCHv2 2/3] matrix-gui-e: updating to latest source revision Chase Maupin
2010-09-23 21:55 ` Denys Dmytriyenko
2010-09-23 19:41 ` [PATCHv3 3/3] matrix-gui: updating to use " Chase Maupin
2010-09-23 21:56 ` Denys Dmytriyenko
2010-09-23 21:55 ` [PATCHv2 1/3] matrix-gui-common: update to latest sources Denys Dmytriyenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox