Date: Thu, 09 Apr 2026 09:29:19 +0000 From: Ronald Klop <ronald@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 821f1e07ca6b - main - java/java3d: split combined patches Message-ID: <69d7716f.44ce7.6f2f9e39@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=821f1e07ca6bcbbed34a57dd6216719a5d681097 commit 821f1e07ca6bcbbed34a57dd6216719a5d681097 Author: Ronald Klop <ronald@FreeBSD.org> AuthorDate: 2026-04-09 07:06:26 +0000 Commit: Ronald Klop <ronald@FreeBSD.org> CommitDate: 2026-04-09 09:29:05 +0000 java/java3d: split combined patches Redo make makepatch to have "modern" port patches. No functional change intended. Approved-by: no maintainer --- java/java3d/files/patch-freebsd | 176 --------------------- ...state_javax_media_j3d_ImageComponentState.java} | 9 +- java/java3d/files/patch-j3d-core_build.xml | 28 ++++ .../files/patch-j3d-core_src_classes_build.xml | 19 +++ .../files/patch-j3d-core_src_native_build.xml | 48 ++++++ ...patch-j3d-core_src_native_ogl_build-freebsd.xml | 77 +++++++++ 6 files changed, 176 insertions(+), 181 deletions(-) diff --git a/java/java3d/files/patch-freebsd b/java/java3d/files/patch-freebsd deleted file mode 100644 index 7e5635a72e8e..000000000000 --- a/java/java3d/files/patch-freebsd +++ /dev/null @@ -1,176 +0,0 @@ -diff -ruN ../java3d-1.5.2/j3d-core/build.xml ./j3d-core/build.xml ---- ../java3d-1.5.2/j3d-core/build.xml 2008-05-24 08:31:19.000000000 +1200 -+++ ./j3d-core/build.xml 2009-07-12 13:20:26.000000000 +1200 -@@ -142,6 +142,16 @@ - <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}"/> -+ <property name="ports.localbase" value="/usr/local"/> -+ </target> -+ - <target name="setupSolaris" if="isSolarisOnSparc"> - <property name="isUnix" value="true"/> - <property name="shell" value="/usr/bin/ksh"/> -@@ -232,7 +242,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 ../java3d-1.5.2/j3d-core/src/classes/build.xml ./j3d-core/src/classes/build.xml ---- ../java3d-1.5.2/j3d-core/src/classes/build.xml 2008-02-29 09:17:18.000000000 +1300 -+++ ./j3d-core/src/classes/build.xml 2009-07-12 13:19:17.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 ../java3d-1.5.2/j3d-core/src/native/build.xml ./j3d-core/src/native/build.xml ---- ../java3d-1.5.2/j3d-core/src/native/build.xml 2008-02-29 09:17:58.000000000 +1300 -+++ ./j3d-core/src/native/build.xml 2009-07-12 13:19:17.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"/> -@@ -347,6 +360,7 @@ - <javah destdir="${javahCoreTarget}" force="yes"> - <classpath> - <pathelement path="${build}/${platform}/${bldType}/classes"/> -+ <pathelement path="${vecmath_home}/build/opt/lib/ext/vecmath.jar"/> - </classpath> - - <class name="javax.media.j3d.Background"/> -diff -ruN ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml ./j3d-core/src/native/ogl/build-freebsd.xml ---- ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml 1970-01-01 12:00:00.000000000 +1200 -+++ ./j3d-core/src/native/ogl/build-freebsd.xml 2009-07-12 13:21:41.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 -I${oglsrc} -I${ports.localbase}/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="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 -shared -z defs -L${ports.localbase}/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="-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="gcc"> -+ <arg line="CgWrapper.o -shared -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> diff --git a/java/java3d/files/patch-ImageComponentState.java b/java/java3d/files/patch-j3d-core-utils_src_classes_share_com_sun_j3d_utils_scenegraph_io_state_javax_media_j3d_ImageComponentState.java similarity index 84% rename from java/java3d/files/patch-ImageComponentState.java rename to java/java3d/files/patch-j3d-core-utils_src_classes_share_com_sun_j3d_utils_scenegraph_io_state_javax_media_j3d_ImageComponentState.java index 6eacc3fa0a09..9a230c2f8413 100644 --- a/java/java3d/files/patch-ImageComponentState.java +++ b/java/java3d/files/patch-j3d-core-utils_src_classes_share_com_sun_j3d_utils_scenegraph_io_state_javax_media_j3d_ImageComponentState.java @@ -1,7 +1,6 @@ -work/java3d-1.5.2/j3d-core-utils/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d ---- j3d-core-utils/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java.orig +--- j3d-core-utils/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java.orig 2007-02-09 17:20:35 UTC +++ j3d-core-utils/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java -@@ -61,10 +61,7 @@ import com.sun.j3d.utils.scenegraph.io.r +@@ -61,10 +61,7 @@ import java.awt.image.DataBuffer; import com.sun.j3d.utils.scenegraph.io.retained.SGIORuntimeException; import java.awt.color.ColorSpace; import java.awt.image.DataBuffer; @@ -13,7 +12,7 @@ work/java3d-1.5.2/j3d-core-utils/src/classes/share/com/sun/j3d/utils/scenegraph/ public abstract class ImageComponentState extends NodeComponentState { -@@ -203,10 +200,9 @@ public abstract class ImageComponentStat +@@ -203,10 +200,9 @@ public abstract class ImageComponentState extends Node private void writeBufferedImageJpegCompression( DataOutput out, BufferedImage image ) throws IOException { ByteArrayOutputStream byteStream = new ByteArrayOutputStream(); @@ -27,7 +26,7 @@ work/java3d-1.5.2/j3d-core-utils/src/classes/share/com/sun/j3d/utils/scenegraph/ byte[] buffer = byteStream.toByteArray(); out.writeInt( buffer.length ); -@@ -261,11 +257,15 @@ public abstract class ImageComponentStat +@@ -261,11 +257,15 @@ public abstract class ImageComponentState extends Node byte[] buffer = new byte[ size ]; in.readFully( buffer ); ByteArrayInputStream byteStream = new ByteArrayInputStream( buffer ); diff --git a/java/java3d/files/patch-j3d-core_build.xml b/java/java3d/files/patch-j3d-core_build.xml new file mode 100644 index 000000000000..27cf7573bdb2 --- /dev/null +++ b/java/java3d/files/patch-j3d-core_build.xml @@ -0,0 +1,28 @@ +--- j3d-core/build.xml.orig 2008-05-23 20:31:19 UTC ++++ j3d-core/build.xml +@@ -142,6 +142,16 @@ + <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}"/> ++ <property name="ports.localbase" value="/usr/local"/> ++ </target> ++ + <target name="setupSolaris" if="isSolarisOnSparc"> + <property name="isUnix" value="true"/> + <property name="shell" value="/usr/bin/ksh"/> +@@ -232,7 +242,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 --git a/java/java3d/files/patch-j3d-core_src_classes_build.xml b/java/java3d/files/patch-j3d-core_src_classes_build.xml new file mode 100644 index 000000000000..7bfc8635f7e5 --- /dev/null +++ b/java/java3d/files/patch-j3d-core_src_classes_build.xml @@ -0,0 +1,19 @@ +--- j3d-core/src/classes/build.xml.orig 2008-02-28 20:17:18 UTC ++++ j3d-core/src/classes/build.xml +@@ -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 --git a/java/java3d/files/patch-j3d-core_src_native_build.xml b/java/java3d/files/patch-j3d-core_src_native_build.xml new file mode 100644 index 000000000000..905364d04866 --- /dev/null +++ b/java/java3d/files/patch-j3d-core_src_native_build.xml @@ -0,0 +1,48 @@ +--- j3d-core/src/native/build.xml.orig 2008-02-28 20:17:58 UTC ++++ j3d-core/src/native/build.xml +@@ -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"/> +@@ -347,6 +360,7 @@ + <javah destdir="${javahCoreTarget}" force="yes"> + <classpath> + <pathelement path="${build}/${platform}/${bldType}/classes"/> ++ <pathelement path="${vecmath_home}/build/opt/lib/ext/vecmath.jar"/> + </classpath> + + <class name="javax.media.j3d.Background"/> diff --git a/java/java3d/files/patch-j3d-core_src_native_ogl_build-freebsd.xml b/java/java3d/files/patch-j3d-core_src_native_ogl_build-freebsd.xml new file mode 100644 index 000000000000..738dbc9f237d --- /dev/null +++ b/java/java3d/files/patch-j3d-core_src_native_ogl_build-freebsd.xml @@ -0,0 +1,77 @@ +--- j3d-core/src/native/ogl/build-freebsd.xml.orig 2026-04-09 07:04:07 UTC ++++ j3d-core/src/native/ogl/build-freebsd.xml +@@ -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 -I${oglsrc} -I${ports.localbase}/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="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 -shared -z defs -L${ports.localbase}/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="-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="gcc"> ++ <arg line="CgWrapper.o -shared -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>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69d7716f.44ce7.6f2f9e39>