[pkg-java] r16417 - in trunk/libjogl2-java/debian: . patches
Sylvestre Ledru
sylvestre at alioth.debian.org
Sun Mar 3 14:04:38 UTC 2013
Author: sylvestre
Date: 2013-03-03 14:04:38 +0000 (Sun, 03 Mar 2013)
New Revision: 16417
Added:
trunk/libjogl2-java/debian/patches/arm-build.diff
Removed:
trunk/libjogl2-java/debian/patches/TARGET_PLATFORM_LIBS_2.diff
trunk/libjogl2-java/debian/patches/armhf-build.diff
trunk/libjogl2-java/debian/patches/armhfbuild.diff
Modified:
trunk/libjogl2-java/debian/changelog
trunk/libjogl2-java/debian/patches/series
trunk/libjogl2-java/debian/rules
Log:
* Define isAbiEabiGnuArmhf=true when building for armhf.
* Non-maintainer upload.
* Search libs in default system paths in make/build-newt.xml
* Combine TARGET_PLATFORM_LIBS_2.diff, armhfbuild.diff and armhf-build.diff
patches into arm-build.diff patch.
* Non-maintainer upload.
* Fix wrong copy/paste in changes made in previous upload.
Modified: trunk/libjogl2-java/debian/changelog
===================================================================
--- trunk/libjogl2-java/debian/changelog 2013-02-25 14:40:14 UTC (rev 16416)
+++ trunk/libjogl2-java/debian/changelog 2013-03-03 14:04:38 UTC (rev 16417)
@@ -1,3 +1,26 @@
+libjogl2-java (2.0-rc11-1~exp5) experimental; urgency=low
+
+ [ Colin Watson ]
+ * Define isAbiEabiGnuArmhf=true when building for armhf.
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sun, 03 Mar 2013 13:54:53 +0100
+
+libjogl2-java (2.0-rc11-1~exp4.3) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * Search libs in default system paths in make/build-newt.xml
+ * Combine TARGET_PLATFORM_LIBS_2.diff, armhfbuild.diff and armhf-build.diff
+ patches into arm-build.diff patch.
+
+ -- Thomas Preud'homme <robotux at debian.org> Wed, 26 Dec 2012 15:23:17 +0100
+
+libjogl2-java (2.0-rc11-1~exp4.2) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * Fix wrong copy/paste in changes made in previous upload.
+
+ -- Thomas Preud'homme <robotux at debian.org> Wed, 26 Dec 2012 10:11:00 +0100
+
libjogl2-java (2.0-rc11-1~exp4.1) experimental; urgency=low
* Fix armhf FTBFS by generalizing changes to build-nativewindow.xml to
Deleted: trunk/libjogl2-java/debian/patches/TARGET_PLATFORM_LIBS_2.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/TARGET_PLATFORM_LIBS_2.diff 2013-02-25 14:40:14 UTC (rev 16416)
+++ trunk/libjogl2-java/debian/patches/TARGET_PLATFORM_LIBS_2.diff 2013-03-03 14:04:38 UTC (rev 16417)
@@ -1,26 +0,0 @@
-Index: jogl-v2.0-rc11/make/build-jogl.xml
-===================================================================
---- jogl-v2.0-rc11.orig/make/build-jogl.xml 2012-10-31 21:58:36.000000000 +0100
-+++ jogl-v2.0-rc11/make/build-jogl.xml 2012-11-08 16:44:29.000000000 +0100
-@@ -1151,7 +1151,7 @@
- </linker>
-
- <linker id="linker.cfg.linux.armv6.jogl.x11" extends="linker.cfg.linux.armv6">
-- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11"/>
-+ <syslibset libs="X11"/>
- </linker>
-
- <linker id="linker.cfg.android.jogl" extends="linker.cfg.android">
-Index: jogl-v2.0-rc11/make/build-newt.xml
-===================================================================
---- jogl-v2.0-rc11.orig/make/build-newt.xml 2012-10-31 21:58:36.000000000 +0100
-+++ jogl-v2.0-rc11/make/build-newt.xml 2012-11-08 16:43:44.000000000 +0100
-@@ -326,7 +326,7 @@
- </linker>
-
- <linker id="linker.cfg.android.newt" extends="linker.cfg.android">
-- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="android" />
-+ <syslibset libs="android" />
- </linker>
-
- <linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris">
Added: trunk/libjogl2-java/debian/patches/arm-build.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/arm-build.diff (rev 0)
+++ trunk/libjogl2-java/debian/patches/arm-build.diff 2013-03-03 14:04:38 UTC (rev 16417)
@@ -0,0 +1,276 @@
+diff --git a/make/build-jogl.xml b/make/build-jogl.xml
+index a071441..aa7aa6e 100644
+--- a/make/build-jogl.xml
++++ b/make/build-jogl.xml
+@@ -197,6 +197,19 @@
+ <isset property="setup.noSWT"/>
+ </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.javadoc.packagenames"
+ value="jogamp.opengl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/>
+
+@@ -1122,7 +1135,7 @@
+ <includepath path="/usr/local/include" />
+ </compiler>
+
+- <compiler id="compiler.cfg.linux.armv6.jogl.x11" extends="compiler.cfg.linux.armv6">
++ <compiler id="compiler.cfg.linux.arm.jogl.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" />
+@@ -1150,8 +1163,8 @@
+ <syslibset libs="X11"/>
+ </linker>
+
+- <linker id="linker.cfg.linux.armv6.jogl.x11" extends="linker.cfg.linux.armv6">
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11"/>
++ <linker id="linker.cfg.linux.arm.jogl.x11" extends="linker.cfg.linux">
++ <syslibset libs="X11"/>
+ </linker>
+
+ <linker id="linker.cfg.android.jogl" extends="linker.cfg.android">
+@@ -1239,10 +1252,10 @@
+ <property name="linker.cfg.id.os" value="linker.cfg.linux.amd64.jogl.x11" />
+ </target>
+
+- <target name="c.configure.linux.armv6" if="isLinuxARMv6">
+- <echo message="Linux.armv6" />
+- <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6.jogl.x11" />
+- <property name="linker.cfg.id.os" value="linker.cfg.linux.armv6.jogl.x11" />
++ <target name="c.configure.linux.arm" if="isLinuxARM">
++ <echo message="Linux.arm" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux.arm.jogl.x11" />
++ <property name="linker.cfg.id.os" value="linker.cfg.linux.arm.jogl.x11" />
+ </target>
+
+ <target name="c.configure.linux.ia64" if="isLinuxIA64">
+@@ -1293,7 +1306,7 @@
+ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.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.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" />
+diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
+index 26cf237..d49ef21 100644
+--- a/make/build-nativewindow.xml
++++ b/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.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,10 +409,10 @@
+ <syslibset libs="Xrender"/>
+ </linker>
+
+- <linker id="linker.cfg.linux.armv6.nativewindow.x11" extends="linker.cfg.linux.armv6">
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" />
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xxf86vm" />
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrender" />
++ <linker id="linker.cfg.linux.arm.nativewindow.x11" extends="linker.cfg.linux">
++ <syslibset libs="X11" />
++ <syslibset libs="Xxf86vm" />
++ <syslibset libs="Xrender" />
+ </linker>
+
+ <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris">
+@@ -487,10 +500,10 @@
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.amd64.nativewindow.x11" />
+ </target>
+
+- <target name="c.configure.linux.armv6" if="isLinuxARMv6">
+- <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.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 +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.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" />
+diff --git a/make/build-newt.xml b/make/build-newt.xml
+index 9872912..c4f4c6b 100644
+--- a/make/build-newt.xml
++++ b/make/build-newt.xml
+@@ -157,6 +157,19 @@
+ <isset property="setup.noOpenGL"/>
+ </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}, ${java.excludes.swt}, ${java.excludes.opengl}" />
+ <echo message="java.excludes.all: ${java.excludes.all}" />
+
+@@ -265,7 +278,7 @@
+ <includepath path="/usr/local/include" />
+ </compiler>
+
+- <compiler id="compiler.cfg.linux.armv6.newt.x11" extends="compiler.cfg.linux.armv6">
++ <compiler id="compiler.cfg.linux.arm.newt.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" />
+@@ -320,13 +333,13 @@
+ <!--syslibset libs="X11-xcb" /-->
+ </linker>
+
+- <linker id="linker.cfg.linux.armv6.newt.x11" extends="linker.cfg.linux.armv6">
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" />
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrandr" />
++ <linker id="linker.cfg.linux.arm.newt.x11" extends="linker.cfg.linux">
++ <syslibset libs="X11" />
++ <syslibset libs="Xrandr" />
+ </linker>
+
+ <linker id="linker.cfg.android.newt" extends="linker.cfg.android">
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="android" />
++ <syslibset libs="android" />
+ </linker>
+
+ <linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris">
+@@ -410,11 +423,11 @@
+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
+ </target>
+
+- <target name="c.configure.linux.armv6" if="isLinuxARMv6">
+- <echo message="Linux.armv6" />
+- <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6.newt.x11" />
+- <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.armv6.newt.x11"
+- else="linker.cfg.linux.armv6">
++ <target name="c.configure.linux.arm" if="isLinuxARM">
++ <echo message="Linux.arm" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux.arm.newt.x11" />
++ <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.arm.newt.x11"
++ else="linker.cfg.linux.arm">
+ <isset property="isX11" />
+ </condition>
+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
+@@ -496,7 +509,7 @@
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" />
+ </target>
+
+- <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv6,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.linux.ia64,c.configure.x11" if="isLinux"/>
++ <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.arm,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.linux.ia64,c.configure.x11" if="isLinux"/>
+
+ <target name="c.configure.android" if="isAndroid">
+ <echo message="Android" />
+diff --git a/make/scripts/make.jogl.all.linux-armv7hf.sh b/make/scripts/make.jogl.all.linux-armv7hf.sh
+new file mode 100644
+index 0000000..5170810
+--- /dev/null
++++ b/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
++
+diff --git a/make/scripts/tests-armv7_armhf.sh b/make/scripts/tests-armv7_armhf.sh
+new file mode 100644
+index 0000000..5526e81
+--- /dev/null
++++ b/make/scripts/tests-armv7_armhf.sh
+@@ -0,0 +1,7 @@
++#! /bin/bash
++
++spath=`dirname $0`
++
++. $spath/tests.sh `which java` -DummyArg ../build-linux-armv7hf $*
++
++
+diff --git a/make/scripts/tests-linux-armv7hf.sh b/make/scripts/tests-linux-armv7hf.sh
+new file mode 100644
+index 0000000..5526e81
+--- /dev/null
++++ b/make/scripts/tests-linux-armv7hf.sh
+@@ -0,0 +1,7 @@
++#! /bin/bash
++
++spath=`dirname $0`
++
++. $spath/tests.sh `which java` -DummyArg ../build-linux-armv7hf $*
++
++
Deleted: trunk/libjogl2-java/debian/patches/armhf-build.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/armhf-build.diff 2013-02-25 14:40:14 UTC (rev 16416)
+++ trunk/libjogl2-java/debian/patches/armhf-build.diff 2013-03-03 14:04:38 UTC (rev 16417)
@@ -1,252 +0,0 @@
-unchanged:
---- 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.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 +409,7 @@
- <syslibset libs="Xrender"/>
- </linker>
-
-- <linker id="linker.cfg.linux.armv6.nativewindow.x11" extends="linker.cfg.linux.armv6">
-+ <linker id="linker.cfg.linux.arm.nativewindow.x11" extends="linker.cfg.linux">
- <syslibset libs="X11" />
- <syslibset libs="Xxf86vm" />
- <syslibset libs="Xrender" />
-@@ -487,10 +500,10 @@
- <property name="linker.cfg.id.oswin" value="linker.cfg.linux.amd64.nativewindow.x11" />
- </target>
-
-- <target name="c.configure.linux.armv6" if="isLinuxARMv6">
-- <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.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 +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.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 $*
-+
-+
-only in patch2:
-unchanged:
---- libjogl2-java-2.0-rc11.orig/make/build-jogl.xml
-+++ libjogl2-java-2.0-rc11/make/build-jogl.xml
-@@ -197,6 +197,19 @@
- <isset property="setup.noSWT"/>
- </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.javadoc.packagenames"
- value="jogamp.opengl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/>
-
-@@ -1122,7 +1135,7 @@
- <includepath path="/usr/local/include" />
- </compiler>
-
-- <compiler id="compiler.cfg.linux.armv6.jogl.x11" extends="compiler.cfg.linux.armv6">
-+ <compiler id="compiler.cfg.linux.arm.jogl.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" />
-@@ -1150,7 +1163,7 @@
- <syslibset libs="X11"/>
- </linker>
-
-- <linker id="linker.cfg.linux.armv6.jogl.x11" extends="linker.cfg.linux.armv6">
-+ <linker id="linker.cfg.linux.arm.jogl.x11" extends="linker.cfg.linux">
- <syslibset libs="X11"/>
- </linker>
-
-@@ -1239,10 +1252,10 @@
- <property name="linker.cfg.id.os" value="linker.cfg.linux.amd64.jogl.x11" />
- </target>
-
-- <target name="c.configure.linux.armv6" if="isLinuxARMv6">
-- <echo message="Linux.armv6" />
-- <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6.jogl.x11" />
-- <property name="linker.cfg.id.os" value="linker.cfg.linux.armv6.jogl.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.os" value="linker.cfg.linux.arm.jogl.x11" />
- </target>
-
- <target name="c.configure.linux.ia64" if="isLinuxIA64">
-@@ -1293,7 +1306,7 @@
- <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.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.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" />
-only in patch2:
-unchanged:
---- libjogl2-java-2.0-rc11.orig/make/build-newt.xml
-+++ libjogl2-java-2.0-rc11/make/build-newt.xml
-@@ -157,6 +157,19 @@
- <isset property="setup.noOpenGL"/>
- </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}, ${java.excludes.swt}, ${java.excludes.opengl}" />
- <echo message="java.excludes.all: ${java.excludes.all}" />
-
-@@ -265,7 +278,7 @@
- <includepath path="/usr/local/include" />
- </compiler>
-
-- <compiler id="compiler.cfg.linux.armv6.newt.x11" extends="compiler.cfg.linux.armv6">
-+ <compiler id="compiler.cfg.linux.arm.newt.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" />
-@@ -320,7 +333,7 @@
- <!--syslibset libs="X11-xcb" /-->
- </linker>
-
-- <linker id="linker.cfg.linux.armv6.newt.x11" extends="linker.cfg.linux.armv6">
-+ <linker id="linker.cfg.linux.arm.newt.x11" extends="linker.cfg.linux">
- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" />
- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrandr" />
- </linker>
-@@ -410,11 +423,11 @@
- <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
- </target>
-
-- <target name="c.configure.linux.armv6" if="isLinuxARMv6">
-- <echo message="Linux.armv6" />
-- <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6.newt.x11" />
-- <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.armv6.newt.x11"
-- else="linker.cfg.linux.armv6">
-+ <target name="c.configure.linux.arm" if="isLinuxARM">
-+ <echo message="Linux.arm" />
-+ <property name="compiler.cfg.id" value="compiler.cfg.linux.arm.newt.x11" />
-+ <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.arm.newt.x11"
-+ else="linker.cfg.linux.arm">
- <isset property="isX11" />
- </condition>
- <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
-@@ -496,7 +509,7 @@
- <property name="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" />
- </target>
-
-- <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv6,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.linux.ia64,c.configure.x11" if="isLinux"/>
-+ <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.arm,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.linux.ia64,c.configure.x11" if="isLinux"/>
-
- <target name="c.configure.android" if="isAndroid">
- <echo message="Android" />
Deleted: trunk/libjogl2-java/debian/patches/armhfbuild.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/armhfbuild.diff 2013-02-25 14:40:14 UTC (rev 16416)
+++ trunk/libjogl2-java/debian/patches/armhfbuild.diff 2013-03-03 14:04:38 UTC (rev 16417)
@@ -1,17 +0,0 @@
-Index: jogl-v2.0-rc11/make/build-nativewindow.xml
-===================================================================
---- jogl-v2.0-rc11.orig/make/build-nativewindow.xml 2012-10-31 21:58:36.000000000 +0100
-+++ jogl-v2.0-rc11/make/build-nativewindow.xml 2012-11-08 16:45:12.000000000 +0100
-@@ -397,9 +397,9 @@
- </linker>
-
- <linker id="linker.cfg.linux.armv6.nativewindow.x11" extends="linker.cfg.linux.armv6">
-- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" />
-- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xxf86vm" />
-- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrender" />
-+ <syslibset libs="X11" />
-+ <syslibset libs="Xxf86vm" />
-+ <syslibset libs="Xrender" />
- </linker>
-
- <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris">
Modified: trunk/libjogl2-java/debian/patches/series
===================================================================
--- trunk/libjogl2-java/debian/patches/series 2013-02-25 14:40:14 UTC (rev 16416)
+++ trunk/libjogl2-java/debian/patches/series 2013-03-03 14:04:38 UTC (rev 16417)
@@ -9,8 +9,6 @@
#linker.cfg.id.os.diff
#otherArchsoswin_2.diff
#disable_android_3.diff
-TARGET_PLATFORM_LIBS_2.diff
manifest.diff
-armhfbuild.diff
s390x.diff
-armhf-build.diff
+arm-build.diff
Modified: trunk/libjogl2-java/debian/rules
===================================================================
--- trunk/libjogl2-java/debian/rules 2013-02-25 14:40:14 UTC (rev 16416)
+++ trunk/libjogl2-java/debian/rules 2013-03-03 14:04:38 UTC (rev 16417)
@@ -13,6 +13,10 @@
ENABLE_BUILD_HELP_ARCHS := amd64 i386
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+ifeq ($(DEB_HOST_ARCH),armhf)
+DEB_ANT_ARGS += -DisAbiEabiGnuArmhf=true
+endif
+
build-indep:
# Disable the build of the help on slow archs. It takes forever (a few hours)
ifneq (,$(findstring $(DEB_HOST_ARCH),$(ENABLE_BUILD_HELP_ARCHS)))
More information about the pkg-java-commits
mailing list