-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Trevor Harmon wrote:
> Error: Files with names less specifically versioned than ones in public
> Shlibs entries do not belong in this package
> Offending file: /sw/lib/libjogl.jnilib
For jnilibs, the best way to handle them is to build them as bundles,
since they're dynamically loaded into the JVM.
It looks like changing the build.xml to use "plugin" instead of "shared"
for the cc task will Do The Right Thing.
Of course, once you do that, you don't need an shlibs anymore since it's
an unversioned plugin, and you can go back to basically 1.1.1-1's info
file. ;)
Attached is an updated info file and patch.
- --
Benjamin Reed a.k.a. Ranger Rick
Fink, KDE, and Mac OS X development
Blog: http://www.raccoonfink.com/
Music: http://music.raccoonfink.com/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFI/z9RUu+jZtP2Zf4RAr4WAJ4ryUtjt7JGvAFE/rCMytVJS33SnACfe3Tu
PAs4ECOFNnKXTux7vNgfBHo=
=2jy5
-----END PGP SIGNATURE-----
Package: jogl
Version: 1.1.1
Revision: 2
Type: java
Source: mirror:sourceforge:fink/%n-%v-src.zip
Source-MD5: a5d6b630a17b41227ab41506c826277b
SourceDirectory: %n
# ant-optional is required for the Antlr task
BuildDepends: ant-optional, antlr (>= 2.7.5)
Depends: system-java
PatchScript: sed -e 's|@PREFIX@|%p|g' -e 's|@PACKAGE@|%n|g' < %a/%n.patch |
patch -p1
CompileScript: <<
#!/bin/sh -ex
unset CLASSPATH
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
<<
InstallScript: <<
#!/bin/sh -ex
# 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
<<
PostInstScript: ln -s %p/lib/lib%n.jnilib /Library/Java/Extensions
PostRmScript: rm -f /Library/Java/Extensions/lib%n.jnilib
JarFiles: build/jogl.jar
Homepage: http://jogl.dev.java.net/
Maintainer: Trevor Harmon <[EMAIL PROTECTED]>
Description: OpenGL bindings for Java
DescDetail: <<
The JOGL Project hosts a reference implementation of the Java bindings for
OpenGL API, and is designed to provide hardware-supported 3D graphics to
applications written in Java. It is part of a suite of open-source technologies
initiated by the Game Technology Group at Sun Microsystems. JOGL provides full
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.
<<
License: BSD
diff -Nurd jogl/make/build.xml jogl-patched/make/build.xml
--- jogl/make/build.xml 2005-05-13 16:35:36.000000000 -0400
+++ jogl-patched/make/build.xml 2008-10-22 10:44:14.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
- exist. -->
- <property name="user.properties.file"
value="${user.home}/jogl.properties" />
+ <property name="user.properties.file" value="jogl.properties" />
<property file="${user.properties.file}" />
<echo message="Loaded ${user.properties.file}." />
@@ -83,7 +83,7 @@
<!-- Load the user specified properties file that defines various host
- specific paths. The user will be notified if this is does not
- exist. -->
- <property name="user.properties.file"
value="${user.home}/jogl.properties" />
+ <property name="user.properties.file" value="jogl.properties" />
<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/make/jogl.properties jogl-patched/make/jogl.properties
--- jogl/make/jogl.properties 2005-06-15 18:46:40.000000000 -0400
+++ jogl-patched/make/jogl.properties 2008-10-22 10:44:56.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/src/net/java/games/gluegen/StructLayout.java
jogl-patched/src/net/java/games/gluegen/StructLayout.java
--- jogl/src/net/java/games/gluegen/StructLayout.java 2005-05-27
14:24:16.000000000 -0400
+++ jogl-patched/src/net/java/games/gluegen/StructLayout.java 2008-10-22
10:44:56.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
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-devel mailing list
Fink-devel@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.devel
