[libjogl2-java] 04/07: Refresh patches.
Gilles Filippini
pini at debian.org
Mon Oct 12 19:10:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch master
in repository libjogl2-java.
commit a3821e703da39082ffc474fb4c7e3a65ace6e33c
Author: Gilles Filippini <pini at debian.org>
Date: Mon Oct 12 14:09:55 2015 +0200
Refresh patches.
---
debian/changelog | 1 +
debian/patches/add-ports.diff | 81 ++++++++++------------------------
debian/patches/alpha.diff | 42 ++++++++++--------
debian/patches/arm-build.diff | 85 +++++++++++++++++++++---------------
debian/patches/clang_FTBFS.patch | 10 +++--
debian/patches/disable-applet.diff | 8 ++--
debian/patches/disable_git_call.diff | 8 ++--
debian/patches/s390x.diff | 64 +++++++++++++++------------
debian/patches/swt.diff | 8 ++--
debian/patches/variousFixes.diff | 18 +++++---
10 files changed, 163 insertions(+), 162 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d5ec23d..eb42b1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libjogl2-java (2.3.2+dfsg-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release.
+ * Refresh patches.
-- Gilles Filippini <pini at debian.org> Mon, 12 Oct 2015 14:13:33 +0200
diff --git a/debian/patches/add-ports.diff b/debian/patches/add-ports.diff
index 4710273..ff19c46 100644
--- a/debian/patches/add-ports.diff
+++ b/debian/patches/add-ports.diff
@@ -1,19 +1,8 @@
---- a/make/build-jogl.xml
-+++ b/make/build-jogl.xml
-@@ -1330,6 +1330,12 @@
- <property name="linker.cfg.id.os" value="linker.cfg.linux.arm.jogl.x11" />
- </target>
-
-+ <target name="c.configure.linux.aarch64" if="isLinuxAarch64">
-+ <echo message="Linux.aarch64" />
-+ <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.ia64" if="isLinuxIA64">
- <echo message="Linux.IA64" />
- <property name="compiler.cfg.id" value="compiler.cfg.linux" />
-@@ -1360,6 +1366,18 @@
+Index: libjogl2-java/make/build-jogl.xml
+===================================================================
+--- libjogl2-java.orig/make/build-jogl.xml
++++ libjogl2-java/make/build-jogl.xml
+@@ -1377,6 +1377,18 @@
<property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" />
</target>
@@ -32,31 +21,20 @@
<target name="c.configure.linux.s390" if="isLinuxs390">
<echo message="Linux.S390" />
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
-@@ -1378,7 +1396,7 @@
+@@ -1395,7 +1407,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.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.linux" depends="c.configure.linux.arm,c.configure.linux.aarch64,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.linux" depends="c.configure.linux.arm,c.configure.linux.aarch64,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.ppc64,c.configure.linux.ppc64le,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" />
---- a/make/build-nativewindow.xml
-+++ b/make/build-nativewindow.xml
-@@ -504,6 +504,12 @@
- <property name="linker.cfg.id.oswin" value="linker.cfg.linux.arm.nativewindow.x11" />
- </target>
-
-+ <target name="c.configure.linux.aarch64" if="isLinuxAarch64">
-+ <echo message="Linux.Aarch64" />
-+ <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.ia64" if="isLinuxIA64">
- <echo message="Linux.IA64" />
- <property name="compiler.cfg.id" value="compiler.cfg.linux" />
-@@ -534,6 +540,18 @@
+Index: libjogl2-java/make/build-nativewindow.xml
+===================================================================
+--- libjogl2-java.orig/make/build-nativewindow.xml
++++ libjogl2-java/make/build-nativewindow.xml
+@@ -558,6 +558,18 @@
<property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" />
</target>
@@ -75,35 +53,20 @@
<target name="c.configure.linux.s390" if="isLinuxs390">
<echo message="Linux.S390" />
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
-@@ -552,7 +570,7 @@
+@@ -576,7 +588,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.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.linux" depends="c.configure.linux.arm,c.configure.linux.aarch64,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.linux" depends="c.configure.linux.arm,c.configure.linux.aarch64,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.ppc64,c.configure.linux.ppc64le,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" />
---- a/make/build-newt.xml
-+++ b/make/build-newt.xml
-@@ -453,6 +453,16 @@
- <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
- </target>
-
-+ <target name="c.configure.linux.aarch64" if="isLinuxAarch64">
-+ <echo message="Linux.aarch64" />
-+ <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.hppa" if="isLinuxHppa">
- <echo message="Linux.hppa" />
- <property name="compiler.cfg.id" value="compiler.cfg.linux" />
-@@ -493,6 +503,26 @@
+Index: libjogl2-java/make/build-newt.xml
+===================================================================
+--- libjogl2-java.orig/make/build-newt.xml
++++ libjogl2-java/make/build-newt.xml
+@@ -525,6 +525,26 @@
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
</target>
@@ -130,12 +93,12 @@
<target name="c.configure.linux.s390" if="isLinuxs390">
<echo message="Linux.S390" />
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
-@@ -529,7 +559,7 @@
+@@ -561,7 +581,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.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.linux" depends="c.configure.linux.arm,c.configure.linux.aarch64,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.ppc64,c.configure.linux.ppc64le,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.x86,c.configure.linux.alpha,c.configure.linux.amd64,c.configure.linux.arm,c.configure.linux.aarch64,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.aarch64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.ppc64,c.configure.linux.ppc64le,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/alpha.diff b/debian/patches/alpha.diff
index a8a6fe4..08a89eb 100644
--- a/debian/patches/alpha.diff
+++ b/debian/patches/alpha.diff
@@ -1,6 +1,8 @@
---- a/make/build-jogl.xml
-+++ b/make/build-jogl.xml
-@@ -1312,6 +1312,12 @@
+Index: libjogl2-java/make/build-jogl.xml
+===================================================================
+--- libjogl2-java.orig/make/build-jogl.xml
++++ libjogl2-java/make/build-jogl.xml
+@@ -1323,6 +1323,12 @@
<property name="linker.cfg.id.os" value="linker.cfg.linux.x86.jogl.x11" />
</target>
@@ -13,18 +15,20 @@
<target name="c.configure.linux.amd64" if="isLinuxAMD64">
<echo message="Linux.AMD64" />
<property name="compiler.cfg.id" value="compiler.cfg.linux.amd64" />
-@@ -1372,7 +1378,7 @@
+@@ -1389,7 +1395,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.linux" depends="c.configure.linux.arm,c.configure.linux.aarch64,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.aarch64,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" />
---- a/make/build-nativewindow.xml
-+++ b/make/build-nativewindow.xml
-@@ -486,6 +486,12 @@
+Index: libjogl2-java/make/build-nativewindow.xml
+===================================================================
+--- libjogl2-java.orig/make/build-nativewindow.xml
++++ libjogl2-java/make/build-nativewindow.xml
+@@ -504,6 +504,12 @@
<property name="linker.cfg.id.oswin" value="linker.cfg.linux.x86.nativewindow.x11" />
</target>
@@ -37,18 +41,20 @@
<target name="c.configure.linux.amd64" if="isLinuxAMD64">
<echo message="Linux.AMD64" />
<property name="compiler.cfg.id" value="compiler.cfg.linux.amd64" />
-@@ -546,7 +552,7 @@
+@@ -570,7 +576,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.linux" depends="c.configure.linux.arm,c.configure.linux.aarch64,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.aarch64,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" />
---- a/make/build-newt.xml
-+++ b/make/build-newt.xml
-@@ -423,6 +423,16 @@
+Index: libjogl2-java/make/build-newt.xml
+===================================================================
+--- libjogl2-java.orig/make/build-newt.xml
++++ libjogl2-java/make/build-newt.xml
+@@ -445,6 +445,16 @@
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
</target>
@@ -65,12 +71,12 @@
<target name="c.configure.linux.amd64" if="isLinuxAMD64">
<echo message="Linux.AMD64" />
<property name="compiler.cfg.id" value="compiler.cfg.linux.amd64" />
-@@ -519,7 +529,7 @@
+@@ -551,7 +561,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.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.arm,c.configure.linux.aarch64,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.aarch64,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/arm-build.diff b/debian/patches/arm-build.diff
index ce63a19..2ed49cc 100644
--- a/debian/patches/arm-build.diff
+++ b/debian/patches/arm-build.diff
@@ -1,5 +1,7 @@
---- a/make/build-jogl.xml
-+++ b/make/build-jogl.xml
+Index: libjogl2-java/make/build-jogl.xml
+===================================================================
+--- libjogl2-java.orig/make/build-jogl.xml
++++ libjogl2-java/make/build-jogl.xml
@@ -203,6 +203,19 @@
<isset property="setup.noSWT"/>
</condition>
@@ -20,7 +22,7 @@
<property name="java.excludes.javadoc.packagenames"
value="jogamp.opengl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/>
-@@ -1188,7 +1201,7 @@
+@@ -1189,7 +1202,7 @@
<includepath path="/usr/local/include" />
</compiler>
@@ -29,7 +31,7 @@
<!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
<compilerarg value="-idirafter" />
<compilerarg value="/usr/include" />
-@@ -1216,8 +1229,8 @@
+@@ -1223,8 +1236,8 @@
<syslibset libs="X11"/>
</linker>
@@ -39,8 +41,8 @@
+ <syslibset libs="X11"/>
</linker>
- <linker id="linker.cfg.android.jogl" extends="linker.cfg.android">
-@@ -1305,10 +1318,10 @@
+ <linker id="linker.cfg.linux.aarch64.jogl.x11" extends="linker.cfg.linux.aarch64">
+@@ -1316,10 +1329,10 @@
<property name="linker.cfg.id.os" value="linker.cfg.linux.amd64.jogl.x11" />
</target>
@@ -54,18 +56,20 @@
+ <property name="linker.cfg.id.os" value="linker.cfg.linux.arm.jogl.x11" />
</target>
- <target name="c.configure.linux.ia64" if="isLinuxIA64">
-@@ -1359,7 +1372,7 @@
+ <target name="c.configure.linux.aarch64" if="isLinuxARM64">
+@@ -1376,7 +1389,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.linux" depends="c.configure.linux.armv6,c.configure.linux.aarch64,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.aarch64,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" />
---- a/make/build-nativewindow.xml
-+++ b/make/build-nativewindow.xml
+Index: libjogl2-java/make/build-nativewindow.xml
+===================================================================
+--- libjogl2-java.orig/make/build-nativewindow.xml
++++ libjogl2-java/make/build-nativewindow.xml
@@ -88,6 +88,19 @@
<isset property="setup.noAWT"/>
</condition>
@@ -86,7 +90,7 @@
<property name="java.excludes.all" value="${java.excludes.awt}" />
<echo message="java.excludes.all: ${java.excludes.all}" />
</target>
-@@ -338,7 +351,7 @@
+@@ -344,7 +357,7 @@
<includepath path="/usr/local/include" />
</compiler>
@@ -95,7 +99,7 @@
<!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
<compilerarg value="-idirafter" />
<compilerarg value="/usr/include" />
-@@ -391,10 +404,10 @@
+@@ -403,10 +416,10 @@
<syslibset libs="Xrender"/>
</linker>
@@ -109,8 +113,8 @@
+ <syslibset libs="Xrender" />
</linker>
- <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris">
-@@ -479,10 +492,10 @@
+ <linker id="linker.cfg.linux.aarch64.nativewindow.x11" extends="linker.cfg.linux.aarch64">
+@@ -497,10 +510,10 @@
<property name="linker.cfg.id.oswin" value="linker.cfg.linux.amd64.nativewindow.x11" />
</target>
@@ -124,19 +128,21 @@
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.arm.nativewindow.x11" />
</target>
- <target name="c.configure.linux.ia64" if="isLinuxIA64">
-@@ -533,7 +546,7 @@
+ <target name="c.configure.linux.aarch64" if="isLinuxARM64">
+@@ -557,7 +570,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.linux" depends="c.configure.linux.armv6,c.configure.linux.aarch64,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.aarch64,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" />
---- a/make/build-newt.xml
-+++ b/make/build-newt.xml
-@@ -157,6 +157,19 @@
+Index: libjogl2-java/make/build-newt.xml
+===================================================================
+--- libjogl2-java.orig/make/build-newt.xml
++++ libjogl2-java/make/build-newt.xml
+@@ -167,6 +167,19 @@
<isset property="setup.noOpenGL"/>
</condition>
@@ -153,10 +159,10 @@
+ </and>
+ </condition>
+
- <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.swt}, ${java.excludes.opengl}" />
+ <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.swt}, ${java.excludes.applet3}, ${java.excludes.opengl}" />
<echo message="java.excludes.all: ${java.excludes.all}" />
-@@ -265,7 +278,7 @@
+@@ -275,7 +288,7 @@
<includepath path="/usr/local/include" />
</compiler>
@@ -165,7 +171,7 @@
<!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
<compilerarg value="-idirafter" />
<compilerarg value="/usr/include" />
-@@ -325,14 +338,13 @@
+@@ -341,10 +354,9 @@
<!--syslibset libs="X11-xcb" /-->
</linker>
@@ -173,11 +179,14 @@
- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" />
- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrandr" />
- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xcursor" />
-- </linker>
+ <linker id="linker.cfg.linux.arm.newt.x11" extends="linker.cfg.linux">
+ <syslibset libs="X11" />
+ <syslibset libs="Xrandr" />
-+ </linker>
+ </linker>
+
+ <linker id="linker.cfg.linux.aarch64.newt.x11" extends="linker.cfg.linux.aarch64">
+@@ -354,7 +366,7 @@
+ </linker>
<linker id="linker.cfg.android.newt" extends="linker.cfg.android">
- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="android" />
@@ -185,7 +194,7 @@
</linker>
<linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris">
-@@ -421,11 +433,11 @@
+@@ -443,11 +455,11 @@
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
</target>
@@ -202,17 +211,19 @@
<isset property="isX11" />
</condition>
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
-@@ -507,7 +519,7 @@
+@@ -539,7 +551,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.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv6,c.configure.linux.aarch64,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.aarch64,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" />
+Index: libjogl2-java/make/scripts/make.jogl.all.linux-armv7hf.sh
+===================================================================
--- /dev/null
-+++ b/make/scripts/make.jogl.all.linux-armv7hf.sh
++++ libjogl2-java/make/scripts/make.jogl.all.linux-armv7hf.sh
@@ -0,0 +1,27 @@
+#! /bin/sh
+
@@ -241,8 +252,10 @@
+ -Djunit.run.arg0="-Dnewt.test.Screen.disableScreenMode" \
+ $* 2>&1 | tee make.jogl.all.linux-armv7hf.log
+
+Index: libjogl2-java/make/scripts/tests-armv7_armhf.sh
+===================================================================
--- /dev/null
-+++ b/make/scripts/tests-armv7_armhf.sh
++++ libjogl2-java/make/scripts/tests-armv7_armhf.sh
@@ -0,0 +1,7 @@
+#! /bin/bash
+
@@ -251,8 +264,10 @@
+. $spath/tests.sh `which java` -DummyArg ../build-linux-armv7hf $*
+
+
+Index: libjogl2-java/make/scripts/tests-linux-armv7hf.sh
+===================================================================
--- /dev/null
-+++ b/make/scripts/tests-linux-armv7hf.sh
++++ libjogl2-java/make/scripts/tests-linux-armv7hf.sh
@@ -0,0 +1,7 @@
+#! /bin/bash
+
diff --git a/debian/patches/clang_FTBFS.patch b/debian/patches/clang_FTBFS.patch
index ee82ef6..002fc18 100644
--- a/debian/patches/clang_FTBFS.patch
+++ b/debian/patches/clang_FTBFS.patch
@@ -1,13 +1,15 @@
Description: fix FTBFS with clang instead of gcc [-Wreturn-type]
Author: Nicolas Sévelin-Radiguet <nicosr at free.fr>
Last-Update: 2014-09-02
---- a/src/newt/native/bcm_vc_iv.c
-+++ b/src/newt/native/bcm_vc_iv.c
-@@ -357,7 +357,7 @@
+Index: libjogl2-java/src/newt/native/bcm_vc_iv.c
+===================================================================
+--- libjogl2-java.orig/src/newt/native/bcm_vc_iv.c
++++ libjogl2-java/src/newt/native/bcm_vc_iv.c
+@@ -357,7 +357,7 @@ JNIEXPORT jlong JNICALL Java_jogamp_newt
VC_RECT_T src_rect;
if( 0 == display ) {
-- return;
+- return 0;
+ return NULL;
}
dst_rect.x = x;
diff --git a/debian/patches/disable-applet.diff b/debian/patches/disable-applet.diff
index ecbd82a..dc44f3d 100644
--- a/debian/patches/disable-applet.diff
+++ b/debian/patches/disable-applet.diff
@@ -1,7 +1,7 @@
-Index: libjogl2-java-2.1.4/make/build-newt.xml
+Index: libjogl2-java/make/build-newt.xml
===================================================================
---- libjogl2-java-2.1.4.orig/make/build-newt.xml 2014-02-27 23:21:42.000000000 +0100
-+++ libjogl2-java-2.1.4/make/build-newt.xml 2014-02-27 23:32:11.638399263 +0100
+--- libjogl2-java.orig/make/build-newt.xml
++++ libjogl2-java/make/build-newt.xml
@@ -100,7 +100,7 @@
<!-- partitioning -->
@@ -11,7 +11,7 @@ Index: libjogl2-java-2.1.4/make/build-newt.xml
<property name="java.part.opengl"
value="com/jogamp/newt/opengl/** jogamp/newt/driver/opengl/**"/>
-@@ -236,7 +236,7 @@
+@@ -246,7 +246,7 @@
-->
<target name="java.compile.javase">
<javac destdir="${classes}"
diff --git a/debian/patches/disable_git_call.diff b/debian/patches/disable_git_call.diff
index 15a27a1..2dd9d03 100644
--- a/debian/patches/disable_git_call.diff
+++ b/debian/patches/disable_git_call.diff
@@ -1,6 +1,8 @@
---- a/make/build-common.xml
-+++ b/make/build-common.xml
-@@ -72,19 +72,7 @@
+Index: libjogl2-java/make/build-common.xml
+===================================================================
+--- libjogl2-java.orig/make/build-common.xml
++++ libjogl2-java/make/build-common.xml
+@@ -73,19 +73,7 @@
<property name="jogl.build.number" value="manual"/>
<property name="jogl.build.id" value="${version.timestamp}"/>
<mkdir dir="${tempdir}" />
diff --git a/debian/patches/s390x.diff b/debian/patches/s390x.diff
index a8f1dff..05d9d3d 100644
--- a/debian/patches/s390x.diff
+++ b/debian/patches/s390x.diff
@@ -1,6 +1,8 @@
---- a/make/build-jogl.xml
-+++ b/make/build-jogl.xml
-@@ -1346,6 +1346,12 @@
+Index: libjogl2-java/make/build-jogl.xml
+===================================================================
+--- libjogl2-java.orig/make/build-jogl.xml
++++ libjogl2-java/make/build-jogl.xml
+@@ -1363,6 +1363,12 @@
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
<property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" />
</target>
@@ -13,63 +15,67 @@
<target name="c.configure.linux.sparc" if="isLinuxSparc">
<echo message="Linux.SPARC" />
-@@ -1353,7 +1359,7 @@
+@@ -1370,7 +1376,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.sparc,c.configure.x11" if="isLinux" />
-+ <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.armv6,c.configure.linux.aarch64,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.armv6,c.configure.linux.aarch64,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" />
---- a/make/build-nativewindow.xml
-+++ b/make/build-nativewindow.xml
-@@ -521,13 +521,19 @@
- <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" />
+Index: libjogl2-java/make/build-newt.xml
+===================================================================
+--- libjogl2-java.orig/make/build-newt.xml
++++ libjogl2-java/make/build-newt.xml
+@@ -513,6 +513,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" />
-+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" />
++ <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" />
+ <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" />
+@@ -529,7 +539,7 @@
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.newt.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.sparc,c.configure.x11" if="isLinux" />
-+ <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.x86,c.configure.linux.amd64,c.configure.linux.armv6,c.configure.linux.aarch64,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.armv6,c.configure.linux.aarch64,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" />
---- a/make/build-newt.xml
-+++ b/make/build-newt.xml
-@@ -481,6 +481,16 @@
- <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
+Index: libjogl2-java/make/build-nativewindow.xml
+===================================================================
+--- libjogl2-java.orig/make/build-nativewindow.xml
++++ libjogl2-java/make/build-nativewindow.xml
+@@ -545,13 +545,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" />
-+ <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}" />
++ <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" />
+ <echo message="Linux.SPARC" />
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
-@@ -497,7 +507,7 @@
- <property name="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" />
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.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.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.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.armv6,c.configure.linux.aarch64,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.armv6,c.configure.linux.aarch64,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/debian/patches/swt.diff b/debian/patches/swt.diff
index 13f8d2e..e71c2b3 100644
--- a/debian/patches/swt.diff
+++ b/debian/patches/swt.diff
@@ -1,6 +1,8 @@
---- a/make/build-common.xml
-+++ b/make/build-common.xml
-@@ -132,15 +132,9 @@
+Index: libjogl2-java/make/build-common.xml
+===================================================================
+--- libjogl2-java.orig/make/build-common.xml
++++ libjogl2-java/make/build-common.xml
+@@ -133,15 +133,9 @@
<condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-freebsd-x86_64/swt.jar">
<istrue value="${isFreeBSDAMD64}" />
</condition>
diff --git a/debian/patches/variousFixes.diff b/debian/patches/variousFixes.diff
index 0a08410..ea104e7 100644
--- a/debian/patches/variousFixes.diff
+++ b/debian/patches/variousFixes.diff
@@ -1,5 +1,7 @@
---- a/make/build-common.xml
-+++ b/make/build-common.xml
+Index: libjogl2-java/make/build-common.xml
+===================================================================
+--- libjogl2-java.orig/make/build-common.xml
++++ libjogl2-java/make/build-common.xml
@@ -13,7 +13,7 @@
</fail>
@@ -18,7 +20,7 @@
<condition property="rootrel.build" value="build">
<not>
-@@ -209,7 +209,7 @@
+@@ -213,7 +213,7 @@
<property name="gluegen.build.xml" value="${gluegen.make}/build.xml" />
<property name="build.gluegen" value="${gluegen.root}/${rootrel.build}" />
<property name="obj.gluegen" value="${build.gluegen}/obj"/>
@@ -27,7 +29,7 @@
<property name="build.joal" value="${joal.root}/${rootrel.build}" /> <!-- optional -->
-@@ -432,7 +432,7 @@
+@@ -438,7 +438,7 @@
</path>
<!-- JavaSE combinations -->
@@ -36,7 +38,7 @@
<property name="gluegen-rt-android.jar" value="${build.gluegen}/gluegen-rt-android.jar" />
<property name="gluegen-test-util.jar" value="${build.gluegen}/gluegen-test-util.jar" />
<property name="jogl-test.jar" value="${jar}/jogl-test.jar"/>
-@@ -643,7 +643,10 @@
+@@ -649,7 +649,10 @@
<!-- Run the GlueGen build to ensure that the GlueGen ANT task
- has been built. -->
@@ -48,8 +50,10 @@
</target>
---- a/make/build.xml
-+++ b/make/build.xml
+Index: libjogl2-java/make/build.xml
+===================================================================
+--- libjogl2-java.orig/make/build.xml
++++ libjogl2-java/make/build.xml
@@ -327,7 +327,7 @@
</target>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjogl2-java.git
More information about the pkg-java-commits
mailing list