From baa621f8fae9cbd07a930d54a25c6b344ab301e3 Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sun, 11 Jun 2023 19:50:45 +0200
Subject: [PATCH 1/2] crengine: fix fribidi include

---
 Makefile.third               | 2 +-
 thirdparty/kpvcrlib/crengine | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.third b/Makefile.third
index 0bad234eb..46ce5ffe9 100644
--- a/Makefile.third
+++ b/Makefile.third
@@ -233,7 +233,7 @@ $(CRENGINE_LIB): $(ZLIB) $(ZSTD_LIB) $(PNG_LIB) $(FREETYPE_LIB) $(HARFBUZZ_LIB)
 		-DZLIB_INCLUDE_DIR="$(ZLIB_DIR)/include" \
 		-DFREETYPE_INCLUDE_DIR="$(FREETYPE_DIR)/include/freetype2" \
 		-DHARFBUZZ_INCLUDE_DIR="$(HARFBUZZ_DIR)/include/harfbuzz" \
-		-DFRIBIDI_INCLUDE_DIR="$(FRIBIDI_DIR)/include" \
+		-DFRIBIDI_INCLUDE_DIR="$(FRIBIDI_DIR)/include/fribidi" \
 		-DLIBWEBP_INCLUDE_DIR="$(LIBWEBP_DIR)/include" \
 		-DLIBUNIBREAK_INCLUDE_DIR="$(LIBUNIBREAK_DIR)/include" \
 		-DUTF8PROC_INCLUDE_DIR="$(UTF8PROC_DIR)" \
diff --git a/thirdparty/kpvcrlib/crengine b/thirdparty/kpvcrlib/crengine
index 7718d1dd2..20ded54d6 160000
--- a/thirdparty/kpvcrlib/crengine
+++ b/thirdparty/kpvcrlib/crengine
@@ -1 +1 @@
-Subproject commit 7718d1dd25e6557160062ff9212b09ad19c57e7e
+Subproject commit 20ded54d61d8c3a4a763d0e0c009089a4f9b0172

From 57b29289a5faf31437f4a572fb0b6199694a091a Mon Sep 17 00:00:00 2001
From: Benoit Pierre <benoit.pierre@gmail.com>
Date: Sun, 11 Jun 2023 19:53:17 +0200
Subject: [PATCH 2/2] xtext: fix fribidi include

---
 Makefile  | 2 +-
 xtext.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 5c2b16ed7..e35088b3a 100644
--- a/Makefile
+++ b/Makefile
@@ -168,7 +168,7 @@ $(OUTPUT_DIR)/libs/libkoreader-xtext.so: xtext.cpp \
 			$(FREETYPE_LIB) $(HARFBUZZ_LIB) $(FRIBIDI_LIB) $(LIBUNIBREAK_LIB)
 	$(CXX) -I$(FREETYPE_DIR)/include/freetype2 \
 	-I$(HARFBUZZ_DIR)/include/harfbuzz \
-	-I$(FRIBIDI_DIR)/include \
+	-I$(FRIBIDI_DIR)/include/fribidi \
 	-I$(LIBUNIBREAK_DIR)/include \
 	$(DYNLIB_CXXFLAGS) $(SYMVIS_FLAGS) -Wall -o $@ xtext.cpp $(LUAJIT_LIB_LINK_FLAG) \
 	$(FREETYPE_LIB_LINK_FLAG) $(HARFBUZZ_LIB_LINK_FLAG) $(FRIBIDI_LIB_LINK_FLAG) $(LIBUNIBREAK_LIB_LINK_FLAG) \
diff --git a/xtext.cpp b/xtext.cpp
index 014afb707..492e442c0 100644
--- a/xtext.cpp
+++ b/xtext.cpp
@@ -21,7 +21,7 @@ extern "C"
 #include <hb-ft.h>
 
 // FriBiDi
-#include <fribidi/fribidi.h>
+#include <fribidi.h>
 
 // libunibreak
 #include <wordbreak.h>