Codebase list java3d / 6e79cdd
Fixed the build failure with Java 9 (Closes: #875418) Emmanuel Bourg 5 years ago
4 changed file(s) with 84 addition(s) and 16 deletion(s). Raw diff Collapse all Expand all
+1
-0
debian/changelog less more
66 and invalid-short-name-in-dep5-copyright in debian/copyright.
77
88 [ Emmanuel Bourg ]
9 * Fixed the build failure with Java 9 (Closes: #875418)
910 * Build with the DH sequencer instead of CDBS
1011 * Moved the package to Git
1112 * Standards-Version updated to 4.1.3
+10
-16
debian/patches/02_fix_generic_ftbfs.patch less more
0 Index: java3d-1.5.2+dfsg/j3d-core/build.xml
1 ===================================================================
2 --- java3d-1.5.2+dfsg.orig/j3d-core/build.xml 2010-01-09 18:52:55.000000000 +0530
3 +++ java3d-1.5.2+dfsg/j3d-core/build.xml 2010-01-09 20:24:13.000000000 +0530
0 --- a/j3d-core/build.xml
1 +++ b/j3d-core/build.xml
42 @@ -196,6 +196,15 @@
53 <property name="install.bin" value="lib/ppc"/>
64 </target>
4038 <condition property="isSolarisOnSparc">
4139 <os name="SunOS" arch="sparc"/>
4240 </condition>
43 Index: java3d-1.5.2+dfsg/j3d-core/src/native/build.xml
44 ===================================================================
45 --- java3d-1.5.2+dfsg.orig/j3d-core/src/native/build.xml 2010-01-09 18:52:55.000000000 +0530
46 +++ java3d-1.5.2+dfsg/j3d-core/src/native/build.xml 2010-01-09 20:23:04.000000000 +0530
41 --- a/j3d-core/src/native/build.xml
42 +++ b/j3d-core/src/native/build.xml
4743 @@ -45,6 +45,13 @@
4844 <property name="osNativeScreenInfo" value="X11NativeScreenInfo"/>
4945 </target>
9086 <property name="bldType" value="opt"/>
9187 <property name="javahCoreSrc"
9288 location="${src}/classes/share/javax/media/j3d"/>
93 Index: java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-generic.xml
94 ===================================================================
95 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
96 +++ java3d-1.5.2+dfsg/j3d-core/src/native/ogl/build-linux-generic.xml 2010-01-09 20:23:04.000000000 +0530
89 --- /dev/null
90 +++ b/j3d-core/src/native/ogl/build-linux-generic.xml
9791 @@ -0,0 +1,74 @@
9892 +<?xml version="1.0"?>
9993 +
120114 + <echo message="Executing native renderer build [${bldType}]"/>
121115 +
122116 + <!-- Compile the c source files-->
123 + <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
124 + <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"/>
117 + <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc" >
118 + <arg line="-fPIC -I${oglsrc} -I${java.home}/include -I${java.home}/include/linux -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"/>
125119 + </exec>
126120 +
127121 + <!-- Create the library file-->
128122 + <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
129 + <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 -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/${os.arch} -ljawt -L${java.home}/lib/${os.arch}/server -ljvm -o libj3dcore-ogl.so"/>
123 + <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 -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/${os.arch} -L${java.home}/lib -ljawt -L${java.home}/lib/${os.arch}/server -L${java.home}/lib/server -ljvm -o libj3dcore-ogl.so"/>
130124 + </exec>
131125 +
132126 + </target>
134128 + <target name="compile-ogl-cg" if="build.cg">
135129 + <!-- Compile the wrapper -->
136130 + <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
137 + <arg line="-fPIC -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/>
131 + <arg line="-fPIC -I${oglsrc} -I${java.home}/include -I${java.home}/include/linux -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/>
138132 + </exec>
139133 +
140134 + <!-- Create the wrapper library -->
+72
-0
debian/patches/07_java9_compatibility.patch less more
0 Description: Fixes the build failure with Java 9 caused by the new layout of the JDK directory
1 Author: Emmanuel Bourg <ebourg@apache.org>
2 Forwarded: no
3 --- a/j3d-core/src/native/ogl/build-linux-amd64.xml
4 +++ b/j3d-core/src/native/ogl/build-linux-amd64.xml
5 @@ -25,12 +25,12 @@
6 <!-- Compile the c source files-->
7 <!-- Inhibit all warning for 32 bit build. Any warning will be caught in the 64 bit build -->
8 <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
9 - <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"/>
10 + <arg line="-fPIC -m64 -march=k8 -I${oglsrc} -I${java.home}/include -I${java.home}/include/linux -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"/>
11 </exec>
12
13 <!-- Create the library file-->
14 <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
15 - <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 -L/usr/X11R6/lib64 -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/amd64 -ljawt -L${java.home}/lib/amd64/server -ljvm -o libj3dcore-ogl.so"/>
16 + <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 -L/usr/X11R6/lib64 -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/amd64 -L${java.home}/lib -ljawt -L${java.home}/lib/amd64/server -L${java.home}/lib/server -ljvm -o libj3dcore-ogl.so"/>
17 </exec>
18
19 </target>
20 @@ -38,7 +38,7 @@
21 <target name="compile-ogl-cg" if="build.cg">
22 <!-- Compile the wrapper -->
23 <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
24 - <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"/>
25 + <arg line="-fPIC -m64 -march=k8 -I${oglsrc} -I${java.home}/include -I${java.home}/include/linux -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/>
26 </exec>
27
28 <!-- Create the wrapper library -->
29 --- a/j3d-core/src/native/ogl/build-linux-i586.xml
30 +++ b/j3d-core/src/native/ogl/build-linux-i586.xml
31 @@ -25,12 +25,12 @@
32 <!-- Compile the c source files-->
33 <!-- Inhibit all warning for 32 bit build. Any warning will be caught in the 64 bit build -->
34 <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
35 - <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"/>
36 + <arg line="-fPIC -w -m32 -mcpu=i386 -I${oglsrc} -I${java.home}/include -I${java.home}/include/linux -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"/>
37 </exec>
38
39 <!-- Create the library file-->
40 <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
41 - <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 -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/i386 -ljawt -L${java.home}/lib/i386/server -ljvm -o libj3dcore-ogl.so"/>
42 + <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 -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/i386 -L${java.home}/lib -ljawt -L${java.home}/lib/i386/server -L${java.home}/lib/server -ljvm -o libj3dcore-ogl.so"/>
43 </exec>
44
45 </target>
46 @@ -38,7 +38,7 @@
47 <target name="compile-ogl-cg" if="build.cg">
48 <!-- Compile the wrapper -->
49 <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
50 - <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"/>
51 + <arg line="-fPIC -m32 -mcpu=i386 -I${oglsrc} -I${java.home}/include -I${java.home}/include/linux -I${java.home}/../include -I${java.home}/../include/linux -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/>
52 </exec>
53
54 <!-- Create the wrapper library -->
55 --- a/j3d-core/src/native/ogl/build-linux-ppc.xml
56 +++ b/j3d-core/src/native/ogl/build-linux-ppc.xml
57 @@ -23,12 +23,12 @@
58 <!-- Compile the c source files-->
59 <!-- Inhibit all warning for 32 bit build. Any warning will be caught in the 64 bit build -->
60 <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
61 - <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"/>
62 + <arg line="-fPIC -w -I${oglsrc} -I${java.home}/include -I${java.home}/include/linux -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"/>
63 </exec>
64
65 <!-- Create the library file-->
66 <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
67 - <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 -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/ppc -R/usr/openwin/lib -L${java.home}/bin -ljawt -L${java.home}/lib/ppc/server -L${java.home}/bin/classic -ljvm -o libj3dcore-ogl.so"/>
68 + <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 -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/ppc -R/usr/openwin/lib -L${java.home}/bin -L${java.home}/lib -ljawt -L${java.home}/lib/ppc/server -L${java.home}/bin/classic -L${java.home}/lib/server -ljvm -o libj3dcore-ogl.so"/>
69 </exec>
70
71 <!-- Copy the copyright library file -->
+1
-0
debian/patches/series less more
55 05_pic_i586.patch
66 06_java-compat.patch
77 typedef.patch
8 07_java9_compatibility.patch