[pkg-java] r16379 - in trunk/libjogl2-java/debian: . patches

Sylvestre Ledru sylvestre at alioth.debian.org
Mon Dec 24 08:39:27 UTC 2012 

Author: sylvestre
Date: 2012-12-24 08:39:27 +0000 (Mon, 24 Dec 2012)
New Revision: 16379

Modified:
   trunk/libjogl2-java/debian/changelog
   trunk/libjogl2-java/debian/patches/armhf-build.diff
Log:
Try again to fix the armhf FTBFS (thanks again to Thomas Preud'homme)

Modified: trunk/libjogl2-java/debian/changelog
===================================================================
--- trunk/libjogl2-java/debian/changelog	2012-12-24 08:12:46 UTC (rev 16378)
+++ trunk/libjogl2-java/debian/changelog	2012-12-24 08:39:27 UTC (rev 16379)
@@ -1,3 +1,9 @@
+libjogl2-java (2.0-rc11-1~exp4) experimental; urgency=low
+
+  * Try again to fix the armhf FTBFS (thanks again to Thomas Preud'homme)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 24 Dec 2012 09:12:34 +0100
+
 libjogl2-java (2.0-rc11-1~exp3) experimental; urgency=low
 
   * Apply Ubuntu changes introduced in 2.0-rc8-1ubuntu1

Modified: trunk/libjogl2-java/debian/patches/armhf-build.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/armhf-build.diff	2012-12-24 08:12:46 UTC (rev 16378)
+++ trunk/libjogl2-java/debian/patches/armhf-build.diff	2012-12-24 08:39:27 UTC (rev 16379)
@@ -1,26 +1,45 @@
-Index: libjogl2-java-2.0-rc11/make/build-nativewindow.xml
-===================================================================
---- libjogl2-java-2.0-rc11.orig/make/build-nativewindow.xml	2012-11-26 11:52:13.000000000 +0100
-+++ libjogl2-java-2.0-rc11/make/build-nativewindow.xml	2012-12-20 16:11:30.000000000 +0100
-@@ -342,7 +342,7 @@
+diff -u libjogl2-java-2.0-rc11/make/build-nativewindow.xml libjogl2-java-2.0-rc11/make/build-nativewindow.xml
+--- libjogl2-java-2.0-rc11/make/build-nativewindow.xml
++++ libjogl2-java-2.0-rc11/make/build-nativewindow.xml
+@@ -88,6 +88,19 @@
+            <isset property="setup.noAWT"/> 
+         </condition>
+ 
++        <condition property="isLinuxARM">
++            <and>
++                <istrue value="${isLinux}" />
++                <or>
++                    <os arch="arm" />
++                    <os arch="armv4" />
++                    <os arch="armv5" />
++                    <os arch="armv6" />
++                    <os arch="armv7" />
++                </or>
++            </and>
++        </condition>
++
+         <property name="java.excludes.all" value="${java.excludes.awt}" />
+         <echo message="java.excludes.all: ${java.excludes.all}" />
+     </target>
+@@ -342,7 +355,7 @@
          <includepath path="/usr/local/include" />
        </compiler>
  
 -      <compiler id="compiler.cfg.linux.armv6.nativewindow.x11" extends="compiler.cfg.linux.armv6">
-+      <compiler id="compiler.cfg.linux.armv7hf.nativewindow.x11" extends="compiler.cfg.linux.armv7hf">
++      <compiler id="compiler.cfg.linux.arm.nativewindow.x11" extends="compiler.cfg.linux">
          <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
          <compilerarg value="-idirafter" />
          <compilerarg value="/usr/include" />
-@@ -396,7 +396,7 @@
+@@ -396,7 +409,7 @@
          <syslibset libs="Xrender"/>
        </linker>
  
 -      <linker id="linker.cfg.linux.armv6.nativewindow.x11" extends="linker.cfg.linux.armv6">
-+      <linker id="linker.cfg.linux.armv7hf.nativewindow.x11" extends="linker.cfg.linux.armv7hf">
++      <linker id="linker.cfg.linux.arm.nativewindow.x11" extends="linker.cfg.linux">
          <syslibset libs="X11" />
          <syslibset libs="Xxf86vm" />
          <syslibset libs="Xrender" />
-@@ -487,10 +487,10 @@
+@@ -487,10 +500,10 @@
        <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.amd64.nativewindow.x11" />
      </target>
      
@@ -28,19 +47,72 @@
 -      <echo message="Linux.armv6" />
 -      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.armv6.nativewindow.x11" />
 -      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.armv6.nativewindow.x11" />
-+    <target name="c.configure.linux.armv7hf" if="isLinuxArmv7hf">
-+      <echo message="Linux.armv7hf" />
-+      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.armv7hf.nativewindow.x11" />
-+      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.armv7hf.nativewindow.x11" />
++    <target name="c.configure.linux.arm" if="isLinuxARM">
++      <echo message="Linux.arm" />
++      <property name="compiler.cfg.id"                      value="compiler.cfg.linux.arm.nativewindow.x11" />
++      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.arm.nativewindow.x11" />
      </target>
      
      <target name="c.configure.linux.ia64" if="isLinuxIA64">
-@@ -541,7 +541,7 @@
+@@ -541,7 +554,7 @@
        <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
      </target>
  
 -    <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
-+    <target name="c.configure.linux" depends="c.configure.linux.armv7hf,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
++    <target name="c.configure.linux" depends="c.configure.linux.arm,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
  
      <target name="c.configure.android" if="isAndroid">
        <echo message="Android" />
+unchanged:
+--- /dev/null
++++ libjogl2-java-2.0-rc11/make/scripts/tests-armv7_armhf.sh
+@@ -0,0 +1,7 @@
++#! /bin/bash
++
++spath=`dirname $0`
++
++. $spath/tests.sh  `which java` -DummyArg ../build-linux-armv7hf $*
++
++
+unchanged:
+--- /dev/null
++++ libjogl2-java-2.0-rc11/make/scripts/make.jogl.all.linux-armv7hf.sh
+@@ -0,0 +1,27 @@
++#! /bin/sh
++
++# arm-linux-gnueabihf == armhf triplet
++PATH=`pwd`/../../gluegen/make/lib/linux/arm-linux-gnueabihf/bin:$PATH
++export PATH
++
++#    -Dc.compiler.debug=true 
++#    -Dgluegen.cpptasks.detected.os=true \
++#    -DisUnix=true \
++#    -DisLinux=true \
++#    -DisLinuxARMv7=true \
++#    -DisX11=false \
++
++export TARGET_PLATFORM_ROOT=/
++export TARGET_PLATFORM_LIBS=/usr/lib/arm-linux-gnueabihf
++export TARGET_JAVA_LIBS=/usr/lib/jvm/java-6-openjdk-armhf/jre/lib/arm
++
++export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv7hf.xml"
++
++ant \
++    -Drootrel.build=build-linux-armv7hf \
++    -Dsetup.addNativeKD=true \
++    -Dsetup.addNativeOpenMAX=true \
++    -Dsetup.addNativeBroadcom=true \
++    -Djunit.run.arg0="-Dnewt.test.Screen.disableScreenMode" \
++    $* 2>&1 | tee make.jogl.all.linux-armv7hf.log
++
+unchanged:
+--- /dev/null
++++ libjogl2-java-2.0-rc11/make/scripts/tests-linux-armv7hf.sh
+@@ -0,0 +1,7 @@
++#! /bin/bash
++
++spath=`dirname $0`
++
++. $spath/tests.sh  `which java` -DummyArg ../build-linux-armv7hf $*
++
++

More information about the pkg-java-commits mailing list