fix(libxshmfence): Disable futex because it won't work

termux · Dec 9, 2024 · 150eca2 · 150eca2
1 parent 4b02a76
commit 150eca2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/src/main/cpp/lorie/InitOutput.c b/app/src/main/cpp/lorie/InitOutput.c
@@ -71,6 +71,7 @@ from The Open Group.
 #include "cursorstr.h"
 #include "propertyst.h"
 #include "shmint.h"
+#include "misyncshm.h"
 #include "glxserver.h"
 #include "glxutil.h"
 #include "fbconfigs.h"
@@ -591,6 +592,7 @@ lorieScreenInit(ScreenPtr pScreen, unused int argc, unused char **argv) {
 
     QueueWorkProc(resetRootCursor, NULL, NULL);
     ShmRegisterFbFuncs(pScreen);
+    miSyncShmScreenInit(pScreen);
 
     return TRUE;
 }                               /* end lorieScreenInit */

diff --git a/app/src/main/cpp/recipes/xshmfence.cmake b/app/src/main/cpp/recipes/xshmfence.cmake
@@ -1,5 +1,5 @@
 file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/values.h" CONTENT "#include <limits.h>")
 execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_SOURCE_DIR}/libxshmfence/src/xshmfence.h" "${CMAKE_CURRENT_BINARY_DIR}/X11/xshmfence.h")
-add_library(xshmfence STATIC "libxshmfence/src/xshmfence_alloc.c" "libxshmfence/src/xshmfence_futex.c")
+add_library(xshmfence STATIC "libxshmfence/src/xshmfence_alloc.c" "libxshmfence/src/xshmfence_pthread.c")
 target_include_directories(xshmfence PRIVATE "xorgproto/include" "${CMAKE_CURRENT_BINARY_DIR}")
-target_compile_options(xshmfence PRIVATE "-DSHMDIR=\"/\"" "-DHAVE_FUTEX" "-DMAXINT=INT_MAX")
+target_compile_options(xshmfence PRIVATE "-DSHMDIR=\"/\"" "-DHAVE_PTHREAD" "-DMAXINT=INT_MAX")