[libjogl2-java] 39/58: Imported Debian patch 2.0-rc11-1~exp4.3
Tony Mancill
tmancill at moszumanska.debian.org
Thu Sep 4 03:59:18 UTC 2014
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository libjogl2-java.
commit e43aacc3b9ca96014223bbcd9bb26591c8f78b02
Author: Thomas Preud'homme <robotux at debian.org>
Date: Wed Dec 26 15:23:17 2012 +0100
Imported Debian patch 2.0-rc11-1~exp4.3
---
debian/changelog | 9 +
debian/patches/TARGET_PLATFORM_LIBS_2.diff | 26 ---
.../patches/{armhf-build.diff => arm-build.diff} | 246 +++++++++++----------
debian/patches/armhfbuild.diff | 17 --
debian/patches/series | 4 +-
5 files changed, 145 insertions(+), 157 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d286336..2c1e899 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libjogl2-java (2.0-rc11-1~exp4.3) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * Search libs in default system paths in make/build-newt.xml
+ * Combine TARGET_PLATFORM_LIBS_2.diff, armhfbuild.diff and armhf-build.diff
+ patches into arm-build.diff patch.
+
+ -- Thomas Preud'homme <robotux at debian.org> Wed, 26 Dec 2012 15:23:17 +0100
+
libjogl2-java (2.0-rc11-1~exp4.2) experimental; urgency=low
* Non-maintainer upload.
diff --git a/debian/patches/TARGET_PLATFORM_LIBS_2.diff b/debian/patches/TARGET_PLATFORM_LIBS_2.diff
deleted file mode 100644
index b2c525b..0000000
--- a/debian/patches/TARGET_PLATFORM_LIBS_2.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: jogl-v2.0-rc11/make/build-jogl.xml
-===================================================================
---- jogl-v2.0-rc11.orig/make/build-jogl.xml 2012-10-31 21:58:36.000000000 +0100
-+++ jogl-v2.0-rc11/make/build-jogl.xml 2012-11-08 16:44:29.000000000 +0100
-@@ -1151,7 +1151,7 @@
- </linker>
-
- <linker id="linker.cfg.linux.armv6.jogl.x11" extends="linker.cfg.linux.armv6">
-- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11"/>
-+ <syslibset libs="X11"/>
- </linker>
-
- <linker id="linker.cfg.android.jogl" extends="linker.cfg.android">
-Index: jogl-v2.0-rc11/make/build-newt.xml
-===================================================================
---- jogl-v2.0-rc11.orig/make/build-newt.xml 2012-10-31 21:58:36.000000000 +0100
-+++ jogl-v2.0-rc11/make/build-newt.xml 2012-11-08 16:43:44.000000000 +0100
-@@ -326,7 +326,7 @@
- </linker>
-
- <linker id="linker.cfg.android.newt" extends="linker.cfg.android">
-- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="android" />
-+ <syslibset libs="android" />
- </linker>
-
- <linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris">
diff --git a/debian/patches/armhf-build.diff b/debian/patches/arm-build.diff
similarity index 83%
rename from debian/patches/armhf-build.diff
rename to debian/patches/arm-build.diff
index d741850..2d587a4 100644
--- a/debian/patches/armhf-build.diff
+++ b/debian/patches/arm-build.diff
@@ -1,8 +1,9 @@
-unchanged:
---- libjogl2-java-2.0-rc11/make/build-nativewindow.xml
-+++ libjogl2-java-2.0-rc11/make/build-nativewindow.xml
-@@ -88,6 +88,19 @@
- <isset property="setup.noAWT"/>
+diff --git a/make/build-jogl.xml b/make/build-jogl.xml
+index a071441..aa7aa6e 100644
+--- a/make/build-jogl.xml
++++ b/make/build-jogl.xml
+@@ -197,6 +197,19 @@
+ <isset property="setup.noSWT"/>
</condition>
+ <condition property="isLinuxARM">
@@ -18,44 +19,46 @@ unchanged:
+ </and>
+ </condition>
+
- <property name="java.excludes.all" value="${java.excludes.awt}" />
- <echo message="java.excludes.all: ${java.excludes.all}" />
- </target>
-@@ -342,7 +355,7 @@
+ <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.nativewindow.x11" extends="compiler.cfg.linux.armv6">
-+ <compiler id="compiler.cfg.linux.arm.nativewindow.x11" extends="compiler.cfg.linux">
+- <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" />
-@@ -396,7 +409,7 @@
- <syslibset libs="Xrender"/>
+@@ -1150,8 +1163,8 @@
+ <syslibset libs="X11"/>
</linker>
-- <linker id="linker.cfg.linux.armv6.nativewindow.x11" extends="linker.cfg.linux.armv6">
-+ <linker id="linker.cfg.linux.arm.nativewindow.x11" extends="linker.cfg.linux">
- <syslibset libs="X11" />
- <syslibset libs="Xxf86vm" />
- <syslibset libs="Xrender" />
-@@ -487,10 +500,10 @@
- <property name="linker.cfg.id.oswin" value="linker.cfg.linux.amd64.nativewindow.x11" />
+- <linker id="linker.cfg.linux.armv6.jogl.x11" extends="linker.cfg.linux.armv6">
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11"/>
++ <linker id="linker.cfg.linux.arm.jogl.x11" extends="linker.cfg.linux">
++ <syslibset libs="X11"/>
+ </linker>
+
+ <linker id="linker.cfg.android.jogl" extends="linker.cfg.android">
+@@ -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.nativewindow.x11" />
-- <property name="linker.cfg.id.oswin" value="linker.cfg.linux.armv6.nativewindow.x11" />
+- <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.oswin" value="linker.cfg.linux.arm.nativewindow.x11" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux.arm.jogl.x11" />
++ <property name="linker.cfg.id.os" value="linker.cfg.linux.arm.jogl.x11" />
</target>
<target name="c.configure.linux.ia64" if="isLinuxIA64">
-@@ -541,7 +554,7 @@
- <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" />
+@@ -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" />
@@ -63,65 +66,12 @@ unchanged:
<target name="c.configure.android" if="isAndroid">
<echo message="Android" />
-unchanged:
---- /dev/null
-+++ libjogl2-java-2.0-rc11/make/scripts/tests-armv7_armhf.sh
-@@ -0,0 +1,7 @@
-+#! /bin/bash
-+
-+spath=`dirname $0`
-+
-+. $spath/tests.sh `which java` -DummyArg ../build-linux-armv7hf $*
-+
-+
-unchanged:
---- /dev/null
-+++ libjogl2-java-2.0-rc11/make/scripts/make.jogl.all.linux-armv7hf.sh
-@@ -0,0 +1,27 @@
-+#! /bin/sh
-+
-+# arm-linux-gnueabihf == armhf triplet
-+PATH=`pwd`/../../gluegen/make/lib/linux/arm-linux-gnueabihf/bin:$PATH
-+export PATH
-+
-+# -Dc.compiler.debug=true
-+# -Dgluegen.cpptasks.detected.os=true \
-+# -DisUnix=true \
-+# -DisLinux=true \
-+# -DisLinuxARMv7=true \
-+# -DisX11=false \
-+
-+export TARGET_PLATFORM_ROOT=/
-+export TARGET_PLATFORM_LIBS=/usr/lib/arm-linux-gnueabihf
-+export TARGET_JAVA_LIBS=/usr/lib/jvm/java-6-openjdk-armhf/jre/lib/arm
-+
-+export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv7hf.xml"
-+
-+ant \
-+ -Drootrel.build=build-linux-armv7hf \
-+ -Dsetup.addNativeKD=true \
-+ -Dsetup.addNativeOpenMAX=true \
-+ -Dsetup.addNativeBroadcom=true \
-+ -Djunit.run.arg0="-Dnewt.test.Screen.disableScreenMode" \
-+ $* 2>&1 | tee make.jogl.all.linux-armv7hf.log
-+
-unchanged:
---- /dev/null
-+++ libjogl2-java-2.0-rc11/make/scripts/tests-linux-armv7hf.sh
-@@ -0,0 +1,7 @@
-+#! /bin/bash
-+
-+spath=`dirname $0`
-+
-+. $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"/>
+diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
+index 26cf237..d49ef21 100644
+--- a/make/build-nativewindow.xml
++++ b/make/build-nativewindow.xml
+@@ -88,6 +88,19 @@
+ <isset property="setup.noAWT"/>
</condition>
+ <condition property="isLinuxARM">
@@ -137,44 +87,50 @@ unchanged:
+ </and>
+ </condition>
+
- <property name="java.excludes.javadoc.packagenames"
- value="jogamp.opengl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/>
-
-@@ -1122,7 +1135,7 @@
+ <property name="java.excludes.all" value="${java.excludes.awt}" />
+ <echo message="java.excludes.all: ${java.excludes.all}" />
+ </target>
+@@ -342,7 +355,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">
+- <compiler id="compiler.cfg.linux.armv6.nativewindow.x11" extends="compiler.cfg.linux.armv6">
++ <compiler id="compiler.cfg.linux.arm.nativewindow.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"/>
+@@ -396,10 +409,10 @@
+ <syslibset libs="Xrender"/>
</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 id="linker.cfg.linux.armv6.nativewindow.x11" extends="linker.cfg.linux.armv6">
+- <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" />
++ <linker id="linker.cfg.linux.arm.nativewindow.x11" extends="linker.cfg.linux">
++ <syslibset libs="X11" />
++ <syslibset libs="Xxf86vm" />
++ <syslibset libs="Xrender" />
</linker>
-@@ -1239,10 +1252,10 @@
- <property name="linker.cfg.id.os" value="linker.cfg.linux.amd64.jogl.x11" />
+ <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris">
+@@ -487,10 +500,10 @@
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.amd64.nativewindow.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" />
+- <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6.nativewindow.x11" />
+- <property name="linker.cfg.id.oswin" value="linker.cfg.linux.armv6.nativewindow.x11" />
+ <target name="c.configure.linux.arm" if="isLinuxARM">
+ <echo message="Linux.arm" />
-+ <property name="compiler.cfg.id" value="compiler.cfg.linux.arm.jogl.x11" />
-+ <property name="linker.cfg.id.os" value="linker.cfg.linux.arm.jogl.x11" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux.arm.nativewindow.x11" />
++ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.arm.nativewindow.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" />
+@@ -541,7 +554,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" />
@@ -182,10 +138,10 @@ unchanged:
<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
+diff --git a/make/build-newt.xml b/make/build-newt.xml
+index 9872912..c4f4c6b 100644
+--- a/make/build-newt.xml
++++ b/make/build-newt.xml
@@ -157,6 +157,19 @@
<isset property="setup.noOpenGL"/>
</condition>
@@ -215,15 +171,24 @@ unchanged:
<!-- 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 @@
+@@ -320,13 +333,13 @@
<!--syslibset libs="X11-xcb" /-->
</linker>
- <linker id="linker.cfg.linux.armv6.newt.x11" extends="linker.cfg.linux.armv6">
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" />
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrandr" />
+ <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" />
++ <syslibset libs="X11" />
++ <syslibset libs="Xrandr" />
</linker>
+
+ <linker id="linker.cfg.android.newt" extends="linker.cfg.android">
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="android" />
++ <syslibset libs="android" />
+ </linker>
+
+ <linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris">
@@ -410,11 +423,11 @@
<echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
</target>
@@ -250,3 +215,62 @@ unchanged:
<target name="c.configure.android" if="isAndroid">
<echo message="Android" />
+diff --git a/make/scripts/make.jogl.all.linux-armv7hf.sh b/make/scripts/make.jogl.all.linux-armv7hf.sh
+new file mode 100644
+index 0000000..5170810
+--- /dev/null
++++ b/make/scripts/make.jogl.all.linux-armv7hf.sh
+@@ -0,0 +1,27 @@
++#! /bin/sh
++
++# arm-linux-gnueabihf == armhf triplet
++PATH=`pwd`/../../gluegen/make/lib/linux/arm-linux-gnueabihf/bin:$PATH
++export PATH
++
++# -Dc.compiler.debug=true
++# -Dgluegen.cpptasks.detected.os=true \
++# -DisUnix=true \
++# -DisLinux=true \
++# -DisLinuxARMv7=true \
++# -DisX11=false \
++
++export TARGET_PLATFORM_ROOT=/
++export TARGET_PLATFORM_LIBS=/usr/lib/arm-linux-gnueabihf
++export TARGET_JAVA_LIBS=/usr/lib/jvm/java-6-openjdk-armhf/jre/lib/arm
++
++export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv7hf.xml"
++
++ant \
++ -Drootrel.build=build-linux-armv7hf \
++ -Dsetup.addNativeKD=true \
++ -Dsetup.addNativeOpenMAX=true \
++ -Dsetup.addNativeBroadcom=true \
++ -Djunit.run.arg0="-Dnewt.test.Screen.disableScreenMode" \
++ $* 2>&1 | tee make.jogl.all.linux-armv7hf.log
++
+diff --git a/make/scripts/tests-armv7_armhf.sh b/make/scripts/tests-armv7_armhf.sh
+new file mode 100644
+index 0000000..5526e81
+--- /dev/null
++++ b/make/scripts/tests-armv7_armhf.sh
+@@ -0,0 +1,7 @@
++#! /bin/bash
++
++spath=`dirname $0`
++
++. $spath/tests.sh `which java` -DummyArg ../build-linux-armv7hf $*
++
++
+diff --git a/make/scripts/tests-linux-armv7hf.sh b/make/scripts/tests-linux-armv7hf.sh
+new file mode 100644
+index 0000000..5526e81
+--- /dev/null
++++ b/make/scripts/tests-linux-armv7hf.sh
+@@ -0,0 +1,7 @@
++#! /bin/bash
++
++spath=`dirname $0`
++
++. $spath/tests.sh `which java` -DummyArg ../build-linux-armv7hf $*
++
++
diff --git a/debian/patches/armhfbuild.diff b/debian/patches/armhfbuild.diff
deleted file mode 100644
index 1b29702..0000000
--- a/debian/patches/armhfbuild.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: jogl-v2.0-rc11/make/build-nativewindow.xml
-===================================================================
---- jogl-v2.0-rc11.orig/make/build-nativewindow.xml 2012-10-31 21:58:36.000000000 +0100
-+++ jogl-v2.0-rc11/make/build-nativewindow.xml 2012-11-08 16:45:12.000000000 +0100
-@@ -397,9 +397,9 @@
- </linker>
-
- <linker id="linker.cfg.linux.armv6.nativewindow.x11" extends="linker.cfg.linux.armv6">
-- <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/series b/debian/patches/series
index 667ac51..4b9b454 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,8 +9,6 @@ disable_android_2.diff
#linker.cfg.id.os.diff
#otherArchsoswin_2.diff
#disable_android_3.diff
-TARGET_PLATFORM_LIBS_2.diff
manifest.diff
-armhfbuild.diff
s390x.diff
-armhf-build.diff
+arm-build.diff
--
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