diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2024-06-05 14:01:51 +0200 |
|---|---|---|
| committer | Sefa Eyeoglu <contact@scrumplex.net> | 2024-06-05 14:01:51 +0200 |
| commit | b9a98bc2439296f96fb2e766e7a66be989d24585 (patch) | |
| tree | 284021e6cae87f7ffe03efcfe5aaf26ea85e6228 | |
| parent | 2f27ad8aa10f5151e3eb996f44630cc4e3897725 (diff) | |
| download | Project-Tick-b9a98bc2439296f96fb2e766e7a66be989d24585.tar.gz Project-Tick-b9a98bc2439296f96fb2e766e7a66be989d24585.zip | |
fix: add new LWJGL variant with fixed os rules
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
| -rw-r--r-- | meta/common/mojang-library-patches.json | 15 | ||||
| -rwxr-xr-x | meta/run/generate_mojang.py | 3 |
2 files changed, 2 insertions, 16 deletions
diff --git a/meta/common/mojang-library-patches.json b/meta/common/mojang-library-patches.json index 7ea3be266c..74d4d26c4b 100644 --- a/meta/common/mojang-library-patches.json +++ b/meta/common/mojang-library-patches.json @@ -2875,20 +2875,5 @@ }, "name": "org.lwjgl:lwjgl-glfw-natives-linux:3.3.2-lwjgl.1" } - }, - { - "match": [ - "org.lwjgl:lwjgl-freetype-natives-macos-patch:3.3.3" - ], - "override": { - "rules": [ - { - "action": "allow", - "os": { - "name": "osx" - } - } - ] - } } ] diff --git a/meta/run/generate_mojang.py b/meta/run/generate_mojang.py index 9631a6c240..6a0d0d9b9e 100755 --- a/meta/run/generate_mojang.py +++ b/meta/run/generate_mojang.py @@ -90,7 +90,7 @@ LOG4J_HASHES = { # We want versions that contain natives for all platforms. If there are multiple, pick the latest one # LWJGL versions we want PASS_VARIANTS = [ - "6f32ef730d05562ede7db0b845b72ea16dd239d5", # 3.3.3 (2024-05-29 12:04:43+00:00) + "73974b3af2afeb5b272ffbadcd7963014387c84f", # 3.3.3 (2024-05-22 16:25:41+00:00) "765b4ab443051d286bdbb1c19cd7dc86b0792dce", # 3.3.2 (2024-01-17 13:19:20+00:00) "54c4fb1d6a96ac3007c947bf310c8bcf94a862be", # 3.3.1 (2023-04-20 11:55:19+00:00) split natives, with WoA natives "ea4973ebc9eadf059f30f0958c89f330898bff51", # 3.2.2 (2019-07-04 14:41:05+00:00) will be patched, missing tinyfd @@ -106,6 +106,7 @@ PASS_VARIANTS = [ # LWJGL versions we def. don't want! BAD_VARIANTS = [ + "6f32ef730d05562ede7db0b845b72ea16dd239d5", # 3.3.3 (2024-05-29 12:04:43+00:00) missing os rule for freetype natives-macos-patch "8a9b08f11271eb4de3b50e5d069949500b2c7bc1", # 3.3.3 (2024-04-03 11:49:39+00:00) seems to have a broken libfreetype for macOS x86_64 "79bde9e46e9ad9accebda11e8293ed08d80dbdc3", # 3.3.2 (2023-08-30 11:24:35+00:00) does not have lwjgl-freetype "8836c419f90f69a278b97d945a34af165c24ff60", # 3.3.1 (2022-05-18 13:51:54+00:00) split natives, with workaround, replaced by 23w26a |