Cherry pick the changes from octeep to make recent versions of Minecraft

work on OpenBSD
kmosiejczuk · Jan 21, 2021 · 01a8cff · 01a8cff
1 parent 4606f2a
commit 01a8cff
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 45 deletions.
diff --git a/build.xml b/build.xml
@@ -1105,50 +1105,7 @@
 
             <!-- Bundle javadoc -->
             <!-- This is slow, use -Djavadoc.skip=true for fast local builds -->
-            <mkdir dir="${release}/${module}/javadoc" unless:set="javadoc.skip"/>
-            <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"
-                unless:set="javadoc.skip"
-            >
-                <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/org/lwjgl" includes="**" if:set="hasMain.javadoc"/>
-                <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=&#10;"/>
-                <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" unless:set="javadoc.skip"/>
-
-            <java classname="org.lwjgl.system.JavadocPostProcess" failonerror="true" unless:set="javadoc.skip">
-                <classpath path="${bin.generator}"/>
-
-                <arg value="${release}/${module}/javadoc"/>
-            </java>
-            <zip destfile="${release}/${module}/${module}-javadoc.jar" basedir="${release}/${module}/javadoc" includes="**" level="9" unless:set="javadoc.skip"/>
-            <delete dir="${release}/${module}/javadoc" unless:set="javadoc.skip"/>
+            <!-- Javadoc has been removed because it is slow and useless -->
 
             <!-- Bundle source -->
             <quiet>

diff --git a/modules/lwjgl/core/src/main/java/org/lwjgl/system/APIUtil.java b/modules/lwjgl/core/src/main/java/org/lwjgl/system/APIUtil.java
@@ -124,6 +124,8 @@ public static SharedLibrary apiCreateLibrary(String name) {
                 return new LinuxLibrary(name);
             case MACOSX:
                 return MacOSXLibrary.create(name);
+            case OPENBSD:
+                return new OpenBSDLibrary(name);
             default:
                 throw new IllegalStateException();
         }

diff --git a/modules/lwjgl/openal/src/main/java/org/lwjgl/openal/ALC.java b/modules/lwjgl/openal/src/main/java/org/lwjgl/openal/ALC.java
@@ -56,6 +56,7 @@ public static void create() {
         String libName;
         switch (Platform.get()) {
             case LINUX:
+            case OPENBSD:
             case MACOSX:
                 libName = "openal";
                 break;
@@ -228,4 +229,4 @@ public static ALCCapabilities createCapabilities(long device) {
         return new ALCCapabilities(functionProvider, device, supportedExtensions);
     }
 
-}
+}
diff --git a/modules/lwjgl/opengl/src/main/java/org/lwjgl/opengl/GL.java b/modules/lwjgl/opengl/src/main/java/org/lwjgl/opengl/GL.java
@@ -7,6 +7,7 @@
 import org.lwjgl.system.*;
 import org.lwjgl.system.macosx.*;
 import org.lwjgl.system.windows.*;
+import org.lwjgl.system.openbsd.*;
 
 import javax.annotation.*;
 import java.nio.*;
@@ -107,6 +108,9 @@ public static void create() {
             case WINDOWS:
                 GL = Library.loadNative(GL.class, "org.lwjgl.opengl", Configuration.OPENGL_LIBRARY_NAME, "opengl32");
                 break;
+            case OPENBSD:
+                GL = Library.loadNative(GL.class, "org.lwjgl.opengl", Configuration.OPENGL_LIBRARY_NAME, "libGL.so.17.1", "libGL.so");
+                break;
             default:
                 throw new IllegalStateException();
         }
@@ -158,6 +162,7 @@ long getExtensionAddress(long name) {
                         }
                     };
                     break;
+                case OPENBSD:
                 case LINUX:
                     functionProvider = new SharedLibraryGL(OPENGL) {
                         private final long glXGetProcAddress;