diff options
| -rw-r--r-- | games/lwjgl3/Makefile | 7 | ||||
| -rw-r--r-- | games/lwjgl3/distinfo | 6 | ||||
| -rw-r--r-- | games/lwjgl3/files/patch-build.xml | 72 | ||||
| -rw-r--r-- | games/lwjgl3/pkg-plist | 21 | ||||
| -rw-r--r-- | games/multimc/Makefile | 1 | ||||
| -rwxr-xr-x | games/multimc/files/multimc-minecraft-runtime | 61 | ||||
| -rw-r--r-- | games/multimc/files/patch-api_logic_java_JavaUtils.cpp | 2 |
7 files changed, 90 insertions, 80 deletions
diff --git a/games/lwjgl3/Makefile b/games/lwjgl3/Makefile index c4e0978..cb46f42 100644 --- a/games/lwjgl3/Makefile +++ b/games/lwjgl3/Makefile @@ -4,21 +4,20 @@ PORTNAME= lwjgl3 DISTVERSION= 3.2.2 DISTVERSIONSUFFIX= -full CATEGORIES= games java -MASTER_SITES= https://github.com/CRKatri/lwjgl3/releases/download/${DISTVERSION}-freebsd-1/ +MASTER_SITES= https://github.com/CRKatri/lwjgl3/releases/download/${DISTVERSION}-freebsd-3/ MAINTAINER= me@cameronkatri.com COMMENT= Lightweight Java Game Library 3 LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${LOCALBASE}/lib/libdyncall_s.a:devel/dyncall \ - pkg-config:devel/pkgconf +BUILD_DEPENDS= ${LOCALBASE}/lib/libdyncall_s.a:devel/dyncall LIB_DEPENDS= libglfw.so:graphics/glfw \ libopenal.so:audio/openal-soft \ libopus.so:audio/opus \ libOpenCL.so:devel/ocl-icd -USES= gl gnome xorg +USES= gl gnome xorg pkgconfig USE_ANT= yes USE_GL= gl egl glesv2 USE_GNOME= gtk30 glib20 diff --git a/games/lwjgl3/distinfo b/games/lwjgl3/distinfo index 68eb30e..13b87c7 100644 --- a/games/lwjgl3/distinfo +++ b/games/lwjgl3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1625838438 -SHA256 (lwjgl3-3.2.2-full.tar.gz) = ab0d92ef2ab5a06747eeaf46ff37834e8b1a04e9dde7c3f9b173ed9fb38d55c5 -SIZE (lwjgl3-3.2.2-full.tar.gz) = 68334964 +TIMESTAMP = 1626568078 +SHA256 (lwjgl3-3.2.2-full.tar.gz) = b1d1ec25bc3f20d878d00397fbfbe0d70b316fc2d9df8fd1f443f4d663c08430 +SIZE (lwjgl3-3.2.2-full.tar.gz) = 68348945 diff --git a/games/lwjgl3/files/patch-build.xml b/games/lwjgl3/files/patch-build.xml deleted file mode 100644 index 8fc3bee..0000000 --- a/games/lwjgl3/files/patch-build.xml +++ /dev/null @@ -1,72 +0,0 @@ ---- build.xml.orig 2021-07-09 13:26:32 UTC -+++ build.xml -@@ -1050,69 +1050,6 @@ - <local name="hasMain"/> - <available file="${module.lwjgl}/@{name}/src/main/java" type="dir" property="hasMain"/> - -- <!-- Bundle javadoc --> -- <!-- This is slow, comment out the following section for fast local builds --> -- <mkdir dir="${release}/${module}/javadoc"/> -- <javadoc -- destdir="${release}/${module}/javadoc" -- source="9" -- windowtitle="LWJGL ${build.version} - @{title}" -- encoding="UTF-8" -- docencoding="UTF-8" -- charset="UTF-8" -- useexternalfile="true" -- nohelp="true" -- notree="true" -- public="true" -- failonerror="true" -- > -- <doctitle><![CDATA[<h1>LWJGL - @{title}</h1>]]></doctitle> -- <bottom><![CDATA[<i>Copyright LWJGL. All Rights Reserved. <a href="https://www.lwjgl.org/license">License terms</a>.</i>]]></bottom> -- -- <classpath> -- <pathelement path="${module.classpath}"/> -- <pathelement path="${lib}/java/jsr305.jar"/> -- </classpath> -- -- <fileset dir="${module.lwjgl}/@{name}/src/main/java" includes="**" if:set="hasMain"/> -- <fileset dir="${module.lwjgl}/@{name}/src/generated/java" includes="**"/> -- -- <arg value="-XDignore.symbol.file"/> <!-- Suppresses internal API (e.g. Unsafe) usage warnings --> -- -- <arg line="-Xdoclint:html,reference,syntax"/> -- <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> -- <arg line="-notimestamp"/> -- <arg value="-html5" if:set="jdk9"/> -- <arg line="-J-Dfile.encoding=UTF8 -J-Dline.separator= "/> -- <arg line="--add-exports jdk.javadoc/com.sun.tools.doclets=ALL-UNNAMED" if:set="jdk9"/> -- </javadoc> -- <get-quiet name="favicon" url="https://www.lwjgl.org/favicon.ico" dest="${release}/${module}/javadoc"/> -- -- <java classname="org.lwjgl.system.JavadocPostProcess" failonerror="true"> -- <classpath path="${bin.generator}"/> -- -- <arg value="${release}/${module}/javadoc"/> -- </java> -- <zip destfile="${release}/${module}/${module}-javadoc.jar" basedir="${release}/${module}/javadoc" includes="**" level="9"/> -- <delete dir="${release}/${module}/javadoc"/> -- -- <!-- Bundle source --> -- <quiet> -- <copy -- file ="${module.lwjgl}/@{name}/src/main/resources/module-info.java" -- todir="${module.lwjgl}/@{name}/src/generated/java/META-INF/versions/9" -- quiet="true" -- if:set="jdk9" -- /> -- </quiet> -- <jar destfile="${release}/${module}/${module}-sources.jar" level="9"> -- <fileset dir="${module.lwjgl}/@{name}/src/main/java" includes="**" if:set="hasMain"/> -- <fileset dir="${module.lwjgl}/@{name}/src/generated/java" includes="**"/> -- </jar> -- <quiet> -- <delete dir="${module.lwjgl}/@{name}/src/generated/java/META-INF" quiet="true"/> -- </quiet> -- - <!-- Copy license --> - <quiet> - <copy todir="${release}/${module}"> diff --git a/games/lwjgl3/pkg-plist b/games/lwjgl3/pkg-plist index ab7c4f1..62f0f56 100644 --- a/games/lwjgl3/pkg-plist +++ b/games/lwjgl3/pkg-plist @@ -39,52 +39,73 @@ lib/lwjgl3/liblwjgl_yoga.so %%JAVAJARDIR%%/lwjgl3/lwjgl-jawt.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-jemalloc.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-libdivide-natives-freebsd.jar +%%JAVAJARDIR%%/lwjgl3/lwjgl-libdivide-natives-linux.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-libdivide.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-llvm-natives-freebsd.jar +%%JAVAJARDIR%%/lwjgl3/lwjgl-llvm-natives-linux.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-llvm.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-lmdb.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-lz4-natives-freebsd.jar +%%JAVAJARDIR%%/lwjgl3/lwjgl-lz4-natives-linux.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-lz4.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-meow-natives-freebsd.jar +%%JAVAJARDIR%%/lwjgl3/lwjgl-meow-natives-linux.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-meow.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-nanovg-natives-freebsd.jar +%%JAVAJARDIR%%/lwjgl3/lwjgl-nanovg-natives-linux.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-nanovg.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-natives-freebsd.jar +%%JAVAJARDIR%%/lwjgl3/lwjgl-natives-linux.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-nfd-natives-freebsd.jar +%%JAVAJARDIR%%/lwjgl3/lwjgl-nfd-natives-linux.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-nfd.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-nuklear-natives-freebsd.jar +%%JAVAJARDIR%%/lwjgl3/lwjgl-nuklear-natives-linux.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-nuklear.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-odbc.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-openal.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-opencl.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-opengl-natives-freebsd.jar +%%JAVAJARDIR%%/lwjgl3/lwjgl-opengl-natives-linux.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-opengl.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-opengles-natives-freebsd.jar +%%JAVAJARDIR%%/lwjgl3/lwjgl-opengles-natives-linux.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-opengles.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-openvr-natives-freebsd.jar +%%JAVAJARDIR%%/lwjgl3/lwjgl-openvr-natives-linux.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-openvr.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-opus.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-par-natives-freebsd.jar +%%JAVAJARDIR%%/lwjgl3/lwjgl-par-natives-linux.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-par.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-remotery-natives-freebsd.jar +%%JAVAJARDIR%%/lwjgl3/lwjgl-remotery-natives-linux.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-remotery.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-rpmalloc-natives-freebsd.jar +%%JAVAJARDIR%%/lwjgl3/lwjgl-rpmalloc-natives-linux.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-rpmalloc.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-sse-natives-freebsd.jar +%%JAVAJARDIR%%/lwjgl3/lwjgl-sse-natives-linux.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-sse.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-stb-natives-freebsd.jar +%%JAVAJARDIR%%/lwjgl3/lwjgl-stb-natives-linux.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-stb.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-tinyexr-natives-freebsd.jar +%%JAVAJARDIR%%/lwjgl3/lwjgl-tinyexr-natives-linux.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-tinyexr.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-tinyfd-natives-freebsd.jar +%%JAVAJARDIR%%/lwjgl3/lwjgl-tinyfd-natives-linux.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-tinyfd.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-tootle.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-vma-natives-freebsd.jar +%%JAVAJARDIR%%/lwjgl3/lwjgl-vma-natives-linux.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-vma.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-vulkan.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-xxhash-natives-freebsd.jar +%%JAVAJARDIR%%/lwjgl3/lwjgl-xxhash-natives-linux.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-xxhash.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-yoga-natives-freebsd.jar +%%JAVAJARDIR%%/lwjgl3/lwjgl-yoga-natives-linux.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-yoga.jar %%JAVAJARDIR%%/lwjgl3/lwjgl-zstd.jar %%JAVAJARDIR%%/lwjgl3/lwjgl.jar diff --git a/games/multimc/Makefile b/games/multimc/Makefile index 5245a7c..e05c5b6 100644 --- a/games/multimc/Makefile +++ b/games/multimc/Makefile @@ -32,5 +32,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/application/package/linux/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svg ${INSTALL_DATA} ${WRKSRC}/application/resources/multimc/scalable/multimc.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svg + ${INSTALL_SCRIPT} ${FILESDIR}/multimc-minecraft-runtime ${STAGEDIR}${PREFIX}/bin/ .include <bsd.port.mk> diff --git a/games/multimc/files/multimc-minecraft-runtime b/games/multimc/files/multimc-minecraft-runtime new file mode 100755 index 0000000..99057a3 --- /dev/null +++ b/games/multimc/files/multimc-minecraft-runtime @@ -0,0 +1,61 @@ +#!/bin/sh + +LWJGL_JLP_OVRD="/usr/local/lib/lwjgl3:/usr/local/lib:/usr/lib" + +LWJGL_OVRD="/usr/local/share/java/classes/lwjgl3/lwjgl.jar" +LWJGL_OGL_OVRD="/usr/local/share/java/classes/lwjgl3/lwjgl-opengl.jar" +LWJGL_OAL_OVRD="/usr/local/share/java/classes/lwjgl3/lwjgl-openal.jar" +LWJGL_GLFW_OVRD="/usr/local/share/java/classes/lwjgl3/lwjgl-glfw.jar" +LWJGL_STB_OVRD="/usr/local/share/java/classes/lwjgl3/lwjgl-stb.jar" +LWJGL_JEM_OVRD="/usr/local/share/java/classes/lwjgl3/lwjgl-jemalloc.jar" + +# Use openjdk16 for 1.17 support +export JAVA_HOME=/usr/local/openjdk16 + +build_classpath() { + local IFS=":" + for p in ${1}; do + case "${p}" in + *lwjgl-opengl*) + cp="${cp}:${LWJGL_OGL_OVRD}" + ;; + *lwjgl-openal*) + cp="${cp}:${LWJGL_OAL_OVRD}" + ;; + *lwjgl-glfw*) + cp="${cp}:${LWJGL_GLFW_OVRD}" + ;; + *lwjgl-stb*) + cp="${cp}:${LWJGL_STB_OVRD}" + ;; + *lwjgl-jemalloc*) + cp="${cp}:${LWJGL_JEM_OVRD}" + ;; + *lwjgl*) + cp="${cp}:${LWJGL_OVRD}" + ;; + *) + cp="${cp}:${p}" + ;; + esac + done + cp=${cp#?} +} + +for var in "${@}" +do + case "${var}" in + -Djava.library*) + args="${args} -Djava.library.path=${LWJGL_JLP_OVRD}" + ;; + *lwjgl-opengl*) + build_classpath "${var}" + args="${args} ${cp}" + ;; + *) + args="${args} ${var}" + ;; + esac +done + +${JAVA_HOME}/bin/java ${args} diff --git a/games/multimc/files/patch-api_logic_java_JavaUtils.cpp b/games/multimc/files/patch-api_logic_java_JavaUtils.cpp index 56adb9c..4bad181 100644 --- a/games/multimc/files/patch-api_logic_java_JavaUtils.cpp +++ b/games/multimc/files/patch-api_logic_java_JavaUtils.cpp @@ -32,7 +32,7 @@ #if defined(Q_OS_WIN32) javaVersion->path = "javaw"; +#elif defined(Q_OS_FREEBSD) -+ javaVersion->path = "minecraft-runtime"; ++ javaVersion->path = "multimc-minecraft-runtime"; #else javaVersion->path = "java"; #endif |