Merge upstream

.github/workflows/main.yml

@@ -120,7 +120,8 @@ jobs:
 
       - name: Install Haxe dependencies
         run: |
-          haxelib install hxcpp 4.2.1 --quiet
+          curl -LO https://github.com/HaxeFoundation/hxcpp/releases/download/v4.3.45/hxcpp-4.3.45.zip
+          haxelib install ./hxcpp-4.3.45.zip --quiet
           haxelib install format --quiet
           haxelib install hxp --quiet
 
@@ -137,6 +138,7 @@ jobs:
       - name: Rebuild Lime (macOS)
         run: |
           lime rebuild macos -clean -release -64 -nocolor -verbose -nocffi
+          lime rebuild macos -clean -release -arm64 -nocolor -verbose -nocffi
           lime rebuild hl -clean -release -nocolor -verbose -nocffi
 
       - uses: actions/upload-artifact@v3
@@ -147,6 +149,14 @@ jobs:
             !**/.gitignore
           if-no-files-found: error
 
+      - uses: actions/upload-artifact@v3
+        with:
+          name: MacArm64-NDLL
+          path: |
+            ndll/MacArm64/
+            !**/.gitignore
+          if-no-files-found: error
+
       - uses: actions/upload-artifact@v3
         with:
           name: Mac64-Hashlink
@@ -466,6 +476,11 @@ jobs:
           name: Mac64-NDLL
           path: ndll/Mac64/
 
+      - uses: actions/download-artifact@v3
+        with:
+          name: MacArm64-NDLL
+          path: ndll/MacArm64/
+
       - uses: actions/download-artifact@v3
         with:
           name: Windows-NDLL

CHANGELOG.md

@@ -1,6 +1,24 @@
 Changelog
 =========
 
+8.1.3 (07/22/2024)
+------------------
+
+* Fixed Unicode conversion issues with various APIs, including as clipboard, window text, file dialogs, and fonts.
+* Fixed Android builds with the `-emulator` flag that broke when using newer Android SDKs.
+* Fixed "Could not link to neko" error message on macOS when lime.ndll is built with Xcode 15.
+* Fixed system environment variables with the same name as common targets conflicting with other targets.
+* Fixed `<echo/>` and `<log/>` output confusing Haxe's completion server. Now skipped when `display` is defined.
+* Fixed `Clipboard.text` incorrectly getting cleared to null when targeting HTML5.
+* Fixed integer value parsing in _project.xml_, including immediately reporting errors for invalid values.
+* Fixed incorrect path discovery for NDLL files that found source directory instead.
+* Fixed missing error message if HXP project class name does not match file name.
+* Fixed unspecified behavior from `null` keys in `ObjectPool`.
+* Fixed some issues when running Haxe built natively for Apple Silicon.
+* Fixed missing cancellation of vibration on Android when app is paused or destroyed.
+* Fixed static linking of native curl library on macOS.
+* Fixed deprecation warnings in Android Gradle builds.
+
 8.1.2 (03/13/2024)
 ------------------
 

NOTICE.md

@@ -104,6 +104,9 @@ This product bundles FileSaver.js 1.3.3, which is available under an
 This product bundles pako 1.0.2, which is available under an
 "MIT" license. For details, see [dependencies/pako.min.js](dependencies/pako.min.js).
 
+This product bundles LZMA-JS 2.3.2, which is available under an
+"MIT" license. For details, see [dependencies/lzma_worker-min.js](dependencies/lzma_worker-min.js).
+
 This product bundles stats.js r16, which is available under an
 "MIT" license. For details, see [dependencies/stats.min.js](dependencies/stats.min.js).
 

dependencies/extension-api/build.gradle

