[pkg-java] r10383 - in trunk/java3d/debian: . patches
Torsten Werner
twerner at alioth.debian.org
Tue Sep 15 10:07:35 UTC 2009
Author: twerner
Date: 2009-09-15 10:07:35 +0000 (Tue, 15 Sep 2009)
New Revision: 10383
Added:
trunk/java3d/debian/patches/05_pic_amd64.patch
trunk/java3d/debian/patches/05_pic_i586.patch
Modified:
trunk/java3d/debian/changelog
trunk/java3d/debian/patches/01_fix_powerpc_ftbfs.patch
trunk/java3d/debian/patches/02_fix_generic_ftbfs.patch
trunk/java3d/debian/patches/03_fix_ia64_ftbfs.patch
trunk/java3d/debian/patches/series
Log:
Add missing compiler option -fPIC. (hopefully closes: #545840)
Modified: trunk/java3d/debian/changelog
===================================================================
--- trunk/java3d/debian/changelog 2009-09-15 10:02:43 UTC (rev 10382)
+++ trunk/java3d/debian/changelog 2009-09-15 10:07:35 UTC (rev 10383)
@@ -1,3 +1,9 @@
+java3d (1.5.2+dfsg-4) unstable; urgency=low
+
+ * Add missing compiler option -fPIC. (hopefully closes: #545840)
+
+ -- Torsten Werner <twerner at debian.org> Tue, 15 Sep 2009 12:01:30 +0200
+
java3d (1.5.2+dfsg-3) unstable; urgency=low
[ Onkar Shinde ]
Modified: trunk/java3d/debian/patches/01_fix_powerpc_ftbfs.patch
===================================================================
--- trunk/java3d/debian/patches/01_fix_powerpc_ftbfs.patch 2009-09-15 10:02:43 UTC (rev 10382)
+++ trunk/java3d/debian/patches/01_fix_powerpc_ftbfs.patch 2009-09-15 10:07:35 UTC (rev 10383)
@@ -1,7 +1,14 @@
-diff -Nur -x '*.orig' -x '*~' java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-ppc.xml java3d-1.5.2+dfsg.new/j3d-core/src/native/ogl/build-linux-ppc.xml
---- java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-ppc.xml 2008-02-29 01:48:00.000000000 +0530
-+++ java3d-1.5.2+dfsg.new/j3d-core/src/native/ogl/build-linux-ppc.xml 2009-08-11 20:37:25.000000000 +0530
-@@ -28,7 +28,7 @@
+Index: java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-ppc.xml
+===================================================================
+--- java3d-1.5.2+dfsg.orig/j3d-core/src/native/ogl/build-linux-ppc.xml 2008-02-28 21:18:00.000000000 +0100
++++ java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-ppc.xml 2009-09-15 11:56:23.000000000 +0200
+@@ -23,12 +23,12 @@
+ <!-- Compile the c source files-->
+ <!-- Inhibit all warning for 32 bit build. Any warning will be caught in the 64 bit build -->
+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
+- <arg line="-w -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I/usr/X11R6/include -I${javahCoreTarget} ${bldFlag} -DLINUX -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c ${oglsrc}/NativeScreenInfo.c ${oglsrc}/NativeConfigTemplate3D.c ${oglsrc}/MasterControl.c ${oglsrc}/GeometryArrayRetained.c ${oglsrc}/Attributes.c ${oglsrc}/CgShaderProgram.c ${oglsrc}/GLSLShaderProgram.c ${oglsrc}/Lights.c"/>
++ <arg line="-fPIC -w -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I/usr/X11R6/include -I${javahCoreTarget} ${bldFlag} -DLINUX -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c ${oglsrc}/NativeScreenInfo.c ${oglsrc}/NativeConfigTemplate3D.c ${oglsrc}/MasterControl.c ${oglsrc}/GeometryArrayRetained.c ${oglsrc}/Attributes.c ${oglsrc}/CgShaderProgram.c ${oglsrc}/GLSLShaderProgram.c ${oglsrc}/Lights.c"/>
+ </exec>
<!-- Create the library file-->
<exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
Modified: trunk/java3d/debian/patches/02_fix_generic_ftbfs.patch
===================================================================
--- trunk/java3d/debian/patches/02_fix_generic_ftbfs.patch 2009-09-15 10:02:43 UTC (rev 10382)
+++ trunk/java3d/debian/patches/02_fix_generic_ftbfs.patch 2009-09-15 10:07:35 UTC (rev 10383)
@@ -1,6 +1,7 @@
-diff -Nur -x '*.orig' -x '*~' java3d-1.5.2+dfsg/j3d-core/build.xml java3d-1.5.2+dfsg.new/j3d-core/build.xml
---- java3d-1.5.2+dfsg/j3d-core/build.xml 2008-05-24 02:01:19.000000000 +0530
-+++ java3d-1.5.2+dfsg.new/j3d-core/build.xml 2009-08-14 09:43:53.000000000 +0530
+Index: java3d-1.5.2+dfsg/j3d-core/build.xml
+===================================================================
+--- java3d-1.5.2+dfsg.orig/j3d-core/build.xml 2008-05-23 22:31:19.000000000 +0200
++++ java3d-1.5.2+dfsg/j3d-core/build.xml 2009-09-15 11:56:34.000000000 +0200
@@ -196,6 +196,15 @@
<property name="install.bin" value="lib/ppc"/>
</target>
@@ -37,9 +38,10 @@
<condition property="isSolarisOnSparc">
<os name="SunOS" arch="sparc"/>
</condition>
-diff -Nur -x '*.orig' -x '*~' java3d-1.5.2+dfsg/j3d-core/src/native/build.xml java3d-1.5.2+dfsg.new/j3d-core/src/native/build.xml
---- java3d-1.5.2+dfsg/j3d-core/src/native/build.xml 2008-02-29 01:47:58.000000000 +0530
-+++ java3d-1.5.2+dfsg.new/j3d-core/src/native/build.xml 2009-08-14 09:45:22.000000000 +0530
+Index: java3d-1.5.2+dfsg/j3d-core/src/native/build.xml
+===================================================================
+--- java3d-1.5.2+dfsg.orig/j3d-core/src/native/build.xml 2008-02-28 21:17:58.000000000 +0100
++++ java3d-1.5.2+dfsg/j3d-core/src/native/build.xml 2009-09-15 11:56:34.000000000 +0200
@@ -45,6 +45,13 @@
<property name="osNativeScreenInfo" value="X11NativeScreenInfo"/>
</target>
@@ -86,9 +88,10 @@
<property name="bldType" value="opt"/>
<property name="javahCoreSrc"
location="${src}/classes/share/javax/media/j3d"/>
-diff -Nur -x '*.orig' -x '*~' java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-generic.xml java3d-1.5.2+dfsg.new/j3d-core/src/native/ogl/build-linux-generic.xml
---- java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-generic.xml 1970-01-01 05:30:00.000000000 +0530
-+++ java3d-1.5.2+dfsg.new/j3d-core/src/native/ogl/build-linux-generic.xml 2009-08-14 09:39:15.000000000 +0530
+Index: java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-generic.xml
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-generic.xml 2009-09-15 11:57:25.000000000 +0200
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+
@@ -116,7 +119,7 @@
+
+ <!-- Compile the c source files-->
+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
-+ <arg line="-I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c ${oglsrc}/NativeScreenInfo.c ${oglsrc}/NativeConfigTemplate3D.c ${oglsrc}/MasterControl.c ${oglsrc}/GeometryArrayRetained.c ${oglsrc}/Attributes.c ${oglsrc}/CgShaderProgram.c ${oglsrc}/GLSLShaderProgram.c ${oglsrc}/Lights.c"/>
++ <arg line="-fPIC -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c ${oglsrc}/NativeScreenInfo.c ${oglsrc}/NativeConfigTemplate3D.c ${oglsrc}/MasterControl.c ${oglsrc}/GeometryArrayRetained.c ${oglsrc}/Attributes.c ${oglsrc}/CgShaderProgram.c ${oglsrc}/GLSLShaderProgram.c ${oglsrc}/Lights.c"/>
+ </exec>
+
+ <!-- Create the library file-->
@@ -129,7 +132,7 @@
+ <target name="compile-ogl-cg" if="build.cg">
+ <!-- Compile the wrapper -->
+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
-+ <arg line="-I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/>
++ <arg line="-fPIC -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/>
+ </exec>
+
+ <!-- Create the wrapper library -->
Modified: trunk/java3d/debian/patches/03_fix_ia64_ftbfs.patch
===================================================================
--- trunk/java3d/debian/patches/03_fix_ia64_ftbfs.patch 2009-09-15 10:02:43 UTC (rev 10382)
+++ trunk/java3d/debian/patches/03_fix_ia64_ftbfs.patch 2009-09-15 10:07:35 UTC (rev 10383)
@@ -1,7 +1,16 @@
-diff -Nur -x '*.orig' -x '*~' java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-ia64.xml java3d-1.5.2+dfsg.new/j3d-core/src/native/ogl/build-linux-ia64.xml
---- java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-ia64.xml 2008-02-29 01:48:00.000000000 +0530
-+++ java3d-1.5.2+dfsg.new/j3d-core/src/native/ogl/build-linux-ia64.xml 2009-08-14 00:33:04.000000000 +0530
-@@ -29,7 +29,7 @@
+Index: java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-ia64.xml
+===================================================================
+--- java3d-1.5.2+dfsg.orig/j3d-core/src/native/ogl/build-linux-ia64.xml 2008-02-28 21:18:00.000000000 +0100
++++ java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-ia64.xml 2009-09-15 11:58:18.000000000 +0200
+@@ -22,14 +22,14 @@
+
+ <!-- Compile the c source files; based on build-linux-amd64.xml-->
+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
+- <arg line="-I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c ${oglsrc}/NativeScreenInfo.c ${oglsrc}/NativeConfigTemplate3D.c ${oglsrc}/MasterControl.c ${oglsrc}/GeometryArrayRetained.c ${oglsrc}/Attributes.c ${oglsrc}/CgShaderProgram.c ${oglsrc}/GLSLShaderProgram.c ${oglsrc}/Lights.c"/>
++ <arg line="-fPIC -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c ${oglsrc}/NativeScreenInfo.c ${oglsrc}/NativeConfigTemplate3D.c ${oglsrc}/MasterControl.c ${oglsrc}/GeometryArrayRetained.c ${oglsrc}/Attributes.c ${oglsrc}/CgShaderProgram.c ${oglsrc}/GLSLShaderProgram.c ${oglsrc}/Lights.c"/>
+ </exec>
+
+ <!-- Create the library file; based on build-linux-amd64.xml-->
<!-- Must use gcc to link, not ld, hence also need -shared; refer to http://www.gelato.unsw.edu.au/linux-ia64/0006/0212.html -->
<!-- Removed -R/usr/openwin/lib - an ld specific option (should be a filename, not a dir?!?) -->
<exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
Added: trunk/java3d/debian/patches/05_pic_amd64.patch
===================================================================
--- trunk/java3d/debian/patches/05_pic_amd64.patch (rev 0)
+++ trunk/java3d/debian/patches/05_pic_amd64.patch 2009-09-15 10:07:35 UTC (rev 10383)
@@ -0,0 +1,22 @@
+Index: java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-amd64.xml
+===================================================================
+--- java3d-1.5.2+dfsg.orig/j3d-core/src/native/ogl/build-linux-amd64.xml 2009-09-15 11:59:43.000000000 +0200
++++ java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-amd64.xml 2009-09-15 12:00:03.000000000 +0200
+@@ -25,7 +25,7 @@
+ <!-- Compile the c source files-->
+ <!-- Inhibit all warning for 32 bit build. Any warning will be caught in the 64 bit build -->
+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
+- <arg line="-m64 -march=k8 -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c ${oglsrc}/NativeScreenInfo.c ${oglsrc}/NativeConfigTemplate3D.c ${oglsrc}/MasterControl.c ${oglsrc}/GeometryArrayRetained.c ${oglsrc}/Attributes.c ${oglsrc}/CgShaderProgram.c ${oglsrc}/GLSLShaderProgram.c ${oglsrc}/Lights.c"/>
++ <arg line="-fPIC -m64 -march=k8 -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c ${oglsrc}/NativeScreenInfo.c ${oglsrc}/NativeConfigTemplate3D.c ${oglsrc}/MasterControl.c ${oglsrc}/GeometryArrayRetained.c ${oglsrc}/Attributes.c ${oglsrc}/CgShaderProgram.c ${oglsrc}/GLSLShaderProgram.c ${oglsrc}/Lights.c"/>
+ </exec>
+
+ <!-- Create the library file-->
+@@ -38,7 +38,7 @@
+ <target name="compile-ogl-cg" if="build.cg">
+ <!-- Compile the wrapper -->
+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
+- <arg line="-m64 -march=k8 -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/>
++ <arg line="-fPIC -m64 -march=k8 -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/>
+ </exec>
+
+ <!-- Create the wrapper library -->
Added: trunk/java3d/debian/patches/05_pic_i586.patch
===================================================================
--- trunk/java3d/debian/patches/05_pic_i586.patch (rev 0)
+++ trunk/java3d/debian/patches/05_pic_i586.patch 2009-09-15 10:07:35 UTC (rev 10383)
@@ -0,0 +1,22 @@
+Index: java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-i586.xml
+===================================================================
+--- java3d-1.5.2+dfsg.orig/j3d-core/src/native/ogl/build-linux-i586.xml 2009-09-15 12:00:21.000000000 +0200
++++ java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-i586.xml 2009-09-15 12:00:47.000000000 +0200
+@@ -25,7 +25,7 @@
+ <!-- Compile the c source files-->
+ <!-- Inhibit all warning for 32 bit build. Any warning will be caught in the 64 bit build -->
+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
+- <arg line="-w -m32 -mcpu=i386 -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c ${oglsrc}/NativeScreenInfo.c ${oglsrc}/NativeConfigTemplate3D.c ${oglsrc}/MasterControl.c ${oglsrc}/GeometryArrayRetained.c ${oglsrc}/Attributes.c ${oglsrc}/CgShaderProgram.c ${oglsrc}/GLSLShaderProgram.c ${oglsrc}/Lights.c"/>
++ <arg line="-fPIC -w -m32 -mcpu=i386 -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c ${oglsrc}/NativeScreenInfo.c ${oglsrc}/NativeConfigTemplate3D.c ${oglsrc}/MasterControl.c ${oglsrc}/GeometryArrayRetained.c ${oglsrc}/Attributes.c ${oglsrc}/CgShaderProgram.c ${oglsrc}/GLSLShaderProgram.c ${oglsrc}/Lights.c"/>
+ </exec>
+
+ <!-- Create the library file-->
+@@ -38,7 +38,7 @@
+ <target name="compile-ogl-cg" if="build.cg">
+ <!-- Compile the wrapper -->
+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
+- <arg line="-m32 -mcpu=i386 -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/>
++ <arg line="-fPIC -m32 -mcpu=i386 -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/>
+ </exec>
+
+ <!-- Create the wrapper library -->
Modified: trunk/java3d/debian/patches/series
===================================================================
--- trunk/java3d/debian/patches/series 2009-09-15 10:02:43 UTC (rev 10382)
+++ trunk/java3d/debian/patches/series 2009-09-15 10:07:35 UTC (rev 10383)
@@ -2,3 +2,5 @@
02_fix_generic_ftbfs.patch
03_fix_ia64_ftbfs.patch
04_no_maxmemory.patch
+05_pic_amd64.patch
+05_pic_i586.patch
More information about the pkg-java-commits
mailing list