[libjogl2-java] 25/58: Imported Debian patch 2.0-rc8-1

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository libjogl2-java.

commit 219202057bad607c7b0acfbfd44f1db2106f0d55
Author: Sylvestre Ledru <sylvestre at debian.org>
Date:   Wed Jun 13 18:34:05 2012 +0200

    Imported Debian patch 2.0-rc8-1
---
 debian/changelog               |  7 ++++
 debian/patches/armhfbuild.diff | 17 +++++++++
 debian/patches/s390x.diff      | 80 ++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |  2 ++
 4 files changed, 106 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d024061..4047429 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libjogl2-java (2.0-rc8-1) unstable; urgency=low
+
+  * Upload to unstable
+  * Support of armhf & s390x added.
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 13 Jun 2012 18:34:05 +0200
+
 libjogl2-java (2.0-rc8-1~exp2) experimental; urgency=low
 
   * Force also the version of gluegen2 in the package themself
diff --git a/debian/patches/armhfbuild.diff b/debian/patches/armhfbuild.diff
new file mode 100644
index 0000000..f2cd436
--- /dev/null
+++ b/debian/patches/armhfbuild.diff
@@ -0,0 +1,17 @@
+Index: libjogl2-java-2.0-rc8/make/build-nativewindow.xml
+===================================================================
+--- libjogl2-java-2.0-rc8.orig/make/build-nativewindow.xml	2012-05-02 03:28:29.000000000 +0200
++++ libjogl2-java-2.0-rc8/make/build-nativewindow.xml	2012-06-13 18:25:52.000000000 +0200
+@@ -397,9 +397,9 @@
+       </linker>
+ 
+       <linker id="linker.cfg.linux.armv7.nativewindow.x11" extends="linker.cfg.linux.armv7">
+-        <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">
diff --git a/debian/patches/s390x.diff b/debian/patches/s390x.diff
new file mode 100644
index 0000000..717d17d
--- /dev/null
+++ b/debian/patches/s390x.diff
@@ -0,0 +1,80 @@
+Index: libjogl2-java-2.0-rc8/make/build-jogl.xml
+===================================================================
+--- libjogl2-java-2.0-rc8.orig/make/build-jogl.xml	2012-06-13 18:24:37.000000000 +0200
++++ libjogl2-java-2.0-rc8/make/build-jogl.xml	2012-06-13 18:28:51.000000000 +0200
+@@ -1285,13 +1285,19 @@
+       <property name="linker.cfg.id.os"                    value="linker.cfg.linux.jogl.x11" />
+     </target>
+ 
++    <target name="c.configure.linux.s390x" if="isLinuxs390x">
++      <echo message="Linux.S390x" />
++      <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.sparc" if="isLinuxSparc">
+       <echo message="Linux.SPARC" />
+       <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" depends="c.configure.linux.armv7,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.sparc,c.configure.x11" if="isLinux" />
++    <target name="c.configure.linux" depends="c.configure.linux.armv7,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" />
+Index: libjogl2-java-2.0-rc8/make/build-nativewindow.xml
+===================================================================
+--- libjogl2-java-2.0-rc8.orig/make/build-nativewindow.xml	2012-06-13 18:25:52.000000000 +0200
++++ libjogl2-java-2.0-rc8/make/build-nativewindow.xml	2012-06-13 18:27:24.000000000 +0200
+@@ -529,13 +529,19 @@
+       <property name="linker.cfg.id.oswin"                  value="linker.cfg.linux.nativewindow.x11" />
+     </target>
+ 
++    <target name="c.configure.linux.s390x" if="isLinuxs390x">
++      <echo message="Linux.S390x" />
++      <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.sparc" if="isLinuxSparc">
+       <echo message="Linux.SPARC" />
+       <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" depends="c.configure.linux.armv7,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.sparc,c.configure.x11" if="isLinux" />
++    <target name="c.configure.linux" depends="c.configure.linux.armv7,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" />
+Index: libjogl2-java-2.0-rc8/make/build-newt.xml
+===================================================================
+--- libjogl2-java-2.0-rc8.orig/make/build-newt.xml	2012-06-13 18:24:37.000000000 +0200
++++ libjogl2-java-2.0-rc8/make/build-newt.xml	2012-06-13 18:28:33.000000000 +0200
+@@ -423,6 +423,16 @@
+       <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
+     </target>
+ 
++    <target name="c.configure.linux.s390x" if="isLinuxs390x">
++      <echo message="Linux.S390x" />
++      <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.sparc" if="isLinuxSparc">
+       <echo message="Linux.sparc" />
+       <property name="compiler.cfg.id"                      value="compiler.cfg.linux" />
+@@ -439,7 +449,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.armv7,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,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.armv7,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/debian/patches/series b/debian/patches/series
index 608c259..b97b07b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,5 @@ disable_android_2.diff
 disable_android_3.diff
 TARGET_PLATFORM_LIBS_2.diff
 manifest.diff
+armhfbuild.diff
+s390x.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjogl2-java.git