From 39af23f0ceb4b455a50dfcd7fd15e04bacbfbc65 Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Thu, 2 Jan 2025 09:29:50 -0800 Subject: [PATCH 1/7] Update LICENSE.md --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index 726f005e6..2e2eed918 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,7 +1,7 @@ MIT License =========== -Copyright (c) 2013-2024 Joshua Granick and other Lime contributors +Copyright (c) 2013-2025 Joshua Granick and other Lime contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 69086df2060fe2b4c8b547e5538971df256507f4 Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Thu, 2 Jan 2025 09:32:18 -0800 Subject: [PATCH 2/7] Update NOTICE.md --- NOTICE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOTICE.md b/NOTICE.md index a2f4b4de6..a806789eb 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -2,7 +2,7 @@ Notices ======= ### Lime -Copyright (c) 2013-2024 Joshua Granick and other Lime contributors +Copyright (c) 2013-2025 Joshua Granick and other Lime contributors This product bundles cairo 1.15.2, which is available under an "MPL 1.1" license. For details, see [project/lib/cairo/](project/lib). From 37e758072008ab6a13a93087544e5c864e4b8ed0 Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Mon, 23 Dec 2024 17:29:43 +0000 Subject: [PATCH 3/7] Fix module paths for haxe 5 Haxe 5 will no longer support module resolution like this. See: https://github.com/HaxeFoundation/haxe/issues/9150 --- src/lime/tools/FlashHelper.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lime/tools/FlashHelper.hx b/src/lime/tools/FlashHelper.hx index bbae4fd0c..9cc436f85 100644 --- a/src/lime/tools/FlashHelper.hx +++ b/src/lime/tools/FlashHelper.hx @@ -167,7 +167,7 @@ class FlashHelper var frameData = frameDataWriter.getBytes(); - var snd:format.swf.Sound = + var snd:format.swf.Data.Sound = { sid: cid, format: SFMP3, @@ -255,7 +255,7 @@ class FlashHelper { var sampleCount = Std.int(wav.data.length / (hdr.bitsPerSample / 8)); - var snd:format.swf.Sound = + var snd:format.swf.Data.Sound = { sid: cid, format: SFLittleEndianUncompressed, From 57cf88b02d1ffc135fb846c879c701d0cb12d4e1 Mon Sep 17 00:00:00 2001 From: Josh Tynjala Date: Mon, 6 Jan 2025 10:06:24 -0800 Subject: [PATCH 4/7] CommandLineTools: set macos define when using cpp target on macOS (closes #1878) It should behave the same as mac or macos target. --- tools/CommandLineTools.hx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/CommandLineTools.hx b/tools/CommandLineTools.hx index a5a11fadb..f2c381759 100644 --- a/tools/CommandLineTools.hx +++ b/tools/CommandLineTools.hx @@ -1514,6 +1514,11 @@ class CommandLineTools target = System.hostPlatform; targetFlags.set("cpp", ""); + if (target == Platform.MAC) + { + overrides.haxedefs.set("macos", ""); + } + case "neko": target = System.hostPlatform; targetFlags.set("neko", ""); From 44dd331801326e3b5eac7c35f8ee0560ad828bca Mon Sep 17 00:00:00 2001 From: Josh Tynjala Date: Tue, 7 Jan 2025 09:43:21 -0800 Subject: [PATCH 5/7] libjpeg: fix rendering on 32-bit platforms Fixes SIZEOF_SIZE_T on 32-bit platforms that should be 4 instead of 8 Tested on Windows x86_32 and Android armv7 --- project/lib/custom/jpeg/jconfigint.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/project/lib/custom/jpeg/jconfigint.h b/project/lib/custom/jpeg/jconfigint.h index 69767e917..632329a8b 100644 --- a/project/lib/custom/jpeg/jconfigint.h +++ b/project/lib/custom/jpeg/jconfigint.h @@ -23,10 +23,10 @@ #define VERSION "2.0.7" /* The size of `size_t', as computed by sizeof. */ -#if defined(RASPBERRYPI) -#define SIZEOF_SIZE_T 4 -#else +#if (__WORDSIZE == 64) || defined(_WIN64) #define SIZEOF_SIZE_T 8 +#else +#define SIZEOF_SIZE_T 4 #endif /* Define if your compiler has __builtin_ctzl() and sizeof(unsigned long) == sizeof(size_t). */ From 951d5510c2b70f994ecfafba16ae0311b4bb5d25 Mon Sep 17 00:00:00 2001 From: Josh Tynjala Date: Tue, 7 Jan 2025 12:47:30 -0800 Subject: [PATCH 6/7] GameActivity: check for VIBRATE permission on Android While we add this permission by default, if a developer sets custom permissions, we want to avoid crashing when we try to access an API that we don't have permission to use --- .../app/src/main/java/org/haxe/lime/GameActivity.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/templates/android/template/app/src/main/java/org/haxe/lime/GameActivity.java b/templates/android/template/app/src/main/java/org/haxe/lime/GameActivity.java index 3c28d7a6c..18a276f6e 100644 --- a/templates/android/template/app/src/main/java/org/haxe/lime/GameActivity.java +++ b/templates/android/template/app/src/main/java/org/haxe/lime/GameActivity.java @@ -3,6 +3,7 @@ package org.haxe.lime; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; import android.content.res.AssetManager; import android.net.Uri; import android.os.Build; @@ -16,6 +17,7 @@ import android.view.KeyCharacterMap; import android.view.KeyEvent; import android.view.View; import android.webkit.MimeTypeMap; +import android.Manifest; import org.haxe.extension.Extension; import org.libsdl.app.SDLActivity; @@ -110,7 +112,13 @@ public class GameActivity extends SDLActivity { super.onCreate (state); assetManager = getAssets (); - vibrator = (Vibrator)mSingleton.getSystemService (Context.VIBRATOR_SERVICE); + + if (checkSelfPermission(Manifest.permission.VIBRATE) == PackageManager.PERMISSION_GRANTED) { + + vibrator = (Vibrator)mSingleton.getSystemService (Context.VIBRATOR_SERVICE); + + } + handler = new Handler (); Extension.assetManager = assetManager; From 6a5908b02b70dffd5fd024d6bc1bfa9e662477d2 Mon Sep 17 00:00:00 2001 From: Igor <1659590+pozirk@users.noreply.github.com> Date: Wed, 8 Jan 2025 14:05:26 -0500 Subject: [PATCH 7/7] Just fixing some typo --- src/lime/tools/Keystore.hx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lime/tools/Keystore.hx b/src/lime/tools/Keystore.hx index 878ba70a6..65a0a6f31 100644 --- a/src/lime/tools/Keystore.hx +++ b/src/lime/tools/Keystore.hx @@ -26,9 +26,9 @@ class Keystore if (keystore != null) { if (keystore.path != null && keystore.path != "") path = keystore.path; - if (keystore.password != null) path = keystore.password; - if (keystore.alias != null) path = keystore.alias; - if (keystore.aliasPassword != null) path = keystore.aliasPassword; + if (keystore.password != null) password = keystore.password; + if (keystore.alias != null) alias = keystore.alias; + if (keystore.aliasPassword != null) aliasPassword = keystore.aliasPassword; } } }