[libjogl2-java] 33/58: Imported Debian patch 2.0-rc11-1~exp1
Tony Mancill
tmancill at moszumanska.debian.org
Thu Sep 4 03:59:17 UTC 2014
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository libjogl2-java.
commit 399d5e3b8b828480dc8e0b1fc0e4ef00b47222ab
Merge: 4727972 bc4be11
Author: Sylvestre Ledru <sylvestre at debian.org>
Date: Thu Nov 8 16:51:30 2012 +0100
Imported Debian patch 2.0-rc11-1~exp1
debian/changelog | 6 +
debian/control | 4 +-
debian/patches/TARGET_PLATFORM_LIBS_2.diff | 18 +-
debian/patches/armhfbuild.diff | 8 +-
debian/patches/s390x.diff | 43 +-
debian/patches/swt.diff | 14 +-
debian/patches/variousFixes.diff | 16 +-
doc/TODO.txt | 24 +-
doc/deployment/JOGL-DEPLOYMENT.html | 123 +-
doc/userguide/index.html | 9 +-
etc/test.sh | 2 +-
jnlp-files/jogl-all-awt-cg.jnlp | 12 +-
jnlp-files/jogl-all-awt.jnlp | 6 +-
jnlp-files/jogl-all-mobile.jnlp | 6 +-
jnlp-files/jogl-all-noawt.jnlp | 6 +-
.../jogl-applet-runner-newt-gears-gl3-napplet.html | 107 ++
jnlp-files/jogl-test-applets.html | 3 +-
make/build-common.xml | 19 +-
make/build-jogl.xml | 37 +-
make/build-nativewindow.xml | 15 +-
make/build-newt.xml | 113 +-
make/build-test.xml | 8 +-
make/build.xml | 2 +-
make/config/jogl/cgl-macosx.cfg | 4 +
make/config/jogl/cglext.cfg | 4 +
make/config/jogl/egl.cfg | 6 +-
make/config/jogl/eglext.cfg | 4 +
make/config/jogl/gl-common.cfg | 69 +-
make/config/jogl/gl-gl4bc.cfg | 10 +
.../config/jogl/gl-impl-CustomJavaCode-common.java | 20 +
make/config/jogl/gl2_es2-common.cfg | 10 -
make/config/jogl/glx-CustomCCode.c | 60 +-
make/config/jogl/glx-CustomJavaCode.java | 56 +-
make/config/jogl/glx-x11.cfg | 6 +-
make/config/jogl/glxext.cfg | 4 +
make/config/jogl/wgl-win32.cfg | 6 +-
make/config/jogl/wglext.cfg | 4 +
make/config/nativewindow/x11-CustomJavaCode.java | 5 +
make/scripts/adb-install-all-armv6.sh | 4 +
make/scripts/adb-launch-main.sh | 6 +-
make/scripts/adb-reinstall-all-armv6.sh | 5 +
make/scripts/java-win32-dbg.bat | 19 +-
make/scripts/java-win32.bat | 13 +-
make/scripts/java-win64-dbg.bat | 12 +-
make/scripts/java-win64.bat | 4 +-
make/scripts/lstjars.sh | 24 +-
make/scripts/make.jogl.all.android-armv6-cross.sh | 92 ++
...cross.sh => make.jogl.all.linux-armv6-cross.sh} | 12 +-
...linux-armv7.sh => make.jogl.all.linux-armv6.sh} | 10 +-
...oss.sh => make.jogl.all.linux-armv6hf-cross.sh} | 14 +-
make/scripts/make.jogl.all.linux-armv6hf.sh | 27 +
make/scripts/make.jogl.all.win32.bat | 4 +-
make/scripts/make.jogl.all.win64.bat | 6 +-
make/scripts/targetcommand-awt.sh | 12 +-
...{targetcommand-awt.sh => targetcommand-loop.sh} | 40 +-
make/scripts/targetcommand-newt.sh | 21 +-
make/scripts/tests-armv6_armel.sh | 7 +
make/scripts/tests-armv6_armhf.sh | 7 +
make/scripts/tests-armv7l_eabi.sh | 7 -
make/scripts/tests-javaws-x64.bat | 2 +-
make/scripts/tests-linux-armv6.sh | 7 +
make/scripts/tests-linux-armv6hf.sh | 7 +
make/scripts/tests-linux-armv7.sh | 7 -
make/scripts/tests-linux-armv7hf.sh | 7 -
make/scripts/tests-x32.bat | 9 +-
make/scripts/tests-x64.bat | 50 +-
make/scripts/tests.sh | 140 ++-
make/stub_includes/opengl/GL/glxext.h | 10 +
make/stub_includes/opengl/macosx-window-system.h | 13 +-
make/stub_includes/x11/window-lib.c | 5 +-
make/versions.xml | 2 +-
.../com/jogamp/graph/curve/opengl/RenderState.java | 6 +-
src/jogl/classes/com/jogamp/opengl/FBObject.java | 1298 +++++++++++++-------
src/jogl/classes/com/jogamp/opengl/FloatUtil.java | 130 +-
.../jogamp}/opengl/GLAutoDrawableDelegate.java | 81 +-
.../classes/com/jogamp/opengl/GLExtensions.java | 3 +
.../com/jogamp/opengl/GLRendererQuirks.java | 144 +++
.../opengl/GenericGLCapabilitiesChooser.java} | 35 +-
.../classes/com/jogamp/opengl/JoglVersion.java | 17 +
.../com/jogamp/opengl/OffscreenAutoDrawable.java | 98 --
.../classes/com/jogamp/opengl/swt/GLCanvas.java | 75 +-
.../com/jogamp/opengl/util/GLArrayDataClient.java | 39 +-
.../jogamp/opengl/util/GLArrayDataEditable.java | 33 +-
.../com/jogamp/opengl/util/GLArrayDataWrapper.java | 14 +-
.../classes/com/jogamp/opengl/util/GLBuffers.java | 73 +-
.../com/jogamp/opengl/util/GLReadBufferUtil.java | 8 +-
.../com/jogamp/opengl/util/ImmModeSink.java | 1029 ++++++++++------
.../classes/com/jogamp/opengl/util/PMVMatrix.java | 732 ++++++++---
.../com/jogamp/opengl/util/glsl/ShaderCode.java | 30 +
.../com/jogamp/opengl/util/glsl/ShaderProgram.java | 37 +-
.../com/jogamp/opengl/util/glsl/ShaderState.java | 145 ++-
.../com/jogamp/opengl/util/glsl/ShaderUtil.java | 49 +-
.../opengl/util/glsl/fixedfunc/FixedFuncUtil.java | 46 +-
.../util/glsl/fixedfunc/ShaderSelectionMode.java | 27 +
.../com/jogamp/opengl/util/texture/Texture.java | 9 +-
.../opengl/util/texture/spi/LEDataInputStream.java | 2 +-
.../media/opengl/DefaultGLCapabilitiesChooser.java | 39 +-
.../classes/javax/media/opengl/GLArrayData.java | 6 +-
.../classes/javax/media/opengl/GLAutoDrawable.java | 38 +-
src/jogl/classes/javax/media/opengl/GLBase.java | 38 +
.../classes/javax/media/opengl/GLCapabilities.java | 125 +-
.../media/opengl/GLCapabilitiesImmutable.java | 79 +-
src/jogl/classes/javax/media/opengl/GLContext.java | 315 +++--
.../classes/javax/media/opengl/GLDrawable.java | 2 +-
.../javax/media/opengl/GLDrawableFactory.java | 271 +++-
.../classes/javax/media/opengl/GLFBODrawable.java | 175 +++
.../media/opengl/GLOffscreenAutoDrawable.java} | 71 +-
src/jogl/classes/javax/media/opengl/GLPbuffer.java | 6 +-
src/jogl/classes/javax/media/opengl/GLProfile.java | 167 +--
.../classes/javax/media/opengl/GLRunnable2.java} | 18 +-
.../classes/javax/media/opengl/GLUniformData.java | 36 +-
.../classes/javax/media/opengl/awt/GLCanvas.java | 183 +--
.../classes/javax/media/opengl/awt/GLJPanel.java | 15 +-
.../javax/media/opengl/fixedfunc/GLMatrixFunc.java | 175 ++-
.../media/opengl/fixedfunc/GLPointerFuncUtil.java | 15 +-
.../graph/curve/opengl/RegionRendererImpl01.java | 4 +-
.../graph/curve/opengl/TextRendererImpl01.java | 4 +-
.../jogamp/graph/curve/opengl/VBORegion2PES2.java | 18 +-
.../jogamp/graph/curve/opengl/VBORegionSPES2.java | 14 +-
.../opengl/shader/curverenderer01-es2-merged.vp | 4 +-
.../curve/opengl/shader/curverenderer01-es2.vp | 4 +-
.../opengl/shader/curverenderer01a-es2-merged.fp | 4 +-
.../curve/opengl/shader/curverenderer01b-es2.fp | 2 +-
.../curve/opengl/shader/curverenderer02a-es2.fp | 2 +-
.../curve/opengl/shader/curverenderer02b-es2.fp | 2 +-
.../classes/jogamp/graph/font/JavaFontLoader.java | 8 +-
.../jogamp/graph/font/UbuntuFontLoader.java | 14 +-
.../classes/jogamp/graph/geom/plane/Path2D.java | 2 +-
.../classes/jogamp/opengl/GLAutoDrawableBase.java | 96 +-
.../jogamp/opengl/GLBufferStateTracker.java | 14 +-
src/jogl/classes/jogamp/opengl/GLContextImpl.java | 301 +++--
.../jogamp/opengl/GLDrawableFactoryImpl.java | 175 +--
.../classes/jogamp/opengl/GLDrawableHelper.java | 196 ++-
src/jogl/classes/jogamp/opengl/GLDrawableImpl.java | 94 +-
.../classes/jogamp/opengl/GLFBODrawableImpl.java | 571 +++++++--
.../jogamp/opengl/GLGraphicsConfigurationUtil.java | 233 ++--
.../jogamp/opengl/GLOffscreenAutoDrawableImpl.java | 123 ++
src/jogl/classes/jogamp/opengl/GLPbufferImpl.java | 31 +-
.../classes/jogamp/opengl/GLVersionNumber.java | 26 +-
.../classes/jogamp/opengl/GLXExtensions.java} | 24 +-
src/jogl/classes/jogamp/opengl/ProjectFloat.java | 356 +++---
src/jogl/classes/jogamp/opengl/ThreadingImpl.java | 3 +-
src/jogl/classes/jogamp/opengl/egl/EGLContext.java | 67 +-
.../classes/jogamp/opengl/egl/EGLDisplayUtil.java | 157 ++-
.../classes/jogamp/opengl/egl/EGLDrawable.java | 142 +--
.../jogamp/opengl/egl/EGLDrawableFactory.java | 608 +++++----
.../opengl/egl/EGLDummyUpstreamSurfaceHook.java | 59 +
.../jogamp/opengl/egl/EGLExternalContext.java | 11 -
.../jogamp/opengl/egl/EGLGLCapabilities.java | 23 +-
.../opengl/egl/EGLGraphicsConfiguration.java | 233 ++--
.../egl/EGLGraphicsConfigurationFactory.java | 70 +-
.../jogamp/opengl/egl/EGLOnscreenContext.java | 11 -
.../jogamp/opengl/egl/EGLOnscreenDrawable.java | 4 +-
.../jogamp/opengl/egl/EGLPbufferContext.java | 10 -
.../jogamp/opengl/egl/EGLPbufferDrawable.java | 8 +-
.../jogamp/opengl/egl/EGLUpstreamSurfaceHook.java | 145 ++-
.../jogamp/opengl/egl/EGLWrappedSurface.java | 26 +
.../classes/jogamp/opengl/glu/GLUquadricImpl.java | 42 +-
.../jogamp/opengl/macosx/cgl/MacOSXCGLContext.java | 775 ++++++++----
.../opengl/macosx/cgl/MacOSXCGLDrawable.java | 48 +-
.../macosx/cgl/MacOSXCGLDrawableFactory.java | 134 +-
.../macosx/cgl/MacOSXCGLGraphicsConfiguration.java | 193 ++-
.../cgl/MacOSXCGLGraphicsConfigurationFactory.java | 30 +-
.../macosx/cgl/MacOSXExternalCGLContext.java | 7 +-
.../macosx/cgl/MacOSXOnscreenCGLContext.java | 19 +-
.../macosx/cgl/MacOSXOnscreenCGLDrawable.java | 4 +-
.../opengl/macosx/cgl/MacOSXPbufferCGLContext.java | 1 +
.../macosx/cgl/MacOSXPbufferCGLDrawable.java | 42 +-
.../classes/jogamp/opengl/shader/texture01_xxx.fp | 19 +
.../classes/jogamp/opengl}/shader/texture01_xxx.vp | 12 +-
.../classes/jogamp/opengl/util/GLArrayHandler.java | 21 +-
.../jogamp/opengl/util/GLArrayHandlerFlat.java | 4 +-
.../opengl/util/GLArrayHandlerInterleaved.java | 40 +-
.../jogamp/opengl/util/GLDataArrayHandler.java | 41 +-
.../jogamp/opengl/util/GLFixedArrayHandler.java | 41 +-
.../opengl/util/GLFixedArrayHandlerFlat.java | 36 +-
...ataArrayHandler.java => GLVBOArrayHandler.java} | 45 +-
.../jogamp/opengl/util/av/EGLMediaPlayerImpl.java | 6 +-
.../jogamp/opengl/util/av/GLMediaPlayerImpl.java | 13 +-
.../av/impl/FFMPEGDynamicLibraryBundleInfo.java | 17 +
.../opengl/util/av/impl/FFMPEGMediaPlayer.java | 16 +-
.../jogamp/opengl/util/glsl/GLSLArrayHandler.java | 28 +-
.../opengl/util/glsl/GLSLArrayHandlerFlat.java | 36 +-
.../util/glsl/GLSLArrayHandlerInterleaved.java | 40 +-
.../opengl/util/glsl/fixedfunc/FixedFuncHook.java | 210 +++-
.../util/glsl/fixedfunc/FixedFuncPipeline.java | 1234 +++++++++++++++----
.../util/glsl/fixedfunc/shaders/FixedFuncColor.fp | 28 +-
.../util/glsl/fixedfunc/shaders/FixedFuncColor.vp | 6 +
.../glsl/fixedfunc/shaders/FixedFuncColorLight.vp | 16 +-
.../fixedfunc/shaders/FixedFuncColorTexture.fp | 136 +-
.../util/glsl/fixedfunc/shaders/FixedFuncPoints.fp | 47 +
.../util/glsl/fixedfunc/shaders/FixedFuncPoints.vp | 40 +
.../util/glsl/fixedfunc/shaders/mgl_alphatest.fp | 33 +
.../util/glsl/fixedfunc/shaders/mgl_attribute.glsl | 28 +-
.../util/glsl/fixedfunc/shaders/mgl_const.glsl | 31 +-
.../util/glsl/fixedfunc/shaders/mgl_lightdef.glsl | 3 +
.../util/glsl/fixedfunc/shaders/mgl_settexcoord.vp | 6 +
.../util/glsl/fixedfunc/shaders/mgl_uniform.glsl | 43 +-
.../glsl/fixedfunc/shaders/mgl_uniform_light.glsl | 1 +
.../util/glsl/fixedfunc/shaders/mgl_varying.glsl | 2 +
.../opengl/util/pngj/chunks/PngChunkTIME.java | 2 +-
.../opengl/windows/wgl/WGLGLCapabilities.java | 47 +-
.../windows/wgl/WindowsExternalWGLContext.java | 4 +-
.../windows/wgl/WindowsExternalWGLDrawable.java | 4 +-
.../windows/wgl/WindowsPbufferWGLDrawable.java | 66 +-
.../opengl/windows/wgl/WindowsWGLContext.java | 14 +-
.../opengl/windows/wgl/WindowsWGLDrawable.java | 43 +-
.../windows/wgl/WindowsWGLDrawableFactory.java | 87 +-
.../wgl/WindowsWGLGraphicsConfiguration.java | 556 +++++----
.../WindowsWGLGraphicsConfigurationFactory.java | 164 ++-
.../classes/jogamp/opengl/x11/glx/GLXUtil.java | 81 +-
.../opengl/x11/glx/X11ExternalGLXContext.java | 29 +-
.../opengl/x11/glx/X11ExternalGLXDrawable.java | 33 +-
.../jogamp/opengl/x11/glx/X11GLXContext.java | 167 +--
.../jogamp/opengl/x11/glx/X11GLXDrawable.java | 7 +-
.../opengl/x11/glx/X11GLXDrawableFactory.java | 125 +-
.../x11/glx/X11GLXGraphicsConfiguration.java | 340 +++--
.../glx/X11GLXGraphicsConfigurationFactory.java | 154 +--
.../opengl/x11/glx/X11OnscreenGLXDrawable.java | 2 +-
.../opengl/x11/glx/X11PbufferGLXDrawable.java | 35 +-
.../macosx/MacOSXWindowSystemInterface-calayer.m | 840 +++++++++++++
.../macosx/MacOSXWindowSystemInterface-pbuffer.m | 494 --------
.../native/macosx/MacOSXWindowSystemInterface.m | 81 +-
.../DelegatedUpstreamSurfaceHookMutableSize.java | 39 +
...elegatedUpstreamSurfaceHookWithSurfaceSize.java | 54 +
.../UpstreamSurfaceHookMutableSize.java | 45 +
.../com/jogamp/nativewindow/awt/JAWTWindow.java | 99 +-
.../jogamp/nativewindow/egl/EGLGraphicsDevice.java | 19 +-
.../com/jogamp/nativewindow/swt/SWTAccessor.java | 38 +-
.../jogamp/nativewindow/x11/X11GraphicsDevice.java | 42 +-
.../jogamp/nativewindow/x11/X11GraphicsScreen.java | 16 +-
.../media/nativewindow/AbstractGraphicsDevice.java | 13 +-
.../javax/media/nativewindow/Capabilities.java | 182 +--
.../media/nativewindow/CapabilitiesImmutable.java | 35 +-
.../nativewindow/DefaultCapabilitiesChooser.java | 9 +-
.../media/nativewindow/DefaultGraphicsDevice.java | 24 +-
.../nativewindow/GraphicsConfigurationFactory.java | 2 +-
.../javax/media/nativewindow/NativeSurface.java | 5 +-
.../media/nativewindow/NativeWindowFactory.java | 345 +++---
.../media/nativewindow/OffscreenLayerSurface.java | 3 +
.../javax/media/nativewindow/ProxySurface.java | 266 +---
.../javax/media/nativewindow/ToolkitLock.java | 38 +-
.../{ToolkitLock.java => UpstreamSurfaceHook.java} | 34 +-
...JAWTToolkitLock.java => GlobalToolkitLock.java} | 72 +-
.../nativewindow/NativeWindowFactoryImpl.java | 15 +-
.../jogamp/nativewindow/NullToolkitLock.java | 26 +-
.../nativewindow/ProxySurfaceImpl.java} | 204 +--
...11ToolkitLock.java => ResourceToolkitLock.java} | 65 +-
.../nativewindow/SharedResourceToolkitLock.java | 148 +++
.../jogamp/nativewindow/ToolkitProperties.java | 47 +
.../jogamp/nativewindow/WrappedSurface.java | 53 +-
.../jogamp/nativewindow/jawt/JAWTJNILibLoader.java | 2 +-
.../classes/jogamp/nativewindow/jawt/JAWTUtil.java | 55 +-
.../nativewindow/jawt/macosx/MacOSXJAWTWindow.java | 84 +-
.../nativewindow/jawt/x11/X11JAWTWindow.java | 3 +-
.../macosx/OSXDummyUpstreamSurfaceHook.java | 56 +
.../jogamp/nativewindow/macosx/OSXUtil.java | 55 +-
.../windows/GDIDummyUpstreamSurfaceHook.java | 50 +
.../jogamp/nativewindow/windows/GDISurface.java | 34 +-
.../jogamp/nativewindow/windows/GDIUtil.java | 40 +-
.../x11/X11DummyUpstreamSurfaceHook.java | 70 ++
.../classes/jogamp/nativewindow/x11/X11Util.java | 365 +++---
.../awt/X11AWTGraphicsConfigurationFactory.java | 7 +-
src/nativewindow/native/macosx/OSXmisc.m | 189 ++-
src/nativewindow/native/x11/Xmisc.c | 148 ++-
src/newt/classes/com/jogamp/newt/Display.java | 49 +-
src/newt/classes/com/jogamp/newt/NewtFactory.java | 13 +-
src/newt/classes/com/jogamp/newt/Screen.java | 10 +-
src/newt/classes/com/jogamp/newt/Window.java | 8 +-
.../classes/com/jogamp/newt/awt/NewtCanvasAWT.java | 9 +
.../classes/com/jogamp/newt/event/InputEvent.java | 90 +-
.../classes/com/jogamp/newt/event/KeyEvent.java | 419 +++----
.../classes/com/jogamp/newt/event/MouseEvent.java | 23 +-
.../classes/com/jogamp/newt/event/NEWTEvent.java | 14 +-
.../classes/com/jogamp/newt/event/WindowEvent.java | 13 +-
.../com/jogamp/newt/event/WindowUpdateEvent.java | 11 +-
.../jogamp/newt/event/awt/AWTWindowAdapter.java | 28 +-
.../classes/com/jogamp/newt/opengl/GLWindow.java | 25 +-
.../classes/com/jogamp/newt/swt/NewtCanvasSWT.java | 20 +-
.../classes/com/jogamp/newt/swt/SWTEDTUtil.java | 217 +++-
src/newt/classes/com/jogamp/newt/util/EDTUtil.java | 40 +-
.../classes/com/jogamp/newt/util/MainThread.java | 6 +-
src/newt/classes/jogamp/newt/DefaultEDTUtil.java | 62 +-
src/newt/classes/jogamp/newt/DisplayImpl.java | 111 +-
src/newt/classes/jogamp/newt/OffscreenWindow.java | 31 +-
src/newt/classes/jogamp/newt/ScreenImpl.java | 74 +-
src/newt/classes/jogamp/newt/WindowImpl.java | 132 +-
.../{AndroidDisplay.java => DisplayDriver.java} | 6 +-
.../newt/driver/android/NewtBaseActivity.java | 25 +-
.../newt/driver/android/NewtVersionActivity.java | 2 +-
.../{AndroidScreen.java => ScreenDriver.java} | 6 +-
.../{AndroidWindow.java => WindowDriver.java} | 56 +-
.../classes/jogamp/newt/driver/awt/AWTCanvas.java | 29 +-
.../classes/jogamp/newt/driver/awt/AWTEDTUtil.java | 221 +++-
.../awt/{AWTDisplay.java => DisplayDriver.java} | 16 +-
.../awt/{AWTScreen.java => ScreenDriver.java} | 4 +-
.../awt/{AWTWindow.java => WindowDriver.java} | 90 +-
.../Display.java => bcm/egl/DisplayDriver.java} | 12 +-
.../egl/Screen.java => bcm/egl/ScreenDriver.java} | 8 +-
.../egl/Window.java => bcm/egl/WindowDriver.java} | 8 +-
.../vc/iv/DisplayDriver.java} | 36 +-
.../vc/iv/ScreenDriver.java} | 57 +-
.../KDWindow.java => bcm/vc/iv/WindowDriver.java} | 114 +-
.../intel/gdl/{Display.java => DisplayDriver.java} | 20 +-
.../intel/gdl/{Screen.java => ScreenDriver.java} | 7 +-
.../intel/gdl/{Window.java => WindowDriver.java} | 19 +-
.../kd/{KDDisplay.java => DisplayDriver.java} | 9 +-
.../driver/kd/{KDScreen.java => ScreenDriver.java} | 6 +-
.../driver/kd/{KDWindow.java => WindowDriver.java} | 8 +-
.../newt/driver/linux/LinuxMouseTracker.java | 221 ++++
.../macosx/{MacDisplay.java => DisplayDriver.java} | 11 +-
.../jogamp/newt/driver/macosx/MacKeyUtil.java | 172 +--
.../macosx/{MacScreen.java => ScreenDriver.java} | 6 +-
.../macosx/{MacWindow.java => WindowDriver.java} | 128 +-
.../{WindowsDisplay.java => DisplayDriver.java} | 9 +-
.../{WindowsScreen.java => ScreenDriver.java} | 6 +-
.../{WindowsWindow.java => WindowDriver.java} | 80 +-
.../x11/{X11Display.java => DisplayDriver.java} | 80 +-
.../x11/{X11Screen.java => ScreenDriver.java} | 41 +-
.../x11/{X11Window.java => WindowDriver.java} | 125 +-
src/newt/native/AndroidWindow.c | 18 +-
src/newt/native/InputEvent.h | 27 +-
src/newt/native/IntelGDL.c | 24 +-
src/newt/native/KDWindow.c | 20 +-
src/newt/native/MacWindow.m | 165 +--
src/newt/native/NewtMacWindow.h | 4 +
src/newt/native/NewtMacWindow.m | 73 +-
src/newt/native/WindowsWindow.c | 300 +++--
src/newt/native/X11Common.h | 7 +-
src/newt/native/X11Display.c | 176 +--
src/newt/native/{X11Display.c => X11Event.c} | 443 +------
src/newt/native/X11Event.h | 9 +
src/newt/native/X11Screen.c | 87 +-
.../native/{X11Screen.c => X11ScreenRandR11.c} | 288 +----
.../native/{X11Screen.c => X11ScreenRandR13.c} | 311 ++---
src/newt/native/X11Window.c | 54 +-
src/newt/native/XCBEvent.c | 314 +++++
src/newt/native/XCBEvent.h | 10 +
src/newt/native/{BroadcomEGL.c => bcm_egl.c} | 16 +-
src/newt/native/bcm_vc_iv.c | 219 ++++
src/newt/native/bcm_vc_iv.h | 187 +++
src/test-native/contextRetargetDrawable01.c | 154 +++
src/test-native/contextRetargetDrawable02.c | 382 ++++++
src/test-native/glExtensionsListGL2.c | 2 +
src/test-native/glExtensionsListGL3.c | 25 +-
src/test-native/make.sh | 2 +
.../test/android/MovieCubeActivityLauncher0.java | 2 +
.../opengl/test/android/MovieSimpleActivity0.java | 6 +-
.../opengl/test/android/MovieSimpleActivity1.java | 10 +-
.../test/android/NEWTGearsES2ActivityLauncher.java | 8 +-
.../android/NEWTGraphUI1pActivityLauncher.java | 22 +-
...urrentNEWT.java => InitConcurrentBaseNEWT.java} | 86 +-
...WT.java => TestFBOAutoDrawableDeadlockAWT.java} | 11 +-
.../jogl/acore/TestFBOAutoDrawableFactoryNEWT.java | 375 ++++++
.../test/junit/jogl/acore/TestFBODrawableNEWT.java | 272 ----
.../test/junit/jogl/acore/TestFBOMRTNEWT01.java | 25 +-
.../junit/jogl/acore/TestFBOMix2DemosES2NEWT.java | 2 +-
...FBOOffThreadSharedContextMix2DemosES2NEWT.java} | 216 ++--
... TestFBOOnThreadSharedContext1DemoES2NEWT.java} | 191 +--
.../jogl/acore/TestGLAutoDrawableDelegateNEWT.java | 152 ---
...estGLAutoDrawableDelegateOnOffscrnCapsNEWT.java | 385 ++++++
.../TestGLAutoDrawableFactoryOffscrnCapsNEWT.java | 306 +++++
...TestGLAutoDrawableGLCanvasOnOffscrnCapsAWT.java | 324 +++++
...estGLAutoDrawableGLWindowOnOffscrnCapsNEWT.java | 339 +++++
...LAutoDrawableNewtCanvasAWTOnOffscrnCapsAWT.java | 299 +++++
.../acore/TestGLContextDrawableSwitchNEWT.java | 44 +-
.../jogl/acore/TestGLExtensionQueryOffscreen.java | 19 +-
.../junit/jogl/acore/TestGLProfile00NEWT.java} | 30 +-
.../test/junit/jogl/acore/TestGPUMemSec01NEWT.java | 4 +-
.../acore/TestInitConcurrent01NEWT.java} | 78 +-
.../junit/jogl/acore/TestInitConcurrent02NEWT.java | 96 ++
.../jogl/acore/TestNEWTCloseX11DisplayBug565.java | 46 +-
.../acore/TestOffscreenLayer01GLCanvasAWT.java} | 94 +-
.../acore/TestOffscreenLayer02NewtCanvasAWT.java} | 111 +-
.../junit/jogl/acore/TestPBufferDeadlockAWT.java | 2 +
.../test/junit/jogl/acore/TestPMVMatrix01NEWT.java | 442 +++++++
.../test/junit/jogl/acore/TestPMVMatrix02NEWT.java | 109 ++
.../test/junit/jogl/acore/TestPointsNEWT.java | 156 +++
.../junit/jogl/acore/TestSharedContextListAWT.java | 20 +-
.../jogl/acore/TestSharedContextListNEWT.java | 20 +-
.../jogl/acore/TestSharedContextListNEWT2.java | 14 +-
.../jogl/acore/TestSharedContextNewtAWTBug523.java | 17 +-
.../jogl/acore/TestSharedContextVBOES1NEWT.java | 20 +-
.../jogl/acore/TestSharedContextVBOES2NEWT.java | 132 +-
.../jogl/acore/TestSharedContextVBOES2NEWT2.java | 168 ---
.../junit/jogl/acore/TestShutdownCompleteAWT.java | 4 +-
.../junit/jogl/acore/TestShutdownCompleteNEWT.java | 14 +-
.../junit/jogl/acore/TestShutdownSharedAWT.java | 124 --
.../junit/jogl/acore/TestShutdownSharedNEWT.java | 127 --
.../opengl/test/junit/jogl/awt/TestAWT01GLn.java | 60 +-
...ava => TestBug461FBOSupersamplingSwingAWT.java} | 12 +-
...=> TestBug461PBufferSupersamplingSwingAWT.java} | 6 +-
.../opengl/test/junit/jogl/awt/TestBug572AWT.java | 127 ++
.../opengl/test/junit/jogl/awt/TestBug611AWT.java | 81 ++
.../jogl/awt/TestJScrollPaneMixHwLw01AWT.java | 172 +++
.../junit/jogl/caps/TestBug605FlippedImageAWT.java | 185 +++
.../jogl/caps/TestBug605FlippedImageNEWT.java | 176 +++
.../junit/jogl/caps/TestMultisampleES1AWT.java | 2 +-
.../junit/jogl/caps/TestMultisampleES1NEWT.java | 2 +-
.../junit/jogl/caps/TestMultisampleES2NEWT.java | 2 +-
.../opengl/test/junit/jogl/demos/GearsObject.java | 14 +-
.../opengl/test/junit/jogl/demos/PointsDemo.java} | 32 +-
.../opengl/test/junit/jogl/demos/es1/GearsES1.java | 50 +-
.../test/junit/jogl/demos/es1/GearsObjectES1.java | 7 +-
.../junit/jogl/demos/es1/MultisampleDemoES1.java | 11 +-
.../test/junit/jogl/demos/es1/OneTriangle.java | 11 +-
.../test/junit/jogl/demos/es1/PointsDemoES1.java | 198 +++
.../test/junit/jogl/demos/es1/RedSquareES1.java | 65 +-
.../jogl/demos/es1/newt/TestGearsES1NEWT.java | 27 +-
.../jogl/demos/es1/newt/TestRedSquareES1NEWT.java | 27 +-
.../test/junit/jogl/demos/es2/FBOMix2DemosES2.java | 51 +-
.../opengl/test/junit/jogl/demos/es2/GearsES2.java | 33 +-
.../test/junit/jogl/demos/es2/GearsObjectES2.java | 17 +-
.../{FBOMix2DemosES2.java => Mix2TexturesES2.java} | 169 +--
.../junit/jogl/demos/es2/MultisampleDemoES2.java | 14 +-
.../es2/{RedSquareES2.java => PointsDemoES2.java} | 164 +--
.../test/junit/jogl/demos/es2/RedSquareES2.java | 31 +-
.../jogl/demos/es2/TextureDraw01ES2Listener.java | 17 +-
.../junit/jogl/demos/es2/awt/TestGearsES2AWT.java | 62 +-
.../jogl/demos/es2/newt/TestGearsES2NEWT.java | 52 +-
.../jogl/demos/es2/newt/TestRedSquareES2NEWT.java | 41 +-
.../junit/jogl/demos/es2/shader/PointsShader.fp | 47 +
.../junit/jogl/demos/es2/shader/PointsShader.vp | 47 +
.../junit/jogl/demos/es2/shader/RedSquareShader.fp | 19 +-
.../junit/jogl/demos/es2/shader/RedSquareShader.vp | 15 +-
.../jogl/demos/es2/shader/RedSquareShader2.fp | 22 +-
.../test/junit/jogl/demos/es2/shader/default.vp | 5 +
.../shader/elektronenmultiplizierer_development.fp | 12 +-
.../es2/shader/elektronenmultiplizierer_port.fp | 12 +-
.../test/junit/jogl/demos/es2/shader/gears.fp | 10 +-
.../test/junit/jogl/demos/es2/shader/gears.vp | 7 +-
.../junit/jogl/demos/es2/shader/mgl_default_xxx.fp | 10 +-
.../junit/jogl/demos/es2/shader/mgl_default_xxx.vp | 4 +
.../test/junit/jogl/demos/es2/shader/ruler.fp | 9 +-
.../junit/jogl/demos/es2/shader/texsequence_xxx.fp | 9 +-
.../junit/jogl/demos/es2/shader/texsequence_xxx.vp | 5 +
.../junit/jogl/demos/es2/shader/texture01_xxx.fp | 10 +-
.../junit/jogl/demos/es2/shader/texture01_xxx.vp | 5 +
.../junit/jogl/demos/es2/shader/texture02_xxx.fp | 14 +-
.../opengl/test/junit/jogl/demos/gl2/Gears.java | 13 +-
.../jogl/demos/gl2/awt/TestGLJPanelAWTBug450.java | 2 +-
.../demos/gl2/newt/TestGearsNewtAWTWrapper.java | 20 +-
.../junit/jogl/drawable/TestDrawable01NEWT.java | 183 ---
.../test/junit/jogl/glsl/GLSLMiscHelper.java | 8 +-
.../junit/jogl/glsl/TestGLSLShaderState01NEWT.java | 10 +-
.../junit/jogl/glsl/TestGLSLShaderState02NEWT.java | 28 +-
.../test/junit/jogl/glsl/TestRulerNEWT01.java | 8 +-
.../test/junit/jogl/offscreen/ReadBufferBase.java | 2 +-
.../test/junit/jogl/swt/TestNewtCanvasSWTGLn.java | 2 +-
.../junit/jogl/swt/TestSWTAccessor03AWTGLn.java | 137 ++-
.../junit/jogl/swt/TestSWTJOGLGLCanvas01GLn.java | 2 +-
.../junit/jogl/util/DemoGL2ES1ImmModeSink.java | 97 ++
.../test/junit/jogl/util/DemoGL2ES1Plain.java | 161 +++
.../jogl/util/DemoGL2ES1TextureImmModeSink.java | 142 +++
.../TestES1FixedFunctionPipelineNEWT.java} | 95 +-
.../junit/jogl/util/TestImmModeSinkES1NEWT.java | 140 +++
.../TestGLReadBufferUtilTextureIOWrite01AWT.java | 4 +-
.../TestGLReadBufferUtilTextureIOWrite01NEWT.java | 16 +-
.../TestGLReadBufferUtilTextureIOWrite02AWT.java | 2 +-
.../TestGLReadBufferUtilTextureIOWrite02NEWT.java | 2 +-
.../util/texture/TestPNGTextureFromFileAWT.java | 2 +-
.../util/texture/TestPNGTextureFromFileNEWT.java | 2 +-
.../test/junit/newt/TestFocus01SwingAWTRobot.java | 27 +-
.../test/junit/newt/TestFocus02SwingAWTRobot.java | 20 +-
.../junit/newt/TestNewtKeyCodeModifiersAWT.java | 275 +++++
...SwingAWTRobot.java => TestNewtKeyCodesAWT.java} | 222 ++--
.../junit/newt/TestNewtKeyEventAutoRepeatAWT.java | 320 +++++
...AWTRobot.java => TestNewtKeyEventOrderAWT.java} | 210 ++--
...=> TestNewtKeyPressReleaseUnmaskRepeatAWT.java} | 197 +--
.../test/junit/newt/TestRemoteGLWindows01NEWT.java | 1 -
.../test/junit/newt/TestRemoteWindow01NEWT.java | 2 +-
.../test/junit/newt/TestScreenMode00NEWT.java | 2 +-
.../test/junit/newt/TestScreenMode00bNEWT.java | 2 +-
.../test/junit/newt/TestScreenMode01NEWT.java | 50 +-
.../opengl/test/junit/newt/TestWindows01NEWT.java | 3 +-
.../parenting/NewtAWTReparentingKeyAdapter.java | 6 +-
.../TestParentingFocusTraversal01AWT.java | 5 +-
.../opengl/test/junit/util/AWTFocusAdapter.java | 11 +-
.../opengl/test/junit/util/AWTKeyAdapter.java | 65 +-
.../opengl/test/junit/util/AWTMouseAdapter.java | 43 +-
.../opengl/test/junit/util/AWTRobotUtil.java | 124 +-
.../test/junit/util/AWTWindowFocusAdapter.java | 11 +-
.../opengl/test/junit/util/EventCountAdapter.java | 9 +
.../test/junit/util/InputEventCountAdapter.java | 6 +
...CountAdapter.java => KeyEventCountAdapter.java} | 11 +-
.../jogamp/opengl/test/junit/util/MiscUtils.java | 48 +
.../opengl/test/junit/util/NEWTFocusAdapter.java | 11 +-
.../opengl/test/junit/util/NEWTGLContext.java | 4 +-
.../opengl/test/junit/util/NEWTKeyAdapter.java | 80 +-
.../jogamp/opengl/test/junit/util/NEWTKeyUtil.java | 185 +++
.../opengl/test/junit/util/NEWTMouseAdapter.java | 44 +-
.../jogamp/opengl/test/junit/util/UITestCase.java | 159 ++-
.../{MiscUtils.java => ValidateLockListener.java} | 67 +-
493 files changed, 25813 insertions(+), 12299 deletions(-)
diff --cc debian/changelog
index aa6e3c0,0000000..e47da44
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,164 -1,0 +1,170 @@@
++libjogl2-java (2.0-rc11-1~exp1) experimental; urgency=low
++
++ * New upstream release
++
++ -- Sylvestre Ledru <sylvestre at debian.org> Thu, 08 Nov 2012 16:51:30 +0100
++
+libjogl2-java (2.0-rc10-1~exp1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 03 Sep 2012 09:34:29 +0200
+
+libjogl2-java (2.0-rc9-1~exp1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 02 Jul 2012 03:22:25 +0200
+
+libjogl2-java (2.0-rc8-1) unstable; urgency=low
+
+ * Upload to unstable
+ * Support of armhf & s390x added.
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Wed, 13 Jun 2012 18:34:05 +0200
+
+libjogl2-java (2.0-rc8-1~exp2) experimental; urgency=low
+
+ * Force also the version of gluegen2 in the package themself
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Wed, 13 Jun 2012 13:54:44 +0200
+
+libjogl2-java (2.0-rc8-1~exp1) experimental; urgency=low
+
+ * New upstream release
+ * Set the exact version of the dependency between libjogl2-java
+ and libjogl2-jni
+
+ [ Miguel Landaeta ]
+ * Use public access URL in Vcs-Svn field. (Closes: #670283).
+ * Fix debian-control-has-unusual-field-spacing lintian warning.
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Wed, 23 May 2012 14:23:19 +0200
+
+libjogl2-java (2.0-rc5-2) unstable; urgency=low
+
+ * Really upload to unstable (oups)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Tue, 13 Mar 2012 09:46:59 +0100
+
+libjogl2-java (2.0-rc5-1) experimental; urgency=low
+
+ * Upload in unstable
+ * Standards-Version updated to version 3.9.3
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 12 Mar 2012 20:23:07 +0100
+
+libjogl2-java (2.0-rc5-1~exp3) experimental; urgency=low
+
+ * Some sbuild still want to build the doc package. Enable it only for amd64
+ and x86. See build log of ia64 & powerpc of version 2.0-rc5-1~exp2
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Wed, 28 Dec 2011 13:59:28 +0100
+
+libjogl2-java (2.0-rc5-1~exp2) experimental; urgency=low
+
+ * Only build the doc once
+ * Disable some TARGET_PLATFORM_LIBS variables
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Tue, 27 Dec 2011 23:22:05 +0100
+
+libjogl2-java (2.0-rc5-1~exp1) experimental; urgency=low
+
+ * New upstream release
+ * watch + repack script added
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 26 Dec 2011 02:06:41 +0100
+
+libjogl2-java (2.0-rc3-7) unstable; urgency=low
+
+ * Drop patch sparc.diff since it is now managed into gluegen2
+ * Disable the build of the documentation for arch indep build
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Tue, 22 Nov 2011 00:42:13 +0100
+
+libjogl2-java (2.0-rc3-6) unstable; urgency=low
+
+ * Fix a problem under arm
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sun, 20 Nov 2011 21:43:36 +0100
+
+libjogl2-java (2.0-rc3-5) unstable; urgency=low
+
+ * Example is now working (Closes: #634996)
+ * Fix the various FTBFS (Closes: #638431) (LP: #809743)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sun, 20 Nov 2011 21:43:29 +0100
+
+libjogl2-java (2.0-rc3-4) unstable; urgency=low
+
+ * Ant to build C code = a lot of uploads ... pfff
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 10 Oct 2011 12:13:14 +0200
+
+libjogl2-java (2.0-rc3-3) unstable; urgency=low
+
+ * Fix more FTBFS
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sun, 09 Oct 2011 19:26:30 +0200
+
+libjogl2-java (2.0-rc3-2) unstable; urgency=low
+
+ * Fix various FTBFS:
+ - disable the android include
+ - build the documentation as indep package (to avoid the timeout)
+ - disable the git call
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sat, 08 Oct 2011 11:39:42 +0200
+
+libjogl2-java (2.0-rc3-1) unstable; urgency=low
+
+ * New upstream release
+ * libjogl2-java, libjogl2-jni and libjogl2-java-doc added
+ (better match of the version 1)
+ * Massive cleanup of the package list. Upstream decided to simplify all the
+ jar packages.
+ See: http://bit.ly/qBNO7V
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Thu, 06 Oct 2011 15:53:38 +0200
+
+libjogl2-java (2.0-rc2-4) unstable; urgency=low
+
+ * Team upload.
+ * Update dependency libswt-gtk-3.6-java to libswt-gtk-3-java
+ (Closes: #635656)
+
+ -- tony mancill <tmancill at debian.org> Fri, 29 Jul 2011 22:15:33 -0700
+
+libjogl2-java (2.0-rc2-3) unstable; urgency=low
+
+ * Support of the other debian arch. Should fix the various FTBFS
+ (otherArchsoswin.diff)
+ * Update dependency libswt-gtk-3.5-java to libswt-gtk-3.6-java
+ (Closes: #629777)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Tue, 21 Jun 2011 21:54:41 +0200
+
+libjogl2-java (2.0-rc2-2) unstable; urgency=low
+
+ * cg-common.cfg.diff, build-java.diff, build.diff & defaultDebianPath.diff
+ removed (deprecated patches)
+ * libjogl2-core-java depended on libjogl2-core-jni which does not exist
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sun, 08 May 2011 23:30:49 +0200
+
+libjogl2-java (2.0-rc2-1) unstable; urgency=low
+
+ * New upstream release
+ * Standards-Version updated to version 3.9.2
+ * needless-dependency-on-jre removed
+ * swt-debug.jar removed from the archive. Update the dep list.
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sun, 17 Apr 2011 14:41:20 +0200
+
+libjogl2-java (2.0-rc1-1) unstable; urgency=low
+
+ * New upstream release (Closes: #614819)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Tue, 01 Mar 2011 14:12:56 +0100
+
+
diff --cc debian/control
index f975834,0000000..836d941
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,327 -1,0 +1,327 @@@
+Source: libjogl2-java
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Sylvestre Ledru <sylvestre at debian.org>
+Build-Depends: debhelper (>= 5), cdbs, quilt, default-jdk,
- libgluegen2-build-java (>= 2.0-rc10-1~), libgluegen2-rt-java (>= 2.0-rc10-1~),
++ libgluegen2-build-java (>= 2.0-rc11-1~), libgluegen2-rt-java (>= 2.0-rc11-1~),
+ ant-optional, libgl1-mesa-dev, libglu1-mesa-dev, libxxf86vm-dev,
+ x11proto-xf86vidmode-dev, libxt-dev, junit4, libswt-gtk-3-java,
+ ant-contrib, ant-contrib-cpptasks, libxinerama-dev, libxrandr-dev,
+ ant (>= 1.8)
+Standards-Version: 3.9.3
+Homepage: http://jogamp.org/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjogl2-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjogl2-java/
+
+Package: libjogl2-java
+Architecture: all
+Depends: ${misc:Depends},
- libgluegen2-rt-java (>= 2.0-rc10), libjogl2-jni (>= ${source:Version})
++ libgluegen2-rt-java (>= 2.0-rc11), libjogl2-jni (>= ${source:Version})
+Suggests: libjogl2-java-doc
+Description: Java bindings for OpenGL API
+ The JOGL project hosts the development version of the Java Bindings for
+ OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics
+ to applications written in Java. JOGL is not the official reference
+ implementation of the JSR, but an evolving workspace; snapshots are taken
+ from this workspace which become the official reference implementations of
+ the JSR.
+ .
+ JOGL provides full access to the APIs in the OpenGL 1.3 - 3.0, 3.1 - 3.3,
+ >= 4.0, ES 1.x and ES 2.x specification as well as nearly all vendor
+ extensions. It integrates with the AWT and Swing widget sets, as well with
+ custom windowing toolkits using the NativeWindow API. It is part of a
+ suite of open-source technologies initiated by the Game Technology Group at
+ Sun Microsystems.
+
+Package: libjogl2-jni
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Architecture: any
+Description: Java bindings for OpenGL API (JNI lib)
+ The JOGL project hosts the development version of the Java Bindings for
+ OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics
+ to applications written in Java. JOGL is not the official reference
+ implementation of the JSR, but an evolving workspace; snapshots are taken
+ from this workspace which become the official reference implementations of
+ the JSR. JOGL is part of a suite of open-source technologies initiated by
+ the Game Technology Group at Sun Microsystems.
+ .
+ JOGL provides full access to the APIs in the OpenGL 2.0 specification as
+ well as nearly all vendor extensions, and integrates with the AWT and Swing
+ widget sets.
+
+# Package: libjogl2-core-newt-java
+# Architecture: all
+# Depends: ${misc:Depends},
+# libjogl2-core-java
+# Description: Java bindings for OpenGL API
+# The JOGL project hosts the development version of the Java Bindings for
+# OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics
+# to applications written in Java. JOGL is not the official reference
+# implementation of the JSR, but an evolving workspace; snapshots are taken
+# from this workspace which become the official reference implementations of
+# the JSR.
+# .
+# JOGL provides full access to the APIs in the OpenGL 1.3 - 3.0, 3.1 - 3.3,
+# >= 4.0, ES 1.x and ES 2.x specification as well as nearly all vendor
+# extensions. It integrates with the AWT and Swing widget sets, as well with
+# custom windowing toolkits using the NativeWindow API. It is part of a
+# suite of open-source technologies initiated by the Game Technology Group at
+# Sun Microsystems.
+
+
+# Package: libjogl2-core-newt-jni
+# Architecture: any
+# Depends: ${misc:Depends}, ${shlibs:Depends},
+# libjogl2-core-java
+# Description: Java bindings for OpenGL API (JNI lib)
+# The JOGL project hosts the development version of the Java Bindings for
+# OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics
+# to applications written in Java. JOGL is not the official reference
+# implementation of the JSR, but an evolving workspace; snapshots are taken
+# from this workspace which become the official reference implementations of
+# the JSR. JOGL is part of a suite of open-source technologies initiated by
+# the Game Technology Group at Sun Microsystems.
+# .
+# JOGL provides full access to the APIs in the OpenGL 2.0 specification as
+# well as nearly all vendor extensions, and integrates with the AWT and Swing
+# widget sets.
+
+# Package: libjogl2-platform-java
+# Architecture: all
+# Depends: ${misc:Depends}, libjogl2-core-java
+# Description: Java bindings for OpenGL API
+# The JOGL project hosts the development version of the Java Bindings for
+# OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics
+# to applications written in Java. JOGL is not the official reference
+# implementation of the JSR, but an evolving workspace; snapshots are taken
+# from this workspace which become the official reference implementations of
+# the JSR.
+# .
+# JOGL provides full access to the APIs in the OpenGL 1.3 - 3.0, 3.1 - 3.3,
+# >= 4.0, ES 1.x and ES 2.x specification as well as nearly all vendor
+# extensions. It integrates with the AWT and Swing widget sets, as well with
+# custom windowing toolkits using the NativeWindow API. It is part of a
+# suite of open-source technologies initiated by the Game Technology Group at
+# Sun Microsystems.
+
+# Package: libjogl2-platform-jni
+# Architecture: any
+# Depends: ${misc:Depends}, libjogl2-core-java, ${shlibs:Depends}
+# Description: Java bindings for OpenGL API (JNI lib)
+# The JOGL project hosts the development version of the Java Bindings for
+# OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics
+# to applications written in Java. JOGL is not the official reference
+# implementation of the JSR, but an evolving workspace; snapshots are taken
+# from this workspace which become the official reference implementations of
+# the JSR. JOGL is part of a suite of open-source technologies initiated by
+# the Game Technology Group at Sun Microsystems.
+# .
+# JOGL provides full access to the APIs in the OpenGL 2.0 specification as
+# well as nearly all vendor extensions, and integrates with the AWT and Swing
+# widget sets.
+
+# Package: libjogl2-platform-newt-java
+# Architecture: all
+# Depends: ${misc:Depends}, libjogl2-core-newt-java
+# Description: Java bindings for OpenGL API
+# The JOGL project hosts the development version of the Java Bindings for
+# OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics
+# to applications written in Java. JOGL is not the official reference
+# implementation of the JSR, but an evolving workspace; snapshots are taken
+# from this workspace which become the official reference implementations of
+# the JSR.
+# .
+# JOGL provides full access to the APIs in the OpenGL 1.3 - 3.0, 3.1 - 3.3,
+# >= 4.0, ES 1.x and ES 2.x specification as well as nearly all vendor
+# extensions. It integrates with the AWT and Swing widget sets, as well with
+# custom windowing toolkits using the NativeWindow API. It is part of a
+# suite of open-source technologies initiated by the Game Technology Group at
+# Sun Microsystems.
+
+# # nativewindow.core.jar nativewindow.os.x11.jar jogl.core.jar jogl.os.x11.jar
+# # newt.core.jar newt.os.x11.jar newt.ogl.jar jogl.util.jar jogl.os.x11.jar
+# # jogl.gldesktop.jar jogl.gldesktop.dbg.jar
+# Package: libjogl2-desktop-java
+# Architecture: all
+# Suggests: libjogl2-java-doc
+# Depends: ${misc:Depends}, libjogl2-core-java, libjogl2-platform-java,
+# libjogl2-platform-newt-java
+# Description: Java bindings for Desktop OpenGL API (main package)
+# The JOGL project hosts the development version of the Java Bindings for
+# OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics
+# to applications written in Java. JOGL is not the official reference
+# implementation of the JSR, but an evolving workspace; snapshots are taken
+# from this workspace which become the official reference implementations of
+# the JSR.
+# .
+# JOGL provides full access to the APIs in the OpenGL 1.3 - 3.0, 3.1 - 3.3,
+# >= 4.0, ES 1.x and ES 2.x specification as well as nearly all vendor
+# extensions. It integrates with the AWT and Swing widget sets, as well with
+# custom windowing toolkits using the NativeWindow API. It is part of a
+# suite of open-source technologies initiated by the Game Technology Group at
+# Sun Microsystems.
+
+
+
+# Package: libjogl2-desktop-jni
+# Architecture: any
+# Depends: ${misc:Depends}, ${shlibs:Depends}
+# Description: Java bindings for Desktop OpenGL API (JNI lib)
+# The JOGL project hosts the development version of the Java Bindings for
+# OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics
+# to applications written in Java. JOGL is not the official reference
+# implementation of the JSR, but an evolving workspace; snapshots are taken
+# from this workspace which become the official reference implementations of
+# the JSR. JOGL is part of a suite of open-source technologies initiated by
+# the Game Technology Group at Sun Microsystems.
+# .
+# JOGL provides full access to the APIs in the OpenGL 2.0 specification as
+# well as nearly all vendor extensions, and integrates with the AWT and Swing
+# widget sets.
+
+# # nativewindow.core.jar nativewindow.os.x11.jar jogl.core.jar jogl.os.x11.jar
+# # newt.core.jar newt.os.x11.jar newt.ogl.jar jogl.util.jar jogl.os.x11.jar
+# # jogl.gl2es12.jar jogl.gles1.dbg.jar jogl.gles2.dbg.jar
+# # jogl.util.fixedfuncemu.jar
+# # Package: libjogl2-desktop-gl2es12-java
+# # Architecture: all
+# # Suggests: libjogl2-java-doc
+# # Depends: ${misc:Depends}, libjogl2-core-java, libjogl2-platform-java,
+# # libjogl2-platform-newt-java, libjogl2-toolkits
+# # Description: Java bindings for desktop ES1/ES2 emulation OpenGL API
+# # The JOGL project hosts the development version of the Java Bindings for
+# # OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics
+# # to applications written in Java. JOGL is not the official reference
+# # implementation of the JSR, but an evolving workspace; snapshots are taken
+# # from this workspace which become the official reference implementations of
+# # the JSR. JOGL is part of a suite of open-source technologies initiated by
+# # the Game Technology Group at Sun Microsystems.
+# # .
+# # JOGL provides full access to the APIs in the OpenGL 2.0 specification as
+# # well as nearly all vendor extensions, and integrates with the AWT and Swing
+# # widget sets.
+
+# # Package: libjogl2-desktop-gl2es12-jni
+# # Architecture: any
+# # Depends: ${misc:Depends}, ${shlibs:Depends}
+# # Description: Java bindings for desktop ES1/ES2 emulation OpenGL API (JNI lib)
+# # The JOGL project hosts the development version of the Java Bindings for
+# # OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics
+# # to applications written in Java. JOGL is not the official reference
+# # implementation of the JSR, but an evolving workspace; snapshots are taken
+# # from this workspace which become the official reference implementations of
+# # the JSR. JOGL is part of a suite of open-source technologies initiated by
+# # the Game Technology Group at Sun Microsystems.
+# # .
+# # JOGL provides full access to the APIs in the OpenGL 2.0 specification as
+# # well as nearly all vendor extensions, and integrates with the AWT and Swing
+# # widget sets.
+# # .
+# # This package includes the architecture specific java native interface.
+
+
+# Package: libjogl2-awt-java
+# Architecture: all
+# Depends: ${misc:Depends}
+# Description: Java bindings for AWT OpenGL API
+# The JOGL project hosts the development version of the Java Bindings for
+# OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics
+# to applications written in Java. JOGL is not the official reference
+# implementation of the JSR, but an evolving workspace; snapshots are taken
+# from this workspace which become the official reference implementations of
+# the JSR. JOGL is part of a suite of open-source technologies initiated by
+# the Game Technology Group at Sun Microsystems.
+# .
+# JOGL provides full access to the APIs in the OpenGL 2.0 specification as
+# well as nearly all vendor extensions, and integrates with the AWT and Swing
+# widget sets.
+
+# Package: libjogl2-awt-jni
+# Architecture: any
+# Depends: ${misc:Depends}, ${shlibs:Depends}
+# Description: Java bindings for AWT OpenGL API (JNI lib)
+# The JOGL project hosts the development version of the Java Bindings for
+# OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics
+# to applications written in Java. JOGL is not the official reference
+# implementation of the JSR, but an evolving workspace; snapshots are taken
+# from this workspace which become the official reference implementations of
+# the JSR. JOGL is part of a suite of open-source technologies initiated by
+# the Game Technology Group at Sun Microsystems.
+# .
+# JOGL provides full access to the APIs in the OpenGL 2.0 specification as
+# well as nearly all vendor extensions, and integrates with the AWT and Swing
+# widget sets.
+
+# Package: libjogl2-awt-newt-java
+# Architecture: all
+# Depends: ${misc:Depends}
+# Description: Java bindings for AWT NEWT OpenGL API
+# The JOGL project hosts the development version of the Java Bindings for
+# OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics
+# to applications written in Java. JOGL is not the official reference
+# implementation of the JSR, but an evolving workspace; snapshots are taken
+# from this workspace which become the official reference implementations of
+# the JSR. JOGL is part of a suite of open-source technologies initiated by
+# the Game Technology Group at Sun Microsystems.
+# .
+# JOGL provides full access to the APIs in the OpenGL 2.0 specification as
+# well as nearly all vendor extensions, and integrates with the AWT and Swing
+# widget sets.
+
+# Package: libjogl2-glu-java
+# Architecture: all
+# Depends: ${misc:Depends}
+# Description: Java bindings for GLU OpenGL API
+# The JOGL project hosts the development version of the Java Bindings for
+# OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics
+# to applications written in Java. JOGL is not the official reference
+# implementation of the JSR, but an evolving workspace; snapshots are taken
+# from this workspace which become the official reference implementations of
+# the JSR. JOGL is part of a suite of open-source technologies initiated by
+# the Game Technology Group at Sun Microsystems.
+# .
+# JOGL provides full access to the APIs in the OpenGL 2.0 specification as
+# well as nearly all vendor extensions, and integrates with the AWT and Swing
+# widget sets.
+
+
+Package: libjogl2-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Documentation for the Java bindings for OpenGL
+ The JOGL project hosts the development version of the Java Bindings for
+ OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics
+ to applications written in Java. JOGL is not the official reference
+ implementation of the JSR, but an evolving workspace; snapshots are taken
+ from this workspace which become the official reference implementations of
+ the JSR.
+ .
+ JOGL provides full access to the APIs in the OpenGL 2.0 specification as
+ well as nearly all vendor extensions, and integrates with the AWT and Swing
+ widget sets.
+ .
+ This package includes the API documentation for JOGL package.
+
+
+Package: libjogl2-toolkits
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Toolkits to play with JOGL2
+ The JOGL project hosts the development version of the Java Bindings for
+ OpenGL (JSR-231), and is designed to provide hardware-supported 3D graphics
+ to applications written in Java. JOGL is not the official reference
+ implementation of the JSR, but an evolving workspace; snapshots are taken
+ from this workspace which become the official reference implementations of
+ the JSR.
+ .
+ JOGL provides full access to the APIs in the OpenGL 1.3 - 3.0, 3.1 - 3.3,
+ >= 4.0, ES 1.x and ES 2.x specification as well as nearly all vendor
+ extensions. It integrates with the AWT and Swing widget sets, as well with
+ custom windowing toolkits using the NativeWindow API. It is part of a
+ suite of open-source technologies initiated by the Game Technology Group at
+ Sun Microsystems.
+ .
+ This package includes JOGL toolkits.
diff --cc debian/patches/TARGET_PLATFORM_LIBS_2.diff
index e03535a,0000000..b2c525b
mode 100644,000000..100644
--- a/debian/patches/TARGET_PLATFORM_LIBS_2.diff
+++ b/debian/patches/TARGET_PLATFORM_LIBS_2.diff
@@@ -1,26 -1,0 +1,26 @@@
- Index: jogl-v2.0-rc9/make/build-jogl.xml
++Index: jogl-v2.0-rc11/make/build-jogl.xml
+===================================================================
- --- jogl-v2.0-rc9.orig/make/build-jogl.xml 2012-06-19 05:23:28.000000000 +0200
- +++ jogl-v2.0-rc9/make/build-jogl.xml 2012-07-02 03:26:25.434527540 +0200
- @@ -1148,7 +1148,7 @@
++--- jogl-v2.0-rc11.orig/make/build-jogl.xml 2012-10-31 21:58:36.000000000 +0100
+++++ jogl-v2.0-rc11/make/build-jogl.xml 2012-11-08 16:44:29.000000000 +0100
++@@ -1151,7 +1151,7 @@
+ </linker>
+
- <linker id="linker.cfg.linux.armv7.jogl.x11" extends="linker.cfg.linux.armv7">
++ <linker id="linker.cfg.linux.armv6.jogl.x11" extends="linker.cfg.linux.armv6">
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11"/>
++ <syslibset libs="X11"/>
+ </linker>
+
+ <linker id="linker.cfg.android.jogl" extends="linker.cfg.android">
- Index: jogl-v2.0-rc9/make/build-newt.xml
++Index: jogl-v2.0-rc11/make/build-newt.xml
+===================================================================
- --- jogl-v2.0-rc9.orig/make/build-newt.xml 2012-07-02 03:25:32.350528723 +0200
- +++ jogl-v2.0-rc9/make/build-newt.xml 2012-07-02 03:26:25.434527540 +0200
- @@ -292,7 +292,7 @@
++--- jogl-v2.0-rc11.orig/make/build-newt.xml 2012-10-31 21:58:36.000000000 +0100
+++++ jogl-v2.0-rc11/make/build-newt.xml 2012-11-08 16:43:44.000000000 +0100
++@@ -326,7 +326,7 @@
+ </linker>
+
+ <linker id="linker.cfg.android.newt" extends="linker.cfg.android">
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="android" />
++ <syslibset libs="android" />
+ </linker>
+
+ <linker id="linker.cfg.solaris.newt.x11" extends="linker.cfg.solaris">
diff --cc debian/patches/armhfbuild.diff
index f2cd436,0000000..1b29702
mode 100644,000000..100644
--- a/debian/patches/armhfbuild.diff
+++ b/debian/patches/armhfbuild.diff
@@@ -1,17 -1,0 +1,17 @@@
- Index: libjogl2-java-2.0-rc8/make/build-nativewindow.xml
++Index: jogl-v2.0-rc11/make/build-nativewindow.xml
+===================================================================
- --- libjogl2-java-2.0-rc8.orig/make/build-nativewindow.xml 2012-05-02 03:28:29.000000000 +0200
- +++ libjogl2-java-2.0-rc8/make/build-nativewindow.xml 2012-06-13 18:25:52.000000000 +0200
++--- jogl-v2.0-rc11.orig/make/build-nativewindow.xml 2012-10-31 21:58:36.000000000 +0100
+++++ jogl-v2.0-rc11/make/build-nativewindow.xml 2012-11-08 16:45:12.000000000 +0100
+@@ -397,9 +397,9 @@
+ </linker>
+
- <linker id="linker.cfg.linux.armv7.nativewindow.x11" extends="linker.cfg.linux.armv7">
++ <linker id="linker.cfg.linux.armv6.nativewindow.x11" extends="linker.cfg.linux.armv6">
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" />
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xxf86vm" />
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrender" />
++ <syslibset libs="X11" />
++ <syslibset libs="Xxf86vm" />
++ <syslibset libs="Xrender" />
+ </linker>
+
+ <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris">
diff --cc debian/patches/s390x.diff
index 8e09370,0000000..9af0d95
mode 100644,000000..100644
--- a/debian/patches/s390x.diff
+++ b/debian/patches/s390x.diff
@@@ -1,80 -1,0 +1,81 @@@
- Index: jogl-v2.0-rc9/make/build-jogl.xml
++Index: jogl-v2.0-rc11/make/build-jogl.xml
+===================================================================
- --- jogl-v2.0-rc9.orig/make/build-jogl.xml 2012-07-02 03:26:25.434527540 +0200
- +++ jogl-v2.0-rc9/make/build-jogl.xml 2012-07-02 03:26:31.382527406 +0200
- @@ -1278,13 +1278,19 @@
++--- jogl-v2.0-rc11.orig/make/build-jogl.xml 2012-11-08 16:44:29.000000000 +0100
+++++ jogl-v2.0-rc11/make/build-jogl.xml 2012-11-08 16:46:41.000000000 +0100
++@@ -1280,6 +1280,12 @@
++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" />
+ </target>
-
+++
++ <target name="c.configure.linux.s390x" if="isLinuxs390x">
++ <echo message="Linux.S390x" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
++ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" />
++ </target>
- +
++
+ <target name="c.configure.linux.sparc" if="isLinuxSparc">
+ <echo message="Linux.SPARC" />
- <property name="compiler.cfg.id" value="compiler.cfg.linux" />
++@@ -1287,7 +1293,7 @@
+ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" />
+ </target>
+
- - <target name="c.configure.linux" depends="c.configure.linux.armv7,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
- + <target name="c.configure.linux" depends="c.configure.linux.armv7,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
++- <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
+++ <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
+
+ <target name="c.configure.android" if="isAndroid">
+ <echo message="Android" />
- Index: jogl-v2.0-rc9/make/build-nativewindow.xml
++Index: jogl-v2.0-rc11/make/build-nativewindow.xml
+===================================================================
- --- jogl-v2.0-rc9.orig/make/build-nativewindow.xml 2012-07-02 03:26:30.550527425 +0200
- +++ jogl-v2.0-rc9/make/build-nativewindow.xml 2012-07-02 03:26:31.382527406 +0200
++--- jogl-v2.0-rc11.orig/make/build-nativewindow.xml 2012-11-08 16:45:12.000000000 +0100
+++++ jogl-v2.0-rc11/make/build-nativewindow.xml 2012-11-08 16:48:45.000000000 +0100
+@@ -529,13 +529,19 @@
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" />
+ </target>
+
++ <target name="c.configure.linux.s390x" if="isLinuxs390x">
++ <echo message="Linux.S390x" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
++ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" />
++ </target>
++
+ <target name="c.configure.linux.sparc" if="isLinuxSparc">
+ <echo message="Linux.SPARC" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" />
+ </target>
+
- - <target name="c.configure.linux" depends="c.configure.linux.armv7,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
- + <target name="c.configure.linux" depends="c.configure.linux.armv7,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
++- <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
+++ <target name="c.configure.linux" depends="c.configure.linux.armv6,c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.ia64,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.x11" if="isLinux" />
+
+ <target name="c.configure.android" if="isAndroid">
+ <echo message="Android" />
- Index: jogl-v2.0-rc9/make/build-newt.xml
++Index: jogl-v2.0-rc11/make/build-newt.xml
+===================================================================
- --- jogl-v2.0-rc9.orig/make/build-newt.xml 2012-07-02 03:26:25.434527540 +0200
- +++ jogl-v2.0-rc9/make/build-newt.xml 2012-07-02 03:26:31.386527406 +0200
- @@ -436,6 +436,16 @@
++--- jogl-v2.0-rc11.orig/make/build-newt.xml 2012-11-08 16:43:44.000000000 +0100
+++++ jogl-v2.0-rc11/make/build-newt.xml 2012-11-08 16:49:14.000000000 +0100
++@@ -470,6 +470,16 @@
+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
+ </target>
+
++ <target name="c.configure.linux.s390x" if="isLinuxs390x">
++ <echo message="Linux.S390x" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
++ <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11"
++ else="linker.cfg.linux">
++ <isset property="isX11" />
++ </condition>
++ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
++ </target>
++
+ <target name="c.configure.linux.sparc" if="isLinuxSparc">
+ <echo message="Linux.sparc" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
- @@ -452,7 +462,7 @@
++@@ -486,7 +496,7 @@
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" />
+ </target>
+
- - <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv7,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
- + <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv7,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
++- <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv6,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
+++ <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv6,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.s390x,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
+
+ <target name="c.configure.android" if="isAndroid">
+ <echo message="Android" />
diff --cc debian/patches/swt.diff
index 97980a6,0000000..3496224
mode 100644,000000..100644
--- a/debian/patches/swt.diff
+++ b/debian/patches/swt.diff
@@@ -1,21 -1,0 +1,23 @@@
- Index: jogl-v2.0-rc5/make/build-common.xml
++Index: jogl-v2.0-rc11/make/build-common.xml
+===================================================================
- --- jogl-v2.0-rc5.orig/make/build-common.xml 2011-12-26 02:00:28.000000000 +0100
- +++ jogl-v2.0-rc5/make/build-common.xml 2011-12-26 02:00:34.658064939 +0100
- @@ -133,14 +133,8 @@
++--- jogl-v2.0-rc11.orig/make/build-common.xml 2012-11-08 16:41:46.000000000 +0100
+++++ jogl-v2.0-rc11/make/build-common.xml 2012-11-08 16:43:26.000000000 +0100
++@@ -133,15 +133,9 @@
+ <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-freebsd-x86_64/swt.jar">
+ <istrue value="${isFreeBSDAMD64}" />
+ </condition>
+- <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86_64/swt-debug.jar">
+- <istrue value="${isLinuxAMD64}" />
+- </condition>
+- <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar">
+- <istrue value="${isLinuxX86}" />
+- </condition>
+- <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar">
- - <istrue value="${isLinuxARMv7}" /> <!-- FIXME JAU .. hack -->
++- <istrue value="${isLinuxARMv6}" /> <!-- FIXME JAU .. hack -->
++- </condition>
++ <condition property="swt.jar" value="/usr/share/java/swt.jar">
++ <istrue value="${isLinux}" />
- </condition>
+++ </condition>
+ <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar">
+ <istrue value="${isAndroid}" /> <!-- FIXME JAU .. hack -->
++ </condition>
diff --cc debian/patches/variousFixes.diff
index f393303,0000000..303fc21
mode 100644,000000..100644
--- a/debian/patches/variousFixes.diff
+++ b/debian/patches/variousFixes.diff
@@@ -1,63 -1,0 +1,63 @@@
- Index: jogl-v2.0-rc10/make/build-common.xml
++Index: jogl-v2.0-rc11/make/build-common.xml
+===================================================================
- --- jogl-v2.0-rc10.orig/make/build-common.xml 2012-08-03 00:38:37.000000000 +0200
- +++ jogl-v2.0-rc10/make/build-common.xml 2012-09-03 09:38:18.000000000 +0200
++--- jogl-v2.0-rc11.orig/make/build-common.xml 2012-10-31 21:58:36.000000000 +0100
+++++ jogl-v2.0-rc11/make/build-common.xml 2012-11-08 16:41:46.000000000 +0100
+@@ -13,13 +13,13 @@
+ </fail>
+
+ <!-- Pull in GlueGen cpptasks build file -->
+- <property name="gluegen.root" value="../../gluegen" />
++ <property name="gluegen.root" value="/usr/share/gluegen2/" />
+ <import file="${gluegen.root}/make/gluegen-cpptasks.xml" />
+ <import file="${gluegen.root}/make/jogamp-archivetasks.xml" />
+ <import file="${gluegen.root}/make/jogamp-androidtasks.xml" />
+ <import file="${gluegen.root}/make/jogamp-env.xml" />
+
+- <property name="ant-contrib.jar" value="${gluegen.root}/make/lib/ant-contrib-1.0b3.jar" />
++ <property name="ant-contrib.jar" value="/usr/share/java/ant-contrib.jar" />
+
+ <condition property="rootrel.build" value="build">
+ <not>
+@@ -207,7 +207,7 @@
+ <property name="gluegen.build.xml" value="${gluegen.make}/build.xml" />
+ <property name="build.gluegen" value="${gluegen.root}/${rootrel.build}" />
+ <property name="obj.gluegen" value="${build.gluegen}/obj"/>
+- <property name="gluegen.jar" value="${build.gluegen}/gluegen.jar" />
++ <property name="gluegen.jar" value="/usr/share/java/gluegen2.jar" />
+ <property name="ant.jar" value="${ant.home}/lib/ant.jar" />
+ <property name="ant-junit.jar" value="${ant.home}/lib/ant-junit.jar" />
+
- @@ -400,7 +400,7 @@
++@@ -413,7 +413,7 @@
+ </path>
+
+ <!-- JavaSE combinations -->
+- <property name="gluegen-rt.jar" value="${build.gluegen}/gluegen-rt.jar" />
++ <property name="gluegen-rt.jar" value="/usr/share/java/gluegen2-rt.jar" />
+ <property name="gluegen-rt-android.jar" value="${build.gluegen}/gluegen-rt-android.jar" />
+ <property name="jogl-test.jar" value="${jar}/jogl-test.jar"/>
+ <property name="jogl-test-android.jar" value="${jar}/jogl-test-android.jar"/>
- @@ -555,7 +555,10 @@
++@@ -568,7 +568,10 @@
+
+ <!-- Run the GlueGen build to ensure that the GlueGen ANT task
+ - has been built. -->
+- <ant antfile="${gluegen.build.xml}" dir="${gluegen.make}" target="base.compile" inheritAll="false"/>
++ <ant antfile="${gluegen.build.xml}" dir="${gluegen.make}" target="base.compile" inheritAll="false">
++ <property name="build" value="${basedir}/../"/>
++ <property name="test.dir" value="${basedir}/../test"/>
++ </ant>
+ </target>
+
+
- Index: jogl-v2.0-rc10/make/build.xml
++Index: jogl-v2.0-rc11/make/build.xml
+===================================================================
- --- jogl-v2.0-rc10.orig/make/build.xml 2012-08-03 00:38:37.000000000 +0200
- +++ jogl-v2.0-rc10/make/build.xml 2012-09-03 09:38:18.000000000 +0200
++--- jogl-v2.0-rc11.orig/make/build.xml 2012-10-31 21:58:36.000000000 +0100
+++++ jogl-v2.0-rc11/make/build.xml 2012-11-08 16:41:46.000000000 +0100
+@@ -276,7 +276,7 @@
+ </target>
+
+ <target name="tag.build" depends="init">
+- <copy file="${build.gluegen}/artifact.properties" todir="${build}" overwrite="true"/>
++ <copy file="/usr/share/gluegen2/artifact.properties" todir="${build}" overwrite="true"/>
+ <echo message='jogl.build.number=${jogl.build.number}${line.separator}' file="${build}/artifact.properties" append="true"/>
+ <echo message='jogl.build.id=${jogl.build.id}${line.separator}' file="${build}/artifact.properties" append="true"/>
+ <echo message='jogl.build.branch=${jogl.build.branch}${line.separator}' file="${build}/artifact.properties" append="true"/>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjogl2-java.git
More information about the pkg-java-commits
mailing list