[java3d] 46/77: this should hopefully fix most ftbfs

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Mar 8 11:24:43 GMT 2018 

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository java3d.

commit b3248f37de9151c38306d713202a81eb12974c53
Author: Onkar Shinde <onkarshinde at ubuntu.com>
Date:   Fri Aug 14 04:24:29 2009 +0000

    this should hopefully fix most ftbfs
---
 debian/changelog                          | 10 ++++++
 debian/patches/02_fix_generic_ftbfs.patch | 53 +++++++++++++++++++++++++++++--
 debian/patches/03_fix_ia64_ftbfs.patch    | 12 +++++++
 3 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8c4cfc4..e2b214a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+java3d (1.5.2+dfsg-3) unstable; urgency=low
+
+  * debian/patches/02_fix_generic_ftbfs.patch
+    - Improve the patch as per my understanding of the build system.
+      (Closes: #541384)
+  * debian/patches/03_fix_ia64_ftbfs.patch
+    - Add fix for FTBFS on ia64.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com>  Fri, 14 Aug 2009 00:12:49 +0530
+
 java3d (1.5.2+dfsg-2) unstable; urgency=low
 
   * debian/control
diff --git a/debian/patches/02_fix_generic_ftbfs.patch b/debian/patches/02_fix_generic_ftbfs.patch
index 1adfae9..7390980 100644
--- a/debian/patches/02_fix_generic_ftbfs.patch
+++ b/debian/patches/02_fix_generic_ftbfs.patch
@@ -1,6 +1,6 @@
 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-13 15:01:06.000000000 +0530
++++ java3d-1.5.2+dfsg.new/j3d-core/build.xml	2009-08-14 09:43:53.000000000 +0530
 @@ -196,6 +196,15 @@
      <property name="install.bin" value="lib/ppc"/>
    </target>
@@ -37,9 +37,58 @@ diff -Nur -x '*.orig' -x '*~' java3d-1.5.2+dfsg/j3d-core/build.xml java3d-1.5.2+
      <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
+@@ -45,6 +45,13 @@
+         <property name="osNativeScreenInfo" value="X11NativeScreenInfo"/>
+   </target>
+ 
++  <target name="nativeSetup-debug-linux-generic" if="isLinuxGeneric">
++	<property name="bldFlag" value="-g -DDEBUG"/>
++	<property name="coreLibDependency" value="lib/${os.arch}/libj3dcore-ogl.so"/>
++	<property name="osNativeConfigTemplate3D" value="X11NativeConfigTemplate3D"/>
++	<property name="osNativeScreenInfo" value="X11NativeScreenInfo"/>
++  </target>
++
+   <target name="nativeSetup-debug-win32" if="isWindowsOnX86">
+ 	<property name="bldFlag" 
+ 	         value="-DDEBUG -DWIN32 -D_WINDOWS"/>
+@@ -62,7 +69,7 @@
+         <property name="osNativeScreenInfo" value="Win32NativeScreenInfo"/>
+   </target>
+ 
+-  <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">
++  <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">
+ 	<property name="bldType" value="debug"/>
+ 	<property name="javahCoreSrc"     
+ 	 location="${src}/classes/share/javax/media/j3d"/>
+@@ -112,6 +119,13 @@
+         <property name="osNativeScreenInfo" value="X11NativeScreenInfo"/>
+   </target>
+   
++  <target name="nativeSetup-opt-linux-generic" if="isLinuxGeneric">
++	<property name="bldFlag" value="-O"/>
++	<property name="coreLibDependency" value="lib/${os.arch}/libj3dcore-ogl.so"/>
++	<property name="osNativeConfigTemplate3D" value="X11NativeConfigTemplate3D"/>
++	<property name="osNativeScreenInfo" value="X11NativeScreenInfo"/>
++  </target>
++
+   <target name="nativeSetup-opt-win32" if="isWindowsOnX86">
+ 	<property name="bldFlag" 
+ 	         value="-DWIN32 -D_WINDOWS"/>
+@@ -128,7 +142,7 @@
+         <property name="osNativeScreenInfo" value="Win32NativeScreenInfo"/>
+   </target>
+ 
+-  <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">
++  <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">
+ 	<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-13 15:00:17.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
 @@ -0,0 +1,74 @@
 +<?xml version="1.0"?>
 +
diff --git a/debian/patches/03_fix_ia64_ftbfs.patch b/debian/patches/03_fix_ia64_ftbfs.patch
new file mode 100644
index 0000000..9d56412
--- /dev/null
+++ b/debian/patches/03_fix_ia64_ftbfs.patch
@@ -0,0 +1,12 @@
+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 @@
+     <!-- 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">
+-	<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"/>
++	<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"/>
+     </exec>
+ <!-- -L${java.home}/lib/ia64/server -ljvm  -o libj3dcore-ogl.so"/> -->
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/java3d.git

More information about the pkg-java-commits mailing list