Skip to content

Commit 9e56126

Browse files
Spark: updates to solve exit sequence issues (#461)
1 parent 5de2ac1 commit 9e56126

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

package/spark/0003-spark-wpeframework-compositor.patch

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ diff --git a/cmake/CommDeps.cmake b/cmake/CommDeps.cmake
22
index e2ef012e0..d66bad57e 100644
33
--- a/cmake/CommDeps.cmake
44
+++ b/cmake/CommDeps.cmake
5-
@@ -251,6 +251,26 @@ set(COMM_DEPS_LIBRARY_DIRS ${COMM_DEPS_LIBRARY_DIRS}
5+
@@ -251,6 +251,27 @@ set(COMM_DEPS_LIBRARY_DIRS ${COMM_DEPS_LIBRARY_DIRS}
66
${SQLITE_LIBRARY_DIRS}
77
)
88

@@ -22,6 +22,7 @@ index e2ef012e0..d66bad57e 100644
2222
+ ${ICU_I18N_LIBRARIES}
2323
+ ${ICU_UC_LIBRARIES}
2424
+ ${SQLITE_LIBRARIES}
25+
+ ${EGL_LIBRARIES}
2526
+ )
2627
+
2728
+else ()
@@ -58,7 +59,7 @@ index 55d6499f3..5ef779c56 100644
5859
+ set(PLATFORM_SOURCES egl/pxContextUtils.cpp)
5960
+ find_package(WPEFramework CONFIG REQUIRED)
6061
+ find_package(${NAMESPACE}Plugins REQUIRED)
61-
+ set(PXSCENE_LINK_LIBRARIES ${PXSCENE_LINK_LIBRARIES} compositorclient ${NAMESPACE}Plugins::${NAMESPACE}Plugins)
62+
+ set(PXSCENE_LINK_LIBRARIES ${PXSCENE_LINK_LIBRARIES} compositorclient rtCore ${NAMESPACE}Plugins::${NAMESPACE}Plugins)
6263
else ()
6364
message("building pxscene for glut")
6465
set(PX_PLATFORM PX_PLATFORM_GLUT)
@@ -967,17 +968,17 @@ index 000000000..e5cbec201
967968
+ ~Display()
968969
+ {
969970
+ Stop();
970-
+ close(_display->FileDescriptor());
971-
+ Wait(Thread::BLOCKED | Thread::STOPPED, Core::infinite);
972971
+
973972
+ if (_graphicsSurface != nullptr) {
974973
+ _graphicsSurface->Keyboard(nullptr);
975974
+ _graphicsSurface->Release();
976975
+ }
977-
+
978976
+ if (_display != nullptr) {
977+
+ close(_display->FileDescriptor());
979978
+ _display->Release();
980979
+ }
980+
+
981+
+ Wait(Thread::BLOCKED | Thread::STOPPED, Core::infinite);
981982
+ }
982983
+public:
983984
+ EGLNativeDisplayType Native()

0 commit comments

Comments
 (0)