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.

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

Jump to bottom

Third-party bumps #1534

Merged
merged 2 commits into from Oct 10, 2022
Merged

Third-party bumps #1534

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
bcc904a
Bump SDL2 to 2.24.1
NiLuJe Oct 9, 2022
282a59a
Update to HarfBuzz 5.3.0
NiLuJe Oct 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions ffi-cdecl/harfbuzz_cdecl.c
View file
Open in desktop
Expand Up @@ -676,4 +676,8 @@ cdecl_func(hb_map_hash)

// HB 5.0.0
cdecl_func(hb_language_matches)

// HB 5.3.0
cdecl_func(hb_ot_layout_lookup_get_optical_bound)
cdecl_func(hb_face_builder_sort_tables)
*/
2 changes: 1 addition & 1 deletion thirdparty/harfbuzz/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@ if($ENV{ANDROID})
set(CFG_CMD "${CFG_CMD} && ${ISED} 's|soname_spec=.*|soname_spec=\"\\\\\$libname\\\\\$release\\\\\$shared_ext\\\\\$major\"|' libtool")
endif()

set(HB_VER 5.2.0)
set(HB_VER 5.3.0)

ko_write_gitclone_script(
GIT_CLONE_SCRIPT_FILENAME
Expand Down
6 changes: 3 additions & 3 deletions thirdparty/sdl2/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -15,11 +15,11 @@ ep_get_source_dir(SOURCE_DIR)

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

set(SDL2_VER "2.0.12")
set(SDL2_MD5 "783b6f2df8ff02b19bb5ce492b99c8ff")
set(SDL2_VER "2.24.1")
set(SDL2_MD5 "10bad2a286f155565edc611f41345de1")
download_project(
PROJ ${PROJECT_NAME}
URL https://www.libsdl.org/release/SDL2-${SDL2_VER}.tar.gz
URL https://github.com/libsdl-org/SDL/releases/download/release-${SDL2_VER}/SDL2-${SDL2_VER}.tar.gz
URL_MD5 ${SDL2_MD5}
PATCH_COMMAND COMMAND ${PATCH_CMD}
)
Expand Down
19 changes: 10 additions & 9 deletions thirdparty/sdl2/cocoa.patch
View file
Open in desktop
@@ -1,9 +1,10 @@
diff -uNr a/src/video/cocoa/SDL_cocoaevents.m e/src/video/cocoa/SDL_cocoaevents.m
--- a/src/video/cocoa/SDL_cocoaevents.m 2020-03-11 02:36:18.000000000 +0100
+++ e/src/video/cocoa/SDL_cocoaevents.m 2020-07-28 21:40:49.000000000 +0200
@@ -34,6 +34,18 @@
#define kIOPMAssertPreventUserIdleDisplaySleep kIOPMAssertionTypePreventUserIdleDisplaySleep
#endif
diff --git a/src/video/cocoa/SDL_cocoaevents.m b/src/video/cocoa/SDL_cocoaevents.m
index 4903a8a04..28c4ea325 100644
--- a/src/video/cocoa/SDL_cocoaevents.m
+++ b/src/video/cocoa/SDL_cocoaevents.m
@@ -54,6 +54,18 @@ static SDL_Window *FindSDLWindowForNSWindow(NSWindow *win)
return sdlwindow;
}

+static void _openUrl(NSString *url) {
+ [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:url]];
Expand All @@ -20,7 +21,7 @@ diff -uNr a/src/video/cocoa/SDL_cocoaevents.m e/src/video/cocoa/SDL_cocoaevents.
@interface SDLApplication : NSApplication

- (void)terminate:(id)sender;
@@ -45,6 +57,23 @@
@@ -65,6 +77,23 @@ static SDL_Window *FindSDLWindowForNSWindow(NSWindow *win)

@implementation SDLApplication

Expand All @@ -44,7 +45,7 @@ diff -uNr a/src/video/cocoa/SDL_cocoaevents.m e/src/video/cocoa/SDL_cocoaevents.
// Override terminate to handle Quit and System Shutdown smoothly.
- (void)terminate:(id)sender
{
@@ -233,20 +262,7 @@
@@ -281,20 +310,7 @@ static void Cocoa_DispatchEvent(NSEvent *theEvent)

- (void)applicationDidFinishLaunching:(NSNotification *)notification
{
Expand All @@ -66,7 +67,7 @@ diff -uNr a/src/video/cocoa/SDL_cocoaevents.m e/src/video/cocoa/SDL_cocoaevents.

/* If we call this before NSApp activation, macOS might print a complaint
* about ApplePersistenceIgnoreState. */
@@ -424,12 +440,6 @@
@@ -471,12 +487,6 @@ Cocoa_RegisterApp(void)
}
}
[NSApp finishLaunching];
Expand Down