Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14069
Modified Files:
jogl.info jogl.patch
Log Message:
Updated by maintainer.
https://sourceforge.net/tracker/index.php?func=detail&aid=2189825&group_id=17203&atid=414256
Tested on 10.5.5/Intel
Index: jogl.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/jogl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jogl.patch 20 Jan 2006 20:21:18 -0000 1.1
+++ jogl.patch 7 Dec 2008 18:15:22 -0000 1.2
@@ -1,16 +1,6 @@
---- jogl/make/jogl.properties 2005-06-15 18:46:40.000000000 -0700
-+++ jogl-patched/make/jogl.properties 2005-09-30 14:06:22.000000000 -0700
-@@ -20,7 +20,7 @@
- # Linux
- # antlr.jar=/home/kbr/antlr-2.7.2/antlr.jar
- # Mac OS X
--# antlr.jar=/Users/kbr/antlr-2.7.2/antlr.jar
[EMAIL PROTECTED]@/share/java/antlr/antlr.jar
- # Solaris
- # antlr.jar=/export/kbr/ANTLR/antlr-2.7.2/antlr.jar
-
---- jogl/make/build.xml 2005-05-13 16:35:36.000000000 -0700
-+++ jogl-patched/make/build.xml 2005-09-30 14:05:27.000000000 -0700
+diff -Nurd jogl.old/make/build.xml jogl/make/build.xml
+--- jogl.old/make/build.xml 2005-05-13 16:35:36.000000000 -0400
++++ jogl/make/build.xml 2008-10-23 12:11:50.000000000 -0400
@@ -73,7 +73,7 @@
<!-- Load the user specified properties file that defines various host
- specific paths. The user will be notified if this is does not
@@ -29,3 +19,55 @@
<property file="${user.properties.file}" />
<echo message="Loaded ${user.properties.file}." />
+@@ -802,7 +802,7 @@
+
+ <condition property="c.compiler.use-debug"><istrue
value="${c.compiler.debug}"/></condition>
+
+- <cc outtype="shared"
++ <cc outtype="plugin"
+ objdir="${obj.jogl}"
+ outfile="${obj}/${output.lib.name}"
+ optimize="${c.compiler.optimise}"
+@@ -843,14 +843,14 @@
+
+ <target name="c.rename.jogl.lib.macosx" if="os.isMacOSX">
+ <!-- FIXME: this is a hack; the cpptask should have an option to change
the
+- suffix or at least understand the override from dylib to jnilib -->
+- <move file="${obj}/libjogl.dylib" tofile="${obj}/libjogl.jnilib" />
++ suffix or at least understand the override from bundle to jnilib
-->
++ <move file="${obj}/libjogl.bundle" tofile="${obj}/libjogl.jnilib" />
+ </target>
+
+ <target name="c.rename.jogl_cg.lib.macosx" if="os.isMacOSX">
+ <!-- FIXME: this is a hack; the cpptask should have an option to change
the
+- suffix or at least understand the override from dylib to jnilib -->
+- <move file="${obj}/libjogl_cg.dylib" tofile="${obj}/libjogl_cg.jnilib"
/>
++ suffix or at least understand the override from bundle to jnilib
-->
++ <move file="${obj}/libjogl_cg.bundle" tofile="${obj}/libjogl_cg.jnilib"
/>
+ </target>
+
+ <target name="c.build.jogl">
+diff -Nurd jogl.old/make/jogl.properties jogl/make/jogl.properties
+--- jogl.old/make/jogl.properties 2005-06-15 18:46:40.000000000 -0400
++++ jogl/make/jogl.properties 2008-10-23 12:11:50.000000000 -0400
+@@ -20,7 +20,7 @@
+ # Linux
+ # antlr.jar=/home/kbr/antlr-2.7.2/antlr.jar
+ # Mac OS X
+-# antlr.jar=/Users/kbr/antlr-2.7.2/antlr.jar
[EMAIL PROTECTED]@/share/java/antlr/antlr.jar
+ # Solaris
+ # antlr.jar=/export/kbr/ANTLR/antlr-2.7.2/antlr.jar
+
+diff -Nurd jogl.old/src/net/java/games/gluegen/StructLayout.java
jogl/src/net/java/games/gluegen/StructLayout.java
+--- jogl.old/src/net/java/games/gluegen/StructLayout.java 2005-05-27
14:24:16.000000000 -0400
++++ jogl/src/net/java/games/gluegen/StructLayout.java 2008-10-23
12:12:04.000000000 -0400
+@@ -128,6 +128,8 @@
+ (os.startsWith("sunos") && cpu.equals("sparc")) ||
+ (os.startsWith("sunos") && cpu.equals("x86")) ||
+ (os.startsWith("mac os") && cpu.equals("ppc")) ||
++ (os.startsWith("mac os") && cpu.equals("i386")) ||
++ (os.startsWith("mac os") && cpu.equals("x86_64")) ||
+ (os.startsWith("freebsd") && cpu.equals("i386"))
+ ) {
+ // FIXME: make struct alignment configurable? May need to change
Index: jogl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/jogl.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jogl.info 20 Jan 2006 20:21:18 -0000 1.1
+++ jogl.info 7 Dec 2008 18:15:22 -0000 1.2
@@ -1,6 +1,6 @@
Package: jogl
Version: 1.1.1
-Revision: 1
+Revision: 2
Type: java
Source: mirror:sourceforge:fink/%n-%v-src.zip
Source-MD5: a5d6b630a17b41227ab41506c826277b
@@ -10,25 +10,26 @@
Depends: system-java
PatchScript: sed -e 's|@PREFIX@|%p|g' -e 's|@PACKAGE@|%n|g' < %a/%n.patch |
patch -p1
CompileScript: <<
- #!/bin/sh -ex
- cd make
- ant macosx
- ant javadoc
-
- # The following line, which generates additional JavaDoc files, has been
disabled
- # because it takes way too friggin' long.
- # ant javadoc.dev.macosx
+ #!/bin/sh -ex
+ unset CLASSPATH # JOGL doesn't like finding itself on the CLASSPATH
+ cd make
+ ant macosx
+ ant javadoc
+
+ # The following line, which generates additional JavaDoc files, has been
disabled
+ # because it takes way too long.
+ # ant javadoc.dev.macosx
<<
InstallScript: <<
- #!/bin/sh -ex
+ #!/bin/sh -ex
- # Copy the JNI library
- mkdir -p %i/lib
- cp build/obj/libjogl.jnilib %i/lib
+ # Copy the JNI library
+ mkdir -p %i/lib
+ cp build/obj/libjogl.jnilib %i/lib
- # Copy the documentation
- mkdir -p %i/share/doc/%n
- cp -R doc/* %i/share/doc/%n
+ # Copy the documentation
+ mkdir -p %i/share/doc/%n
+ cp -R doc/* %i/share/doc/%n
<<
PostInstScript: ln -s %p/lib/lib%n.jnilib /Library/Java/Extensions
PostRmScript: rm -f /Library/Java/Extensions/lib%n.jnilib
@@ -44,4 +45,9 @@
access to the APIs in the OpenGL 2.0 specification as well as nearly all vendor
extensions, and integrates with the AWT and Swing widget sets.
<<
+DescPackaging: <<
+JOGL 1.1.1 does not support Mac OS X on Intel, only PowerPC. The current patch
+modifies StructLayout.java to fix this problem. When JOGL 1.1.2 is released,
+this modification will no longer be necessary and can be removed.
+<<
License: BSD
------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
