[pkg-java] r13674 - in trunk/libgluegen2-java/debian: . patches

[Sylvestre Ledru]

Author: sylvestre
Date: 2011-05-08 22:08:24 +0000 (Sun, 08 May 2011)
New Revision: 13674

Added:
   trunk/libgluegen2-java/debian/patches/structLayoutLinux.diff
Modified:
   trunk/libgluegen2-java/debian/
   trunk/libgluegen2-java/debian/changelog
   trunk/libgluegen2-java/debian/patches/series
Log:
  * Fix the runtime detection of the arch + 32/64 bits. Was causing FTBFS of
    jogl2



Property changes on: trunk/libgluegen2-java/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Modified: trunk/libgluegen2-java/debian/changelog
===================================================================
--- trunk/libgluegen2-java/debian/changelog	2011-05-08 15:52:16 UTC (rev 13673)
+++ trunk/libgluegen2-java/debian/changelog	2011-05-08 22:08:24 UTC (rev 13674)
@@ -1,3 +1,10 @@
+gluegen2 (2.0-rc2-7) unstable; urgency=low
+
+  * Fix the runtime detection of the arch + 32/64 bits. Was causing FTBFS of
+    jogl2
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 08 May 2011 23:23:15 +0200
+
 gluegen2 (2.0-rc2-6) unstable; urgency=low
 
   * Upload to unstable

Modified: trunk/libgluegen2-java/debian/patches/series
===================================================================
--- trunk/libgluegen2-java/debian/patches/series	2011-05-08 15:52:16 UTC (rev 13673)
+++ trunk/libgluegen2-java/debian/patches/series	2011-05-08 22:08:24 UTC (rev 13674)
@@ -6,3 +6,5 @@
 alpha-ia64.diff
 other-archs.diff
 moreFeedback.diff
+structLayoutLinux.diff 
+

Added: trunk/libgluegen2-java/debian/patches/structLayoutLinux.diff
===================================================================
--- trunk/libgluegen2-java/debian/patches/structLayoutLinux.diff	                        (rev 0)
+++ trunk/libgluegen2-java/debian/patches/structLayoutLinux.diff	2011-05-08 22:08:24 UTC (rev 13674)
@@ -0,0 +1,30 @@
+Index: gluegen2-2.0-rc2/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")) ||