Attachment 200005 Details for Bug 231946 – v3

[patch] v3

java3d.patch (text/plain), 2.51 KB, created by Piotr Kubaj on 2018-12-10 10:37:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2018-12-10 10:37:07 UTC

Size: 2.51 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 487131)
>+++ Makefile	(working copy)
>@@ -60,12 +60,10 @@
> 		${WRKSRC}/j3d-core/build/default/opt/lib/ext/j3dcore.jar \
> 		${WRKSRC}/j3d-core/build/default/opt/lib/ext/j3dutils.jar \
> 		${STAGEDIR}${JAVA_HOME}/jre/lib/ext
>-.if ${ARCH} != powerpc64
> 	@${MKDIR} ${STAGEDIR}${JAVA_HOME}/jre/lib/${ARCH}
> 	${INSTALL} \
> 		${WRKSRC}/j3d-core/build/default/opt/native/libj3dcore-ogl.so \
> 		${STAGEDIR}${JAVA_HOME}/jre/lib/${ARCH}
>-.endif
> 
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>Index: files/patch-freebsd
>===================================================================
>--- files/patch-freebsd	(revision 487131)
>+++ files/patch-freebsd	(working copy)
>@@ -126,7 +126,7 @@
> +
> +    
> +    <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
>-+	<arg line="-fPIC -march=k8 -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"/>
>++	<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>
> +
> +    
>@@ -139,7 +139,7 @@
> +  <target name="compile-ogl-cg" if="build.cg">
> +    
> +    <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"/>
>++	<arg line="-I${oglsrc} -I${java.home}/../include -I${java.home}/../include/freebsd -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/>
> +    </exec>
> +
> +

Actions: View | Diff

Attachments on bug 231946: 197781 | 198798 | 200004 | 200005