diff options
Diffstat (limited to 'graphics/jogamp-jogl/files/patch-gluegen2')
| -rw-r--r-- | graphics/jogamp-jogl/files/patch-gluegen2 | 39 |
1 files changed, 29 insertions, 10 deletions
diff --git a/graphics/jogamp-jogl/files/patch-gluegen2 b/graphics/jogamp-jogl/files/patch-gluegen2 index b67615bfde3c..5b8641086507 100644 --- a/graphics/jogamp-jogl/files/patch-gluegen2 +++ b/graphics/jogamp-jogl/files/patch-gluegen2 @@ -1,6 +1,25 @@ ---- gluegen/make/build.xml.orig 2014-10-10 13:20:51 UTC +--- gluegen/make/build.xml.orig 2015-10-09 04:18:28 UTC +++ gluegen/make/build.xml -@@ -408,7 +408,7 @@ +@@ -375,10 +375,17 @@ + <property name="c.src.dir.os" value="unix" /> + </target> + +- <target name="declare.freebsd" depends="declare.freebsd.x86,declare.freebsd.amd64" if="isFreeBSD" > ++ <target name="declare.freebsd.ppc" if="isFreeBSDPpc"> ++ <echo message="FreeBSDPpc" /> ++ <property name="compiler.cfg.id" value="compiler.cfg.freebsd" /> ++ <property name="linker.cfg.id" value="linker.cfg.freebsd.ppc" /> + <property name="c.src.dir.os" value="unix" /> + </target> + ++ <target name="declare.freebsd" depends="declare.freebsd.x86,declare.freebsd.amd64,declare.freebsd.ppc" if="isFreeBSD" > ++ <property name="c.src.dir.os" value="unix" /> ++ </target> ++ + <target name="declare.hpux" if="isHPUX"> + <echo message="HP-UX" /> + <property name="compiler.cfg.id" value="compiler.cfg.hpux" /> +@@ -408,7 +415,7 @@ <property name="c.compiler.src.files.common" value="src/native/common/*.c" /> <property name="c.compiler.src.files.os" value="src/native/${c.src.dir.os}/*.c" /> @@ -9,7 +28,7 @@ <condition property="output.lib.name.os" value="lib${output.lib.name}.so"><isset property="isUnix"/></condition> <condition property="output.lib.name.os" value="${output.lib.name}.dll"><isset property="isWindows"/></condition> <condition property="output.lib.name.os" value="lib${output.lib.name}.jnilib"><isset property="isOSX"/></condition> -@@ -605,7 +605,7 @@ +@@ -605,7 +612,7 @@ <srcfiles dir= "${src.jcpp}" includes="**"/> <srcfiles dir= "${c.grammar}" includes="*.g"/> <srcfiles dir= "${j.grammar}" includes="*.g"/> @@ -18,7 +37,7 @@ </uptodate> <uptodate property="gluegen.build.skip.java2"> <srcfiles dir= "." includes="*.xml"/> -@@ -613,7 +613,7 @@ +@@ -613,7 +620,7 @@ <srcfiles dir= "${src.jcpp}" includes="**"/> <srcfiles dir= "${c.grammar}" includes="*.g"/> <srcfiles dir= "${j.grammar}" includes="*.g"/> @@ -27,7 +46,7 @@ </uptodate> <condition property="gluegen.build.skip.java" value="true"> <or> -@@ -753,7 +753,7 @@ +@@ -763,7 +770,7 @@ </copy> <!-- Build gluegen.jar. --> @@ -36,7 +55,7 @@ <service type="javax.annotation.processing.Processor"> <provider classname="com.jogamp.gluegen.structgen.CStructAnnotationProcessor"/> </service> -@@ -806,7 +806,7 @@ +@@ -842,7 +849,7 @@ </copy> <!-- Build gluegen-rt.jar. --> @@ -45,9 +64,9 @@ <fileset dir="${classes}"> <include name="com/jogamp/gluegen/runtime/*.class" /> <include name="com/jogamp/common/**" /> ---- gluegen/src/java/com/jogamp/common/os/Platform.java.orig 2014-10-10 13:20:51 UTC +--- gluegen/src/java/com/jogamp/common/os/Platform.java.orig 2015-10-09 04:18:28 UTC +++ gluegen/src/java/com/jogamp/common/os/Platform.java -@@ -146,7 +146,7 @@ public class Platform extends PlatformPr +@@ -256,7 +256,7 @@ public class Platform extends PlatformPropsImpl { private static final String useTempJarCachePropName = "jogamp.gluegen.UseTempJarCache"; /** fixed basename of JAR file and native library */ @@ -56,9 +75,9 @@ // // static initialization order: ---- gluegen/src/junit/com/jogamp/common/util/TestTempJarCache.java.orig 2014-10-10 13:20:51 UTC +--- gluegen/src/junit/com/jogamp/common/util/TestTempJarCache.java.orig 2015-10-09 04:18:28 UTC +++ gluegen/src/junit/com/jogamp/common/util/TestTempJarCache.java -@@ -196,8 +196,8 @@ public class TestTempJarCache extends SingletonJunitCase { +@@ -196,8 +196,8 @@ public class TestTempJarCache extends SingletonJunitCa @Test public void testTempJarCache02AddNativeLibs() throws IOException, IllegalArgumentException, URISyntaxException { if(AndroidVersion.isAvailable) { System.err.println("n/a on Android"); return; } |