Author: sylvestre Date: 2012-12-25 20:38:15 +0000 (Tue, 25 Dec 2012) New Revision: 16380
Modified: trunk/libjogl2-java/debian/changelog trunk/libjogl2-java/debian/patches/armhf-build.diff trunk/libjogl2-java/debian/patches/series Log: Fix armhf FTBFS by generalizing changes to build-nativewindow.xml to build-jogl.xml and build-newt.xml. Modified: trunk/libjogl2-java/debian/changelog =================================================================== --- trunk/libjogl2-java/debian/changelog 2012-12-24 08:39:27 UTC (rev 16379) +++ trunk/libjogl2-java/debian/changelog 2012-12-25 20:38:15 UTC (rev 16380) @@ -1,3 +1,10 @@ +libjogl2-java (2.0-rc11-1~exp4.1) experimental; urgency=low + + * Fix armhf FTBFS by generalizing changes to build-nativewindow.xml to + build-jogl.xml and build-newt.xml. + + -- Thomas Preud'homme <[email protected]> Tue, 25 Dec 2012 20:18:58 +0100 + libjogl2-java (2.0-rc11-1~exp4) experimental; urgency=low * Try again to fix the armhf FTBFS (thanks again to Thomas Preud'homme) Modified: trunk/libjogl2-java/debian/patches/armhf-build.diff =================================================================== --- trunk/libjogl2-java/debian/patches/armhf-build.diff 2012-12-24 08:39:27 UTC (rev 16379) +++ trunk/libjogl2-java/debian/patches/armhf-build.diff 2012-12-25 20:38:15 UTC (rev 16380) @@ -1,4 +1,4 @@ -diff -u libjogl2-java-2.0-rc11/make/build-nativewindow.xml libjogl2-java-2.0-rc11/make/build-nativewindow.xml +unchanged: --- libjogl2-java-2.0-rc11/make/build-nativewindow.xml +++ libjogl2-java-2.0-rc11/make/build-nativewindow.xml @@ -88,6 +88,19 @@ @@ -116,3 +116,137 @@ +. $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" /> Modified: trunk/libjogl2-java/debian/patches/series =================================================================== --- trunk/libjogl2-java/debian/patches/series 2012-12-24 08:39:27 UTC (rev 16379) +++ trunk/libjogl2-java/debian/patches/series 2012-12-25 20:38:15 UTC (rev 16380) @@ -14,4 +14,3 @@ armhfbuild.diff s390x.diff armhf-build.diff - _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
