[pkg-java] r18340 - in trunk/gluegen2/debian: . patches
Sylvestre Ledru
sylvestre at moszumanska.debian.org
Wed Sep 3 08:28:48 UTC 2014
Author: sylvestre
Date: 2014-09-03 08:28:48 +0000 (Wed, 03 Sep 2014)
New Revision: 18340
Modified:
trunk/gluegen2/debian/changelog
trunk/gluegen2/debian/control
trunk/gluegen2/debian/patches/add-mips-support.patch
trunk/gluegen2/debian/patches/armhf.diff
trunk/gluegen2/debian/patches/disable-test-zip-archive.diff
trunk/gluegen2/debian/patches/disableArchive7z.diff
trunk/gluegen2/debian/patches/disable_git_call.diff
trunk/gluegen2/debian/patches/fix-alpha-build-config.patch
trunk/gluegen2/debian/patches/fix-ppc64-build-config.patch
trunk/gluegen2/debian/patches/hideException.diff
trunk/gluegen2/debian/patches/jarPath.diff
trunk/gluegen2/debian/patches/linker.diff
trunk/gluegen2/debian/patches/missing-arch-symbol.diff
trunk/gluegen2/debian/patches/renamedLibrary.diff
Log:
* New upstream release
- Include the fix for openjdk 8 (Closes: #754971)
Modified: trunk/gluegen2/debian/changelog
===================================================================
--- trunk/gluegen2/debian/changelog 2014-09-02 00:01:57 UTC (rev 18339)
+++ trunk/gluegen2/debian/changelog 2014-09-03 08:28:48 UTC (rev 18340)
@@ -1,13 +1,15 @@
-gluegen2 (2.1.5-2) UNRELEASED; urgency=medium
+gluegen2 (2.2.0-1) unstable; urgency=medium
+ * New upstream release
+ - Include the fix for openjdk 8 (Closes: #754971)
+
[ Anibal Monsalve Salazar ]
- * Team upload.
* Add mips support.
Add add-mips-support.patch.
Patch by Dejan Latinovic <Dejan.Latinovic at imgtec.com>.
Thanks to Anibal Monsalve Salazar. (Closes: #750548)
- -- Anibal Monsalve Salazar <anibal at debian.org> Wed, 04 Jun 2014 13:17:00 +0100
+ -- Sylvestre Ledru <sylvestre at debian.org> Sun, 10 Aug 2014 15:33:20 +0200
gluegen2 (2.1.5-1) unstable; urgency=medium
Modified: trunk/gluegen2/debian/control
===================================================================
--- trunk/gluegen2/debian/control 2014-09-02 00:01:57 UTC (rev 18339)
+++ trunk/gluegen2/debian/control 2014-09-03 08:28:48 UTC (rev 18340)
@@ -4,7 +4,8 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Sylvestre Ledru <sylvestre at debian.org>
Build-Depends: debhelper (>= 9), cdbs, quilt, default-jdk,
- ant, junit4, ant-contrib-cpptasks, ant-optional, libantlr-java
+ ant, junit4, ant-contrib-cpptasks, ant-optional, libantlr-java,
+ ant-contrib
Standards-Version: 3.9.5
Homepage: http://jogamp.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/gluegen2/
Modified: trunk/gluegen2/debian/patches/add-mips-support.patch
===================================================================
--- trunk/gluegen2/debian/patches/add-mips-support.patch 2014-09-02 00:01:57 UTC (rev 18339)
+++ trunk/gluegen2/debian/patches/add-mips-support.patch 2014-09-03 08:28:48 UTC (rev 18340)
@@ -33,9 +33,10 @@
After rebuilding gluegen2 with these changes, I was able to build sivp
successfully.
-diff -uNr a/src/java/com/jogamp/common/os/MachineDescription.java b/src/java/com/jogamp/common/os/MachineDescription.java
---- a/src/java/com/jogamp/common/os/MachineDescription.java 2014-03-10 13:56:04.000000000 +0000
-+++ b/src/java/com/jogamp/common/os/MachineDescription.java 2014-05-28 14:09:01.000000000 +0000
+Index: gluegen-v2.2.0/src/java/com/jogamp/common/os/MachineDescription.java
+===================================================================
+--- gluegen-v2.2.0.orig/src/java/com/jogamp/common/os/MachineDescription.java 2014-08-10 15:38:44.861874993 +0200
++++ gluegen-v2.2.0/src/java/com/jogamp/common/os/MachineDescription.java 2014-08-10 15:38:44.857874863 +0200
@@ -60,7 +60,11 @@
/** {@link Platform.CPUType#X86_64} Little Endian Windows */
X86_64_WINDOWS(Platform.CPUType.X86_64),
@@ -78,9 +79,10 @@
public final ID id;
public final MachineDescription md;
-diff -uNr a/src/java/com/jogamp/common/os/Platform.java b/src/java/com/jogamp/common/os/Platform.java
---- a/src/java/com/jogamp/common/os/Platform.java 2014-05-26 14:57:41.000000000 +0000
-+++ b/src/java/com/jogamp/common/os/Platform.java 2014-05-28 14:09:01.000000000 +0000
+Index: gluegen-v2.2.0/src/java/com/jogamp/common/os/Platform.java
+===================================================================
+--- gluegen-v2.2.0.orig/src/java/com/jogamp/common/os/Platform.java 2014-08-10 15:38:44.861874993 +0200
++++ gluegen-v2.2.0/src/java/com/jogamp/common/os/Platform.java 2014-08-10 15:38:44.857874863 +0200
@@ -113,6 +113,8 @@
MIPS_32( CPUFamily.MIPS, 0x0001),
/** MIPS 64bit */
@@ -90,9 +92,10 @@
/** Itanium default */
IA64( CPUFamily.IA64, 0x0000),
/** PA_RISC2_0 */
-diff -uNr a/src/java/jogamp/common/os/MachineDescriptionRuntime.java b/src/java/jogamp/common/os/MachineDescriptionRuntime.java
---- a/src/java/jogamp/common/os/MachineDescriptionRuntime.java 2014-03-10 13:56:04.000000000 +0000
-+++ b/src/java/jogamp/common/os/MachineDescriptionRuntime.java 2014-05-28 14:09:01.000000000 +0000
+Index: gluegen-v2.2.0/src/java/jogamp/common/os/MachineDescriptionRuntime.java
+===================================================================
+--- gluegen-v2.2.0.orig/src/java/jogamp/common/os/MachineDescriptionRuntime.java 2014-08-10 15:38:44.861874993 +0200
++++ gluegen-v2.2.0/src/java/jogamp/common/os/MachineDescriptionRuntime.java 2014-08-10 15:38:44.857874863 +0200
@@ -78,6 +78,8 @@
case ARMv5:
case ARMv6:
@@ -113,9 +116,10 @@
} else if( osType == Platform.OSType.WINDOWS ) {
return StaticConfig.X86_32_WINDOWS;
} else if( osType == Platform.OSType.MACOS ) {
-diff -uNr a/src/java/jogamp/common/os/PlatformPropsImpl.java b/src/java/jogamp/common/os/PlatformPropsImpl.java
---- a/src/java/jogamp/common/os/PlatformPropsImpl.java 2014-03-10 13:56:04.000000000 +0000
-+++ b/src/java/jogamp/common/os/PlatformPropsImpl.java 2014-05-28 14:09:01.000000000 +0000
+Index: gluegen-v2.2.0/src/java/jogamp/common/os/PlatformPropsImpl.java
+===================================================================
+--- gluegen-v2.2.0.orig/src/java/jogamp/common/os/PlatformPropsImpl.java 2014-08-10 15:38:44.861874993 +0200
++++ gluegen-v2.2.0/src/java/jogamp/common/os/PlatformPropsImpl.java 2014-08-10 15:38:44.857874863 +0200
@@ -298,6 +298,8 @@
return CPUType.PPC;
} else if( archLower.equals("mips") ) { // android
@@ -134,7 +138,7 @@
+ abiType[0] = ABIType.GENERIC_ABI;
}
res = eh;
- } catch(Throwable t) {
+ } catch(final Throwable t) {
@@ -501,6 +506,8 @@
* <li>linux-i586</li>
* <li>linux-armv6</li>
@@ -144,9 +148,9 @@
* <li>android-armv6</li>
* <li>macosx-universal</li>
* <li>solaris-sparc</li>
-@@ -525,6 +532,12 @@
- case ARMv7:
- _os_and_arch = "armv6"; // TODO: sync with gluegen-cpptasks-base.xml
+@@ -530,6 +537,12 @@
+ _and_arch_tmp = "armv6"; // TODO: sync with gluegen-cpptasks-base.xml
+ }
break;
+ case MIPS_32:
+ _os_and_arch = "mips";
@@ -155,11 +159,12 @@
+ _os_and_arch = "mipsel";
+ break;
case SPARC_32:
- _os_and_arch = "sparc";
+ _and_arch_tmp = "sparc";
break;
-diff -uNr a/src/java/jogamp/common/os/elf/ElfHeader.java b/src/java/jogamp/common/os/elf/ElfHeader.java
---- a/src/java/jogamp/common/os/elf/ElfHeader.java 2014-03-10 13:56:04.000000000 +0000
-+++ b/src/java/jogamp/common/os/elf/ElfHeader.java 2014-05-28 14:10:07.000000000 +0000
+Index: gluegen-v2.2.0/src/java/jogamp/common/os/elf/ElfHeader.java
+===================================================================
+--- gluegen-v2.2.0.orig/src/java/jogamp/common/os/elf/ElfHeader.java 2014-08-10 15:38:44.861874993 +0200
++++ gluegen-v2.2.0/src/java/jogamp/common/os/elf/ElfHeader.java 2014-08-10 15:38:44.857874863 +0200
@@ -484,12 +484,19 @@
/**
Modified: trunk/gluegen2/debian/patches/armhf.diff
===================================================================
--- trunk/gluegen2/debian/patches/armhf.diff 2014-09-02 00:01:57 UTC (rev 18339)
+++ trunk/gluegen2/debian/patches/armhf.diff 2014-09-03 08:28:48 UTC (rev 18340)
@@ -1,8 +1,8 @@
-Index: gluegen-v2.1.2/make/build.xml
+Index: gluegen-v2.2.0/make/build.xml
===================================================================
---- gluegen-v2.1.2.orig/make/build.xml 2013-11-08 10:29:07.000000000 +0100
-+++ gluegen-v2.1.2/make/build.xml 2013-11-08 10:29:07.000000000 +0100
-@@ -289,10 +289,16 @@
+--- gluegen-v2.2.0.orig/make/build.xml 2014-08-10 15:38:35.009555506 +0200
++++ gluegen-v2.2.0/make/build.xml 2014-08-10 15:38:35.009555506 +0200
+@@ -258,10 +258,16 @@
<property name="linker.cfg.id" value="linker.cfg.linux" />
</target>
@@ -23,7 +23,7 @@
</target>
<target name="declare.linux.alpha" if="isLinuxAlpha">
-@@ -343,7 +349,7 @@
+@@ -312,7 +318,7 @@
<property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
</target>
@@ -32,10 +32,10 @@
<property name="c.src.dir.os" value="unix" />
<property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
</target>
-Index: gluegen-v2.1.2/make/gluegen-cpptasks-base.xml
+Index: gluegen-v2.2.0/make/gluegen-cpptasks-base.xml
===================================================================
---- gluegen-v2.1.2.orig/make/gluegen-cpptasks-base.xml 2013-11-08 10:29:07.000000000 +0100
-+++ gluegen-v2.1.2/make/gluegen-cpptasks-base.xml 2013-11-08 10:32:33.000000000 +0100
+--- gluegen-v2.2.0.orig/make/gluegen-cpptasks-base.xml 2014-08-10 15:38:35.009555506 +0200
++++ gluegen-v2.2.0/make/gluegen-cpptasks-base.xml 2014-08-10 15:38:35.009555506 +0200
@@ -124,7 +124,7 @@
- compiler.cfg.linux
- compiler.cfg.linux.x86
@@ -55,7 +55,7 @@
- linker.cfg.linux.alpha
- linker.cfg.linux.hppa
- linker.cfg.linux.mips
-@@ -942,7 +943,7 @@
+@@ -964,7 +965,7 @@
- lib/gluegen-cpptasks-linux-armv6.xml (armv5te + softfp), or
- lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp)
for official JogAmp builds! -->
@@ -64,7 +64,7 @@
<defineset>
<define name="__unix__"/>
<define name="__X11__" if="isX11"/>
-@@ -1157,13 +1158,16 @@
+@@ -1181,13 +1182,16 @@
- lib/gluegen-cpptasks-linux-armv6.xml (armv5te + softfp), or
- lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp)
for official JogAmp builds! -->
Modified: trunk/gluegen2/debian/patches/disable-test-zip-archive.diff
===================================================================
--- trunk/gluegen2/debian/patches/disable-test-zip-archive.diff 2014-09-02 00:01:57 UTC (rev 18339)
+++ trunk/gluegen2/debian/patches/disable-test-zip-archive.diff 2014-09-03 08:28:48 UTC (rev 18340)
@@ -1,8 +1,8 @@
-Index: gluegen-v2.0-rc12/make/build-test.xml
+Index: gluegen-v2.2.0/make/build-test.xml
===================================================================
---- gluegen-v2.0-rc12.orig/make/build-test.xml 2013-07-01 14:02:17.000000000 +0200
-+++ gluegen-v2.0-rc12/make/build-test.xml 2013-07-01 14:02:17.000000000 +0200
-@@ -466,7 +466,7 @@
+--- gluegen-v2.2.0.orig/make/build-test.xml 2014-08-10 15:37:47.768023311 +0200
++++ gluegen-v2.2.0/make/build-test.xml 2014-08-10 15:37:47.768023311 +0200
+@@ -499,7 +499,7 @@
</target>
<target name="junit.run" depends="junit.run.settings, junit.run.if.enabled, junit.run.if.disabled">
Modified: trunk/gluegen2/debian/patches/disableArchive7z.diff
===================================================================
--- trunk/gluegen2/debian/patches/disableArchive7z.diff 2014-09-02 00:01:57 UTC (rev 18339)
+++ trunk/gluegen2/debian/patches/disableArchive7z.diff 2014-09-03 08:28:48 UTC (rev 18340)
@@ -1,8 +1,8 @@
-Index: gluegen-v2.1.5/make/build.xml
+Index: gluegen-v2.2.0/make/build.xml
===================================================================
---- gluegen-v2.1.5.orig/make/build.xml 2014-03-24 14:27:09.863870538 +0100
-+++ gluegen-v2.1.5/make/build.xml 2014-03-24 14:27:09.863870538 +0100
-@@ -1009,9 +1009,9 @@
+--- gluegen-v2.2.0.orig/make/build.xml 2014-08-10 15:37:44.463916132 +0200
++++ gluegen-v2.2.0/make/build.xml 2014-08-10 15:37:44.459916002 +0200
+@@ -1037,9 +1037,9 @@
<copy todir="${javadoc.gluegen.path}/resources" overwrite="true">
<fileset dir="doc/javadoc/resources" includes="*" />
</copy>
@@ -14,7 +14,7 @@
</target>
<!-- ================================================================== -->
-@@ -1049,9 +1049,9 @@
+@@ -1077,9 +1077,9 @@
<fileset dir="${project.root}/jnlp-files" includes="*" />
</copy>
<copy todir="${archive}" file="${build}/gluegen-java-src.zip"/>
Modified: trunk/gluegen2/debian/patches/disable_git_call.diff
===================================================================
--- trunk/gluegen2/debian/patches/disable_git_call.diff 2014-09-02 00:01:57 UTC (rev 18339)
+++ trunk/gluegen2/debian/patches/disable_git_call.diff 2014-09-03 08:28:48 UTC (rev 18340)
@@ -1,8 +1,8 @@
-Index: gluegen-v2.1.5/make/build.xml
+Index: gluegen-v2.2.0/make/build.xml
===================================================================
---- gluegen-v2.1.5.orig/make/build.xml 2014-03-24 14:28:02.880616139 +0100
-+++ gluegen-v2.1.5/make/build.xml 2014-03-24 14:29:04.545483279 +0100
-@@ -66,14 +66,6 @@
+--- gluegen-v2.2.0.orig/make/build.xml 2014-08-10 15:37:49.640084036 +0200
++++ gluegen-v2.2.0/make/build.xml 2014-08-10 15:37:49.640084036 +0200
+@@ -67,14 +67,6 @@
<property name="gluegen.build.number" value="manual"/>
<property name="gluegen.build.id" value="${version.timestamp}"/>
<mkdir dir="${build}" />
Modified: trunk/gluegen2/debian/patches/fix-alpha-build-config.patch
===================================================================
--- trunk/gluegen2/debian/patches/fix-alpha-build-config.patch 2014-09-02 00:01:57 UTC (rev 18339)
+++ trunk/gluegen2/debian/patches/fix-alpha-build-config.patch 2014-09-03 08:28:48 UTC (rev 18340)
@@ -1,7 +1,8 @@
-diff -Nurd gluegen2-2.0.2.orig/make/build.xml gluegen2-2.0.2/make/build.xml
---- gluegen2-2.0.2.orig/make/build.xml 2013-11-03 20:08:03.000000000 +1300
-+++ gluegen2-2.0.2/make/build.xml 2013-11-03 20:01:00.000000000 +1300
-@@ -349,7 +349,7 @@
+Index: gluegen-v2.2.0/make/build.xml
+===================================================================
+--- gluegen-v2.2.0.orig/make/build.xml 2014-08-10 15:38:39.449699491 +0200
++++ gluegen-v2.2.0/make/build.xml 2014-08-10 15:38:39.449699491 +0200
+@@ -318,7 +318,7 @@
<property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
</target>
Modified: trunk/gluegen2/debian/patches/fix-ppc64-build-config.patch
===================================================================
--- trunk/gluegen2/debian/patches/fix-ppc64-build-config.patch 2014-09-02 00:01:57 UTC (rev 18339)
+++ trunk/gluegen2/debian/patches/fix-ppc64-build-config.patch 2014-09-03 08:28:48 UTC (rev 18340)
@@ -1,8 +1,8 @@
-Index: b/make/build.xml
+Index: gluegen-v2.2.0/make/build.xml
===================================================================
---- a/make/build.xml
-+++ b/make/build.xml
-@@ -331,6 +331,24 @@
+--- gluegen-v2.2.0.orig/make/build.xml 2014-08-10 15:38:41.125753841 +0200
++++ gluegen-v2.2.0/make/build.xml 2014-08-10 15:38:41.121753711 +0200
+@@ -300,6 +300,24 @@
<property name="linker.cfg.id" value="linker.cfg.linux.ppc" />
</target>
@@ -27,7 +27,7 @@
<target name="declare.linux.s390" if="isLinuxs390">
<echo message="Linux.s390" />
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
-@@ -349,7 +367,7 @@
+@@ -318,7 +336,7 @@
<property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
</target>
@@ -36,10 +36,10 @@
<property name="c.src.dir.os" value="unix" />
<property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
</target>
-Index: b/make/gluegen-cpptasks-base.xml
+Index: gluegen-v2.2.0/make/gluegen-cpptasks-base.xml
===================================================================
---- a/make/gluegen-cpptasks-base.xml
-+++ b/make/gluegen-cpptasks-base.xml
+--- gluegen-v2.2.0.orig/make/gluegen-cpptasks-base.xml 2014-08-10 15:38:41.125753841 +0200
++++ gluegen-v2.2.0/make/gluegen-cpptasks-base.xml 2014-08-10 15:38:41.121753711 +0200
@@ -46,6 +46,9 @@
- isLinuxMips
- isLinuxMipsel
@@ -60,7 +60,7 @@
- compiler.cfg.linux.s390
- compiler.cfg.linux.s390x
- compiler.cfg.linux.sparc
-@@ -388,6 +394,33 @@
+@@ -392,6 +398,33 @@
<condition property="ppc">
<os arch="ppc" />
</condition>
@@ -94,7 +94,7 @@
<condition property="isLinuxs390">
<and>
<istrue value="${isLinux}" />
-@@ -570,6 +603,9 @@
+@@ -574,6 +607,9 @@
<echo message="LinuxMips=${isLinuxMips}" />
<echo message="LinuxMipsel=${isLinuxMipsel}" />
<echo message="LinuxPpc=${isLinuxPpc}" />
@@ -104,7 +104,7 @@
<echo message="Linuxs390=${isLinuxs390}" />
<echo message="Linuxs390x=${isLinuxs390x}" />
<echo message="LinuxSparc=${isLinuxSparc}" />
-@@ -646,6 +682,18 @@
+@@ -650,6 +686,18 @@
<property name="os.and.arch" value="linux-ppc" />
</target>
@@ -123,7 +123,7 @@
<target name="gluegen.cpptasks.detect.os.linux.s390" unless="gluegen.cpptasks.detected.os.2" if="isLinuxs390">
<property name="os.and.arch" value="linux-s390" />
</target>
-@@ -666,7 +714,7 @@
+@@ -670,7 +718,7 @@
<property name="os.and.arch" value="android-armv6hf" />
</target>
@@ -132,7 +132,7 @@
<target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX">
<property name="native.library.suffix" value="*lib" />
-@@ -1183,6 +1231,15 @@
+@@ -1207,6 +1255,15 @@
<linker id="linker.cfg.linux.ppc" name="${gcc.compat.compiler}">
</linker>
@@ -148,7 +148,7 @@
<linker id="linker.cfg.linux.s390" name="${gcc.compat.compiler}">
</linker>
-@@ -1407,6 +1464,27 @@
+@@ -1431,6 +1488,27 @@
<property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc" />
</target>
@@ -176,7 +176,7 @@
<target name="gluegen.cpptasks.declare.compiler.linux.s390" if="isLinuxs390">
<echo message="Linux.s390" />
<property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
-@@ -1428,7 +1506,7 @@
+@@ -1452,7 +1530,7 @@
<property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/sparc" />
</target>
Modified: trunk/gluegen2/debian/patches/hideException.diff
===================================================================
--- trunk/gluegen2/debian/patches/hideException.diff 2014-09-02 00:01:57 UTC (rev 18339)
+++ trunk/gluegen2/debian/patches/hideException.diff 2014-09-03 08:28:48 UTC (rev 18340)
@@ -1,18 +1,18 @@
-Index: gluegen-v2.1.5/src/java/com/jogamp/common/os/Platform.java
+Index: gluegen-v2.2.0/src/java/com/jogamp/common/os/Platform.java
===================================================================
---- gluegen-v2.1.5.orig/src/java/com/jogamp/common/os/Platform.java 2014-03-24 14:29:13.501609214 +0100
-+++ gluegen-v2.1.5/src/java/com/jogamp/common/os/Platform.java 2014-03-24 14:29:13.497609157 +0100
+--- gluegen-v2.2.0.orig/src/java/com/jogamp/common/os/Platform.java 2014-08-10 15:37:54.776250637 +0200
++++ gluegen-v2.2.0/src/java/com/jogamp/common/os/Platform.java 2014-08-10 15:38:26.473278678 +0200
@@ -197,15 +197,6 @@
_USE_TEMP_JAR_CACHE[0] = ( OS_TYPE != OSType.ANDROID ) && ( null != platformClassJarURI ) &&
- Debug.getBooleanProperty(useTempJarCachePropName, true, true);
+ PropertyAccess.getBooleanProperty(useTempJarCachePropName, true, true);
- // load GluegenRT native library
- if(_USE_TEMP_JAR_CACHE[0] && TempJarCache.initSingleton()) {
- try {
-- JNILibLoaderBase.addNativeJarLibs(new Class<?>[] { Platform.class }, null, null );
-- } catch (Exception e0) {
+- JNILibLoaderBase.addNativeJarLibs(new Class<?>[] { jogamp.common.Debug.class }, null);
+- } catch (final Exception e0) {
- // IllegalArgumentException, IOException
-- System.err.println("Catched "+e0.getClass().getSimpleName()+": "+e0.getMessage()+", while JNILibLoaderBase.addNativeJarLibs(..)");
+- System.err.println("Caught "+e0.getClass().getSimpleName()+": "+e0.getMessage()+", while JNILibLoaderBase.addNativeJarLibs(..)");
- }
- }
DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false, cl);
Modified: trunk/gluegen2/debian/patches/jarPath.diff
===================================================================
--- trunk/gluegen2/debian/patches/jarPath.diff 2014-09-02 00:01:57 UTC (rev 18339)
+++ trunk/gluegen2/debian/patches/jarPath.diff 2014-09-03 08:28:48 UTC (rev 18340)
@@ -1,19 +1,21 @@
-Index: gluegen-v2.1.5/make/gluegen-properties.xml
+Index: gluegen-v2.2.0/make/gluegen-properties.xml
===================================================================
---- gluegen-v2.1.5.orig/make/gluegen-properties.xml 2014-03-24 14:27:04.211791046 +0100
-+++ gluegen-v2.1.5/make/gluegen-properties.xml 2014-03-24 14:27:04.211791046 +0100
-@@ -49,10 +49,10 @@
- <property name="gluegen.user.properties.file.set" value="${gluegen.user.properties.file}"/>
+--- gluegen-v2.2.0.orig/make/gluegen-properties.xml 2014-08-10 15:35:46.244079918 +0200
++++ gluegen-v2.2.0/make/gluegen-properties.xml 2014-08-10 15:36:44.665976040 +0200
+@@ -50,11 +50,11 @@
<property file="${gluegen.user.properties.file.set}" />
<echo message="Loaded ${gluegen.user.properties.file.set}." />
+ <echo message="Setting defaults:" />
- <property name="antlr.jar" value="${gluegen.root}/make/lib/antlr.jar" />
- <property name="junit.jar" value="${gluegen.root}/make/lib/junit.jar" />
- <property name="ant.jar" value="${ant.home}/lib/ant.jar" />
- <property name="ant-junit.jar" value="${ant.home}/lib/ant-junit.jar" />
+- <property name="ant-junit4.jar" value="${ant.home}/lib/ant-junit4.jar" />
+ <property name="antlr.jar" value="/usr/share/java/antlr.jar" />
+ <property name="junit.jar" value="/usr/share/java/junit4.jar" />
+ <property name="ant.jar" value="/usr/share/java/ant.jar" />
+ <property name="ant-junit.jar" value="/usr/share/ant/lib/ant-junit.jar" />
++<!-- <property name="ant-junit4.jar" value="${ant.home}/lib/ant-junit4.jar" />-->
+ <property name="semver.jar" value="${gluegen.root}/make/lib/semantic-versioning/semver.jar" />
<property name="android.version" value="9" /> <!-- default - if not set by jogamp-env.xml:jogamp.env.init -->
- <property name="android-min.jar" value="${gluegen.root}/make/lib/android-sdk/${android.version}/android.jar" />
Modified: trunk/gluegen2/debian/patches/linker.diff
===================================================================
--- trunk/gluegen2/debian/patches/linker.diff 2014-09-02 00:01:57 UTC (rev 18339)
+++ trunk/gluegen2/debian/patches/linker.diff 2014-09-03 08:28:48 UTC (rev 18340)
@@ -1,8 +1,8 @@
-Index: gluegen-v2.1.2/make/gluegen-cpptasks-base.xml
+Index: gluegen-v2.2.0/make/gluegen-cpptasks-base.xml
===================================================================
---- gluegen-v2.1.2.orig/make/gluegen-cpptasks-base.xml 2013-11-08 10:25:29.000000000 +0100
-+++ gluegen-v2.1.2/make/gluegen-cpptasks-base.xml 2013-11-08 10:27:43.000000000 +0100
-@@ -1188,6 +1188,8 @@
+--- gluegen-v2.2.0.orig/make/gluegen-cpptasks-base.xml 2014-08-10 15:37:51.316138402 +0200
++++ gluegen-v2.2.0/make/gluegen-cpptasks-base.xml 2014-08-10 15:37:51.316138402 +0200
+@@ -1212,6 +1212,8 @@
<linker id="linker.cfg.linux.sparc" name="${gcc.compat.compiler}">
</linker>
Modified: trunk/gluegen2/debian/patches/missing-arch-symbol.diff
===================================================================
--- trunk/gluegen2/debian/patches/missing-arch-symbol.diff 2014-09-02 00:01:57 UTC (rev 18339)
+++ trunk/gluegen2/debian/patches/missing-arch-symbol.diff 2014-09-03 08:28:48 UTC (rev 18340)
@@ -1,6 +1,8 @@
---- gluegen2-2.1.3.orig/make/stub_includes/platform/glibc-compat-symbols.h
-+++ gluegen2-2.1.3/make/stub_includes/platform/glibc-compat-symbols.h
-@@ -22,7 +22,8 @@
+Index: gluegen-v2.2.0/make/stub_includes/platform/glibc-compat-symbols.h
+===================================================================
+--- gluegen-v2.2.0.orig/make/stub_includes/platform/glibc-compat-symbols.h 2014-08-10 15:38:43.065816752 +0200
++++ gluegen-v2.2.0/make/stub_includes/platform/glibc-compat-symbols.h 2014-08-10 15:38:43.065816752 +0200
+@@ -30,7 +30,8 @@
#elif defined(__amd64__)
#define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.2.5");
#else
@@ -10,4 +12,3 @@
#endif /*__amd64__*/
#else
#warning GLIBC_COMPAT_SYMBOL not supported with current compiler on GNU/Linux
-
Modified: trunk/gluegen2/debian/patches/renamedLibrary.diff
===================================================================
--- trunk/gluegen2/debian/patches/renamedLibrary.diff 2014-09-02 00:01:57 UTC (rev 18339)
+++ trunk/gluegen2/debian/patches/renamedLibrary.diff 2014-09-03 08:28:48 UTC (rev 18340)
@@ -1,7 +1,7 @@
-Index: gluegen-v2.1.5/src/junit/com/jogamp/common/util/TestTempJarCache.java
+Index: gluegen-v2.2.0/src/junit/com/jogamp/common/util/TestTempJarCache.java
===================================================================
---- gluegen-v2.1.5.orig/src/junit/com/jogamp/common/util/TestTempJarCache.java 2014-03-24 14:27:08.039844885 +0100
-+++ gluegen-v2.1.5/src/junit/com/jogamp/common/util/TestTempJarCache.java 2014-03-24 14:27:08.039844885 +0100
+--- gluegen-v2.2.0.orig/src/junit/com/jogamp/common/util/TestTempJarCache.java 2014-08-10 15:36:51.194187876 +0200
++++ gluegen-v2.2.0/src/junit/com/jogamp/common/util/TestTempJarCache.java 2014-08-10 15:36:51.194187876 +0200
@@ -197,8 +197,8 @@
@Test
public void testTempJarCache02AddNativeLibs() throws IOException, IllegalArgumentException, URISyntaxException {
@@ -13,19 +13,10 @@
final ClassLoader cl = getClass().getClassLoader();
URI jarUriRoot = JarUtil.getJarSubURI(TempJarCache.class.getName(), cl);
-@@ -217,7 +217,7 @@
- @Test
- public void testTempJarCache03AddNativeJarLibs() throws IOException {
- if(AndroidVersion.isAvailable) { System.err.println("n/a on Android"); return; }
-- final String libBaseName = "gluegen-rt";
-+ final String libBaseName = "gluegen2-rt";
-
- JNILibLoaderBase.addNativeJarLibs(TempJarCache.class, libBaseName);
- Assert.assertTrue(JNILibLoaderBase.isLoaded(libBaseName));
-Index: gluegen-v2.1.5/src/java/com/jogamp/common/os/Platform.java
+Index: gluegen-v2.2.0/src/java/com/jogamp/common/os/Platform.java
===================================================================
---- gluegen-v2.1.5.orig/src/java/com/jogamp/common/os/Platform.java 2014-03-24 14:27:08.039844885 +0100
-+++ gluegen-v2.1.5/src/java/com/jogamp/common/os/Platform.java 2014-03-24 14:27:08.039844885 +0100
+--- gluegen-v2.2.0.orig/src/java/com/jogamp/common/os/Platform.java 2014-08-10 15:36:51.194187876 +0200
++++ gluegen-v2.2.0/src/java/com/jogamp/common/os/Platform.java 2014-08-10 15:36:51.194187876 +0200
@@ -146,7 +146,7 @@
private static final String useTempJarCachePropName = "jogamp.gluegen.UseTempJarCache";
@@ -43,7 +34,7 @@
+ JVMUtil.initSingleton(); // requires gluegen2-rt, one-time init.
// AWT Headless determination
- if( !Debug.getBooleanProperty("java.awt.headless", true) &&
+ if( !PropertyAccess.getBooleanProperty("java.awt.headless", true) &&
@@ -252,7 +252,7 @@
}
More information about the pkg-java-commits
mailing list