Package list java3d / b3248f3
this should hopefully fix most ftbfs Onkar Shinde 12 years ago
3 changed file(s) with 73 addition(s) and 2 deletion(s). Raw diff Collapse all Expand all
0 java3d (1.5.2+dfsg-3) unstable; urgency=low
1
2 * debian/patches/02_fix_generic_ftbfs.patch
3 - Improve the patch as per my understanding of the build system.
4 (Closes: #541384)
5 * debian/patches/03_fix_ia64_ftbfs.patch
6 - Add fix for FTBFS on ia64.
7
8 -- Onkar Shinde <onkarshinde@ubuntu.com> Fri, 14 Aug 2009 00:12:49 +0530
9
010 java3d (1.5.2+dfsg-2) unstable; urgency=low
111
212 * debian/control
00 diff -Nur -x '*.orig' -x '*~' java3d-1.5.2+dfsg/j3d-core/build.xml java3d-1.5.2+dfsg.new/j3d-core/build.xml
11 --- java3d-1.5.2+dfsg/j3d-core/build.xml 2008-05-24 02:01:19.000000000 +0530
2 +++ java3d-1.5.2+dfsg.new/j3d-core/build.xml 2009-08-13 15:01:06.000000000 +0530
2 +++ java3d-1.5.2+dfsg.new/j3d-core/build.xml 2009-08-14 09:43:53.000000000 +0530
33 @@ -196,6 +196,15 @@
44 <property name="install.bin" value="lib/ppc"/>
55 </target>
3636 <condition property="isSolarisOnSparc">
3737 <os name="SunOS" arch="sparc"/>
3838 </condition>
39 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
40 --- java3d-1.5.2+dfsg/j3d-core/src/native/build.xml 2008-02-29 01:47:58.000000000 +0530
41 +++ java3d-1.5.2+dfsg.new/j3d-core/src/native/build.xml 2009-08-14 09:45:22.000000000 +0530
42 @@ -45,6 +45,13 @@
43 <property name="osNativeScreenInfo" value="X11NativeScreenInfo"/>
44 </target>
45
46 + <target name="nativeSetup-debug-linux-generic" if="isLinuxGeneric">
47 + <property name="bldFlag" value="-g -DDEBUG"/>
48 + <property name="coreLibDependency" value="lib/${os.arch}/libj3dcore-ogl.so"/>
49 + <property name="osNativeConfigTemplate3D" value="X11NativeConfigTemplate3D"/>
50 + <property name="osNativeScreenInfo" value="X11NativeScreenInfo"/>
51 + </target>
52 +
53 <target name="nativeSetup-debug-win32" if="isWindowsOnX86">
54 <property name="bldFlag"
55 value="-DDEBUG -DWIN32 -D_WINDOWS"/>
56 @@ -62,7 +69,7 @@
57 <property name="osNativeScreenInfo" value="Win32NativeScreenInfo"/>
58 </target>
59
60 - <target name="nativeSetup-debug" depends="nativeSetup-debug-solaris, nativeSetup-debug-solaris-x86, nativeSetup-debug-linux, nativeSetup-debug-linux-amd64, nativeSetup-debug-linux-ia64, nativeSetup-debug-linux-ppc, nativeSetup-debug-win32, nativeSetup-debug-winamd64">
61 + <target name="nativeSetup-debug" depends="nativeSetup-debug-solaris, nativeSetup-debug-solaris-x86, nativeSetup-debug-linux, nativeSetup-debug-linux-amd64, nativeSetup-debug-linux-ia64, nativeSetup-debug-linux-ppc, nativeSetup-debug-linux-generic, nativeSetup-debug-win32, nativeSetup-debug-winamd64">
62 <property name="bldType" value="debug"/>
63 <property name="javahCoreSrc"
64 location="${src}/classes/share/javax/media/j3d"/>
65 @@ -112,6 +119,13 @@
66 <property name="osNativeScreenInfo" value="X11NativeScreenInfo"/>
67 </target>
68
69 + <target name="nativeSetup-opt-linux-generic" if="isLinuxGeneric">
70 + <property name="bldFlag" value="-O"/>
71 + <property name="coreLibDependency" value="lib/${os.arch}/libj3dcore-ogl.so"/>
72 + <property name="osNativeConfigTemplate3D" value="X11NativeConfigTemplate3D"/>
73 + <property name="osNativeScreenInfo" value="X11NativeScreenInfo"/>
74 + </target>
75 +
76 <target name="nativeSetup-opt-win32" if="isWindowsOnX86">
77 <property name="bldFlag"
78 value="-DWIN32 -D_WINDOWS"/>
79 @@ -128,7 +142,7 @@
80 <property name="osNativeScreenInfo" value="Win32NativeScreenInfo"/>
81 </target>
82
83 - <target name="nativeSetup-opt" depends="nativeSetup-opt-solaris, nativeSetup-opt-solaris-x86, nativeSetup-opt-linux, nativeSetup-opt-linux-amd64, nativeSetup-opt-linux-ia64, nativeSetup-opt-linux-ppc, nativeSetup-opt-win32, nativeSetup-opt-winamd64">
84 + <target name="nativeSetup-opt" depends="nativeSetup-opt-solaris, nativeSetup-opt-solaris-x86, nativeSetup-opt-linux, nativeSetup-opt-linux-amd64, nativeSetup-opt-linux-ia64, nativeSetup-opt-linux-ppc, nativeSetup-opt-linux-generic, nativeSetup-opt-win32, nativeSetup-opt-winamd64">
85 <property name="bldType" value="opt"/>
86 <property name="javahCoreSrc"
87 location="${src}/classes/share/javax/media/j3d"/>
3988 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
4089 --- java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-generic.xml 1970-01-01 05:30:00.000000000 +0530
41 +++ java3d-1.5.2+dfsg.new/j3d-core/src/native/ogl/build-linux-generic.xml 2009-08-13 15:00:17.000000000 +0530
90 +++ java3d-1.5.2+dfsg.new/j3d-core/src/native/ogl/build-linux-generic.xml 2009-08-14 09:39:15.000000000 +0530
4291 @@ -0,0 +1,74 @@
4392 +<?xml version="1.0"?>
4493 +
0 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
1 --- java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-ia64.xml 2008-02-29 01:48:00.000000000 +0530
2 +++ java3d-1.5.2+dfsg.new/j3d-core/src/native/ogl/build-linux-ia64.xml 2009-08-14 00:33:04.000000000 +0530
3 @@ -29,7 +29,7 @@
4 <!-- Must use gcc to link, not ld, hence also need -shared; refer to http://www.gelato.unsw.edu.au/linux-ia64/0006/0212.html -->
5 <!-- Removed -R/usr/openwin/lib - an ld specific option (should be a filename, not a dir?!?) -->
6 <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
7 - <arg line="DrawingSurfaceObjectAWT.o Canvas3D.o GraphicsContext3D.o NativeScreenInfo.o NativeConfigTemplate3D.o MasterControl.o GeometryArrayRetained.o Attributes.o CgShaderProgram.o GLSLShaderProgram.o Lights.o -G -z defs -shared -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/ia64 -ljawt -L${java.home}/lib/ia64/jrockit -ljvm -o libj3dcore-ogl.so"/>
8 + <arg line="DrawingSurfaceObjectAWT.o Canvas3D.o GraphicsContext3D.o NativeScreenInfo.o NativeConfigTemplate3D.o MasterControl.o GeometryArrayRetained.o Attributes.o CgShaderProgram.o GLSLShaderProgram.o Lights.o -G -z defs -shared -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/ia64 -ljawt -L${java.home}/lib/ia64/server -ljvm -o libj3dcore-ogl.so"/>
9 </exec>
10 <!-- -L${java.home}/lib/ia64/server -ljvm -o libj3dcore-ogl.so"/> -->
11