Skip to content

Commit

Permalink
Merge branch '8.3.0-Dev' into multi_mode_ThreadPool
Browse files Browse the repository at this point in the history
  • Loading branch information
player-03 committed Dec 31, 2024
2 parents 8ec7bec + 8bc9a11 commit 68cc667
Show file tree
Hide file tree
Showing 25 changed files with 511 additions and 79 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
lime build SimpleAudio linux -release -verbose -nocolor
macos:
runs-on: macos-12
runs-on: macos-13
steps:

- uses: actions/checkout@v4
Expand Down Expand Up @@ -353,7 +353,7 @@ jobs:
lime create SimpleAudio -verbose -nocolor -eval
lime build SimpleAudio android -release -verbose -nocolor -eval
ios:
runs-on: macos-12
runs-on: macos-13
steps:

- uses: actions/checkout@v4
Expand Down Expand Up @@ -659,7 +659,7 @@ jobs:
needs: package-haxelib
strategy:
matrix:
os: [windows-latest, ubuntu-20.04, macos-12]
os: [windows-latest, ubuntu-20.04, macos-13]
runs-on: ${{ matrix.os }}
steps:

Expand Down Expand Up @@ -709,7 +709,7 @@ jobs:
needs: package-haxelib
strategy:
matrix:
os: [windows-latest, ubuntu-20.04, macos-12]
os: [windows-latest, ubuntu-20.04, macos-13]
runs-on: ${{ matrix.os }}
steps:

Expand Down Expand Up @@ -816,7 +816,7 @@ jobs:
strategy:
matrix:
haxe-version: [3.4.7, 4.2.5]
os: [windows-latest, ubuntu-20.04, macos-12]
os: [windows-latest, ubuntu-20.04, macos-13]
runs-on: ${{ matrix.os }}
steps:

Expand Down
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,27 @@
Changelog
=========

8.2.2 (12/19/2024)
------------------

* Fixed broken breakpoints in HTML5 debug builds.
* Fixed unecessary operations in `Promise` by inlining some getter functions.
* Fixed failure to read `gradle-plugin` attribute in `<config:android>` tag.
* Fixed failed installation of app on iOS Simulator by choosing only simulators that are considered available.
* Fixed `lime test ios` to install and launch on a device when using Xcode 16 or newer.
* Fixed reported version of OpenAL library.
* Fixed memory cleanup when encoding PNG and JPEG images.
* Fixed error reporting `@rpath/libhl.dylib` not found on macOS when using HashLink nightly build.
* Fixed building HashLink on macOS that required cleaning between compiles.
* Fixed `embedBytes()` macro incorrectly running when `embedByteArray()` macro was also running.
* Fixed `ImageDataUtil.copyPixels()` causing crash on HashLink.
* Fixed missing `neko` target flag when cross-compiling to Windows without `-mingw` or `-cpp` flags.
* Fixed occasional failure running Lime tools by switching certain paths from relative to absolute.
* Fixed missing warning when `lime rebuild` commands fail because C++ source is not available from Haxelib.
* Fixed command instructions to specify requirement for absolute paths when setting up a platform.
* Added detection of `-cpp` flag when cross-compiling to Windows, which works like `-mingw`.
* Updated FreeType submodule to version 2.12.1 again. Resolved issues encountered when using this version in Lime 8.2.0.

8.2.1 (11/01/2024)
------------------

Expand Down
6 changes: 6 additions & 0 deletions project/Build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,12 @@
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/freetype/include" />
<compilerflag value="-DLIME_FREETYPE" />

<!--
prefer FreeType's font metrics algorithm from 2.9.1
it behaves more like SWF than the new algorithm
-->
<compilerflag value="-DLIME_FREETYPE_LEGACY_METRICS" />

<file name="src/text/Font.cpp" />

<section if="LIME_HARFBUZZ">
Expand Down
4 changes: 2 additions & 2 deletions project/lib/custom/openal/build/version.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* Define to the library version */
#define ALSOFT_VERSION "1.19.0"
#define ALSOFT_VERSION "1.20.1"

/* Define the branch being built */
#define ALSOFT_GIT_BRANCH "master"

/* Define the hash of the head commit */
#define ALSOFT_GIT_COMMIT_HASH "96aacac"
#define ALSOFT_GIT_COMMIT_HASH "f5e0eef3"
2 changes: 1 addition & 1 deletion project/lib/freetype
Submodule freetype updated 780 files
13 changes: 6 additions & 7 deletions project/lib/freetype-files.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,7 @@
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/bdf/bdf.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/bzip2/ftbzip2.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cache/ftcache.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cff/cffcmap.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cff/cffdrivr.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cff/cffgload.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cff/cffload.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cff/cffobjs.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cff/cffparse.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cff/cffpic.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cff/cff.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/cid/type1cid.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/gzip/ftgzip.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/lzw/ftlzw.c" />
Expand All @@ -126,8 +120,13 @@
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/pshinter/pshinter.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/psnames/psmodule.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/raster/raster.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/sdf/ftbsdf.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/sdf/ftsdf.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/sdf/ftsdfcommon.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/sdf/ftsdfrend.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/sfnt/sfnt.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/smooth/smooth.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/svg/ftsvg.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/truetype/truetype.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/type1/type1.c" />
<file name="${NATIVE_TOOLKIT_PATH}/freetype/src/type42/type42.c" />
Expand Down
12 changes: 11 additions & 1 deletion project/src/ExternalInterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2052,7 +2052,17 @@ namespace lime {

} else {

ImageDataUtil::CopyPixels (image, sourceImage, sourceRect, destPoint, alphaImage, alphaPoint, mergeAlpha);
if (!alphaPoint) {

Vector2 _alphaPoint = Vector2 (0, 0);

ImageDataUtil::CopyPixels (image, sourceImage, sourceRect, destPoint, alphaImage, &_alphaPoint, mergeAlpha);

} else {

ImageDataUtil::CopyPixels (image, sourceImage, sourceRect, destPoint, alphaImage, alphaPoint, mergeAlpha);

}

}

Expand Down
2 changes: 2 additions & 0 deletions project/src/graphics/format/JPEG.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,8 @@ namespace lime {

}

jpeg_destroy_compress (&cinfo);

return true;

}
Expand Down
4 changes: 4 additions & 0 deletions project/src/graphics/format/PNG.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,8 @@ namespace lime {

if (!info_ptr) {

png_destroy_write_struct (&png_ptr, NULL);

return false;

}
Expand Down Expand Up @@ -310,6 +312,8 @@ namespace lime {

}

png_destroy_write_struct (&png_ptr, &info_ptr);

return true;

}
Expand Down
Loading

0 comments on commit 68cc667

Please sign in to comment.