[meta-arago] [PATCH] Revert "matrix-gui: sleep 1 second prior to weston shutdown"

[Eric Ruei]

This reverts commit 13f988e5e897e10607cd3c9910ce526019f93a48a.
This patch is no longer needed. We need to fix the root issue
at the SGX DDK UM.
---
...e_command-workaround-for-GUI-apps-with-weston.patch | 18 ++++++++----------
.../recipes-core/matrix/matrix-gui_2.0.bb | 2 +-
2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui/0001-execute_command-workaround-for-GUI-apps-with-weston.patch b/meta-arago-extras/recipes-core/matrix/matrix-gui/0001-execute_command-workaround-for-GUI-apps-with-weston.patch
index 90a604e..5a85935 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui/0001-execute_command-workaround-for-GUI-apps-with-weston.patch
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui/0001-execute_command-workaround-for-GUI-apps-with-weston.patch
@@ -1,6 +1,6 @@
-From 156ce8d8d9ee1b614b0079e1e9506af1835bdab7 Mon Sep 17 00:00:00 2001
-From: Jacob Stiffler <j-***@ti.com>
-Date: Wed, 7 Nov 2018 15:48:47 -0500
+From 9647ddc10dc9424b1433db2f8184268523d829da Mon Sep 17 00:00:00 2001
+From: Eric Ruei <e-***@ti.com>
+Date: Wed, 28 Feb 2018 12:20:32 -0500
Subject: [PATCH] execute_command: workaround for GUI apps with weston

* For all GUI apps, shutdown matrix before launching
@@ -8,18 +8,17 @@ Subject: [PATCH] execute_command: workaround for GUI apps with weston
GUI app may get hidden behind matrix with no way to recover.
* For MM and 3D and null window apps, shutdown weston before launching
- These apps use KMS sink or DRM, which collides with weston
- - Wait 1 second to make sure the application freeing all SGX resources
- prior to weston shutdown
+
Signed-off-by: Jacob Stiffler <j-***@ti.com>
Signed-off-by: Eric Ruei <e-***@ti.com>
---
- execute_command.sh | 40 +++++++++++++++++++++++++++++++++++++++-
+ execute_command.sh | 39 ++++++++++++++++++++++++++++++++++++++-
generate.php | 4 ++++
run_script.php | 10 +++++++++-
- 3 files changed, 52 insertions(+), 2 deletions(-)
+ 3 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/execute_command.sh b/execute_command.sh
-index 325dcb9..b8bb6da 100755
+index 325dcb9..180e71f 100755
--- a/execute_command.sh
+++ b/execute_command.sh
@@ -63,7 +63,22 @@ do
@@ -46,7 +45,7 @@ index 325dcb9..b8bb6da 100755
then
touch "lock/"$item

-@@ -72,10 +87,33 @@ do
+@@ -72,10 +87,32 @@ do

done

@@ -56,7 +55,6 @@ index 325dcb9..b8bb6da 100755
+
+ if [ $category == 3d -o $category == multimedia -o $category == touch -o $win_type == null ]
+ then
-+ sleep 1
+ /etc/init.d/weston stop
+ sleep 1
+ fi
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
index 4e335e7..d8aa00b 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui_2.0.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a886c9ef769b2d8271115d2502512e5d"

SECTION = "multimedia"

-PR = "r36"
+PR = "r35"

INITSCRIPT_NAME = "matrix-gui-2.0"
INITSCRIPT_PARAMS = "defaults 97"