[pkg-java] r15429 - in trunk/libjogl2-java/debian: . patches
Sylvestre Ledru
sylvestre at alioth.debian.org
Mon Nov 21 08:19:42 UTC 2011
Author: sylvestre
Date: 2011-11-21 08:19:41 +0000 (Mon, 21 Nov 2011)
New Revision: 15429
Added:
trunk/libjogl2-java/debian/patches/otherArchsoswin_2.diff
trunk/libjogl2-java/debian/patches/sparc.diff
Modified:
trunk/libjogl2-java/debian/changelog
trunk/libjogl2-java/debian/patches/series
Log:
libjogl2-java (2.0-rc3-6) unstable; urgency=low
* Fix a problem under arm
-- Sylvestre Ledru <sylvestre at debian.org> Sun, 20 Nov 2011 21:43:36 +0100
libjogl2-java (2.0-rc3-5) unstable; urgency=low
* Example is now working (Closes: #634996)
* Fix the various FTBFS (Closes: #638431) (LP: #809743)
Modified: trunk/libjogl2-java/debian/changelog
===================================================================
--- trunk/libjogl2-java/debian/changelog 2011-11-21 07:55:23 UTC (rev 15428)
+++ trunk/libjogl2-java/debian/changelog 2011-11-21 08:19:41 UTC (rev 15429)
@@ -1,3 +1,16 @@
+libjogl2-java (2.0-rc3-6) unstable; urgency=low
+
+ * Fix a problem under arm
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sun, 20 Nov 2011 21:43:36 +0100
+
+libjogl2-java (2.0-rc3-5) unstable; urgency=low
+
+ * Example is now working (Closes: #634996)
+ * Fix the various FTBFS (Closes: #638431) (LP: #809743)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sun, 20 Nov 2011 21:43:29 +0100
+
libjogl2-java (2.0-rc3-4) unstable; urgency=low
* Ant to build C code = a lot of uploads ... pfff
Added: trunk/libjogl2-java/debian/patches/otherArchsoswin_2.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/otherArchsoswin_2.diff (rev 0)
+++ trunk/libjogl2-java/debian/patches/otherArchsoswin_2.diff 2011-11-21 08:19:41 UTC (rev 15429)
@@ -0,0 +1,128 @@
+Index: libjogl2-java-2.0-rc3/make/build-nativewindow.xml
+===================================================================
+--- libjogl2-java-2.0-rc3.orig/make/build-nativewindow.xml 2011-11-20 17:10:07.000000000 +0100
++++ libjogl2-java-2.0-rc3/make/build-nativewindow.xml 2011-11-20 21:34:35.923874821 +0100
+@@ -380,10 +380,10 @@
+ </linker>
+
+ <linker id="linker.cfg.linux.armv7.nativewindow.x11" extends="linker.cfg.linux.armv7">
+- <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11" />
+- <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xxf86vm" />
+- <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xinerama" />
+- <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xrender" />
++ <syslibset libs="X11" />
++ <syslibset libs="Xxf86vm" />
++ <syslibset libs="Xinerama" />
++ <syslibset libs="Xrender" />
+ </linker>
+
+ <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris">
+@@ -627,6 +627,7 @@
+ </patternset>
+
+ <echo message="Compiling @{output.lib.name}" />
++ <echo message="java.lib.dir.platform: ${java.lib.dir.platform}" />
+
+ <!-- have to wrap cc task with outofdate, because otherwise cc links a new library
+ even when no files have been compiled -->
+@@ -666,7 +667,7 @@
+ <!-- This must come last to not override real include paths -->
+ <!-- includepath path="stub_includes/macosx" if="isOSX" / -->
+ </compiler>
+-
++
+ <linker extends="@{linker.cfg.id}">
+ <syslibset dir="${java.lib.dir.platform}" libs="jawt" if="@{output.lib.name}.useLibJAWT"/>
+ <syslibset dir="${java.lib.dir.platform}/server" libs="jvm" if="@{output.lib.name}.useLibJVM"/>
+Index: libjogl2-java-2.0-rc3/make/build-newt.xml
+===================================================================
+--- libjogl2-java-2.0-rc3.orig/make/build-newt.xml 2011-11-20 17:10:07.000000000 +0100
++++ libjogl2-java-2.0-rc3/make/build-newt.xml 2011-11-20 18:44:37.728372518 +0100
+@@ -274,9 +274,9 @@
+ </linker>
+
+ <linker id="linker.cfg.linux.armv7.newt.x11" extends="linker.cfg.linux.armv7">
+- <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11" />
+- <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xrandr" />
+- <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xxf86vm" />
++ <syslibset libs="X11" />
++ <syslibset libs="Xrandr" />
++ <syslibset libs="Xxf86vm" />
+ </linker>
+
+ <linker id="linker.cfg.android.newt" extends="linker.cfg.android">
+@@ -367,13 +367,73 @@
+ <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" />
++ <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.mips" if="isLinuxMips">
++ <echo message="Linux.mips" />
++ <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.mipsel" if="isLinuxMipsel">
++ <echo message="Linux.mips" />
++ <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.ppc" if="isLinuxPpc">
++ <echo message="Linux.ppc" />
++ <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.s390" if="isLinuxs390">
++ <echo message="Linux.S390" />
++ <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" />
++ <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.ia64" if="isLinuxIA64">
+ <echo message="Linux.IA64" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <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.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.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 2011-11-21 07:55:23 UTC (rev 15428)
+++ trunk/libjogl2-java/debian/patches/series 2011-11-21 08:19:41 UTC (rev 15429)
@@ -7,4 +7,5 @@
disable_android_2.diff
arch_naming.diff
linker.cfg.id.os.diff
-
+otherArchsoswin_2.diff
+sparc.diff
Added: trunk/libjogl2-java/debian/patches/sparc.diff
===================================================================
--- trunk/libjogl2-java/debian/patches/sparc.diff (rev 0)
+++ trunk/libjogl2-java/debian/patches/sparc.diff 2011-11-21 08:19:41 UTC (rev 15429)
@@ -0,0 +1,13 @@
+Index: libjogl2-java-2.0-rc3/make/build-nativewindow.xml
+===================================================================
+--- libjogl2-java-2.0-rc3.orig/make/build-nativewindow.xml 2011-11-20 21:44:56.000000000 +0100
++++ libjogl2-java-2.0-rc3/make/build-nativewindow.xml 2011-11-20 21:47:09.275858013 +0100
+@@ -670,6 +670,8 @@
+
+ <linker extends="@{linker.cfg.id}">
+ <syslibset dir="${java.lib.dir.platform}" libs="jawt" if="@{output.lib.name}.useLibJAWT"/>
++ <syslibset dir="${java.lib.dir.platform}/sparc/" libs="jawt" if="isLinuxSparc"/>
++
+ <syslibset dir="${java.lib.dir.platform}/server" libs="jvm" if="@{output.lib.name}.useLibJVM"/>
+ </linker>
+ </cc>
More information about the pkg-java-commits
mailing list