diff --git a/patches/lwjgl/jinx-working-patch.patch b/patches/lwjgl/jinx-working-patch.patch index da77748f..1a3cd902 100644 --- a/patches/lwjgl/jinx-working-patch.patch +++ b/patches/lwjgl/jinx-working-patch.patch @@ -83,7 +83,7 @@ index 7f6bb68..1e9d04c 100644 diff --git lwjgl-workdir/platform_build/astral_ant/build.xml lwjgl-workdir/platform_build/astral_ant/build.xml new file mode 100644 -index 0000000..4c3980c +index 0000000..f87405e --- /dev/null +++ lwjgl-workdir/platform_build/astral_ant/build.xml @@ -0,0 +1,68 @@ @@ -92,7 +92,7 @@ index 0000000..4c3980c + + + -+ ++ + + + @@ -124,17 +124,17 @@ index 0000000..4c3980c + + + -+ ++ + + -+ -+ -+ -+ -+ -+ -+ -+ ++ ++ ++ ++ ++ ++ ++ ++ + + + @@ -155,3 +155,16 @@ index 0000000..4c3980c + + + +diff --git lwjgl-clean/src/java/org/lwjgl/LWJGLUtil.java lwjgl-workdir/src/java/org/lwjgl/LWJGLUtil.java +index 0ab810e..fc366ff 100644 +--- lwjgl-clean/src/java/org/lwjgl/LWJGLUtil.java ++++ lwjgl-workdir/src/java/org/lwjgl/LWJGLUtil.java +@@ -272,7 +272,7 @@ public class LWJGLUtil { + final String osName = getPrivilegedProperty("os.name"); + if ( osName.startsWith("Windows") ) + PLATFORM = PLATFORM_WINDOWS; +- else if ( osName.startsWith("Linux") || osName.startsWith("FreeBSD") || osName.startsWith("OpenBSD") || osName.startsWith("SunOS") || osName.startsWith("Unix") ) ++ else if ( osName.startsWith("Linux") || osName.startsWith("FreeBSD") || osName.startsWith("OpenBSD") || osName.startsWith("SunOS") || osName.startsWith("Unix") || osName.startsWith("Astral") ) + PLATFORM = PLATFORM_LINUX; + else if ( osName.startsWith("Mac OS X") || osName.startsWith("Darwin") ) + PLATFORM = PLATFORM_MACOSX; diff --git a/recipes/lwjgl b/recipes/lwjgl index 7206d98b..c6fe8a31 100644 --- a/recipes/lwjgl +++ b/recipes/lwjgl @@ -3,7 +3,7 @@ revision=1 from_source=lwjgl imagedeps="build-essential zip unzip file ant openjdk-8-jdk" hostdeps="xgcc xbinutils libstdc++-v3 pkgconfig autoconf" -deps="base alsa-lib cups freetype fontconfig libpng libjpeg-turbo zlib libx11 libxext libxi libxrandr libxrender libxt libxtst xorgproto libiconv libffi libxcursor libxxf86vm" +deps="base alsa-lib cups freetype fontconfig libpng libjpeg-turbo zlib libx11 libxext libxi libxrandr libxrender libxt libxtst xorgproto libiconv libffi libxcursor libxxf86vm openjdk17" configure() { cp -rp ${source_dir}/* . @@ -11,7 +11,7 @@ configure() { } build() { - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/ ant -DCC=x86_64-astral-gcc -Dhwplatform=x86_64 -Dlwjgl.platform.linux=false -Dlwjgl.platform.astral=true + JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 ant -DCC=x86_64-astral-gcc -Dhwplatform=x86_64 -Dlwjgl.platform.linux=false -Dlwjgl.platform.astral=true -Dsysroot=${sysroot_dir} -Dcross.java.home="/usr/lib/jvm/java-17/" } package() {