From 92de834c22f6fd67ecb76d3d4a6a0105b04c4324 Mon Sep 17 00:00:00 2001
From: Max Khon <fjoe@FreeBSD.org>
Date: Wed, 3 Sep 2008 14:41:58 +0000
Subject: - Update to 1.5.2 - Assign maintainership to PR submitter

PR:		125828
Submitted by:	Jonathan Chen
---
 java/java3d/files/patch-freebsd | 167 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 167 insertions(+)
 create mode 100644 java/java3d/files/patch-freebsd

(limited to 'java/java3d/files/patch-freebsd')

diff --git a/java/java3d/files/patch-freebsd b/java/java3d/files/patch-freebsd
new file mode 100644
index 000000000000..871187276e0e
--- /dev/null
+++ b/java/java3d/files/patch-freebsd
@@ -0,0 +1,167 @@
+diff -ruN ./j3d-core/build.xml ../java3d-1.5.2/j3d-core/build.xml
+--- ./j3d-core/build.xml	2008-05-24 08:31:19.000000000 +1200
++++ ../java3d-1.5.2/j3d-core/build.xml	2008-07-21 23:00:14.000000000 +1200
+@@ -142,6 +142,15 @@
+     <echo message="version_file    = ${version_file}"/>
+   </target>
+ 
++  <target name="setupFreeBSD" if="isFreeBSD">
++    <property name="isUnix" value="true"/>
++    <property name="shell" value="/bin/sh"/>
++    <property name="wstype" value="x11"/>
++    <property name="platformname" value="freebsd-${os.arch}"/>
++    <property name="platform" value="freebsd"/>
++    <property name="install.bin" value="lib/${os.arch}"/>
++  </target>
++
+   <target name="setupSolaris" if="isSolarisOnSparc">
+     <property name="isUnix" value="true"/>
+     <property name="shell" value="/usr/bin/ksh"/>
+@@ -232,7 +241,7 @@
+   </target>
+ 
+   <target name="setupPlatform"
+-       depends="init, setupBuildType, setupSolaris, setupSolarisX86, setupLinux, setupLinuxAmd64, setupLinuxIA64, setupLinuxPPC, setupWindows, setupWindowsAmd64, setupMacOSX, setupJogl">
++       depends="init, setupBuildType, setupFreeBSD, setupSolaris, setupSolarisX86, setupLinux, setupLinuxAmd64, setupLinuxIA64, setupLinuxPPC, setupWindows, setupWindowsAmd64, setupMacOSX, setupJogl">
+     <property name="build-debug-gen" location="${build}/${platform}/debug/gen"/>
+     <property name="build-opt-gen" location="${build}/${platform}/opt/gen"/>
+     <property name="docname" value="${build.relprefix}-${version_file}-doc"/>
+diff -ruN ./j3d-core/src/classes/build.xml ../java3d-1.5.2/j3d-core/src/classes/build.xml
+--- ./j3d-core/src/classes/build.xml	2008-02-29 09:17:18.000000000 +1300
++++ ../java3d-1.5.2/j3d-core/src/classes/build.xml	2008-07-21 23:02:37.000000000 +1200
+@@ -95,6 +95,7 @@
+    <javac srcdir="${src}/classes/share:${src}/classes/${wstype}:${jogl.pipeline.srcdir}:${core_utils_src}/classes/share:${build-opt-gen}/classes"            destdir="${build}/${platform}/opt/classes"
+            source="1.5"
+            target="1.5"
++		   fork="yes" memoryMaximumSize="128m"
+            debug="true"
+            debuglevel="lines,source"
+            deprecation="off"
+@@ -318,7 +319,7 @@
+              excludepackagenames="com.sun.j3d.utils.scenegraph.io.retained,
+ 			   com.sun.j3d.exp.swing.impl,
+ 			   com.sun.j3d.utils.scenegraph.io.state.*"
+-             maxmemory="128m"
++             maxmemory="256m"
+              destdir="${build}/${platform}/javadocs/docs-public"
+ 	     bottom="${javadoc.bottom}"
+              windowtitle="${build.javadoc.name} ${version}">
+diff -ruN ./j3d-core/src/native/build.xml ../java3d-1.5.2/j3d-core/src/native/build.xml
+--- ./j3d-core/src/native/build.xml	2008-02-29 09:17:58.000000000 +1300
++++ ../java3d-1.5.2/j3d-core/src/native/build.xml	2008-07-21 23:00:14.000000000 +1200
+@@ -3,6 +3,19 @@
+ <!-- Ant file for building native files -->
+ <project name="j3d-core native" default="compile-opt">
+ 
++  <target name="nativeSetup-debug-freebsd" if="isFreeBSD">
++	<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-opt-freebsd" if="isFreeBSD">
++	<property name="bldFlag" value="-O2"/>
++	<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-solaris" if="isSolarisOnSparc">
+ 	<property name="bldFlag" value="-g -DDEBUG"/>
+ 	<property name="coreLibDependency" value="lib/sparc/libj3dcore-ogl.so"/>
+@@ -62,7 +75,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-freebsd, 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">
+ 	<property name="bldType" value="debug"/>
+ 	<property name="javahCoreSrc"     
+ 	 location="${src}/classes/share/javax/media/j3d"/>
+@@ -128,7 +141,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-freebsd, 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">
+ 	<property name="bldType" value="opt"/>
+ 	<property name="javahCoreSrc"     
+ 	 location="${src}/classes/share/javax/media/j3d"/>
+diff -ruN ./j3d-core/src/native/ogl/build-freebsd.xml ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml
+--- ./j3d-core/src/native/ogl/build-freebsd.xml	1970-01-01 12:00:00.000000000 +1200
++++ ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml	2008-07-21 23:00:14.000000000 +1200
+@@ -0,0 +1,74 @@
++<?xml version="1.0"?>
++
++<!-- Ant file for building native ogl renderer files for FreeBSD -->
++<project name="j3d-core native" default="compile">
++
++  <target name="init" depends="init-cg,init-nocg">
++    <!-- Create the build directories for freebsd -->
++    <mkdir dir="${build}/${platform}/${bldType}/native/ogl/objs"/>
++    <mkdir dir="${build}/${platform}/${bldType}/lib/${os.arch}"/>
++    
++    <property name="oglsrc"     location="${src}/native/ogl"/>
++  </target>
++
++  <target name="init-cg" if="build.cg">
++    <property name="cflags.cg"  value="-DCOMPILE_CG_SHADERS=1"/>
++  </target>
++
++  <target name="init-nocg" unless="build.cg">
++    <property name="cflags.cg"  value=""/>
++  </target>
++
++  <target name="compile-ogl">
++    <echo message="Executing native renderer build [${bldType}]"/>
++
++    <!-- Compile the c source files-->
++    <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
++	<arg line="-fPIC -march=k8 -I${oglsrc} -I/usr/local/include -I${java.home}/../include -I${java.home}/../include/freebsd -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-->
++    <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
++	<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/local/lib -lGL -lX11 -lXext -lm -lc -L${java.home}/lib/${os.arch} -ljawt -L${java.home}/lib/${os.arch}/server -ljvm  -o libj3dcore-ogl.so"/>
++    </exec>
++
++  </target>
++
++  <target name="compile-ogl-cg" if="build.cg">
++    <!-- Compile the wrapper -->
++    <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
++	<arg line="-march=k8 -I${oglsrc} -I${java.home}/../include -I${java.home}/../include/freebsd -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/>
++    </exec>
++
++    <!-- Create the wrapper library -->
++    <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
++	<arg line="CgWrapper.o -G -z defs -L/usr/X11R6/lib64 -ldl -lCg -lCgGL -lpthread -lGL -lX11 -lXext -lm -lnsl -lc -o libj3dcore-ogl-cg.so"/>
++    </exec>
++
++  </target>
++
++  <target name="compile" depends="init,compile-ogl,compile-ogl-cg">
++
++    <!-- Copy the  library file -->
++    <copy todir="${build}/${platform}/${bldType}/lib/${os.arch}">
++          <fileset dir="${build}/${platform}/${bldType}/native/ogl/objs"
++                      includes="libj3dcore-ogl*.so"
++          />
++    </copy>
++
++  </target>
++
++  <target name="dist">
++    <!-- Create the distribution directory -->
++    <mkdir dir="${dist}/${platform}/lib/${os.arch}"/>
++
++    <!-- Copy the library files -->
++    <copy todir="${dist}/${platform}/lib/${os.arch}">
++          <fileset dir="${build}/${platform}/opt/lib/${os.arch}"
++                      includes="libj3dcore-ogl*.so"
++          />
++    </copy>
++
++  </target>
++
++</project>
-- 
cgit v1.2.3