Merge pull request #4508 from gohai/arm-updates

ARM Updates
This commit is contained in:
Ben Fry
2016-06-02 16:33:33 -04:00
2 changed files with 10 additions and 9 deletions
-9
View File
@@ -59,15 +59,6 @@
<!-- Switching to 8 because updates for 7 ended April 2015 -->
<property name="jdk.version" value="8" />
<!-- temporarily work around performance regression on ARM -->
<condition property="jdk.update" value="77">
<equals arg1="${linux-arm32}" arg2="linux-arm32" />
</condition>
<condition property="jdk.build" value="3">
<equals arg1="${linux-arm32}" arg2="linux-arm32" />
</condition>
<property name="jdk.update" value="92" />
<property name="jdk.build" value="14" />
@@ -133,6 +133,16 @@ public class PSurfaceJOGL implements PSurface {
public void initFrame(PApplet sketch) {
this.sketch = sketch;
initIcons();
// https://jogamp.org/bugzilla/show_bug.cgi?id=1290
File mesaLib = new File("/usr/lib/arm-linux-gnueabihf/libGLESv2.so.2");
if (mesaLib.exists()) {
System.out.println("\nIf you are receiving an error regarding the undefined symbol bcm_host_init, " +
"make sure you have the package libgles2-mesa deinstalled. This can be done " +
"by executing \"sudo aptitude remove libgles2-mesa\" in the terminal, and is " +
"a known issue with the Raspbian distribution.\n");
}
initDisplay();
initGL();
initWindow();