* rebase patch against weston 5.0.0

Signed-off-by: Jacob Stiffler <[email protected]>
---
 .../0001-Add-soc-performance-monitor-utilites.patch    | 18 +++++++++---------
 .../{weston_2.0.0.bbappend => weston_%.bbappend}       |  0
 2 files changed, 9 insertions(+), 9 deletions(-)
 rename recipes-graphics/wayland/{weston_2.0.0.bbappend => weston_%.bbappend} 
(100%)

diff --git 
a/recipes-graphics/wayland/weston/0001-Add-soc-performance-monitor-utilites.patch
 
b/recipes-graphics/wayland/weston/0001-Add-soc-performance-monitor-utilites.patch
index 0eafbfc..013209e 100644
--- 
a/recipes-graphics/wayland/weston/0001-Add-soc-performance-monitor-utilites.patch
+++ 
b/recipes-graphics/wayland/weston/0001-Add-soc-performance-monitor-utilites.patch
@@ -1,4 +1,4 @@
-From 7830118ecb980766f4a6e3997769d7ae326bee77 Mon Sep 17 00:00:00 2001
+From 8b47050702b51cc335ff69c6f5c42f3ae760758a Mon Sep 17 00:00:00 2001
 From: Karthik Ramanan <[email protected]>
 Date: Fri, 3 Jun 2016 18:32:50 +0530
 Subject: [PATCH] Add soc performance monitor utilites
@@ -14,7 +14,7 @@ Signed-off-by: Karthik Ramanan <[email protected]>
  clients/statcoll_gui.h            |  101 +++
  clients/time_bar_graph.c          |  515 +++++++++++++
  clients/time_bar_graph.h          |   93 +++
- 10 files changed, 4873 insertions(+), 1 deletion(-)
+ 9 files changed, 3474 insertions(+), 1 deletion(-)
  create mode 100644 clients/Dra7xx_ddrstat_speed.c
  create mode 100644 clients/soc_performance_monitor.c
  create mode 100644 clients/soc_performance_monitor.h
@@ -25,13 +25,13 @@ Signed-off-by: Karthik Ramanan <[email protected]>
  create mode 100644 clients/time_bar_graph.h
 
 diff --git a/Makefile.am b/Makefile.am
-index 62719c9..55aed6d 100644
+index 83bb253..7b4048f 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -432,7 +432,9 @@ demo_clients =                                     \
-       weston-fullscreen                       \
+@@ -545,7 +545,9 @@ demo_clients =                                     \
        weston-stacking                         \
        weston-calibrator                       \
+       weston-touch-calibrator                 \
 -      weston-scaler
 +      weston-scaler                           \
 +      soc-performance-monitor                 \
@@ -39,7 +39,7 @@ index 62719c9..55aed6d 100644
  
  if INSTALL_DEMO_CLIENTS
  bin_PROGRAMS += $(demo_clients)
-@@ -570,6 +572,19 @@ weston_image_SOURCES = clients/image.c
+@@ -702,6 +704,19 @@ weston_image_SOURCES = clients/image.c
  weston_image_LDADD = libtoytoolkit.la
  weston_image_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS)
  
@@ -58,7 +58,7 @@ index 62719c9..55aed6d 100644
 +
  weston_cliptest_SOURCES =                             \
        clients/cliptest.c                              \
-       src/vertex-clipping.c                           \
+       libweston/vertex-clipping.c                     \
 diff --git a/clients/Dra7xx_ddrstat_speed.c b/clients/Dra7xx_ddrstat_speed.c
 new file mode 100644
 index 0000000..af06733
@@ -561,7 +561,7 @@ index 0000000..af06733
 +
 diff --git a/clients/soc_performance_monitor.c 
b/clients/soc_performance_monitor.c
 new file mode 100644
-index 0000000..5d1db32
+index 0000000..2721059
 --- /dev/null
 +++ b/clients/soc_performance_monitor.c
 @@ -0,0 +1,630 @@
@@ -3566,5 +3566,5 @@ index 0000000..97ac05a
 +
 +#endif /* _BAR_GRAPH_H_ */
 -- 
-1.9.1
+2.7.4
 
diff --git a/recipes-graphics/wayland/weston_2.0.0.bbappend 
b/recipes-graphics/wayland/weston_%.bbappend
similarity index 100%
rename from recipes-graphics/wayland/weston_2.0.0.bbappend
rename to recipes-graphics/wayland/weston_%.bbappend
-- 
2.7.4

_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Reply via email to