Skip to content

Commit

Permalink
thirdparty/djvulibre Bump to latest master (#1119)
Browse files Browse the repository at this point in the history
Nothing of much importance besides perhaps a few ARM64 fixes, and [8e79901a927d7b20b629f5240e64f617d67f3dff](https://gitlab.com/koreader/djvulibre/-/commit/8e79901a927d7b20b629f5240e64f617d67f3dff) deprecates part of our Android patch.
  • Loading branch information
Frenzie committed Jun 21, 2020
1 parent 6148d3c commit 68e433e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 18 deletions.
2 changes: 1 addition & 1 deletion thirdparty/djvulibre/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ endif()
ko_write_gitclone_script(
GIT_CLONE_SCRIPT_FILENAME
https://gitlab.com/koreader/djvulibre.git
8cb2151866c1147ceb79348c666a81053bedcd11
32ff0948c5bc27c0b7507dba90e726fc941fcc42
${SOURCE_DIR}
)

Expand Down
17 changes: 0 additions & 17 deletions thirdparty/djvulibre/android.patch
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,3 @@ index f72a4c9..51b2ce3 100644

#include "DjVuToPS.h"
#include "IFFByteStream.h"
diff --git a/libdjvu/GThreads.cpp b/libdjvu/GThreads.cpp
index 0b0fe0a..afb28b0 100644
--- a/libdjvu/GThreads.cpp
+++ b/libdjvu/GThreads.cpp
@@ -446,10 +449,11 @@ GThread::create(void (*entry)(void*), void *arg)
void
GThread::terminate()
{
+#ifndef __ANDROID__
if (xentry || xarg)
pthread_cancel(hthr);
+#endif
}
-
int
GThread::yield()
{

0 comments on commit 68e433e

Please sign in to comment.