From b400e24361432bbccd84f9193bab179d933df24c Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Thu, 20 Apr 2023 16:40:57 +0200 Subject: [PATCH] fix: add mark new LWJGL variant as good Signed-off-by: Sefa Eyeoglu --- generateMojang.py | 4 +- static/mojang/library-patches.json | 182 ----------------------------- 2 files changed, 2 insertions(+), 184 deletions(-) diff --git a/generateMojang.py b/generateMojang.py index 4f100ef..6e9b7cf 100755 --- a/generateMojang.py +++ b/generateMojang.py @@ -88,8 +88,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 = [ - # "beed62ec1d40ae89d808fe70b83df6bd4b3be81f", # 3.3.1 (2022-05-18 13:51:54+00:00) split natives, without workaround - "8836c419f90f69a278b97d945a34af165c24ff60", # 3.3.1 (2022-05-18 13:51:54+00:00) split natives, with workaround + "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 "8e1f89b96c6f583a0e494949c75115ed13412ba1", # 3.2.1 (2019-02-13 16:12:08+00:00) "7ed2372097dbd635f5aef3137711141ce91c4ee9", # 3.1.6 (2018-11-29 13:11:38+00:00) @@ -103,6 +102,7 @@ PASS_VARIANTS = [ # LWJGL versions we def. don't want! BAD_VARIANTS = [ + "8836c419f90f69a278b97d945a34af165c24ff60", # 3.3.1 (2022-05-18 13:51:54+00:00) split natives, with workaround, replaced by 23w26a "e1106ca765798218323b7a6d7528050260ea9d88", # 3.3.1 (2022-05-04 14:41:35+00:00) doesn't use split natives "90b3d9ca01058286c033b6b7ae7f6dc370a04015", # 3.2.2 (2022-03-31 14:53:25+00:00) only linux, windows "d986df9598fa2bcf4a5baab5edf044548e66d011", # 3.2.2 (2021-12-10 03:36:38+00:00) only linux, windows diff --git a/static/mojang/library-patches.json b/static/mojang/library-patches.json index 6df4356..0ca9f9f 100644 --- a/static/mojang/library-patches.json +++ b/static/mojang/library-patches.json @@ -1943,187 +1943,5 @@ ] } ] - }, - { - "_comment": "Add windows-arm64 support for LWJGL 3.3.1", - "match": [ - "org.lwjgl:lwjgl-glfw:3.3.1" - ], - "additionalLibraries": [ - { - "downloads": { - "artifact": { - "sha1": "beda65ee503443e60aa196d58ed31f8d001dc22a", - "size": 123808, - "url": "https://build.lwjgl.org/release/3.3.1/bin/lwjgl-glfw/lwjgl-glfw-natives-windows-arm64.jar" - } - }, - "name": "org.lwjgl:lwjgl-glfw-natives-windows-arm64:3.3.1-lwjgl.1", - "rules": [ - { - "action": "allow", - "os": { - "name": "windows-arm64" - } - } - ] - } - ] - }, - { - "_comment": "Add windows-arm64 support for LWJGL 3.3.1", - "match": [ - "org.lwjgl:lwjgl-jemalloc:3.3.1" - ], - "additionalLibraries": [ - { - "downloads": { - "artifact": { - "sha1": "cae85c4edb219c88b6a0c26a87955ad98dc9519d", - "size": 114250, - "url": "https://build.lwjgl.org/release/3.3.1/bin/lwjgl-jemalloc/lwjgl-jemalloc-natives-windows-arm64.jar" - } - }, - "name": "org.lwjgl:lwjgl-jemalloc-natives-windows-arm64:3.3.1-lwjgl.1", - "rules": [ - { - "action": "allow", - "os": { - "name": "windows-arm64" - } - } - ] - } - ] - }, - { - "_comment": "Add windows-arm64 support for LWJGL 3.3.1", - "match": [ - "org.lwjgl:lwjgl-openal:3.3.1" - ], - "additionalLibraries": [ - { - "downloads": { - "artifact": { - "sha1": "40d65f1a7368a2aa47336f9cb69f5a190cf9975a", - "size": 505234, - "url": "https://build.lwjgl.org/release/3.3.1/bin/lwjgl-openal/lwjgl-openal-natives-windows-arm64.jar" - } - }, - "name": "org.lwjgl:lwjgl-openal-natives-windows-arm64:3.3.1-lwjgl.1", - "rules": [ - { - "action": "allow", - "os": { - "name": "windows-arm64" - } - } - ] - } - ] - }, - { - "_comment": "Add windows-arm64 support for LWJGL 3.3.1", - "match": [ - "org.lwjgl:lwjgl-opengl:3.3.1" - ], - "additionalLibraries": [ - { - "downloads": { - "artifact": { - "sha1": "527d78f1e9056aff3ed02ce93019c73c5e8f1721", - "size": 82445, - "url": "https://build.lwjgl.org/release/3.3.1/bin/lwjgl-opengl/lwjgl-opengl-natives-windows-arm64.jar" - } - }, - "name": "org.lwjgl:lwjgl-opengl-natives-windows-arm64:3.3.1-lwjgl.1", - "rules": [ - { - "action": "allow", - "os": { - "name": "windows-arm64" - } - } - ] - } - ] - }, - { - "_comment": "Add windows-arm64 support for LWJGL 3.3.1", - "match": [ - "org.lwjgl:lwjgl-stb:3.3.1" - ], - "additionalLibraries": [ - { - "downloads": { - "artifact": { - "sha1": "fde63cdd2605c00636721a6c8b961e41d1f6b247", - "size": 216848, - "url": "https://build.lwjgl.org/release/3.3.1/bin/lwjgl-stb/lwjgl-stb-natives-windows-arm64.jar" - } - }, - "name": "org.lwjgl:lwjgl-stb-natives-windows-arm64:3.3.1-lwjgl.1", - "rules": [ - { - "action": "allow", - "os": { - "name": "windows-arm64" - } - } - ] - } - ] - }, - { - "_comment": "Add windows-arm64 support for LWJGL 3.3.1", - "match": [ - "org.lwjgl:lwjgl-tinyfd:3.3.1" - ], - "additionalLibraries": [ - { - "downloads": { - "artifact": { - "sha1": "83a5e780df610829ff3a737822b4f931cffecd91", - "size": 109139, - "url": "https://build.lwjgl.org/release/3.3.1/bin/lwjgl-tinyfd/lwjgl-tinyfd-natives-windows-arm64.jar" - } - }, - "name": "org.lwjgl:lwjgl-tinyfd-natives-windows-arm64:3.3.1-lwjgl.1", - "rules": [ - { - "action": "allow", - "os": { - "name": "windows-arm64" - } - } - ] - } - ] - }, - { - "_comment": "Add windows-arm64 support for LWJGL 3.3.1", - "match": [ - "org.lwjgl:lwjgl:3.3.1" - ], - "additionalLibraries": [ - { - "downloads": { - "artifact": { - "sha1": "0f46cadcf95675908fd3a550d63d9d709cb68998", - "size": 130064, - "url": "https://build.lwjgl.org/release/3.3.1/bin/lwjgl/lwjgl-natives-windows-arm64.jar" - } - }, - "name": "org.lwjgl:lwjgl-natives-windows-arm64:3.3.1-lwjgl.1", - "rules": [ - { - "action": "allow", - "os": { - "name": "windows-arm64" - } - } - ] - } - ] } ]