[pkg-java] r15155 - in trunk/libgluegen2-java/debian: . patches
Sylvestre Ledru
sylvestre at alioth.debian.org
Thu Oct 6 13:36:13 UTC 2011
Author: sylvestre
Date: 2011-10-06 13:36:13 +0000 (Thu, 06 Oct 2011)
New Revision: 15155
Added:
trunk/libgluegen2-java/debian/patches/disable-test-zip-archive.diff
trunk/libgluegen2-java/debian/patches/disable_android.diff
trunk/libgluegen2-java/debian/patches/fix_issues.diff
Removed:
trunk/libgluegen2-java/debian/patches/alpha-ia64.diff
trunk/libgluegen2-java/debian/patches/disablesSomeOptions.diff
trunk/libgluegen2-java/debian/patches/macosx.diff
trunk/libgluegen2-java/debian/patches/moreFeedback.diff
Modified:
trunk/libgluegen2-java/debian/changelog
trunk/libgluegen2-java/debian/orig-tar.sh
trunk/libgluegen2-java/debian/patches/jarPath.diff
trunk/libgluegen2-java/debian/patches/other-archs.diff
trunk/libgluegen2-java/debian/patches/renamedLibrary.diff
trunk/libgluegen2-java/debian/patches/series
trunk/libgluegen2-java/debian/patches/structLayoutLinux.diff
Log:
gluegen2 (2.0-rc3-1) unstable; urgency=low
* New upstream release
Modified: trunk/libgluegen2-java/debian/changelog
===================================================================
--- trunk/libgluegen2-java/debian/changelog 2011-10-05 22:30:12 UTC (rev 15154)
+++ trunk/libgluegen2-java/debian/changelog 2011-10-06 13:36:13 UTC (rev 15155)
@@ -1,3 +1,9 @@
+gluegen2 (2.0-rc3-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Thu, 06 Oct 2011 13:24:11 +0200
+
gluegen2 (2.0-rc2-7) unstable; urgency=low
* Fix the runtime detection of the arch + 32/64 bits. Was causing FTBFS of
Modified: trunk/libgluegen2-java/debian/orig-tar.sh
===================================================================
--- trunk/libgluegen2-java/debian/orig-tar.sh 2011-10-05 22:30:12 UTC (rev 15154)
+++ trunk/libgluegen2-java/debian/orig-tar.sh 2011-10-06 13:36:13 UTC (rev 15155)
@@ -1,14 +1,19 @@
#!/bin/sh -e
+VERSION="2.0-rc3"
-# called by uscan with '--upstream-version' <version> <file>
-DIR=jogl-$2
-TAR=../libjogl-java_$2.orig.tar.gz
+DIR=gluegen-$VERSION
+TAR=gluegen2_$VERSION.orig.tar.gz
# clean up the upstream tarball
-unzip $3 -d $DIR
-tar -c -z -f $TAR $DIR
-rm -rf $DIR $3
+git clone git://jogamp.org/srv/scm/gluegen.git gluegen-$VERSION
+cd $DIR
+git checkout $VERSION
+rm -rf .git .gitignore .htaccess make/lib/
+cd ..
+tar zcvf $TAR $DIR
+rm -rf $DIR
+
# move to directory 'tarballs'
if [ -r .svn/deb-layout ]; then
. .svn/deb-layout
Deleted: trunk/libgluegen2-java/debian/patches/alpha-ia64.diff
===================================================================
--- trunk/libgluegen2-java/debian/patches/alpha-ia64.diff 2011-10-05 22:30:12 UTC (rev 15154)
+++ trunk/libgluegen2-java/debian/patches/alpha-ia64.diff 2011-10-06 13:36:13 UTC (rev 15155)
@@ -1,87 +0,0 @@
-diff -ur plop/gluegen-v2.0-rc2/make//build.xml gluegen2-2.0-rc2/make//build.xml
---- plop/gluegen-v2.0-rc2/make//build.xml 2011-03-04 14:24:34.000000000 +0100
-+++ gluegen2-2.0-rc2/make//build.xml 2011-03-13 22:46:10.000000000 +0100
-@@ -272,7 +272,13 @@
- <property name="linker.cfg.id" value="linker.cfg.linux" />
- </target>
-
-- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64" if="isLinux" >
-+ <target name="declare.linux.alpha" if="isLinuxAlpha">
-+ <echo message="Linux.alpha" />
-+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
-+ <property name="linker.cfg.id" value="linker.cfg.linux" />
-+ </target>
-+
-+ <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.alpha" if="isLinux" >
- <property name="c.src.dir.os" value="unix" />
- <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
- </target>
---- plop/gluegen-v2.0-rc2/make//gluegen-cpptasks-base.xml 2011-03-04 14:24:34.000000000 +0100
-+++ gluegen2-2.0-rc2/make//gluegen-cpptasks-base.xml 2011-03-13 22:45:46.000000000 +0100
-@@ -24,6 +24,7 @@
- - isLinuxAMD64
- - isLinuxIA64
- - isLinuxX86
-+ - isLinuxAlpha
- - isOSX
- - isOSXPPC
- - isSolaris
-@@ -236,6 +243,15 @@
- <condition property="isIA64">
- <os arch="IA64" />
- </condition>
-+ <condition property="isLinuxAlpha">
-+ <and>
-+ <istrue value="${isLinux}" />
-+ <os arch="alpha" />
-+ </and>
-+ </condition>
-+ <condition property="alpha">
-+ <os arch="alpha" />
-+ </condition>
- <condition property="isSolaris32Bit">
- <and>
- <istrue value="${isSolaris}" />
-@@ -305,6 +321,7 @@
- <echo message="LinuxAMD64=${isLinuxAMD64}" />
- <echo message="LinuxIA64=${isLinuxIA64}" />
- <echo message="LinuxX86=${isLinuxX86}" />
-+ <echo message="LinuxAlpha=${isLinuxAlpha}" />
- <echo message="OS X=${isOSX}" />
- <echo message="OS X PPC=${use.macosppc}" />
- <echo message="OS X x32=${use.macosx32}" />
-@@ -346,7 +363,11 @@
- <property name="os.and.arch" value="linux-i586" />
- </target>
-
-- <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86" unless="gluegen.cpptasks.detected.os.2" />
-+ <target name="gluegen.cpptasks.detect.os.linux.alpha" unless="gluegen.cpptasks.detected.os.2" if="isLinuxAlpha">
-+ <property name="os.and.arch" value="linux-alpha" />
-+ </target>
-+
-+ <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.alpha" unless="gluegen.cpptasks.detected.os.2" />
-
- <target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX">
- <property name="native.library.suffix" value="*lib" />
-@@ -881,12 +902,19 @@
-
- <target name="gluegen.cpptasks.declare.compiler.linux.ia64" if="isLinuxIA64">
- <echo message="Linux.IA64" />
-- <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
-+ <property name="compiler.cfg.id.base" value="compiler.cfg.linux.amd64" />
- <property name="linker.cfg.id.base" value="linker.cfg.linux" />
- <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ia64" />
- </target>
-
-- <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64" if="isLinux">
-+ <target name="gluegen.cpptasks.declare.compiler.linux.alpha" if="isLinuxAlpha">
-+ <echo message="Linux.Alpha" />
-+ <property name="compiler.cfg.id.base" value="compiler.cfg.linux.amd64" />
-+ <property name="linker.cfg.id.base" value="linker.cfg.linux.amd64" />
-+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/alpha" />
-+ </target>
-+
-+ <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.alpha" if="isLinux">
- <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
- </target>
-
Added: trunk/libgluegen2-java/debian/patches/disable-test-zip-archive.diff
===================================================================
--- trunk/libgluegen2-java/debian/patches/disable-test-zip-archive.diff (rev 0)
+++ trunk/libgluegen2-java/debian/patches/disable-test-zip-archive.diff 2011-10-06 13:36:13 UTC (rev 15155)
@@ -0,0 +1,13 @@
+Index: gluegen2-2.0-rc3/make/build-test.xml
+===================================================================
+--- gluegen2-2.0-rc3.orig/make/build-test.xml 2011-10-06 14:44:54.000000000 +0200
++++ gluegen2-2.0-rc3/make/build-test.xml 2011-10-06 14:45:05.000000000 +0200
+@@ -377,7 +377,7 @@
+ </target>
+
+ <target name="junit.run" depends="init,gluegen.cpptasks.detect.os,junit.run.settings,junit.run.local,junit.run.remote.ssh,junit.run.remote.adb">
+- <antcall target="test-zip-archive" inheritRefs="true" />
++<!-- <antcall target="test-zip-archive" inheritRefs="true" /> -->
+ </target>
+
+ <!--
Added: trunk/libgluegen2-java/debian/patches/disable_android.diff
===================================================================
--- trunk/libgluegen2-java/debian/patches/disable_android.diff (rev 0)
+++ trunk/libgluegen2-java/debian/patches/disable_android.diff 2011-10-06 13:36:13 UTC (rev 15155)
@@ -0,0 +1,109 @@
+Index: gluegen2-2.0-rc3/make/build.xml
+===================================================================
+--- gluegen2-2.0-rc3.orig/make/build.xml 2011-10-06 14:16:27.000000000 +0200
++++ gluegen2-2.0-rc3/make/build.xml 2011-10-06 14:29:49.000000000 +0200
+@@ -21,7 +21,7 @@
+
+ <import file="gluegen-cpptasks.xml" />
+ <import file="jogamp-archivetasks.xml" />
+- <import file="jogamp-androidtasks.xml" />
++<!-- <import file="jogamp-androidtasks.xml" /> -->
+ <import file="jogamp-env.xml" />
+
+ <condition property="rootrel.build" value="build">
+@@ -114,7 +114,7 @@
+ This requires the user-defined "antlr.jar" property. -->
+ <path id="gluegencompile.classpath">
+ <pathelement location="${antlr.jar}" />
+- <pathelement location="${android.jar}"/>
++<!-- <pathelement location="${android.jar}"/> -->
+ </path>
+
+ <!-- Create the classpath for using GlueGen. -->
+@@ -147,7 +147,7 @@
+ <!-- property name="javac.memorymax" value="128m" /--> <!-- I ran out of memory with these .. linux x86_64 6u14 -->
+ <property name="javac.memorymax" value="512m" />
+
+- <property name="gluegen.excludes.all" value="${gluegen.excludes.nsig}" />
++ <property name="gluegen.excludes.all" value="${gluegen.excludes.nsig} jogamp/common/os/android/**" />
+ <property name="gluegen-rt.classes" value="com/jogamp/gluegen/runtime/**"/>
+ <property name="jogamp.common.classes" value="com/jogamp/common/**"/>
+ </target>
+Index: gluegen2-2.0-rc3/src/java/com/jogamp/common/util/IOUtil.java
+===================================================================
+--- gluegen2-2.0-rc3.orig/src/java/com/jogamp/common/util/IOUtil.java 2011-10-06 14:38:04.000000000 +0200
++++ gluegen2-2.0-rc3/src/java/com/jogamp/common/util/IOUtil.java 2011-10-06 14:38:48.000000000 +0200
+@@ -42,9 +42,9 @@
+ import java.nio.ByteBuffer;
+
+ import jogamp.common.Debug;
+-import jogamp.common.os.android.StaticContext;
++//import jogamp.common.os.android.StaticContext;
+
+-import android.content.Context;
++//import android.content.Context;
+
+ import com.jogamp.common.nio.Buffers;
+ import com.jogamp.common.os.AndroidVersion;
+@@ -491,14 +491,14 @@
+ throws SecurityException
+ {
+ if(AndroidVersion.isAvailable) {
+- final Context ctx = StaticContext.getContext();
++/* final Context ctx = StaticContext.getContext();
+ if(null != ctx) {
+ final File tmpRoot = ctx.getDir("temp", Context.MODE_WORLD_READABLE);
+ if(DEBUG) {
+ System.err.println("IOUtil.getTempRoot(Android): temp dir: "+tmpRoot.getAbsolutePath());
+ }
+ return tmpRoot;
+- }
++ }*/
+ }
+ final String tmpRootName = System.getProperty("java.io.tmpdir");
+ final File tmpRoot = new File(tmpRootName);
+Index: gluegen2-2.0-rc3/src/java/com/jogamp/common/util/JogampVersion.java
+===================================================================
+--- gluegen2-2.0-rc3.orig/src/java/com/jogamp/common/util/JogampVersion.java 2011-10-06 14:37:11.000000000 +0200
++++ gluegen2-2.0-rc3/src/java/com/jogamp/common/util/JogampVersion.java 2011-10-06 14:37:43.000000000 +0200
+@@ -29,7 +29,7 @@
+ package com.jogamp.common.util;
+
+ import com.jogamp.common.GlueGenVersion;
+-import com.jogamp.common.os.AndroidVersion;
++//import com.jogamp.common.os.AndroidVersion;
+ import com.jogamp.common.os.Platform;
+
+ import java.util.Iterator;
+@@ -37,7 +37,7 @@
+ import java.util.jar.Attributes;
+ import java.util.jar.Manifest;
+
+-import jogamp.common.os.android.PackageInfoUtil;
++//import jogamp.common.os.android.PackageInfoUtil;
+
+ public class JogampVersion {
+
+@@ -50,7 +50,7 @@
+ private Attributes mainAttributes;
+ private Set/*<Attributes.Name>*/ mainAttributeNames;
+
+- private final String androidPackageVersionName;
++ private final String androidPackageVersionName = null;
+
+ protected JogampVersion(String packageName, Manifest mf) {
+ this.packageName = packageName;
+@@ -58,11 +58,11 @@
+ this.hash = this.mf.hashCode();
+ mainAttributes = this.mf.getMainAttributes();
+ mainAttributeNames = mainAttributes.keySet();
+- if(AndroidVersion.isAvailable) {
++/* if(AndroidVersion.isAvailable) {
+ androidPackageVersionName = PackageInfoUtil.getPackageInfoVersionName(packageName);
+ } else {
+ androidPackageVersionName = null;
+- }
++ }*/
+ }
+
+ @Override
Deleted: trunk/libgluegen2-java/debian/patches/disablesSomeOptions.diff
===================================================================
--- trunk/libgluegen2-java/debian/patches/disablesSomeOptions.diff 2011-10-05 22:30:12 UTC (rev 15154)
+++ trunk/libgluegen2-java/debian/patches/disablesSomeOptions.diff 2011-10-06 13:36:13 UTC (rev 15155)
@@ -1,27 +0,0 @@
-Index: gluegen-v2.0-rc2/make/build.xml
-===================================================================
---- gluegen-v2.0-rc2.orig/make/build.xml 2011-03-04 14:59:22.000000000 +0100
-+++ gluegen-v2.0-rc2/make/build.xml 2011-03-04 14:59:39.000000000 +0100
-@@ -663,11 +663,11 @@
- </target>
-
- <target name="junit.compile" depends="init">
-- <ant antfile="build-test.xml" target="junit.compile"/>
-+<!-- <ant antfile="build-test.xml" target="junit.compile"/>-->
- </target>
-
- <target name="junit.run" depends="junit.compile">
-- <ant antfile="build-test.xml" target="junit.run"/>
-+<!-- <ant antfile="build-test.xml" target="junit.run"/>-->
- </target>
-
- <target name="javadoc" depends="init">
-@@ -698,7 +698,7 @@
- <delete includeEmptyDirs="true" quiet="true" dir="${archive}" failonerror="false" />
- <mkdir dir="${archive}" />
- <copy file="${build}/artifact.properties" todir="${archive}"/>
-- <copy file="../LICENSE.txt" todir="${archive}" />
-+<!-- <copy file="../LICENSE.txt" todir="${archive}" />-->
- <mkdir dir="${archive}/jar" />
- <copy todir="${archive}/jar">
- <fileset dir="${build}" includes="gluegen*.jar"/>
Added: trunk/libgluegen2-java/debian/patches/fix_issues.diff
===================================================================
--- trunk/libgluegen2-java/debian/patches/fix_issues.diff (rev 0)
+++ trunk/libgluegen2-java/debian/patches/fix_issues.diff 2011-10-06 13:36:13 UTC (rev 15155)
@@ -0,0 +1,18 @@
+Index: gluegen2-2.0-rc3/make/gluegen-cpptasks-base.xml
+===================================================================
+--- gluegen2-2.0-rc3.orig/make/gluegen-cpptasks-base.xml 2011-10-06 14:11:59.000000000 +0200
++++ gluegen2-2.0-rc3/make/gluegen-cpptasks-base.xml 2011-10-06 14:12:58.000000000 +0200
+@@ -1136,6 +1136,13 @@
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/amd64" />
+ </target>
+
++ <target name="gluegen.cpptasks.declare.compiler.linux.alpha" if="isLinuxAlpha">
++ <echo message="Linux.alpha" />
++ <property name="compiler.cfg.id.base" value="compiler.cfg.linux.alpha" />
++ <property name="linker.cfg.id.base" value="linker.cfg.linux.alpha" />
++ <property name="java.lib.dir.platform" value="${env.TARGET_JAVA_LIBS}" />
++ </target>
++
+ <target name="gluegen.cpptasks.declare.compiler.linux.armv7" if="isLinuxARMv7">
+ <echo message="Linux.armv7" />
+ <property name="compiler.cfg.id.base" value="compiler.cfg.linux.armv7" />
Modified: trunk/libgluegen2-java/debian/patches/jarPath.diff
===================================================================
--- trunk/libgluegen2-java/debian/patches/jarPath.diff 2011-10-05 22:30:12 UTC (rev 15154)
+++ trunk/libgluegen2-java/debian/patches/jarPath.diff 2011-10-06 13:36:13 UTC (rev 15155)
@@ -1,15 +1,19 @@
-Index: gluegen.git/make/gluegen-properties.xml
+Index: gluegen2-2.0-rc3/make/gluegen-properties.xml
===================================================================
---- gluegen.git.orig/make/gluegen-properties.xml 2010-12-04 15:03:21.000000000 +0100
-+++ gluegen.git/make/gluegen-properties.xml 2010-12-04 15:06:40.000000000 +0100
-@@ -39,8 +39,8 @@
+--- gluegen2-2.0-rc3.orig/make/gluegen-properties.xml 2011-10-06 14:54:42.000000000 +0200
++++ gluegen2-2.0-rc3/make/gluegen-properties.xml 2011-10-06 14:55:51.000000000 +0200
+@@ -39,10 +39,10 @@
<property name="gluegen.user.properties.file.set" value="${gluegen.user.properties.file}"/>
<property file="${gluegen.user.properties.file.set}" />
<echo message="Loaded ${gluegen.user.properties.file.set}." />
- <property name="antlr.jar" value="${gluegen.root}/make/lib/antlr.jar" />
- <property name="junit.jar" value="${gluegen.root}/make/lib/junit.jar" />
-+ <property name="antlr.jar" value="/usr/share/java/antlrall.jar" />
+- <property name="ant.jar" value="${ant.home}/lib/ant.jar" />
+- <property name="ant-junit.jar" value="${ant.home}/lib/ant-junit.jar" />
++ <property name="antlr.jar" value="/usr/share/java/antlr.jar" />
+ <property name="junit.jar" value="/usr/share/java/junit4.jar" />
- <condition property="win32.c.compiler" value="mingw64">
- <and>
- <os family="windows" />
++ <property name="ant.jar" value="/usr/share/java/ant.jar" />
++ <property name="ant-junit.jar" value="/usr/share/ant/lib/ant-junit.jar" />
+
+ <property name="android.version" value="9" /> <!-- default - if not set by jogamp-env.xml:jogamp.env.init -->
+ <property name="android.jar" value="${gluegen.root}/make/lib/android-sdk/${android.version}/android.jar" />
Deleted: trunk/libgluegen2-java/debian/patches/macosx.diff
===================================================================
--- trunk/libgluegen2-java/debian/patches/macosx.diff 2011-10-05 22:30:12 UTC (rev 15154)
+++ trunk/libgluegen2-java/debian/patches/macosx.diff 2011-10-06 13:36:13 UTC (rev 15155)
@@ -1,21 +0,0 @@
-Index: gluegen2-2.0-rc2/make/gluegen-cpptasks-base.xml
-===================================================================
---- gluegen2-2.0-rc2.orig/make/gluegen-cpptasks-base.xml 2011-03-13 22:21:01.000000000 +0100
-+++ gluegen2-2.0-rc2/make/gluegen-cpptasks-base.xml 2011-03-13 22:21:53.000000000 +0100
-@@ -138,10 +138,16 @@
- <istrue value="${macosppc}" />
- </condition>
- <condition property="use.macosx32">
-+ <and>
- <istrue value="${macosx32}" />
-+ <os family="mac"/>
-+ </and>
- </condition>
- <condition property="use.macosx64">
-+ <and>
- <istrue value="${macosx64}" />
-+ <os family="mac"/>
-+ </and>
- </condition>
- </target>
-
Deleted: trunk/libgluegen2-java/debian/patches/moreFeedback.diff
===================================================================
--- trunk/libgluegen2-java/debian/patches/moreFeedback.diff 2011-10-05 22:30:12 UTC (rev 15154)
+++ trunk/libgluegen2-java/debian/patches/moreFeedback.diff 2011-10-06 13:36:13 UTC (rev 15155)
@@ -1,10 +0,0 @@
---- gluegen2-2.0-rc2.orig/make/gluegen-cpptasks-base.xml 2011-03-16 11:46:52.000000000 +0100
-+++ gluegen2-2.0-rc2/make/gluegen-cpptasks-base.xml 2011-03-16 11:46:18.000000000 +0100
-@@ -517,6 +517,7 @@
- </target>
-
- <target name="gluegen.cpptasks.detect.os.2" depends="gluegen.cpptasks.detect.os.freebsd,gluegen.cpptasks.detect.os.hpux,gluegen.cpptasks.detect.os.linux,gluegen.cpptasks.detect.os.osx,gluegen.cpptasks.detect.os.solaris,gluegen.cpptasks.detect.os.unix,gluegen.cpptasks.detect.os.windows" unless="gluegen.cpptasks.detected.os.2">
-+ <echo message="${os.and.arch}" />
- </target>
-
- <target name="gluegen.cpptasks.detect.os" depends="gluegen.properties.load.user,gluegen.cpptasks.detect.os.1,gluegen.cpptasks.detect.os.2">
Modified: trunk/libgluegen2-java/debian/patches/other-archs.diff
===================================================================
--- trunk/libgluegen2-java/debian/patches/other-archs.diff 2011-10-05 22:30:12 UTC (rev 15154)
+++ trunk/libgluegen2-java/debian/patches/other-archs.diff 2011-10-06 13:36:13 UTC (rev 15155)
@@ -1,11 +1,10 @@
-Index: gluegen2-2.0-rc2/make/gluegen-cpptasks-base.xml
-===================================================================
---- gluegen2-2.0-rc2.orig/make/gluegen-cpptasks-base.xml 2011-03-14 20:42:55.000000000 +0100
-+++ gluegen2-2.0-rc2/make/gluegen-cpptasks-base.xml 2011-03-14 21:28:31.000000000 +0100
-@@ -25,6 +25,13 @@
+--- gluegen2-2.0-rc3.orig/make/gluegen-cpptasks-base.xml 2011-10-06 13:22:16.000000000 +0200
++++ gluegen2-2.0-rc3/make/gluegen-cpptasks-base.xml 2011-10-06 13:54:22.000000000 +0200
+@@ -29,6 +29,14 @@
- isLinuxIA64
- isLinuxX86
- - isLinuxAlpha
+ - isLinuxARMv7
++ - isLinuxAlpha
+ - isLinuxArmel
+ - isLinuxHPPA
+ - isLinuxMIPS
@@ -16,10 +15,49 @@
- isOSX
- isOSXPPC
- isSolaris
-@@ -252,6 +259,69 @@
- <condition property="alpha">
- <os arch="alpha" />
+@@ -98,6 +106,14 @@
+ - compiler.cfg.linux.x86
+ - compiler.cfg.linux.amd64
+ - compiler.cfg.linux.armv7
++ - compiler.cfg.linux.alpha
++ - compiler.cfg.linux.armel
++ - compiler.cfg.linux.hppa
++ - compiler.cfg.linux.mips
++ - compiler.cfg.linux.mipsel
++ - compiler.cfg.linux.ppc
++ - compiler.cfg.linux.s390
++ - compiler.cfg.linux.sparc
+ - compiler.cfg.solaris
+ - compiler.cfg.solaris.sparcv9
+ - compiler.cfg.solaris.amd64
+@@ -111,6 +127,14 @@
+ - linker.cfg.linux.x86
+ - linker.cfg.linux.amd64
+ - linker.cfg.linux.armv7
++ - linker.cfg.linux.alpha
++ - linker.cfg.linux.armel
++ - linker.cfg.linux.hppa
++ - linker.cfg.linux.mips
++ - linker.cfg.linux.mipsel
++ - linker.cfg.linux.ppc
++ - linker.cfg.linux.s390
++ - linker.cfg.linux.sparc
+ - linker.cfg.freebsd.x86
+ - linker.cfg.freebsd.amd64
+ - linker.cfg.solaris
+@@ -247,6 +271,79 @@
+ </or>
+ </and>
</condition>
++ <condition property="isLinuxAlpha">
++ <and>
++ <istrue value="${isLinux}" />
++ <os arch="alpha" />
++ </and>
++ </condition>
++ <condition property="alpha">
++ <os arch="alpha" />
++ </condition>
+ <condition property="isLinuxArmel">
+ <and>
+ <istrue value="${isLinux}" />
@@ -83,13 +121,15 @@
+ <condition property="sparc">
+ <os arch="sparc" />
+ </condition>
- <condition property="isSolaris32Bit">
++
+ <condition property="isLinuxX86">
<and>
- <istrue value="${isSolaris}" />
-@@ -322,6 +392,13 @@
+ <istrue value="${isLinux}" />
+@@ -347,6 +444,14 @@
<echo message="LinuxIA64=${isLinuxIA64}" />
<echo message="LinuxX86=${isLinuxX86}" />
- <echo message="LinuxAlpha=${isLinuxAlpha}" />
+ <echo message="LinuxARMv7=${isLinuxARMv7}" />
++ <echo message="LinuxAlpha=${isLinuxAlpha}" />
+ <echo message="LinuxArmel=${isLinuxArmel}" />
+ <echo message="LinuxHPPA=${isLinuxHPPA}" />
+ <echo message="LinuxMIPS=${isLinuxMIPS}" />
@@ -100,21 +140,26 @@
<echo message="OS X=${isOSX}" />
<echo message="OS X PPC=${use.macosppc}" />
<echo message="OS X x32=${use.macosx32}" />
-@@ -335,6 +412,9 @@
+@@ -360,7 +465,10 @@
<echo message="Unix=${isUnix}" />
<echo message="Windows=${isWindows}" />
<echo message="X11=${isX11}" />
+- </target>
+ <echo message="os=${os.name}" />
+ <echo message="os=${os.version}" />
-+ <echo message="arch=${os.arch}" />
- </target>
++ <echo message="arch=${os.arch}" />
++ </target>
<target name="gluegen.cpptasks.detect.os.freebsd.x86" unless="gluegen.cpptasks.detected.os.2" if="isFreeBSDX86">
-@@ -367,7 +447,35 @@
- <property name="os.and.arch" value="linux-alpha" />
+ <property name="os.and.arch" value="freebsd-i586" />
+@@ -392,11 +500,44 @@
+ <property name="os.and.arch" value="linux-armv7" />
</target>
-- <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.alpha" unless="gluegen.cpptasks.detected.os.2" />
++ <target name="gluegen.cpptasks.detect.os.linux.alpha" unless="gluegen.cpptasks.detected.os.2" if="isLinuxAlpha">
++ <property name="os.and.arch" value="linux-alpha" />
++ </target>
++
+ <target name="gluegen.cpptasks.detect.os.linux.armel" unless="gluegen.cpptasks.detected.os.2" if="isLinuxArmel">
+ <property name="os.and.arch" value="linux-armel" />
+ </target>
@@ -143,43 +188,20 @@
+ <property name="os.and.arch" value="linux-sparc" />
+ </target>
+
-+ <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.armel,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.detect.os.linux.mipsel,gluegen.cpptasks.detect.os.linux.ppc,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.sparc" unless="gluegen.cpptasks.detected.os.2" />
++
+ <target name="gluegen.cpptasks.detect.os.android.armv7" unless="gluegen.cpptasks.detected.os.2" if="isAndroidARMv7">
+ <property name="os.and.arch" value="android-armv7" />
+ </target>
+- <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv7,gluegen.cpptasks.detect.os.android.armv7" unless="gluegen.cpptasks.detected.os.2" />
++ <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv7,gluegen.cpptasks.detect.os.android.armv7,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.armel,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.detect.os.linux.mipsel,gluegen.cpptasks.detect.os.linux.ppc,gluegen.cpptasks.detect.os.linux.s390,gluegen.cpptasks.detect.os.linux.sparc" unless="gluegen.cpptasks.detected.os.2" />
+
<target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX">
<property name="native.library.suffix" value="*lib" />
-@@ -569,7 +677,6 @@
- <!-- UNIX compiler configuration -->
-
- <compiler id="compiler.cfg.linux" name="gcc">
-- <compilerarg value="-m32"/>
- <defineset>
- <define name="__unix__"/>
- <define name="_DEBUG" if="c.compiler.use-debug"/>
-@@ -751,7 +858,7 @@
- <!-- Unix linker configuration -->
-
- <linker id="linker.cfg.linux" name="gcc">
-- <linkerarg value="-m32"/>
-+<!-- <linkerarg value="-m32"/>-->
- </linker>
-
- <linker id="linker.cfg.linux.amd64" name="gcc">
-@@ -902,8 +1009,8 @@
-
- <target name="gluegen.cpptasks.declare.compiler.linux.ia64" if="isLinuxIA64">
- <echo message="Linux.IA64" />
-- <property name="compiler.cfg.id.base" value="compiler.cfg.linux.amd64" />
-- <property name="linker.cfg.id.base" value="linker.cfg.linux" />
-+ <property name="compiler.cfg.id.base" value="compiler.cfg.linux.ia64" />
-+ <property name="linker.cfg.id.base" value="linker.cfg.linux.amd64" />
+@@ -1008,8 +1149,56 @@
+ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
<property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ia64" />
</target>
-
-@@ -914,7 +1021,56 @@
- <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/alpha" />
- </target>
-
-- <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.alpha" if="isLinux">
+ <target name="gluegen.cpptasks.declare.compiler.linux.armel" if="isLinuxArmel">
+ <echo message="Linux.armel" />
+ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
@@ -228,61 +250,69 @@
+ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/" />
+ </target>
-+
-+ <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.armel,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux">
+
+- <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv7" if="isLinux">
++ <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv7,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.armel,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux">
<property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
</target>
---- gluegen-v2.0-rc2.orig/make/build.xml 2011-03-25 00:00:56.000000000 +0100
-+++ gluegen-v2.0-rc2/make/build.xml 2011-03-25 00:02:24.000000000 +0100
-@@ -278,7 +278,49 @@
- <property name="linker.cfg.id" value="linker.cfg.linux" />
+--- gluegen2-2.0-rc3.orig/make/build.xml 2011-10-06 13:22:16.000000000 +0200
++++ gluegen2-2.0-rc3/make/build.xml 2011-10-06 13:46:35.000000000 +0200
+@@ -306,8 +306,56 @@
+ <property name="compiler.cfg.id" value="compiler.cfg.linux.armv7" />
+ <property name="linker.cfg.id" value="linker.cfg.linux.armv7" />
</target>
-
-- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.alpha" if="isLinux" >
++
++ <target name="declare.linux.alpha" if="isLinuxAlpha">
++ <echo message="Linux.alpha" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux.alpha" />
++ <property name="linker.cfg.id" value="linker.cfg.linux.alpha" />
++ </target>
++
+ <target name="declare.linux.armel" if="isLinuxArmel">
-+ <echo message="Linux.armael" />
-+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
-+ <property name="linker.cfg.id" value="linker.cfg.linux" />
++ <echo message="Linux.armel" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux.armel" />
++ <property name="linker.cfg.id" value="linker.cfg.linux.armel" />
+ </target>
+
-+ <target name="declare.linux.hppa" if="isLinuxHPPA">
++ <target name="declare.linux.hppa" if="isLinuxHppa">
+ <echo message="Linux.hppa" />
-+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
-+ <property name="linker.cfg.id" value="linker.cfg.linux" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux.hppa" />
++ <property name="linker.cfg.id" value="linker.cfg.linux.hppa" />
+ </target>
+
-+ <target name="declare.linux.mips" if="isLinuxMIPS">
++ <target name="declare.linux.mips" if="isLinuxMips">
+ <echo message="Linux.mips" />
-+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
-+ <property name="linker.cfg.id" value="linker.cfg.linux" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux.mips" />
++ <property name="linker.cfg.id" value="linker.cfg.linux.mips" />
+ </target>
+
-+ <target name="declare.linux.mipsel" if="isLinuxMIPSEL">
++ <target name="declare.linux.mipsel" if="isLinuxMipsel">
+ <echo message="Linux.mipsel" />
-+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
-+ <property name="linker.cfg.id" value="linker.cfg.linux" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux.mipsel" />
++ <property name="linker.cfg.id" value="linker.cfg.linux.mipsel" />
+ </target>
+
-+ <target name="declare.linux.ppc" if="isLinuxPPC">
++ <target name="declare.linux.ppc" if="isLinuxPpc">
+ <echo message="Linux.ppc" />
-+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
-+ <property name="linker.cfg.id" value="linker.cfg.linux" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux.ppc" />
++ <property name="linker.cfg.id" value="linker.cfg.linux.ppc" />
+ </target>
+
+ <target name="declare.linux.s390" if="isLinuxS390">
+ <echo message="Linux.s390" />
-+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
-+ <property name="linker.cfg.id" value="linker.cfg.linux" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux.s390" />
++ <property name="linker.cfg.id" value="linker.cfg.linux.s390" />
+ </target>
+
+ <target name="declare.linux.sparc" if="isLinuxSparc">
+ <echo message="Linux.sparc" />
-+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
-+ <property name="linker.cfg.id" value="linker.cfg.linux" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux.sparc" />
++ <property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
+ </target>
-+
-+ <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.alpha,declare.linux.armel,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.s390,declare.linux.sparc" if="isLinux" >
+
+- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.armv7" if="isLinux" >
++ <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.alpha,declare.linux.armel,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.s390,declare.linux.sparc,declare.linux.armv7" if="isLinux" >
<property name="c.src.dir.os" value="unix" />
<property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
</target>
Modified: trunk/libgluegen2-java/debian/patches/renamedLibrary.diff
===================================================================
--- trunk/libgluegen2-java/debian/patches/renamedLibrary.diff 2011-10-05 22:30:12 UTC (rev 15154)
+++ trunk/libgluegen2-java/debian/patches/renamedLibrary.diff 2011-10-06 13:36:13 UTC (rev 15155)
@@ -1,13 +1,43 @@
-Index: gluegen.git/src/java/com/jogamp/gluegen/runtime/NativeLibLoader.java
+Index: gluegen2-2.0-rc3/src/java/com/jogamp/common/os/Platform.java
===================================================================
---- gluegen.git.orig/src/java/com/jogamp/gluegen/runtime/NativeLibLoader.java 2010-12-05 12:36:33.000000000 +0100
-+++ gluegen.git/src/java/com/jogamp/gluegen/runtime/NativeLibLoader.java 2010-12-05 12:36:40.000000000 +0100
-@@ -67,7 +67,7 @@
- didLoading = true;
- AccessController.doPrivileged(new PrivilegedAction() {
- public Object run() {
-- loadLibraryInternal("gluegen-rt");
-+ loadLibraryInternal("gluegen2-rt");
- return null;
- }
- });
+--- gluegen2-2.0-rc3.orig/src/java/com/jogamp/common/os/Platform.java 2011-10-06 13:34:29.000000000 +0200
++++ gluegen2-2.0-rc3/src/java/com/jogamp/common/os/Platform.java 2011-10-06 13:34:43.000000000 +0200
+@@ -294,12 +294,12 @@
+ }
+
+ private static void loadGlueGenRTImpl() {
+- final String libBaseName = "gluegen-rt";
++ final String libBaseName = "gluegen2-rt";
+
+ AccessController.doPrivileged(new PrivilegedAction<Object>() {
+ public Object run() {
+ if(USE_TEMP_JAR_CACHE && TempJarCache.initSingleton()) {
+- final String nativeJarName = "gluegen-rt-natives-"+os_and_arch+".jar";
++ final String nativeJarName = "gluegen2-rt-natives-"+os_and_arch+".jar";
+ final ClassLoader cl = Platform.class.getClassLoader();
+ try {
+ final URL jarUrlRoot = JarUtil.getJarURLDirname(
+Index: gluegen2-2.0-rc3/src/junit/com/jogamp/common/util/TestTempJarCache.java
+===================================================================
+--- gluegen2-2.0-rc3.orig/src/junit/com/jogamp/common/util/TestTempJarCache.java 2011-10-06 13:32:58.000000000 +0200
++++ gluegen2-2.0-rc3/src/junit/com/jogamp/common/util/TestTempJarCache.java 2011-10-06 13:34:11.000000000 +0200
+@@ -181,8 +181,8 @@
+
+ @Test
+ public void testTempJarCache02AddNativeLibs() throws IOException {
+- final String nativeJarName = "gluegen-rt-natives-"+Platform.getOSAndArch()+".jar";
+- final String libBaseName = "gluegen-rt";
++ final String nativeJarName = "gluegen2-rt-natives-"+Platform.getOSAndArch()+".jar";
++ final String libBaseName = "gluegen2-rt";
+ final ClassLoader cl = getClass().getClassLoader();
+
+ URL jarUrlRoot = JarUtil.getJarURL(TempJarCache.class.getName(), cl);
+@@ -201,7 +201,7 @@
+
+ @Test
+ public void testTempJarCache03AddNativeJarLibs() throws IOException {
+- final String libBaseName = "gluegen-rt";
++ final String libBaseName = "gluegen2-rt";
+
+ JNILibLoaderBase.addNativeJarLibs(TempJarCache.class, libBaseName);
+ Assert.assertTrue(JNILibLoaderBase.isLoaded(libBaseName));
Modified: trunk/libgluegen2-java/debian/patches/series
===================================================================
--- trunk/libgluegen2-java/debian/patches/series 2011-10-05 22:30:12 UTC (rev 15154)
+++ trunk/libgluegen2-java/debian/patches/series 2011-10-06 13:36:13 UTC (rev 15155)
@@ -1,10 +1,9 @@
jarPath.diff
renamedLibrary.diff
-disablesSomeOptions.diff
disableArchive7z.diff
-macosx.diff
-alpha-ia64.diff
other-archs.diff
-moreFeedback.diff
-structLayoutLinux.diff
+#structLayoutLinux.diff
+disable-test-zip-archive.diff
+fix_issues.diff
+disable_android.diff
Modified: trunk/libgluegen2-java/debian/patches/structLayoutLinux.diff
===================================================================
--- trunk/libgluegen2-java/debian/patches/structLayoutLinux.diff 2011-10-05 22:30:12 UTC (rev 15154)
+++ trunk/libgluegen2-java/debian/patches/structLayoutLinux.diff 2011-10-06 13:36:13 UTC (rev 15155)
@@ -1,30 +1,43 @@
-Index: gluegen2-2.0-rc2/src/java/com/jogamp/common/os/Platform.java
+Index: gluegen2-2.0-rc3/src/java/com/jogamp/common/os/Platform.java
===================================================================
---- gluegen2-2.0-rc2.orig/src/java/com/jogamp/common/os/Platform.java 2011-05-08 23:21:34.000000000 +0200
-+++ gluegen2-2.0-rc2/src/java/com/jogamp/common/os/Platform.java 2011-05-08 23:22:18.000000000 +0200
-@@ -117,6 +117,8 @@
- (os_lc.startsWith("linux") && arch_lc.equals("amd64")) ||
- (os_lc.startsWith("linux") && arch_lc.equals("x86_64")) ||
- (os_lc.startsWith("linux") && arch_lc.equals("ia64")) ||
-+ (os_lc.startsWith("linux") && arch_lc.indexOf("alpha") != -1) ||
-+ (os_lc.startsWith("linux") && arch_lc.indexOf("64") != -1 ) ||
- (os_lc.startsWith("mac os") && arch_lc.equals("x86_64")) ||
- (os_lc.startsWith("darwin") && arch_lc.equals("x86_64")) ||
- (os_lc.startsWith("sunos") && arch_lc.equals("sparcv9")) ||
-Index: gluegen2-2.0-rc2/src/java/com/jogamp/gluegen/StructLayout.java
-===================================================================
---- gluegen2-2.0-rc2.orig/src/java/com/jogamp/gluegen/StructLayout.java 2011-05-08 23:18:00.000000000 +0200
-+++ gluegen2-2.0-rc2/src/java/com/jogamp/gluegen/StructLayout.java 2011-05-08 23:18:09.000000000 +0200
-@@ -127,11 +127,7 @@
- // It appears that Windows uses a packing alignment of 4 bytes in 32-bit mode
- return new StructLayout(0, 4);
- } else if ((os.startsWith("windows") && cpu.equals("amd64")) ||
-- (os.startsWith("linux") && cpu.equals("i386")) ||
-- (os.startsWith("linux") && cpu.equals("x86")) ||
-- (os.startsWith("linux") && cpu.equals("amd64")) ||
-- (os.startsWith("linux") && cpu.equals("x86_64")) ||
-- (os.startsWith("linux") && cpu.equals("ia64")) ||
-+ (os.startsWith("linux")) ||
- (os.startsWith("sunos") && cpu.equals("sparc")) ||
- (os.startsWith("sunos") && cpu.equals("sparcv9")) ||
- (os.startsWith("sunos") && cpu.equals("x86")) ||
+--- gluegen2-2.0-rc3.orig/src/java/com/jogamp/common/os/Platform.java 2011-10-06 15:01:59.000000000 +0200
++++ gluegen2-2.0-rc3/src/java/com/jogamp/common/os/Platform.java 2011-10-06 15:07:28.000000000 +0200
+@@ -191,6 +191,16 @@
+ CPU_ARCH = CPUType.PA_RISC2_0;
+ } else if( ARCH_lower.equals("ppc") ) {
+ CPU_ARCH = CPUType.PPC;
++ } else if( ARCH_lower.equals("alpha") ) {
++ CPU_ARCH = CPUType.ALPHA;
++ } else if( ARCH_lower.equals("hppa") ) {
++ CPU_ARCH = CPUType.HPPA;
++ } else if( ARCH_lower.equals("mips") ) {
++ CPU_ARCH = CPUType.MIPS;
++ } else if( ARCH_lower.equals("mipsel") ) {
++ CPU_ARCH = CPUType.MIPSEL;
++ } else if( ARCH_lower.equals("s390") ) {
++ CPU_ARCH = CPUType.S390;
+ } else {
+ throw new RuntimeException("Please port CPU detection to your platform (" + OS_lower + "/" + ARCH_lower + ")");
+ }
+@@ -440,6 +450,21 @@
+ case PPC:
+ _os_and_arch = "ppc"; // TODO: sync with gluegen-cpptasks-base.xml
+ break;
++ case ALPHA:
++ _os_and_arch = "alpha";
++ break;
++ case HPPA:
++ _os_and_arch = "hppa";
++ break;
++ case MIPS:
++ _os_and_arch = "mips";
++ break;
++ case MIPSEL:
++ _os_and_arch = "mipsel";
++ break;
++ case S390:
++ _os_and_arch = "s390";
++ break;
+ case X86_64:
+ _os_and_arch = "amd64";
+ break;
More information about the pkg-java-commits
mailing list