Skip to content

Bump LuaJIT to 20231021 #1673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 26, 2023
Merged

Bump LuaJIT to 20231021 #1673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3222389
Bump LuaJIT to 20231021
NiLuJe Oct 24, 2023
d7fbd18
Bump utf8proc to 2.9.0
NiLuJe Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,7 @@ LIBUNIBREAK_BUILD_DIR=$(THIRDPARTY_DIR)/libunibreak/build/$(MACHINE)
LIBUNIBREAK_DIR=$(CURDIR)/$(LIBUNIBREAK_BUILD_DIR)/libunibreak-prefix/src/libunibreak-build
LIBUNIBREAK_LIB_LINK_FLAG=$(if $(WIN32),-l:libunibreak-5.dll,$(if $(DARWIN),$(LIBUNIBREAK_LIB),-l:libunibreak.so.5))

UTF8PROC_LIB_EXT=$(if $(WIN32),-2.dll,$(if $(DARWIN),.2.dylib,.so.2))
UTF8PROC_LIB_EXT=$(if $(WIN32),-3.dll,$(if $(DARWIN),.3.dylib,.so.3))
UTF8PROC_LIB=$(OUTPUT_DIR)/libs/libutf8proc$(UTF8PROC_LIB_EXT)
UTF8PROC_BUILD_DIR=$(THIRDPARTY_DIR)/utf8proc/build/$(MACHINE)
UTF8PROC_DIR=$(CURDIR)/$(UTF8PROC_BUILD_DIR)/utf8proc-prefix/src/utf8proc
Expand Down
6 changes: 3 additions & 3 deletions ffi/utf8proc.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ require("ffi/utf8proc_h")

local libutf8proc
if ffi.os == "Windows" then
libutf8proc = ffi.load("libs/libutf8proc-2.dll")
libutf8proc = ffi.load("libs/libutf8proc-3.dll")
elseif ffi.os == "OSX" then
libutf8proc = ffi.load("libs/libutf8proc.2.dylib")
libutf8proc = ffi.load("libs/libutf8proc.3.dylib")
else
libutf8proc = ffi.load("libs/libutf8proc.so.2")
libutf8proc = ffi.load("libs/libutf8proc.so.3")
end

local Utf8Proc = {}
Expand Down
3 changes: 2 additions & 1 deletion ffi/utf8proc_h.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ struct utf8proc_property_struct {
unsigned int control_boundary : 1;
unsigned int charwidth : 2;
unsigned int pad : 2;
unsigned char boundclass;
unsigned int boundclass : 6;
unsigned int indic_conjunct_break : 2;
};
typedef struct utf8proc_property_struct utf8proc_property_t;
typedef enum {
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/kpvcrlib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ if(DEFINED ENV{WIN32})
find_library(HARFBUZZ_LIB NAMES "harfbuzz-0" PATHS $ENV{LIBS_DIR})
find_library(FRIBIDI_LIB NAMES "fribidi-0" PATHS $ENV{LIBS_DIR})
find_library(LIBUNIBREAK_LIB NAMES "libunibreak-5" PATHS $ENV{LIBS_DIR})
find_library(UTF8PROC_LIB NAMES "utf8proc-2" PATHS $ENV{LIBS_DIR})
find_library(UTF8PROC_LIB NAMES "utf8proc-3" PATHS $ENV{LIBS_DIR})
find_library(JPEG_LIB NAMES "jpeg-8" PATHS $ENV{LIBS_DIR})
find_library(LUNASVG_LIB NAMES "lunasvg" PATHS $ENV{LIBS_DIR})
find_library(LIBWEBP_LIB NAMES "webp-7" PATHS $ENV{LIBS_DIR})
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/luajit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ set(PATCH_CMD2 "${KO_PATCH} ${CMAKE_CURRENT_SOURCE_DIR}/koreader-luajit-enable-t
ko_write_gitclone_script(
GIT_CLONE_SCRIPT_FILENAME
https://github.com/LuaJIT/LuaJIT
656ecbcf8f669feb94e0d0ec4b4f59190bcd2e48
e826d0c101d750fac8334d71e221c50d8dbe236c
${SOURCE_DIR}
)

Expand Down
2 changes: 1 addition & 1 deletion thirdparty/utf8proc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ep_get_binary_dir(BINARY_DIR)
ko_write_gitclone_script(
GIT_CLONE_SCRIPT_FILENAME
https://github.com/JuliaStrings/utf8proc.git
v2.8.0
v2.9.0
${SOURCE_DIR}
)

Expand Down