@@ -12,6 +12,7 @@ buildscript {
 apply plugin: 'com.android.library'
 
 android {
+	namespace 'org.haxe.extension'
 	compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
 	buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
 

dependencies/extension-api/src/main/AndroidManifest.xml

@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.haxe.extension" >
-
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />

haxelib.json

@@ -4,8 +4,8 @@
 	"license": "MIT",
 	"tags": [],
 	"description": "A foundational Haxe framework for cross-platform development",
-	"version": "8.2.0",
-	"releasenote": "Update HashLink, iOS and Android build fixes, and ongoing improvements",
+	"version": "8.3.0",
+	"releasenote": "Various bug fixes",
 	"contributors": [
 		"singmajesty",
 		"bowlerhat",

include.xml

@@ -91,7 +91,8 @@
 		<dependency name="extension-api" path="dependencies/extension-api" if="android" />
 
 		<dependency path="dependencies/howler.min.js" if="html5 howlerjs" embed="true" />
-		<dependency path="dependencies/pako.min.js" if="html5" embed="true" web-worker="true" />
+		<dependency path="dependencies/pako.min.js" if="html5" embed="true" allow-web-workers="true" />
+		<dependency path="dependencies/lzma_worker-min.js" if="html5" embed="true" />
 		<dependency path="dependencies/FileSaver.min.js" if="html5" embed="true" />
 		<dependency path="dependencies/webgl-debug.js" if="html5 webgl-debug" embed="true" />
 		<dependency path="dependencies/stats.min.js" if="html5 stats" embed="true" />
@@ -218,4 +219,4 @@
 
 	</section>
 
-</extension>
+</extension>

project/lib/custom/jpeg/jconfig.h

@@ -19,7 +19,9 @@
 #define MEM_SRCDST_SUPPORTED 1
 
 /* Use accelerated SIMD routines. */
+#ifndef __ANDROID__
 #define WITH_SIMD 1
+#endif
 
 /*
  * Define BITS_IN_JSAMPLE as either
@@ -67,9 +69,10 @@
 #endif
 
 /* If rpcndr.h has defined boolean, jmorecfg.h should not. */
-#ifdef __RPCNDR_H__
-#define HAVE_BOOLEAN
+#ifndef __RPCNDR_H__		/* don't conflict if rpcndr.h already read */
+typedef unsigned char boolean;
 #endif
+#define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */

project/lib/custom/openal/include/config.h

@@ -1,4 +1,8 @@
-#ifdef HX_MACOS
+#if defined(HX_MACOS) && defined(HXCPP_ARM64)
+
+#include "config-macos-arm64.h"
+
+#elif defined(HX_MACOS)
 
 #include "config-macos-x86_64.h"
 

project/lib/custom/pixman/config.h

@@ -293,14 +293,14 @@
 /* #undef USE_OPENMP */
 
 /* use SSE2 compiler intrinsics */
-#if defined(HX_WINDOWS) || defined(HX_MACOS) || (defined(HX_LINUX) && !defined(RASPBERRYPI))
+#if defined(HX_WINDOWS) || (defined(HX_MACOS) && !defined(HXCPP_ARM64)) || (defined(HX_LINUX) && !defined(RASPBERRYPI))
 #define USE_SSE2 1
 #else
 /* #undef USE_SSE2 */
 #endif
 
 /* use SSSE3 compiler intrinsics */
-#if defined(HX_WINDOWS) || defined(HX_MACOS) || (defined(HX_LINUX) && !defined(RASPBERRYPI))
+#if defined(HX_WINDOWS) || (defined(HX_MACOS) && !defined(HXCPP_ARM64)) || (defined(HX_LINUX) && !defined(RASPBERRYPI))
 #define USE_SSE3 1
 #else
 /* #undef USE_SSE3 */

project/lib/openal-files.xml

@@ -152,11 +152,11 @@
 
             <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/coreaudio.cpp" />
 
-            <compilerflag value="-mmmx" />
-            <compilerflag value="-msse" />
-            <compilerflag value="-msse2" />
-            <compilerflag value="-msse3" />
-            <compilerflag value="-mssse3" />
+            <compilerflag value="-mmmx" unless="HXCPP_ARM64" />
+            <compilerflag value="-msse" unless="HXCPP_ARM64" />
+            <compilerflag value="-msse2" unless="HXCPP_ARM64" />
+            <compilerflag value="-msse3" unless="HXCPP_ARM64" />
+            <compilerflag value="-mssse3" unless="HXCPP_ARM64" />
 
         </section>
 

project/lib/pixman-files.xml

@@ -23,11 +23,11 @@
 
 		<compilerflag value="-I${ANDROID_NDK_ROOT}/sources/android/cpufeatures" if="android" />
 
-		<compilerflag value="-mmmx" if="linux || mac" unless="rpi" />
-		<compilerflag value="-msse" if="linux || mac" unless="rpi" />
-		<compilerflag value="-msse2" if="linux || mac" unless="rpi" />
-		<compilerflag value="-msse3" if="linux || mac" unless="rpi" />
-		<compilerflag value="-mssse3" if="linux || mac" unless="rpi" />
+		<compilerflag value="-mmmx" if="linux || mac" unless="rpi || HXCPP_ARM64" />
+		<compilerflag value="-msse" if="linux || mac" unless="rpi || HXCPP_ARM64" />
+		<compilerflag value="-msse2" if="linux || mac" unless="rpi || HXCPP_ARM64" />
+		<compilerflag value="-msse3" if="linux || mac" unless="rpi || HXCPP_ARM64" />
+		<compilerflag value="-mssse3" if="linux || mac" unless="rpi || HXCPP_ARM64" />
 
 		<compilerflag value="-Wno-attributes" if="android" />
 		<compilerflag value="-Wno-tautological-constant-out-of-range-compare" if="mac || ios || tvos" />
@@ -57,15 +57,15 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-linear-gradient.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-matrix.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-mips.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-mmx.c" if="windows || mac || linux" unless="rpi" />
+		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-mmx.c" if="windows || mac || linux" unless="rpi || HXCPP_ARM64" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-noop.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-ppc.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-radial-gradient.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-region16.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-region32.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-solid-fill.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-sse2.c" if="windows || mac || linux" unless="rpi" />
-		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-ssse3.c" if="windows || mac || linux" unless="rpi" />
+		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-sse2.c" if="windows || mac || linux" unless="rpi || HXCPP_ARM64" />
+		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-ssse3.c" if="windows || mac || linux" unless="rpi || HXCPP_ARM64" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-timer.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-trap.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/pixman/pixman/pixman-utils.c" />