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

[Tony Mancill]

Author: tmancill
Date: 2014-02-20 05:20:14 +0000 (Thu, 20 Feb 2014)
New Revision: 17798

Added:
   trunk/libjogl2-java/debian/patches/alpha.diff
Modified:
   trunk/libjogl2-java/debian/changelog
   trunk/libjogl2-java/debian/patches/series
Log:
add patch for building on alpha (Closes: #739397)


Modified: trunk/libjogl2-java/debian/changelog
===================================================================
--- trunk/libjogl2-java/debian/changelog	2014-02-19 15:58:42 UTC (rev 17797)
+++ trunk/libjogl2-java/debian/changelog	2014-02-20 05:20:14 UTC (rev 17798)
@@ -1,3 +1,11 @@
+libjogl2-java (2.1.3-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Add patch (alpha.diff) to allow compilation on alpha. (Closes: #739397)
+    - Thanks to Michael Cree for the patch.
+
+ -- tony mancill <tmancill at debian.org>  Tue, 18 Feb 2014 21:22:22 -0800
+
 libjogl2-java (2.1.3-1) unstable; urgency=low
 
   * New upstream release

Added: trunk/libjogl2-java/debian/patches/alpha.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/alpha.diff	                        (rev 0)
+++ trunk/libjogl2-java/debian/patches/alpha.diff	2014-02-20 05:20:14 UTC (rev 17798)
@@ -0,0 +1,82 @@
+Index: libjogl2-java-2.1.3/make/build-jogl.xml
+===================================================================
+--- libjogl2-java-2.1.3.orig/make/build-jogl.xml	2014-02-15 21:14:02.000000000 +1300
++++ libjogl2-java-2.1.3/make/build-jogl.xml	2014-02-15 21:28:46.898257502 +1300
+@@ -1311,6 +1311,12 @@
+       <property name="linker.cfg.id.os"                    value="linker.cfg.linux.x86.jogl.x11" />
+     </target>
+     
++    <target name="c.configure.linux.alpha" if="isLinuxAlpha">
++      <echo message="Linux.ALPHA" />
++      <property name="compiler.cfg.id"                     value="compiler.cfg.linux" />
++      <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
++    </target>
++
+     <target name="c.configure.linux.amd64" if="isLinuxAMD64">
+       <echo message="Linux.AMD64" />
+       <property name="compiler.cfg.id"                     value="compiler.cfg.linux.amd64" />
+@@ -1371,7 +1377,7 @@
+       <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
+     </target>
+ 
+-    <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.linux" depends="c.configure.linux.arm,c.configure.linux.x86,c.configure.linux.alpha,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" />
+Index: libjogl2-java-2.1.3/make/build-nativewindow.xml
+===================================================================
+--- libjogl2-java-2.1.3.orig/make/build-nativewindow.xml	2014-02-15 21:14:02.000000000 +1300
++++ libjogl2-java-2.1.3/make/build-nativewindow.xml	2014-02-15 21:27:38.028203781 +1300
+@@ -490,6 +490,12 @@
+       <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.x86.nativewindow.x11" />
+     </target>
+     
++    <target name="c.configure.linux.alpha" if="isLinuxAlpha">
++      <echo message="Linux.ALPHA" />
++      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
++      <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
++    </target>
++
+     <target name="c.configure.linux.amd64" if="isLinuxAMD64">
+       <echo message="Linux.AMD64" />
+       <property name="compiler.cfg.id"                      value="compiler.cfg.linux.amd64" />
+@@ -550,7 +556,7 @@
+       <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
+     </target>
+ 
+-    <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.linux" depends="c.configure.linux.arm,c.configure.linux.x86,c.configure.linux.alpha,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" />
+Index: libjogl2-java-2.1.3/make/build-newt.xml
+===================================================================
+--- libjogl2-java-2.1.3.orig/make/build-newt.xml	2014-02-15 21:14:02.000000000 +1300
++++ libjogl2-java-2.1.3/make/build-newt.xml	2014-02-15 21:27:01.154214324 +1300
+@@ -415,6 +415,16 @@
+       <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
+     </target>
+ 
++    <target name="c.configure.linux.alpha" if="isLinuxAlpha">
++      <echo message="Linux.ALPHA" />
++      <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
++      <condition property="linker.cfg.id.oswin"             value="linker.cfg.linux.newt.x11"
++                                                            else="linker.cfg.linux">
++          <isset property="isX11" />
++      </condition>
++      <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
++    </target>
++
+     <target name="c.configure.linux.amd64" if="isLinuxAMD64">
+       <echo message="Linux.AMD64" />
+       <property name="compiler.cfg.id"                      value="compiler.cfg.linux.amd64" />
+@@ -511,7 +521,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.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.linux" depends="c.configure.linux.x86,c.configure.linux.alpha,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	2014-02-19 15:58:42 UTC (rev 17797)
+++ trunk/libjogl2-java/debian/patches/series	2014-02-20 05:20:14 UTC (rev 17798)
@@ -12,3 +12,4 @@
 manifest.diff
 s390x.diff
 arm-build.diff
+alpha.diff