Index: head/math/scilab/Makefile =================================================================== --- head/math/scilab/Makefile (revision 508977) +++ head/math/scilab/Makefile (revision 508978) @@ -1,179 +1,181 @@ # Created by: js@jeannot.org # $FreeBSD$ PORTNAME= scilab PORTVERSION= 5.5.2 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= math cad java MASTER_SITES= https://www.scilab.org/download/${PORTVERSION}/ DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} MAINTAINER= makc@FreeBSD.org COMMENT= Scientific software package for numerical computations LICENSE= GPLv2 BSD3CLAUSE LICENSE_COMB= dual LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/COPYING-BSD # A partial dependencies list can be found at: # http://wiki.scilab.org/Dependencies_of_Scilab_5.X LIB_DEPENDS= libxml2.so:textproc/libxml2 \ libpcre.so:devel/pcre \ libcurl.so:ftp/curl \ libhdf5.so:science/hdf5 \ libarpack.so:math/arpack-ng \ libfftw3.so:math/fftw3 \ libmatio.so:math/matio \ libamd.so:math/suitesparse RUN_DEPENDS= xdg-open:devel/xdg-utils USES= cpe desktop-file-utils fortran gettext gmake gnome iconv \ libtool ncurses pathfix pkgconfig shared-mime-info USE_CXXSTD= gnu++98 USE_LOCALE= en_US.UTF-8 GNU_CONFIGURE= yes INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-gfortran \ --without-emf \ -disable-static-system-lib CONFIGURE_ENV= BLAS_LIBS="${BLASLIB}" LAPACK_LIBS="${LAPACKLIB}" INSTALL_TARGET= install-strip TEST_TARGET= check # XXX: tests fail MAKE_JOBS_UNSAFE= yes PLIST_SUB= SHLIB_VER=${PORTVERSION} OPTIONS_DEFINE= GUI OCAML TK OPTIONS_RADIO= BLAS OPTIONS_RADIO_BLAS= ATLAS NETLIB OPENBLAS OPTIONS_DEFAULT= GUI NETLIB OCAML TK OPTIONS_SUB= yes ATLAS_USES= blaslapack:atlas NETLIB_USES= blaslapack:netlib OPENBLAS_USES= blaslapack:openblas GUI_DESC= Java-based Graphical User Interface OCAML_DESC= Scicos - dynamical system simulator (requires GUI) # Java dependencies: _GUI_DEPENDS+= ${JAVALIBDIR}/flexdock.jar:devel/flexdock \ ${JAVALIBDIR}/jogl2.jar:graphics/jogamp-jogl \ foprep:math/jeuclid \ ${JAVALIBDIR}/jhall.jar:java/javahelp \ ${JAVALIBDIR}/jrosetta-api.jar:java/jrosetta \ ${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \ ${JAVALIBDIR}/jgraphx.jar:java/jgraphx \ ${JAVALIBDIR}/jlatexmath.jar:math/jlatexmath \ ${LOCALBASE}/share/java/ecj-4.5.jar:lang/gcc-ecj45 # Documentation, graphic export: _GUI_DEPENDS+= ${LOCALBASE}/share/java/fop/build/fop.jar:textproc/fop \ ${JAVALIBDIR}/jlatexmath-fop.jar:math/jlatexmath \ ${LOCALBASE}/share/java/batik/lib/batik-all.jar:graphics/batik \ ${JAVALIBDIR}/avalon-framework.jar:devel/avalon-framework \ ${JAVALIBDIR}/commons-io.jar:devel/jakarta-commons-io \ ${JAVALIBDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons # Code quality: _GUI_DEPENDS+= ${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils \ ${JAVALIBDIR}/antlr.jar:devel/antlr \ ${JAVALIBDIR}/junit4.jar:java/junit \ ${LOCALBASE}/bin/splint:devel/splint # Documentation building: _GUI_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/javahelp/javahelp.xsl:textproc/docbook-xsl \ ${JAVALIBDIR}/saxon9he.jar:textproc/saxon-he \ ${JAVALIBDIR}/xml-apis-ext.jar:textproc/xml-commons \ xsltproc:textproc/libxslt # Other gui deps: _GUI_DEPENDS+= ${JAVALIBDIR}/looks.jar:devel/looks \ ${JAVALIBDIR}/skinlf.jar:x11-toolkits/skinlf # Can't use USE_ANT because it overrides do-build target GUI_BUILD_DEPENDS= ${_GUI_DEPENDS} \ ant:devel/apache-ant GUI_RUN_DEPENDS= ${_GUI_DEPENDS} GUI_ALL_TARGET= all doc GUI_USES= gl GUI_USE= GL=gl JAVA=yes GUI_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-bin-JAVA_HOME GUI_CONFIGURE_ON= --with-jdk=${JAVA_HOME} \ --with-docbook=${LOCALBASE}/share/xsl/docbook \ --enable-build-help GUI_CONFIGURE_OFF= --without-gui \ --without-javasci \ --without-xcos \ --disable-build-help OCAML_IMPLIES= GUI OCAML_CONFIGURE_WITH= modelica OCAML_BUILD_DEPENDS= ocaml:lang/ocaml OCAML_RUN_DEPENDS= ocaml:lang/ocaml TK_CONFIGURE_OFF= --without-tk TK_CONFIGURE_ON= --with-tk-library=${LOCALBASE}/lib \ --with-tk-include=${TK_INCLUDEDIR} \ --with-tcl-library=${LOCALBASE}/lib \ --with-tcl-include=${TCL_INCLUDEDIR} TK_USES= tk TK_USE= XORG=x11 TK_RUN_DEPENDS= ${LOCALBASE}/lib/bwidget/init.tcl:x11-toolkits/bwidget .if !exists(/usr/include/omp.h) CONFIGURE_ARGS+= --without-openmp .endif .include .if ${PORT_OPTIONS:MGUI} && ${JAVA_PORT_VERSION:M*8*} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-Makefile.in .endif post-patch: @# Configure fixes @${REINPLACE_CMD} -e 's|-ldl | |' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-lumfpack|-lumfpack -lsuitesparseconfig -lamd -lcholmod -lcolamd $$LAPACK_LIBS $$BLAS_LIBS|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|TCLTK_LIBS=" -ldl"|TCLTK_LIBS=" "|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|"x=" ==|"x" =|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|"x" ==|"x" =|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|sparc64-\*-netbsd\*|amd64-\*-freebsd\*|' ${WRKSRC}/configure @# Build fixes @${REINPLACE_CMD} -e 's|$$(CFLAGS:-O%=)|-I${LOCALBASE}/include -L${LOCALBASE}/lib|' ${WRKSRC}/modules/elementary_functions/Makefile.in @${REINPLACE_CMD} -e 's|freebsd|__FreeBSD__|g' ${WRKSRC}/modules/sparse/includes/spConfig.h @# malloc.h -> stdlib.h conversions @${GREP} -lr "" ${WRKSRC} \ | ${XARGS} ${REINPLACE_CMD} -e \ 's/[<"]malloc.h[>"]//' @# Run fixes @${REINPLACE_CMD} -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|' ${WRKSRC}/etc/librarypath.xml @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/etc/librarypath.xml @${REINPLACE_CMD} -e 's, gfortran, ${FC},' ${WRKSRC}/modules/dynamic_link/src/scripts/configure post-patch-GUI-on: @# Configure fixes @${REINPLACE_CMD} -e 's|/usr/lib/java|${JAVALIBDIR}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/usr/lib64/jni|${LOCALBASE}/lib/|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|$$jardir/batik-all.jar|${LOCALBASE}/share/java/batik/lib/batik-all.jar|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|$$jardir/fop.jar|${LOCALBASE}/share/java/fop/build/fop.jar|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|$$jardir/jeuclid-core*.jar|${LOCALBASE}/share/java/jeuclid/repo/jeuclid-core*.jar|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|jrosetta-API.jar|jrosetta-api.jar|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|javax.media.opengl.glu.GLUnurbs|com.jogamp.opengl.glu.GLUnurbs|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|jogamp.common.os.MachineDescriptionRuntime|jogamp.common.os.MachineDataInfoRuntime|' ${WRKSRC}/configure @# Run fixes @${REINPLACE_CMD} -e 's|%%JAVA_HOME%%|${JAVA_HOME}|' ${WRKSRC}/bin/scilab @${REINPLACE_CMD} -e 's|/usr/share/scilab|${DATADIR}|' ${WRKSRC}/desktop/scilab.desktop @${REINPLACE_CMD} -e 's|/usr/share/scilab-cli|${DATADIR}|' \ ${WRKSRC}/desktop/scilab-adv-cli.desktop ${WRKSRC}/desktop/scilab-cli.desktop pre-install: ${MKDIR} ${STAGEDIR}${DATADIR}/.atoms post-install: @# Remove empty dirs in DATADIR/modules - they will be removed by the @# toolbox uninstaller otherwise if 3rd party toolboxes are used @${FIND} ${STAGEDIR}${DATADIR}/modules -type d -empty -delete .include Index: head/math/scilab/files/patch-jogamp-jogl-2.3.2 =================================================================== --- head/math/scilab/files/patch-jogamp-jogl-2.3.2 (nonexistent) +++ head/math/scilab/files/patch-jogamp-jogl-2.3.2 (revision 508978) @@ -0,0 +1,378 @@ +--- modules/gui/src/java/org/scilab/modules/gui/SwingView.java ++++ modules/gui/src/java/org/scilab/modules/gui/SwingView.java +@@ -84,10 +84,10 @@ import java.util.Map; + import java.util.Set; + import java.util.UUID; + +-import javax.media.opengl.GL; +-import javax.media.opengl.GLCapabilities; +-import javax.media.opengl.GLProfile; +-import javax.media.opengl.awt.GLCanvas; ++import com.jogamp.opengl.GL; ++import com.jogamp.opengl.GLCapabilities; ++import com.jogamp.opengl.GLProfile; ++import com.jogamp.opengl.awt.GLCanvas; + import javax.swing.JComponent; + import javax.swing.JSeparator; + import javax.swing.SwingUtilities; +--- modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java ++++ modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java +@@ -20,7 +20,7 @@ import java.awt.Cursor; + import java.awt.Font; + import java.awt.image.BufferedImage; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + + import org.scilab.modules.gui.canvas.Canvas; + import org.scilab.modules.gui.canvas.ScilabCanvas; +--- modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java ++++ modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java +@@ -32,8 +32,8 @@ import java.awt.event.MouseListener; + import java.awt.event.MouseMotionListener; + import java.awt.image.BufferedImage; + +-import javax.media.opengl.GL; +-import javax.media.opengl.GLAutoDrawable; ++import com.jogamp.opengl.GL; ++import com.jogamp.opengl.GLAutoDrawable; + import javax.swing.JPanel; + + import org.scilab.forge.scirenderer.Canvas; +--- modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java ++++ modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java +@@ -19,12 +19,12 @@ import java.awt.HeadlessException; + import java.util.Calendar; + import java.util.StringTokenizer; + +-import javax.media.opengl.GL; +-import javax.media.opengl.GLCapabilities; +-import javax.media.opengl.GLException; +-import javax.media.opengl.GLProfile; +-import javax.media.opengl.awt.GLCanvas; +-import javax.media.opengl.awt.GLJPanel; ++import com.jogamp.opengl.GL; ++import com.jogamp.opengl.GLCapabilities; ++import com.jogamp.opengl.GLException; ++import com.jogamp.opengl.GLProfile; ++import com.jogamp.opengl.awt.GLCanvas; ++import com.jogamp.opengl.awt.GLJPanel; + + import org.scilab.modules.action_binding.InterpreterManagement; + import org.scilab.modules.commons.OS; +--- modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java ++++ modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java +@@ -14,7 +14,7 @@ package org.scilab.modules.gui.canvas; + + import java.awt.image.BufferedImage; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + + import org.scilab.modules.gui.dockable.Dockable; + +--- modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java ++++ modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java +@@ -16,7 +16,7 @@ package org.scilab.modules.gui.canvas; + + import java.awt.image.BufferedImage; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + + import org.scilab.modules.gui.bridge.ScilabBridge; + import org.scilab.modules.gui.dockable.ScilabDockable; +--- modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java ++++ modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java +@@ -14,7 +14,7 @@ package org.scilab.modules.gui.canvas; + + import java.awt.image.BufferedImage; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + + import org.scilab.modules.gui.bridge.canvas.SwingScilabCanvas; + import org.scilab.modules.gui.utils.Position; +--- modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java ++++ modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java +@@ -15,7 +15,7 @@ package org.scilab.modules.gui.canvas; + import org.scilab.modules.gui.utils.Position; + import org.scilab.modules.gui.utils.Size; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + import java.awt.image.BufferedImage; + + /** +--- modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java ++++ modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/JScrollPaneExample.java +@@ -13,8 +13,8 @@ import org.scilab.forge.scirenderer.tran + import org.scilab.forge.scirenderer.tranformations.TransformationFactory; + import org.scilab.forge.scirenderer.utils.shapes.geometry.CubeFactory; + +-import javax.media.opengl.awt.GLCanvas; +-import javax.media.opengl.awt.GLJPanel; ++import com.jogamp.opengl.awt.GLCanvas; ++import com.jogamp.opengl.awt.GLJPanel; + import javax.swing.*; + import java.awt.*; + +--- modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java ++++ modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/utils/ExampleFrame.java +@@ -15,7 +15,7 @@ import com.jogamp.opengl.util.Animator; + import org.scilab.forge.scirenderer.Canvas; + import org.scilab.forge.scirenderer.implementation.jogl.JoGLCanvasFactory; + +-import javax.media.opengl.awt.GLJPanel; ++import com.jogamp.opengl.awt.GLJPanel; + import javax.swing.JFrame; + import javax.swing.JPanel; + import java.awt.BorderLayout; +--- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java ++++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java +@@ -16,16 +16,16 @@ import java.awt.image.BufferedImage; + import java.lang.reflect.InvocationTargetException; + import java.util.concurrent.Semaphore; + +-import javax.media.opengl.DebugGL2; +-import javax.media.opengl.GL2; +-import javax.media.opengl.GLAutoDrawable; +-import javax.media.opengl.GLCapabilities; +-import javax.media.opengl.GLContext; +-import javax.media.opengl.GLDrawableFactory; +-import javax.media.opengl.GLEventListener; +-import javax.media.opengl.GLException; +-import javax.media.opengl.GLOffscreenAutoDrawable; +-import javax.media.opengl.GLProfile; ++import com.jogamp.opengl.DebugGL2; ++import com.jogamp.opengl.GL2; ++import com.jogamp.opengl.GLAutoDrawable; ++import com.jogamp.opengl.GLCapabilities; ++import com.jogamp.opengl.GLContext; ++import com.jogamp.opengl.GLDrawableFactory; ++import com.jogamp.opengl.GLEventListener; ++import com.jogamp.opengl.GLException; ++import com.jogamp.opengl.GLOffscreenAutoDrawable; ++import com.jogamp.opengl.GLProfile; + import javax.swing.SwingUtilities; + + import org.scilab.forge.scirenderer.Canvas; +--- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java ++++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java +@@ -13,7 +13,7 @@ package org.scilab.forge.scirenderer.imp + + import org.scilab.forge.scirenderer.Canvas; + +-import javax.media.opengl.GLAutoDrawable; ++import com.jogamp.opengl.GLAutoDrawable; + + /** + * @author Pierre Lando +--- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java ++++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java +@@ -11,7 +11,7 @@ + + package org.scilab.forge.scirenderer.implementation.jogl; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + + /** + * This class store current OpenGl context capacity. +--- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java ++++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java +@@ -30,7 +30,7 @@ import org.scilab.forge.scirenderer.tran + import org.scilab.forge.scirenderer.tranformations.TransformationManagerListener; + import org.scilab.forge.scirenderer.tranformations.Vector3d; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + + /** + * +--- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java ++++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java +@@ -11,8 +11,8 @@ + + package org.scilab.forge.scirenderer.implementation.jogl; + +-import javax.media.opengl.GL; +-import javax.media.opengl.glu.GLU; ++import com.jogamp.opengl.GL; ++import com.jogamp.opengl.glu.GLU; + + /** + * @author Pierre Lando +--- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java ++++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java +@@ -16,7 +16,7 @@ import org.scilab.forge.scirenderer.buff + import org.scilab.forge.scirenderer.buffers.ElementsBuffer; + import org.scilab.forge.scirenderer.buffers.IndicesBuffer; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + import java.util.Collection; + import java.util.HashSet; + import java.util.Set; +--- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java ++++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java +@@ -13,7 +13,7 @@ package org.scilab.forge.scirenderer.imp + + import org.scilab.forge.scirenderer.buffers.DataBuffer; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + import java.nio.Buffer; + + /** +--- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java ++++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java +@@ -13,7 +13,7 @@ package org.scilab.forge.scirenderer.imp + + import org.scilab.forge.scirenderer.buffers.ElementsBuffer; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + import java.nio.Buffer; + import java.nio.FloatBuffer; + +--- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java ++++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java +@@ -13,7 +13,7 @@ package org.scilab.forge.scirenderer.imp + + import org.scilab.forge.scirenderer.buffers.IndicesBuffer; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + import java.nio.Buffer; + import java.nio.IntBuffer; + import java.util.Collection; +--- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java ++++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java +@@ -15,7 +15,7 @@ import org.scilab.forge.scirenderer.clip + import org.scilab.forge.scirenderer.clipping.ClippingPlane; + import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + + /** + * @author Pierre Lando +--- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java ++++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java +@@ -17,7 +17,7 @@ import org.scilab.forge.scirenderer.tran + import org.scilab.forge.scirenderer.tranformations.TransformationFactory; + import org.scilab.forge.scirenderer.tranformations.Vector4d; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + + /** + * @author Pierre Lando +--- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java ++++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java +@@ -23,7 +23,7 @@ import org.scilab.forge.scirenderer.text + import org.scilab.forge.scirenderer.lightning.LightManager; + import org.scilab.forge.scirenderer.shapes.appearance.Material; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + import java.nio.FloatBuffer; + import java.nio.IntBuffer; + +--- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java ++++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java +@@ -11,7 +11,7 @@ + + package org.scilab.forge.scirenderer.implementation.jogl.lightning; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + + import org.scilab.forge.scirenderer.implementation.jogl.utils.GLShortCuts; + import org.scilab.forge.scirenderer.lightning.Light; +--- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java ++++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java +@@ -17,7 +17,7 @@ import org.scilab.forge.scirenderer.ligh + import org.scilab.forge.scirenderer.lightning.LightManager; + import org.scilab.forge.scirenderer.shapes.appearance.Material; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + + /** + * JoGL implementation of {@link LightManager} +--- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java ++++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java +@@ -11,7 +11,7 @@ + + package org.scilab.forge.scirenderer.implementation.jogl.picking; + +-import javax.media.opengl.GL; ++import com.jogamp.opengl.GL; + + /** + * @author Pierre Lando +--- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java ++++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java +@@ -16,7 +16,7 @@ import org.scilab.forge.scirenderer.impl + import org.scilab.forge.scirenderer.picking.PickingTools; + import org.scilab.forge.scirenderer.tranformations.Vector3d; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + import java.awt.Point; + import java.nio.FloatBuffer; + +--- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java ++++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java +@@ -15,7 +15,7 @@ import org.scilab.forge.scirenderer.Draw + import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools; + import org.scilab.forge.scirenderer.renderer.Renderer; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + + /** + * @author Pierre Lando +--- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java ++++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java +@@ -15,7 +15,7 @@ import org.scilab.forge.scirenderer.impl + import org.scilab.forge.scirenderer.renderer.Renderer; + import org.scilab.forge.scirenderer.renderer.RendererManager; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + import java.util.HashSet; + import java.util.Set; + import java.util.Stack; +--- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java ++++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java +@@ -28,11 +28,11 @@ import org.scilab.forge.scirenderer.tran + import org.scilab.forge.scirenderer.tranformations.Vector3d; + + +-import javax.media.opengl.GL; +-import javax.media.opengl.GL2; +-import javax.media.opengl.GL2ES1; +-import javax.media.opengl.GL2GL3; +-import javax.media.opengl.GLProfile; ++import com.jogamp.opengl.GL; ++import com.jogamp.opengl.GL2; ++import com.jogamp.opengl.GL2ES1; ++import com.jogamp.opengl.GL2GL3; ++import com.jogamp.opengl.GLProfile; + import java.awt.Dimension; + import java.nio.ByteBuffer; + import java.nio.FloatBuffer; +--- modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java ++++ modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java +@@ -14,7 +14,7 @@ package org.scilab.forge.scirenderer.imp + import org.scilab.forge.scirenderer.shapes.appearance.Appearance; + import org.scilab.forge.scirenderer.shapes.appearance.Color; + +-import javax.media.opengl.GL2; ++import com.jogamp.opengl.GL2; + + /** + * Property changes on: head/math/scilab/files/patch-jogamp-jogl-2.3.2 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property