Skip to content
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.

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

A round of 3rd-party updates #1580

Merged
merged 12 commits into from
Feb 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions ffi/SDL2_0_h.lua
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,8 @@ struct SDL_MouseWheelEvent {
Uint32 direction;
float preciseX;
float preciseY;
Sint32 mouseX;
Sint32 mouseY;
};
typedef struct SDL_MouseWheelEvent SDL_MouseWheelEvent;
struct SDL_JoyAxisEvent {
Expand Down Expand Up @@ -578,6 +580,7 @@ struct SDL_ControllerSensorEvent {
SDL_JoystickID which;
Sint32 sensor;
float data[3];
Uint64 timestamp_us;
};
typedef struct SDL_ControllerSensorEvent SDL_ControllerSensorEvent;
struct SDL_AudioDeviceEvent {
Expand All @@ -595,6 +598,7 @@ struct SDL_SensorEvent {
Uint32 timestamp;
Sint32 which;
float data[6];
Uint64 timestamp_us;
};
typedef struct SDL_SensorEvent SDL_SensorEvent;
struct SDL_QuitEvent {
Expand Down
5 changes: 5 additions & 0 deletions ffi/zstd_h.lua
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ typedef enum {
ZSTD_c_experimentalParam13 = 1010,
ZSTD_c_experimentalParam14 = 1011,
ZSTD_c_experimentalParam15 = 1012,
ZSTD_c_experimentalParam16 = 1013,
ZSTD_c_experimentalParam17 = 1014,
ZSTD_c_experimentalParam18 = 1015,
ZSTD_c_experimentalParam19 = 1016,
} ZSTD_cParameter;
typedef struct {
size_t error;
Expand All @@ -93,6 +97,7 @@ typedef enum {
ZSTD_d_experimentalParam2 = 1001,
ZSTD_d_experimentalParam3 = 1002,
ZSTD_d_experimentalParam4 = 1003,
ZSTD_d_experimentalParam5 = 1004,
} ZSTD_dParameter;
ZSTD_bounds ZSTD_dParam_getBounds(ZSTD_dParameter) __attribute__((visibility("default")));
size_t ZSTD_DCtx_setParameter(ZSTD_DCtx *, ZSTD_dParameter, int) __attribute__((visibility("default")));
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/freetype2/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ endif()
ko_write_gitclone_script(
GIT_CLONE_SCRIPT_FILENAME
https://gitlab.com/koreader/freetype2.git
VER-2-12-1
VER-2-13-0
${SOURCE_DIR}
)

Expand Down
2 changes: 1 addition & 1 deletion thirdparty/libjpeg-turbo/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ endif()
ko_write_gitclone_script(
GIT_CLONE_SCRIPT_FILENAME
https://github.com/libjpeg-turbo/libjpeg-turbo.git
2.1.4
2.1.5.1
${SOURCE_DIR}
)

Expand Down
2 changes: 1 addition & 1 deletion thirdparty/libpng/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ endif()
ko_write_gitclone_script(
GIT_CLONE_SCRIPT_FILENAME
https://github.com/glennrp/libpng.git
v1.6.38
v1.6.39
${SOURCE_DIR}
)

Expand Down
2 changes: 1 addition & 1 deletion thirdparty/lodepng/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ endif()
ko_write_gitclone_script(
GIT_CLONE_SCRIPT_FILENAME
https://github.com/lvandeve/lodepng.git
18964554bc769255401942e0e6dfd09f2fab2093
997936fd2b45842031e4180d73d7880e381cf33f
${SOURCE_DIR}
)

Expand Down
2 changes: 1 addition & 1 deletion thirdparty/luajit/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,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
8625eee71f16a3a780ec92bc303c17456efc7fb3
d0e88930ddde28ff662503f9f20facf34f7265aa
${SOURCE_DIR}
)

Expand Down
2 changes: 1 addition & 1 deletion thirdparty/luasocket/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ set(BUILD_CMD "${BUILD_CMD_STR} LUAINC=\"${LUAINC}\" -j${PARALLEL_JOBS} all")
ko_write_gitclone_script(
GIT_CLONE_SCRIPT_FILENAME
https://github.com/lunarmodules/luasocket
26b524e1d7b9a00045882d3c0f25486485b1d6a8
8c2ff7217e2a205eb107a6f48b04ff1b2b3090a1
${SOURCE_DIR}
)

Expand Down
2 changes: 1 addition & 1 deletion thirdparty/nanosvg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ep_get_source_dir(SOURCE_DIR)
ko_write_gitclone_script(
GIT_CLONE_SCRIPT_FILENAME
https://github.com/memononen/nanosvg.git
bd16c4e6b2842e1f0286dc374d21f85c659862e5
9da543e8329fdd81b64eb48742d8ccb09377aed1
${SOURCE_DIR}
)

Expand Down
2 changes: 1 addition & 1 deletion thirdparty/openssl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ set(BUILD_CMD2 sh -c "${MAKE_CMD} -j${PARALLEL_JOBS} build_libs")
ko_write_gitclone_script(
GIT_CLONE_SCRIPT_FILENAME
https://github.com/openssl/openssl.git
OpenSSL_1_1_1q
OpenSSL_1_1_1t
${SOURCE_DIR}
)

Expand Down
4 changes: 2 additions & 2 deletions thirdparty/sdl2/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ ep_get_source_dir(SOURCE_DIR)

set(PATCH_CMD "${KO_PATCH_SH} ${CMAKE_CURRENT_SOURCE_DIR}/cocoa.patch")

set(SDL2_VER "2.24.1")
set(SDL2_MD5 "10bad2a286f155565edc611f41345de1")
set(SDL2_VER "2.26.3")
set(SDL2_MD5 "6ff7cbe9f77fc5afa79d54895dc6becc")
download_project(
PROJ ${PROJECT_NAME}
URL https://github.com/libsdl-org/SDL/releases/download/release-${SDL2_VER}/SDL2-${SDL2_VER}.tar.gz
Expand Down
136 changes: 130 additions & 6 deletions thirdparty/srell/history_en.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,128 @@
20230106; version 4.016/3.018 (@ only):
* Merged four automata into two (preparation for i-modifier support).
@ Fixed the pattern compiler not to treat /a{0,0}/ as an error.
@ Other minor fixes.

20221227; version 4.015:
* Fixed a minor issue in regex_iterator2 that was treated as an error
by VC when _ITERATOR_DEBUG_LEVEL >= 1.
* Other improvements.

20221220; version 4.014:
* Supplemented some member functions that were missing accidentally
from match_results in the previous release.
* Simplified regex_token_iterator.

20221220; version 4.013:
* Fixed a minor issue in split(). When splitting "abc" by /$/, split()
returned {"abc", ""} instead of {"abc"} that is correct.
* Reduced the number of overload functions of replace(). Now when the
lambda expression is used, the type of match_results that will be
passed to a callback function needs specifying explicitly as the
template argument.
* Added regex_iterator2.

20221216; version 4.012:
* Fixed replace(). VC2005 could not compile it.

20221214; version 4.011/3.017 (@ only):
@ [LWG Issue 3204] Added swap() to sub_match.
* Modified replace() so that it can replace any container type that
looks like std::basic_string.
* Added srell::str_clip.
* Added overload functions to split() that support a pair of iterators
and a pointer.

20221212; version 4.010:
* Adjusted the behaviour of split() in accordance with the document.
While the document says sub_match is pushed to a list container,
in the code basic_string was pushed to the list container.
* Added overloads to the sub_match class that support implicit and
explcit converting to std::basic_string instantiated with a custom
traits/allocator.

20221210; version 4.009/3.016 (@ only):
@ Fixed a problem so that regex_iterator.prefix().matched can be set
to true in incrementing after it matched an empty sequence.
@ Fixed the core of algorithm functions not to cause compilation error
when an object of match_results instantiated with a custom allocator
is provided.
* Added new member functions to basic_regex as API extensions.

20221130; version 4.008:
* Priority was given back to the BMH matcher from the finder
introduced in 4.006.
* Minor improvements of ^ and $ in the multiline mode and \b, \B.

20221124; version 4.007:
* Added support for the un-bounded flag modifiers ((?ims-ims)), which
are available only at the beginning of a regular expression (the
same as Python 3.11).
Note: This feature is not defined in the ECMAScript specification
nor compatible with the regexp-modifiers proposal. This feature can
be disabled by defining SRELL_NO_UBMOD.

20221123; version 4.006:
* Added a new entry point finder for expressions whose first matching
character is a single character.

20221030; version 4.005/3.015 (@ only):
@ Fixed a problem that caused undefined behaviour in conditions where
sizeof (int) != sizeof (long), e.g. LP64 (4/8/8). (Thanks to Travers
Ching for the report).
* Updated unicode/ucfdataout2.cpp and updataout2.cpp. Now they can
compile even without srell_ucfdata2.hpp and srell_updata2.hpp.
* Some clean-ups.

20221022; version 4.004/3.014:
* Updated srell_ucfdata2.hpp and srell_updata2.hpp to support Unicode
15.0.0.
* Updated unicode/updataout2.cpp to support Unicode 15. (Support in
advance new script names that are expected to be available in RegExp
of ECMAScript 2023).
* Removed some code that had become unused or meaningless as a result
of the previous backreference bug fixes.

20221012; version 4.003/3.013:
* Re-refixed the backreference bug. Incidentally, this bug was
introduced along with the addition of the variable-length lookbehind
feature. Therefore, SRELL versions 2.000- have this bug.
(It originated from the fact that in a variable length lookbehind
assertion, it is possible that the parser encounters a backreference
prior to the corresponding bracket pair, such as /(?<=\1\s+(\d+))/,
and the parser cannot know immediately whether the corresponding
capturing bracket pair really exists in the expression).

20221012; version 4.002/3.012:
* Refixed the backreference bug in a different way because the fix of
20221011 did not cover the problem caused by such an expression as
/(?:\1+)*()/. Fixed also an infinite loop caused by an expression
like /()(?:\1+)*/.

20221011; version 4.001/3.011 (@ only):
@ Fixed a bug that caused dereferencing a null pointer or infinite
loop when a backreference is followed by * or +, and the
backreference appears prior to the close bracket of the
corresponding pair of capturing brackets, such as /\1*()/, /(\1+)/.
(Thanks to @datadiode, the author of srellcom, for finding the bug).
* In accordance with the ECMAScript specification, restricted
positions where '-' can be written without escaping in character
classes. Now '-' following a predefined character class such as \d,
\s causes an error, unless it is the final character in a character
class. ([\s-0] causes an error, [\s-] is accepted).
* Adjusted internal UTF-8 iterators.

20220618; version 4.000:
* Added support for the v-flag mode that is expected to be added to
a future version of ECMAScript.
* Changed the format of srell_updata.hpp and renamed to
srell_updata2.hpp.
* In accordance with the change above, unicode/updataout.cpp was
updated and renamed to updataout2.cpp.
* Fixed an issue of a struct layout that clang-tidy warns as
"excessive padding" on 64-bit systems (Thanks for the report).
* Updated unicode/ucfdataout2.cpp.

20220529; version 3.010:
* Reduced the amount of memory used to hold a character class that
contains Unicode property escapes.
Expand Down Expand Up @@ -242,9 +367,8 @@
instead of creating them from case folding data when its instance is
first created.
* In accordance with the change above, srell_ucfdata.hpp and
ucfdataout.cpp that outputs the former were replaced with
srell_ucfdata2.hpp that holds precomputed tables and ucfdataout2.cpp
that outputs the former.
ucfdataout.cpp were replaced with srell_ucfdata2.hpp and
ucfdataout2.cpp, accordingly.
* Changed the method of character class matching from linear search to
binary search.
* Changed the timing of optimisation of a character class from "when a
Expand Down Expand Up @@ -318,7 +442,7 @@

20190714: version 2.230:
* Improved the performance of searching when regular expressions begin
with a character or character class followed by a '*' or '+'. (E.g.,
with a character or character class followed by a '*' or '+'. (E.g.
/[A-Za-z]+ing/).

20190707: version 2.221:
Expand All @@ -327,7 +451,7 @@
* When icase specified, if all characters in a character class become
the same character as a result of case-folding, the pattern compiler
has been changed to convert the character class to the character
literal (e.g., /r[Ss\u017F]t/i -> /rst/i).
literal (e.g. /r[Ss\u017F]t/i -> /rst/i).
* Fixed a minor issue.

20190617: version 2.220:
Expand Down Expand Up @@ -359,7 +483,7 @@
* Fixed a bug that caused failure of capturing when 1) a pair of
capturing brackets exists in a lookbehind assertion, and 2) variable
length expressions exist in both the left side of and the inside of
the pair of brackets. E.g., given "1053" =~ /(?<=(\d+)(\d+))$/, no
the pair of brackets. E.g. given "1053" =~ /(?<=(\d+)(\d+))$/, no
appropriate string was set for $2.
* Updated srell_ucfdata.hpp and srell_updata.hpp to support Unicode
12.1.0.
Expand Down
Loading