[libjogl2-java] 43/58: Imported Debian patch 2.0-rc12-1
Tony Mancill
tmancill at moszumanska.debian.org
Thu Sep 4 03:59:21 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 6dfe3486b63cc636a548e39b37d82ea9641e571c
Merge: c1c71d2 bfc77ea
Author: Sylvestre Ledru <sylvestre at debian.org>
Date: Mon Jul 1 14:26:13 2013 +0200
Imported Debian patch 2.0-rc12-1
.classpath | 1 +
LICENSE.txt | 6 +-
README.txt | 4 +-
debian/changelog | 6 +
debian/control | 4 +-
debian/patches/arm-build.diff | 71 +-
debian/patches/disable_android_2.diff | 8 +-
debian/patches/disable_git_call.diff | 10 +-
debian/patches/manifest.diff | 13 +-
debian/patches/s390x.diff | 28 +-
debian/patches/swt.diff | 8 +-
debian/patches/variousFixes.diff | 26 +-
debian/rules | 2 +-
doc/HowToBuild.html | 2 +-
etc/profile.jogl | 30 +-
etc/test_dbg.sh | 2 +-
.../jogl-applet-runner-newt-gears-gl3-napplet.html | 2 +-
...gl-applet-runner-newt-gears-normal-napplet.html | 2 +-
...l-applet-runner-newt-gears-normal-napplet2.html | 2 +-
make/build-common.xml | 48 +-
make/build-jogl.xml | 118 +-
make/build-nativewindow.xml | 32 +-
make/build-newt.xml | 39 +-
make/build-test.xml | 187 ++-
make/build.xml | 37 +-
make/config/jogl/cg-common-CustomJavaCode.java | 6 +-
make/config/jogl/cg-common.cfg | 2 +
make/config/jogl/cgl-macosx-CustomJavaCode.java | 35 +
make/config/jogl/cgl-macosx.cfg | 11 +
make/config/jogl/gl-common.cfg | 1 +
.../config/jogl/gl-impl-CustomJavaCode-common.java | 5 +
make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java | 138 +-
make/config/jogl/gl-impl-CustomJavaCode-gles1.java | 59 +-
make/config/jogl/gl-impl-CustomJavaCode-gles2.java | 59 +-
make/config/jogl/glu-CustomJavaCode-base.java | 14 +-
make/config/jogl/glu-common.cfg | 1 +
make/config/jogl/glu-gl2.cfg | 3 +-
make/config/jogl/glx-CustomJavaCode.java | 14 +-
make/config/nativewindow/x11-CustomJavaCode.java | 5 +-
make/joglversion | 3 +
make/{joglversion => joglversion-all} | 3 +
make/joglversion-test | 3 +-
make/joglversion-test-android | 3 +-
make/nativewindowversion | 3 +
make/newtversion | 3 +
make/resources/android/AndroidManifest-test.xml | 40 +-
make/resources/android/res-test/values/strings.xml | 4 +
make/scripts/adb-launch-junit.sh | 82 ++
make/scripts/adb-launch-main.sh | 70 +-
make/scripts/check-junit.sh | 1 +
make/scripts/java-win.bat | 4 +
make/scripts/java-win32.bat | 25 -
make/scripts/java-win64.bat | 19 -
make/scripts/lstjars.sh | 7 +-
make/scripts/make.jogl.all.android-armv6-cross.sh | 44 +-
make/scripts/make.jogl.all.android-armv7-cross.sh | 44 +-
make/scripts/make.jogl.all.linux-armv6-cross.sh | 11 +-
make/scripts/make.jogl.all.linux-armv6.sh | 5 +-
make/scripts/make.jogl.all.linux-armv6hf-cross.sh | 9 +-
make/scripts/make.jogl.all.linux-armv6hf.sh | 5 +-
make/scripts/make.jogl.all.linux-x86.sh | 8 +
...6_64.sh => make.jogl.all.linux-x86_64.java7.sh} | 17 +-
make/scripts/make.jogl.all.linux-x86_64.sh | 18 +-
make/scripts/make.jogl.all.macosx-java7.sh | 22 +
make/scripts/make.jogl.all.macosx.sh | 16 +-
make/scripts/make.jogl.all.sh | 9 +
make/scripts/make.jogl.all.solaris-x86.sh | 7 +
make/scripts/make.jogl.all.solaris-x86_64.sh | 7 +
make/scripts/make.jogl.all.win32.bat | 11 +-
make/scripts/make.jogl.all.win64.bat | 15 +-
make/scripts/setenv-jogl.sh | 74 +-
make/scripts/tests-javaws-x64.bat | 2 +-
make/scripts/tests-linux-x64-junit-swt.sh | 7 +
make/scripts/tests-macosx64-junit-java7.sh | 8 +
make/scripts/tests-macosx64-junit-swt.sh | 7 +
.../{tests-osx-x64.sh => tests-osx-x64-custom.sh} | 2 +-
.../{tests-osx-x64.sh => tests-osx-x64-java6.sh} | 5 +-
make/scripts/tests-osx-x64.sh | 7 +-
make/scripts/tests-win.bat | 163 +++
make/scripts/tests-win64-junit-swt.bat | 7 +
.../{java-win32-dbg.bat => tests-x32-dbg.bat} | 11 +-
make/scripts/tests-x32.bat | 131 +-
make/scripts/tests-x32.sh | 2 +
make/scripts/tests-x64-custom.sh | 12 +
.../{java-win64-dbg.bat => tests-x64-dbg.bat} | 19 +-
make/scripts/tests-x64.bat | 146 +-
make/scripts/tests.sh | 383 +++--
make/stub_includes/jni/macosx/jawt_md.h | 48 +-
make/stub_includes/opengl/GL/glext.h | 2 +
make/stub_includes/opengl/GL3/gl3.h | 2 +
make/stub_includes/opengl/macosx-window-system.h | 3 +
make/stub_includes/win32/WindowsDWM.h | 5 +-
make/versions.xml | 47 -
.../com/jogamp/gluegen/opengl/GLConfiguration.java | 0
.../com/jogamp/gluegen/opengl/GLEmitter.java | 83 +-
.../gluegen/opengl/GLJavaMethodBindingEmitter.java | 0
.../opengl/nativesig/NativeSignatureEmitter.java | 0
.../NativeSignatureJavaMethodBindingEmitter.java | 0
.../com/jogamp/graph/curve/OutlineShape.java | 4 +-
.../classes/com/jogamp/graph/curve/Region.java | 2 +-
.../com/jogamp/graph/curve/opengl/GLRegion.java | 0
.../com/jogamp/graph/curve/opengl/Renderer.java | 43 +-
src/jogl/classes/com/jogamp/graph/font/Font.java | 2 +-
.../classes/com/jogamp/graph/font/FontFactory.java | 16 +-
.../classes/com/jogamp/graph/geom/Outline.java | 3 +-
src/jogl/classes/com/jogamp/graph/geom/Vertex.java | 12 +-
.../com/jogamp/graph/geom/opengl/SVertex.java | 8 +-
.../classes/com/jogamp/graph/math/Quaternion.java | 382 -----
src/jogl/classes/com/jogamp/opengl/FBObject.java | 196 +--
.../com/jogamp/opengl/GLAutoDrawableDelegate.java | 25 +-
.../com/jogamp/opengl/GLEventListenerState.java | 435 ++++++
.../classes/com/jogamp/opengl/GLExtensions.java | 5 +-
.../com/jogamp/opengl/GLRendererQuirks.java | 144 +-
.../classes/com/jogamp/opengl/GLStateKeeper.java | 100 ++
.../classes/com/jogamp/opengl/JoglVersion.java | 41 +-
.../opengl/cg/CgDynamicLibraryBundleInfo.java | 21 +-
.../jogamp/opengl/{util => math}/FixedPoint.java | 2 +-
.../com/jogamp/opengl/{ => math}/FloatUtil.java | 165 ++-
.../classes/com/jogamp/opengl/math/Quaternion.java | 426 ++++++
.../jogamp/{graph => opengl}/math/VectorUtil.java | 130 +-
.../com/jogamp/opengl/math/Vert2fImmutable.java} | 23 +-
.../com/jogamp/opengl/math/Vert3fImmutable.java} | 20 +-
.../jogamp/{graph => opengl/math}/geom/AABBox.java | 70 +-
.../com/jogamp/opengl/math/geom/Frustum.java | 388 +++++
.../classes/com/jogamp/opengl/swt/GLCanvas.java | 531 +++++--
.../com/jogamp/opengl/util/AWTAnimatorImpl.java | 2 +-
.../classes/com/jogamp/opengl/util/Animator.java | 205 ++-
.../com/jogamp/opengl/util/AnimatorBase.java | 468 +++++-
.../jogamp/opengl/util/DefaultAnimatorImpl.java | 2 +-
.../com/jogamp/opengl/util/FPSAnimator.java | 318 ++--
.../com/jogamp/opengl/util/GLArrayDataClient.java | 55 +-
.../com/jogamp/opengl/util/GLArrayDataServer.java | 29 +
.../com/jogamp/opengl/util/GLArrayDataWrapper.java | 84 +-
.../classes/com/jogamp/opengl/util/GLBuffers.java | 232 ++-
.../com/jogamp/opengl/util/GLDrawableUtil.java | 167 +++
.../com/jogamp/opengl/util/GLPixelBuffer.java | 269 ++++
.../jogamp/opengl/util/GLPixelStorageModes.java | 34 +-
.../com/jogamp/opengl/util/GLReadBufferUtil.java | 165 ++-
.../com/jogamp/opengl/util/ImmModeSink.java | 281 +++-
.../classes/com/jogamp/opengl/util/PMVMatrix.java | 204 ++-
.../jogamp/opengl/util/awt/AWTGLPixelBuffer.java | 228 +++
.../opengl/util/awt/AWTGLReadBufferUtil.java | 76 +
.../com/jogamp/opengl/util/awt/Screenshot.java | 38 +-
.../com/jogamp/opengl/util/glsl/ShaderCode.java | 175 ++-
.../com/jogamp/opengl/util/glsl/ShaderProgram.java | 4 +-
.../com/jogamp/opengl/util/glsl/ShaderState.java | 208 +--
.../com/jogamp/opengl/util/glsl/ShaderUtil.java | 18 +-
.../com/jogamp/opengl/util/texture/Texture.java | 1 +
.../jogamp/opengl/util/texture/TextureCoords.java | 1 +
.../jogamp/opengl/util/texture/TextureData.java | 174 ++-
.../com/jogamp/opengl/util/texture/TextureIO.java | 59 +-
.../opengl/util/texture/awt/AWTTextureData.java | 148 +-
.../jogamp/opengl/util/texture/spi/JPEGImage.java | 175 +++
.../jogamp/opengl/util/texture/spi/PNGImage.java | 230 ++-
.../javax/media/opengl/GLAnimatorControl.java | 64 +-
.../classes/javax/media/opengl/GLArrayData.java | 57 +-
.../classes/javax/media/opengl/GLAutoDrawable.java | 261 +++-
src/jogl/classes/javax/media/opengl/GLBase.java | 15 +-
.../classes/javax/media/opengl/GLCapabilities.java | 63 +-
.../media/opengl/GLCapabilitiesImmutable.java | 27 -
src/jogl/classes/javax/media/opengl/GLContext.java | 272 ++--
.../classes/javax/media/opengl/GLDrawable.java | 91 +-
.../javax/media/opengl/GLDrawableFactory.java | 104 +-
.../classes/javax/media/opengl/GLFBODrawable.java | 22 +-
src/jogl/classes/javax/media/opengl/GLPbuffer.java | 34 -
src/jogl/classes/javax/media/opengl/GLProfile.java | 39 +-
.../classes/javax/media/opengl/GLUniformData.java | 22 +-
.../classes/javax/media/opengl/awt/GLCanvas.java | 480 +++---
.../classes/javax/media/opengl/awt/GLJPanel.java | 1151 ++++++++-------
.../jogamp/graph/curve/opengl/RegionFactory.java | 0
.../graph/curve/opengl/RegionRendererImpl01.java | 29 +-
.../graph/curve/opengl/TextRendererImpl01.java | 20 +-
...r02a-xxx.fp => curverenderer01-1pass-weight.fp} | 9 +-
...renderer01a-xxx.fp => curverenderer01-1pass.fp} | 9 +-
...r02b-xxx.fp => curverenderer01-2pass-weight.fp} | 16 +-
...renderer01b-xxx.fp => curverenderer01-2pass.fp} | 16 +-
.../opengl/shader/curverenderer01-es2-merged.vp | 19 -
.../curve/opengl/shader/curverenderer01-es2.vp | 9 -
.../curve/opengl/shader/curverenderer01-gl2.vp | 6 -
.../{curverenderer01-xxx.vp => curverenderer01.vp} | 5 +
.../opengl/shader/curverenderer01a-es2-merged.fp | 52 -
.../curve/opengl/shader/curverenderer01a-es2.fp | 13 -
.../curve/opengl/shader/curverenderer01a-gl2.fp | 6 -
.../curve/opengl/shader/curverenderer01b-es2.fp | 14 -
.../curve/opengl/shader/curverenderer01b-gl2.fp | 6 -
.../curve/opengl/shader/curverenderer02a-es2.fp | 14 -
.../curve/opengl/shader/curverenderer02a-gl2.fp | 6 -
.../curve/opengl/shader/curverenderer02b-es2.fp | 14 -
.../curve/opengl/shader/curverenderer02b-gl2.fp | 6 -
.../jogamp/graph/curve/tess/CDTriangulator2D.java | 2 +-
src/jogl/classes/jogamp/graph/curve/tess/Loop.java | 6 +-
.../jogamp/graph/curve/text/GlyphShape.java | 2 +-
.../jogamp/graph/curve/text/GlyphString.java | 2 +-
.../jogamp/graph/font/typecast/TypecastFont.java | 2 +-
.../font/typecast/TypecastFontConstructor.java | 2 +-
.../jogamp/graph/font/typecast/TypecastGlyph.java | 2 +-
.../graph/font/typecast/TypecastHMetrics.java | 2 +-
.../jogamp/graph/font/typecast/ot/OTGlyph.java | 2 +-
.../jogamp/graph/geom/plane/AffineTransform.java | 16 +-
.../graph/{math => geom}/plane/Crossing.java | 23 +-
.../classes/jogamp/graph/geom/plane/Path2D.java | 3 +-
src/jogl/classes/jogamp/graph/math/MathFloat.java | 45 -
src/jogl/classes/jogamp/opengl/Debug.java | 25 +-
.../opengl/DesktopGLDynamicLibraryBundleInfo.java | 4 +-
.../opengl/DesktopGLDynamicLookupHelper.java | 4 +-
.../jogamp/opengl/ExtensionAvailabilityCache.java | 11 +-
src/jogl/classes/jogamp/opengl/FPSCounterImpl.java | 1 +
.../classes/jogamp/opengl/GLAutoDrawableBase.java | 252 +++-
.../jogamp/opengl/GLBufferStateTracker.java | 2 +
src/jogl/classes/jogamp/opengl/GLContextImpl.java | 1007 +++++++++----
.../jogamp/opengl/GLDebugMessageHandler.java | 24 +-
.../jogamp/opengl/GLDrawableFactoryImpl.java | 139 +-
.../classes/jogamp/opengl/GLDrawableHelper.java | 881 +++++++----
src/jogl/classes/jogamp/opengl/GLDrawableImpl.java | 177 ++-
.../jogamp/opengl/GLDynamicLibraryBundleInfo.java | 25 +-
.../jogamp/opengl/GLDynamicLookupHelper.java | 2 +-
.../classes/jogamp/opengl/GLFBODrawableImpl.java | 119 +-
.../jogamp/opengl/GLGraphicsConfigurationUtil.java | 55 +-
.../jogamp/opengl/GLOffscreenAutoDrawableImpl.java | 24 +-
src/jogl/classes/jogamp/opengl/GLPbufferImpl.java | 47 +-
.../classes/jogamp/opengl/GLVersionNumber.java | 157 +-
src/jogl/classes/jogamp/opengl/GLWorkerThread.java | 4 +-
src/jogl/classes/jogamp/opengl/MemoryObject.java | 50 +-
src/jogl/classes/jogamp/opengl/ProjectFloat.java | 2 +-
.../jogamp/opengl/SharedResourceRunner.java | 46 +-
.../jogamp/opengl/awt/AWTThreadingPlugin.java | 9 +-
src/jogl/classes/jogamp/opengl/awt/Java2D.java | 254 ++--
.../classes/jogamp/opengl/awt/Java2DGLContext.java | 52 -
.../egl/DesktopES2DynamicLibraryBundleInfo.java | 16 +-
src/jogl/classes/jogamp/opengl/egl/EGLContext.java | 40 +-
.../classes/jogamp/opengl/egl/EGLDisplayUtil.java | 76 +-
.../classes/jogamp/opengl/egl/EGLDrawable.java | 4 +-
.../jogamp/opengl/egl/EGLDrawableFactory.java | 124 +-
.../opengl/egl/EGLDynamicLibraryBundleInfo.java | 20 +-
.../opengl/egl/EGLES1DynamicLibraryBundleInfo.java | 4 +-
.../opengl/egl/EGLES2DynamicLibraryBundleInfo.java | 4 +-
.../jogamp/opengl/egl/EGLExternalContext.java | 27 +-
.../opengl/egl/EGLGraphicsConfiguration.java | 11 +-
.../egl/EGLGraphicsConfigurationFactory.java | 14 +-
.../jogamp/opengl/egl/EGLOnscreenContext.java | 45 -
.../jogamp/opengl/egl/EGLOnscreenDrawable.java | 2 +-
.../jogamp/opengl/egl/EGLPbufferContext.java | 50 -
.../jogamp/opengl/egl/EGLPbufferDrawable.java | 3 +-
.../jogamp/opengl/egl/EGLUpstreamSurfaceHook.java | 60 +-
.../jogamp/opengl/egl/EGLWrappedSurface.java | 8 +
.../classes/jogamp/opengl/glu/GLUquadricImpl.java | 42 +-
.../jogamp/opengl/macosx/cgl/MacOSXCGLContext.java | 655 ++++++---
.../opengl/macosx/cgl/MacOSXCGLDrawable.java | 11 +-
.../macosx/cgl/MacOSXCGLDrawableFactory.java | 101 +-
.../cgl/MacOSXCGLDynamicLibraryBundleInfo.java | 4 +-
.../macosx/cgl/MacOSXCGLGraphicsConfiguration.java | 10 +-
.../macosx/cgl/MacOSXExternalCGLContext.java | 22 +-
.../macosx/cgl/MacOSXOffscreenCGLContext.java | 66 -
.../macosx/cgl/MacOSXOffscreenCGLDrawable.java | 2 +-
.../macosx/cgl/MacOSXOnscreenCGLContext.java | 115 --
.../macosx/cgl/MacOSXOnscreenCGLDrawable.java | 2 +-
.../opengl/macosx/cgl/MacOSXPbufferCGLContext.java | 95 --
.../macosx/cgl/MacOSXPbufferCGLDrawable.java | 34 +-
.../cgl/awt/MacOSXAWTCGLDrawableFactory.java | 60 -
.../macosx/cgl/awt/MacOSXJava2DCGLContext.java | 121 --
.../jogamp/opengl/openal/av/ALDummyUsage.java | 19 +
.../classes/jogamp/opengl/util/GLArrayHandler.java | 6 +-
.../av/impl/FFMPEGDynamicLibraryBundleInfo.java | 45 +-
.../opengl/util/av/impl/FFMPEGMediaPlayer.java | 37 +-
.../jogamp/opengl/util/glsl/GLSLArrayHandler.java | 66 +-
.../opengl/util/glsl/GLSLArrayHandlerFlat.java | 31 +-
.../util/glsl/GLSLArrayHandlerInterleaved.java | 2 +-
.../jogamp/opengl/util/glsl/GLSLTextureRaster.java | 195 +++
.../util/glsl/fixedfunc/FixedFuncPipeline.java | 4 +-
.../jogamp/opengl/util/jpeg/JPEGDecoder.java | 1542 ++++++++++++++++++++
.../jogamp/opengl/util/pngj/FilterType.java | 49 +-
.../opengl/util/pngj/FilterWriteStrategy.java | 4 +-
.../classes/jogamp/opengl/util/pngj/ImageInfo.java | 38 +-
.../classes/jogamp/opengl/util/pngj/ImageLine.java | 355 +++--
.../jogamp/opengl/util/pngj/ImageLineHelper.java | 318 ++++
.../jogamp/opengl/util/pngj/ImageLines.java | 101 ++
.../jogamp/opengl/util/pngj/PngDeinterlacer.java | 277 ++++
.../{PngHelper.java => PngHelperInternal.java} | 139 +-
.../opengl/util/pngj/PngIDatChunkInputStream.java | 63 +-
.../opengl/util/pngj/PngIDatChunkOutputStream.java | 10 +-
.../classes/jogamp/opengl/util/pngj/PngReader.java | 959 +++++++++---
.../classes/jogamp/opengl/util/pngj/PngWriter.java | 677 ++++++---
.../opengl/util/pngj/PngjExceptionInternal.java | 23 +
.../opengl/util/pngj/ProgressiveOutputStream.java | 8 +-
.../util/pngj/chunks/ChunkCopyBehaviour.java | 3 +-
.../opengl/util/pngj/chunks/ChunkHelper.java | 151 +-
.../jogamp/opengl/util/pngj/chunks/ChunkList.java | 282 ----
.../util/pngj/chunks/ChunkLoadBehaviour.java | 27 +-
.../opengl/util/pngj/chunks/ChunkPredicate.java | 14 +
.../jogamp/opengl/util/pngj/chunks/ChunkRaw.java | 97 +-
.../jogamp/opengl/util/pngj/chunks/ChunksList.java | 174 +++
.../util/pngj/chunks/ChunksListForWrite.java | 171 +++
.../jogamp/opengl/util/pngj/chunks/PngChunk.java | 239 ++-
.../opengl/util/pngj/chunks/PngChunkBKGD.java | 44 +-
.../opengl/util/pngj/chunks/PngChunkCHRM.java | 58 +-
.../opengl/util/pngj/chunks/PngChunkGAMA.java | 30 +-
.../opengl/util/pngj/chunks/PngChunkHIST.java | 32 +-
.../opengl/util/pngj/chunks/PngChunkICCP.java | 35 +-
.../opengl/util/pngj/chunks/PngChunkIDAT.java | 28 +-
.../opengl/util/pngj/chunks/PngChunkIEND.java | 20 +-
.../opengl/util/pngj/chunks/PngChunkIHDR.java | 41 +-
.../opengl/util/pngj/chunks/PngChunkITXT.java | 36 +-
.../opengl/util/pngj/chunks/PngChunkMultiple.java | 27 +
.../opengl/util/pngj/chunks/PngChunkOFFS.java | 89 ++
.../opengl/util/pngj/chunks/PngChunkPHYS.java | 30 +-
.../opengl/util/pngj/chunks/PngChunkPLTE.java | 23 +-
.../opengl/util/pngj/chunks/PngChunkSBIT.java | 40 +-
.../opengl/util/pngj/chunks/PngChunkSPLT.java | 55 +-
.../opengl/util/pngj/chunks/PngChunkSRGB.java | 28 +-
.../opengl/util/pngj/chunks/PngChunkSTER.java | 60 +
.../opengl/util/pngj/chunks/PngChunkSingle.java | 43 +
.../opengl/util/pngj/chunks/PngChunkSkipped.java | 41 +
.../opengl/util/pngj/chunks/PngChunkTEXT.java | 32 +-
.../opengl/util/pngj/chunks/PngChunkTIME.java | 38 +-
.../opengl/util/pngj/chunks/PngChunkTRNS.java | 60 +-
.../opengl/util/pngj/chunks/PngChunkTextVar.java | 10 +-
.../opengl/util/pngj/chunks/PngChunkUNKNOWN.java | 21 +-
.../opengl/util/pngj/chunks/PngChunkZTXT.java | 28 +-
.../opengl/util/pngj/chunks/PngMetadata.java | 198 ++-
.../classes/jogamp/opengl/util/pngj/package.html | 5 +-
.../opengl/windows/wgl/WGLGLCapabilities.java | 53 +-
.../windows/wgl/WindowsBitmapWGLContext.java | 67 -
.../windows/wgl/WindowsBitmapWGLDrawable.java | 77 +-
.../windows/wgl/WindowsExternalWGLContext.java | 24 +-
.../windows/wgl/WindowsOnscreenWGLContext.java | 49 -
.../windows/wgl/WindowsOnscreenWGLDrawable.java | 2 +-
.../windows/wgl/WindowsPbufferWGLContext.java | 156 --
.../windows/wgl/WindowsPbufferWGLDrawable.java | 49 +-
.../opengl/windows/wgl/WindowsWGLContext.java | 121 +-
.../opengl/windows/wgl/WindowsWGLDrawable.java | 2 +-
.../windows/wgl/WindowsWGLDrawableFactory.java | 176 +--
.../wgl/WindowsWGLDynamicLibraryBundleInfo.java | 4 +-
.../wgl/WindowsWGLGraphicsConfiguration.java | 126 +-
.../WindowsWGLGraphicsConfigurationFactory.java | 53 +-
.../opengl/x11/glx/X11ExternalGLXContext.java | 22 +-
.../jogamp/opengl/x11/glx/X11GLXContext.java | 109 +-
.../jogamp/opengl/x11/glx/X11GLXDrawable.java | 2 +-
.../opengl/x11/glx/X11GLXDrawableFactory.java | 139 +-
.../x11/glx/X11GLXDynamicLibraryBundleInfo.java | 13 +-
.../x11/glx/X11GLXGraphicsConfiguration.java | 18 +-
.../glx/X11GLXGraphicsConfigurationFactory.java | 2 +-
.../opengl/x11/glx/X11OnscreenGLXContext.java | 48 -
.../opengl/x11/glx/X11OnscreenGLXDrawable.java | 6 +-
.../opengl/x11/glx/X11PbufferGLXContext.java | 67 -
.../opengl/x11/glx/X11PbufferGLXDrawable.java | 26 +-
.../jogamp/opengl/x11/glx/X11PixmapGLXContext.java | 73 -
.../opengl/x11/glx/X11PixmapGLXDrawable.java | 6 +-
src/jogl/native/JoglCommon.c | 22 +
.../jogamp_opengl_util_av_impl_FFMPEGMediaPlayer.c | 8 +-
.../macosx/MacOSXWindowSystemInterface-calayer.m | 394 +++--
.../native/macosx/MacOSXWindowSystemInterface.m | 98 +-
src/jogl/native/timespec.c | 5 +
src/jogl/native/timespec.h | 3 +
.../nativewindow/MutableGraphicsConfiguration.java | 7 +
.../jogamp/nativewindow/NativeWindowVersion.java | 8 +-
.../nativewindow/awt/AWTGraphicsConfiguration.java | 6 +-
.../nativewindow/awt/AWTWindowClosingProtocol.java | 78 +-
.../com/jogamp/nativewindow/awt/JAWTWindow.java | 202 ++-
.../jogamp/nativewindow/egl/EGLGraphicsDevice.java | 20 +-
.../com/jogamp/nativewindow/swt/SWTAccessor.java | 453 ++++--
.../jogamp/nativewindow/x11/X11GraphicsDevice.java | 22 +-
.../AbstractGraphicsConfiguration.java | 3 +-
.../media/nativewindow/AbstractGraphicsDevice.java | 24 +-
.../media/nativewindow/AbstractGraphicsScreen.java | 2 +
.../javax/media/nativewindow/Capabilities.java | 19 +-
.../nativewindow/DefaultGraphicsConfiguration.java | 17 +-
.../media/nativewindow/DefaultGraphicsDevice.java | 66 +-
.../media/nativewindow/DefaultGraphicsScreen.java | 6 +-
.../javax/media/nativewindow/NativeSurface.java | 2 +-
.../javax/media/nativewindow/NativeWindow.java | 3 +-
.../media/nativewindow/NativeWindowFactory.java | 145 +-
.../media/nativewindow/OffscreenLayerSurface.java | 12 +
.../javax/media/nativewindow/ProxySurface.java | 18 +-
.../media/nativewindow/WindowClosingProtocol.java | 4 +
.../javax/media/nativewindow/util/Dimension.java | 5 +
.../javax/media/nativewindow/util/Insets.java | 8 +
.../javax/media/nativewindow/util/Point.java | 4 +
.../javax/media/nativewindow/util/Rectangle.java | 86 +-
.../nativewindow/util/RectangleImmutable.java | 20 +
.../javax/media/nativewindow/util/SurfaceSize.java | 4 +-
.../classes/jogamp/nativewindow/Debug.java | 24 +-
.../jogamp/nativewindow/ProxySurfaceImpl.java | 32 +-
.../classes/jogamp/nativewindow/awt/AWTMisc.java | 28 +
.../classes/jogamp/nativewindow/jawt/JAWTUtil.java | 127 +-
.../nativewindow/jawt/macosx/MacOSXJAWTWindow.java | 172 ++-
.../jawt/windows/WindowsJAWTWindow.java | 7 -
.../nativewindow/jawt/x11/X11JAWTWindow.java | 7 -
.../jogamp/nativewindow/macosx/OSXUtil.java | 181 ++-
.../jogamp/nativewindow/windows/GDIUtil.java | 15 +-
.../nativewindow/windows/RegisteredClass.java | 5 +-
.../windows/RegisteredClassFactory.java | 26 +-
.../x11/X11DummyUpstreamSurfaceHook.java | 4 +-
.../classes/jogamp/nativewindow/x11/X11Util.java | 69 +-
src/nativewindow/native/NativewindowCommon.c | 9 +-
src/nativewindow/native/NativewindowCommon.h | 2 +-
.../native/macosx/NativeWindowProtocols.h} | 17 +-
src/nativewindow/native/macosx/OSXmisc.m | 466 ++++--
.../native/win32/DeviceDriverQuery.txt | 41 +
src/nativewindow/native/win32/GDImisc.c | 26 +
src/nativewindow/native/win32/WindowsDWM.h | 2 +
src/nativewindow/native/x11/Xmisc.c | 184 ++-
src/nativewindow/native/x11/Xmisc.h | 2 -
src/newt/classes/com/jogamp/newt/Display.java | 14 +-
.../classes/com/jogamp/newt/MonitorDevice.java | 235 +++
src/newt/classes/com/jogamp/newt/MonitorMode.java | 355 +++++
src/newt/classes/com/jogamp/newt/NewtFactory.java | 17 +-
src/newt/classes/com/jogamp/newt/NewtVersion.java | 7 +-
src/newt/classes/com/jogamp/newt/Screen.java | 91 +-
src/newt/classes/com/jogamp/newt/ScreenMode.java | 208 ---
src/newt/classes/com/jogamp/newt/Window.java | 80 +-
.../classes/com/jogamp/newt/awt/NewtCanvasAWT.java | 440 +++---
.../jogamp/newt/awt/applet/JOGLNewtApplet1Run.java | 37 +-
.../jogamp/newt/awt/applet/JOGLNewtAppletBase.java | 29 +-
.../classes/com/jogamp/newt/event/InputEvent.java | 19 +-
.../classes/com/jogamp/newt/event/KeyAdapter.java | 2 -
.../classes/com/jogamp/newt/event/KeyEvent.java | 1258 +++++++++-------
.../classes/com/jogamp/newt/event/KeyListener.java | 24 +-
.../{WindowUpdateEvent.java => MonitorEvent.java} | 53 +-
...nModeListener.java => MonitorModeListener.java} | 12 +-
.../classes/com/jogamp/newt/event/MouseEvent.java | 302 +++-
.../com/jogamp/newt/event/MouseListener.java | 15 +-
.../classes/com/jogamp/newt/event/NEWTEvent.java | 122 +-
.../com/jogamp/newt/event/OutputEvent.java} | 36 +-
.../com/jogamp/newt/event/TraceKeyAdapter.java | 4 -
.../classes/com/jogamp/newt/event/WindowEvent.java | 18 +-
.../com/jogamp/newt/event/WindowListener.java | 16 +-
.../com/jogamp/newt/event/WindowUpdateEvent.java | 2 +-
.../com/jogamp/newt/event/awt/AWTAdapter.java | 7 +-
.../com/jogamp/newt/event/awt/AWTKeyAdapter.java | 18 +-
.../jogamp/newt/event/awt/AWTWindowAdapter.java | 20 +-
.../classes/com/jogamp/newt/opengl/GLWindow.java | 113 +-
.../classes/com/jogamp/newt/swt/NewtCanvasSWT.java | 95 +-
src/newt/classes/com/jogamp/newt/util/EDTUtil.java | 17 +-
.../classes/com/jogamp/newt/util/MonitorMode.java | 102 --
.../com/jogamp/newt/util/MonitorModeUtil.java | 247 ++++
.../com/jogamp/newt/util/ScreenModeUtil.java | 341 -----
src/newt/classes/jogamp/newt/Debug.java | 25 +-
src/newt/classes/jogamp/newt/DefaultEDTUtil.java | 127 +-
src/newt/classes/jogamp/newt/DisplayImpl.java | 122 +-
.../classes/jogamp/newt/MonitorDeviceImpl.java | 147 ++
src/newt/classes/jogamp/newt/MonitorModeProps.java | 355 +++++
src/newt/classes/jogamp/newt/OffscreenWindow.java | 13 +-
src/newt/classes/jogamp/newt/ScreenImpl.java | 637 ++++----
src/newt/classes/jogamp/newt/ScreenModeStatus.java | 231 ---
.../classes/jogamp/newt/ScreenMonitorState.java | 195 +++
src/newt/classes/jogamp/newt/WindowImpl.java | 847 +++++++----
.../jogamp/newt/awt/event/AWTNewtEventFactory.java | 649 +++++++-
.../newt/awt/event/AWTParentWindowAdapter.java | 8 +-
.../jogamp/newt/driver/DriverUpdatePosition.java | 10 +-
.../newt/driver/android/NewtBaseActivity.java | 243 ++-
.../newt/driver/android/NewtVersionActivity.java | 13 +-
.../android/NewtVersionActivityLauncher.java | 2 +-
.../jogamp/newt/driver/android/ScreenDriver.java | 101 +-
.../jogamp/newt/driver/android/WindowDriver.java | 486 ++++--
.../android/event/AndroidNewtEventFactory.java | 612 ++++++--
.../android/event/AndroidNewtEventTranslator.java | 53 +
.../classes/jogamp/newt/driver/awt/AWTCanvas.java | 46 +-
.../classes/jogamp/newt/driver/awt/AWTEDTUtil.java | 114 +-
.../jogamp/newt/driver/awt/DisplayDriver.java | 1 -
.../jogamp/newt/driver/awt/ScreenDriver.java | 65 +-
.../jogamp/newt/driver/awt/WindowDriver.java | 199 ++-
.../jogamp/newt/driver/bcm/egl/ScreenDriver.java | 56 +-
.../jogamp/newt/driver/bcm/vc/iv/ScreenDriver.java | 56 +-
.../jogamp/newt/driver/bcm/vc/iv/WindowDriver.java | 20 +-
.../jogamp/newt/driver/intel/gdl/ScreenDriver.java | 56 +-
.../jogamp/newt/driver/kd/ScreenDriver.java | 54 +-
.../newt/driver/linux/LinuxEventDeviceTracker.java | 959 ++++++++++++
.../newt/driver/linux/LinuxMouseTracker.java | 17 +-
.../jogamp/newt/driver/macosx/MacKeyUtil.java | 264 +++-
.../jogamp/newt/driver/macosx/ScreenDriver.java | 129 +-
.../jogamp/newt/driver/macosx/WindowDriver.java | 436 ++++--
.../jogamp/newt/driver/windows/DisplayDriver.java | 13 +-
.../jogamp/newt/driver/windows/ScreenDriver.java | 146 +-
.../jogamp/newt/driver/windows/WindowDriver.java | 129 +-
.../jogamp/newt/driver/x11/DisplayDriver.java | 22 +-
src/newt/classes/jogamp/newt/driver/x11/RandR.java | 76 +
.../classes/jogamp/newt/driver/x11/RandR11.java | 361 +++++
.../classes/jogamp/newt/driver/x11/RandR13.java | 309 ++++
.../jogamp/newt/driver/x11/ScreenDriver.java | 338 ++---
.../jogamp/newt/driver/x11/WindowDriver.java | 80 +-
.../{com => }/jogamp/newt/swt/SWTEDTUtil.java | 130 +-
.../jogamp/newt/swt/event/SWTNewtEventFactory.java | 375 +++++
src/newt/native/KDWindow.c | 12 +-
src/newt/native/KeyEvent.h | 388 ++---
src/newt/native/MacWindow.m | 636 ++++----
src/newt/native/NewtCommon.c | 9 +-
src/newt/native/NewtCommon.h | 2 +-
src/newt/native/NewtMacWindow.h | 30 +-
src/newt/native/NewtMacWindow.m | 416 ++++--
src/newt/native/ScreenMode.h | 15 +-
src/newt/native/Window.h | 17 +-
src/newt/native/WindowsWindow.c | 1349 +++++++++--------
src/newt/native/X11Common.h | 4 +-
src/newt/native/X11Display.c | 247 ++--
src/newt/native/X11Event.c | 26 +-
.../native/{X11ScreenRandR11.c => X11RandR11.c} | 203 ++-
src/newt/native/X11RandR13.c | 515 +++++++
src/newt/native/X11Screen.c | 429 +-----
.../event/KeyAdapter.java => native/X11Screen.h} | 23 +-
src/newt/native/X11ScreenRandR13.c | 372 -----
src/newt/native/X11Window.c | 28 +-
src/newt/native/XCBEvent.c | 18 +-
src/newt/native/bcm_vc_iv.c | 8 +-
src/test-native/displayMultiple02_mch.c | 130 ++
src/test-native/displayMultiple02_new_mch.c | 199 +++
src/test-native/make.sh | 2 +
.../jogamp/opengl/test/android/LauncherUtil.java | 172 ++-
.../opengl/test/android/MovieCubeActivity0.java | 3 +-
.../test/android/MovieCubeActivityLauncher0.java | 14 +-
.../opengl/test/android/MovieSimpleActivity0.java | 1 -
.../opengl/test/android/MovieSimpleActivity1.java | 1 -
.../android/MovieSimpleActivityLauncher00a.java | 13 +-
.../android/MovieSimpleActivityLauncher00b.java | 13 +-
.../android/MovieSimpleActivityLauncher01a.java | 13 +-
.../android/MovieSimpleActivityLauncher01b.java | 13 +-
.../android/MovieSimpleActivityLauncher02.java | 13 +-
.../opengl/test/android/NEWTElektronActivity.java | 17 +-
.../test/android/NEWTElektronActivityLauncher.java | 12 +-
.../opengl/test/android/NEWTGearsES1Activity.java | 17 +-
.../test/android/NEWTGearsES1ActivityLauncher.java | 12 +-
.../opengl/test/android/NEWTGearsES2Activity.java | 74 +-
.../test/android/NEWTGearsES2ActivityLauncher.java | 24 +-
...r.java => NEWTGearsES2ECTActivityLauncher.java} | 23 +-
...ava => NEWTGearsES2RGB565ActivityLauncher.java} | 23 +-
.../test/android/NEWTGearsES2TransActivity.java | 17 +-
.../android/NEWTGearsES2TransActivityLauncher.java | 14 +-
.../opengl/test/android/NEWTGraphUI1pActivity.java | 17 +-
.../android/NEWTGraphUI1pActivityLauncher.java | 13 +-
.../opengl/test/android/NEWTGraphUI2pActivity.java | 17 +-
.../android/NEWTGraphUI2pActivityLauncher.java | 13 +-
.../test/android/NEWTRedSquareES1Activity.java | 17 +-
.../android/NEWTRedSquareES1ActivityLauncher.java | 13 +-
.../test/android/NEWTRedSquareES2Activity.java | 17 +-
.../android/NEWTRedSquareES2ActivityLauncher.java | 2 +-
.../opengl/test/bugs/Bug427GLJPanelTest1.java | 24 +-
.../aaaa-m1-sync0-flush-wait-finish.log | 751 ++++++++++
.../aaaa-m1-sync1-flush-wait-finish.log | 745 ++++++++++
.../aaaa-m2-sync0-finish-wait-exclctx.log | 751 ++++++++++
.../aaaa-m2-sync0-finish-wait.log | 751 ++++++++++
.../aaaa-m2-sync1-finish-wait.log | 745 ++++++++++
.../opengl/test/bugs/Bug735Inv0AppletAWT.java | 430 ++++++
.../opengl/test/bugs/Bug735Inv1AppletAWT.java | 429 ++++++
.../opengl/test/bugs/Bug735Inv2AppletAWT.java | 272 ++++
.../opengl/test/bugs/Bug735Inv3AppletAWT.java | 218 +++
.../com/jogamp/opengl/test/bugs/Bug735Inv4AWT.java | 202 +++
.../com/jogamp/opengl/test/bugs/Issue344Base.java | 11 +-
.../test/junit/graph/TestTextRendererNEWT00.java | 2 +-
.../test/junit/graph/TestTextRendererNEWT01.java | 0
.../test/junit/graph/TestTextRendererNEWT10.java | 21 +-
.../junit/graph/demos/GPURegionNewtDemo01.java | 0
.../graph/demos/GPURendererListenerBase01.java | 1 -
.../graph/demos/GPUTextRendererListenerBase01.java | 12 +-
.../junit/graph/demos/GPUUISceneGLListener0A.java | 5 +-
.../opengl/test/junit/graph/demos/ui/RIButton.java | 2 +-
.../junit/graph/demos/ui/SceneUIController.java | 1 +
.../junit/graph/demos/ui/UIListenerBase01.java | 1 -
.../opengl/test/junit/graph/demos/ui/UIShape.java | 2 +-
.../junit/jogl/acore/InitConcurrentBaseNEWT.java | 2 +-
.../jogl/acore/TestAWTCloseX11DisplayBug565.java | 17 +-
.../acore/TestAddRemove01GLCanvasSwingAWT.java | 287 ++++
.../TestAddRemove02GLWindowNewtCanvasAWT.java | 285 ++++
.../jogl/acore/TestAddRemove03GLWindowNEWT.java | 144 ++
.../acore/TestBug669RecursiveGLContext01NEWT.java | 135 ++
.../acore/TestBug669RecursiveGLContext02NEWT.java | 132 ++
.../test/junit/jogl/acore/TestBug692GL3VAO.java | 352 +++++
.../jogl/acore/TestFBOAutoDrawableDeadlockAWT.java | 2 +-
.../junit/jogl/acore/TestFBOMix2DemosES2NEWT.java | 5 +-
...tFBOOffThreadSharedContextMix2DemosES2NEWT.java | 3 +
.../TestFBOOnThreadSharedContext1DemoES2NEWT.java | 2 +
.../jogl/acore/TestGLAutoDrawableDelegateNEWT.java | 160 ++
...estGLAutoDrawableDelegateOnOffscrnCapsNEWT.java | 38 +-
...stGLAutoDrawableFactoryES2OffscrnCapsNEWT.java} | 138 +-
...stGLAutoDrawableFactoryGL2OffscrnCapsNEWT.java} | 177 ++-
...estGLAutoDrawableFactoryGLnBitmapCapsNEWT.java} | 162 +-
...TestGLAutoDrawableGLCanvasOnOffscrnCapsAWT.java | 63 +-
...estGLAutoDrawableGLWindowOnOffscrnCapsNEWT.java | 136 +-
...LAutoDrawableNewtCanvasAWTOnOffscrnCapsAWT.java | 53 +-
.../junit/jogl/acore/TestGLMesaBug651NEWT.java | 222 +++
.../junit/jogl/acore/TestGLMesaBug658NEWT.java | 200 +++
.../{TestPointsNEWT.java => TestGLPointsNEWT.java} | 4 +-
.../jogl/acore/TestGLVersionParsing00NEWT.java | 201 +++
.../junit/jogl/acore/TestInitConcurrent01NEWT.java | 6 +-
.../junit/jogl/acore/TestInitConcurrent02NEWT.java | 6 +-
.../acore/TestOffscreenLayer01GLCanvasAWT.java | 15 +-
.../acore/TestOffscreenLayer02NewtCanvasAWT.java | 16 +-
.../junit/jogl/acore/TestPBufferDeadlockAWT.java | 2 +-
.../jogl/acore/TestSharedContextNewtAWTBug523.java | 5 +-
.../junit/jogl/acore/TestShutdownCompleteAWT.java | 7 +-
.../TestX11DefaultDisplay.java} | 133 +-
.../jogl/acore/ect/ExclusiveContextBase00.java | 420 ++++++
.../jogl/acore/ect/ExclusiveContextBase00AWT.java | 161 ++
.../jogl/acore/ect/ExclusiveContextBase00NEWT.java | 94 ++
.../jogl/acore/ect/ExclusiveContextBase10.java | 213 +++
.../jogl/acore/ect/ExclusiveContextBase10AWT.java | 161 ++
.../jogl/acore/ect/ExclusiveContextBase10NEWT.java | 94 ++
.../TestExclusiveContext01VSyncAnimAWT.java} | 66 +-
.../ect/TestExclusiveContext01VSyncAnimNEWT.java} | 53 +-
.../TestExclusiveContext02FPSAnimAWT.java} | 68 +-
.../ect/TestExclusiveContext02FPSAnimNEWT.java} | 55 +-
.../ect/TestExclusiveContext11VSyncAnimNEWT.java} | 52 +-
.../TestExclusiveContext12FPSAnimNEWT.java} | 65 +-
.../acore/glels/GLContextDrawableSwitchBase.java | 291 ++++
.../TestBug722GLContextDrawableSwitchNewt2AWT.java | 143 ++
.../TestGLContextDrawableSwitch01NEWT.java} | 178 ++-
.../glels/TestGLContextDrawableSwitch10NEWT.java | 274 ++++
.../TestGLContextDrawableSwitch11NewtAWT.java | 118 ++
.../glels/TestGLContextDrawableSwitch12AWT.java | 144 ++
.../TestGLContextDrawableSwitch21Newt2AWT.java | 192 +++
.../opengl/test/junit/jogl/awt/TestAWT01GLn.java | 12 +-
.../junit/jogl/awt/TestAWT02WindowClosing.java | 11 +-
.../jogl/awt/TestAWT03GLCanvasRecreate01.java | 2 +-
.../TestAWTCardLayoutAnimatorStartStopBug532.java | 5 +-
.../awt/TestBug461FBOSupersamplingSwingAWT.java | 43 +-
.../opengl/test/junit/jogl/awt/TestBug572AWT.java | 109 +-
....java => TestBug642JSplitPaneMixHwLw01AWT.java} | 112 +-
.../awt/TestBug664GLCanvasSetVisibleSwingAWT.java | 283 ++++
.../jogl/awt/TestBug675BeansInDesignTimeAWT.java | 111 ++
.../awt/TestGLCanvasAWTActionDeadlock00AWT.java | 241 +++
.../awt/TestGLCanvasAWTActionDeadlock01AWT.java | 348 +++++
.../awt/TestGLCanvasAWTActionDeadlock02AWT.java | 687 +++++++++
.../jogl/awt/TestIsRealizedConcurrency01AWT.java | 101 ++
.../jogl/awt/TestJScrollPaneMixHwLw01AWT.java | 7 +-
.../TestAWTTextRendererUseVertexArrayBug464.java | 14 +-
.../jogl/caps/TestBug605FlippedImageNEWT.java | 2 +-
.../junit/jogl/caps/TestMultisampleES1AWT.java | 4 +-
.../junit/jogl/caps/TestMultisampleES1NEWT.java | 0
.../test/junit/jogl/caps/TestTranslucencyAWT.java | 11 +-
.../test/junit/jogl/caps/TestTranslucencyNEWT.java | 5 +-
.../test/junit/jogl/demos/GLFinishOnDisplay.java | 40 +
.../opengl/test/junit/jogl/demos/GearsObject.java | 10 +-
.../opengl/test/junit/jogl/demos/es1/GearsES1.java | 23 +-
.../test/junit/jogl/demos/es1/GearsObjectES1.java | 8 +-
.../test/junit/jogl/demos/es1/OlympicES1.java | 357 +++++
.../test/junit/jogl/demos/es1/RedSquareES1.java | 2 +-
.../jogl/demos/es1/newt/TestGearsES1NEWT.java | 14 +-
...stGearsES1NEWT.java => TestOlympicES1NEWT.java} | 82 +-
.../jogl/demos/es1/newt/TestRedSquareES1NEWT.java | 5 +-
.../opengl/test/junit/jogl/demos/es2/GearsES2.java | 316 +++-
.../test/junit/jogl/demos/es2/GearsObjectES2.java | 43 +-
.../test/junit/jogl/demos/es2/LandscapeES2.java | 182 +++
.../test/junit/jogl/demos/es2/Mix2TexturesES2.java | 37 +-
.../junit/jogl/demos/es2/MultisampleDemoES2.java | 2 +-
.../test/junit/jogl/demos/es2/PointsDemoES2.java | 6 +-
.../test/junit/jogl/demos/es2/RedSquareES2.java | 65 +-
.../jogl/demos/es2/TextureDraw01ES2Listener.java | 4 +-
.../jogl/demos/es2/TextureSequenceCubeES2.java | 1 -
.../test/junit/jogl/demos/es2/av/MovieCube.java | 5 +-
.../test/junit/jogl/demos/es2/av/MovieSimple.java | 0
.../junit/jogl/demos/es2/awt/TestGearsES2AWT.java | 275 +++-
.../demos/es2/awt/TestGearsES2GLJPanelAWT.java | 361 +++++
.../demos/es2/awt/TestGearsES2GLJPanelsAWT.java | 419 ++++++
.../es2/newt/TestElektronenMultipliziererNEWT.java | 5 +-
.../jogl/demos/es2/newt/TestGearsES2NEWT.java | 185 ++-
.../demos/es2/newt/TestGearsES2NewtCanvasAWT.java | 511 +++++++
...ES2NEWT.java => TestGearsES2NewtCanvasSWT.java} | 287 ++--
...quareES2NEWT.java => TestLandscapeES2NEWT.java} | 123 +-
.../es2/newt/TestLandscapeES2NewtCanvasAWT.java | 261 ++++
.../jogl/demos/es2/newt/TestRedSquareES2NEWT.java | 25 +-
.../test/junit/jogl/demos/es2/shader/landscape.fp | 339 +++++
.../test/junit/jogl/demos/es2/shader/landscape.vp | 11 +
.../junit/jogl/demos/es2/swt/TestGearsES2SWT.java | 341 +++++
.../opengl/test/junit/jogl/demos/gl2/Gears.java | 11 +-
.../opengl/test/junit/jogl/demos/gl2/Teapot.java | 124 ++
.../jogl/demos/gl2/awt/TestGLJPanelAWTBug450.java | 22 +-
.../junit/jogl/demos/gl2/awt/TestGearsAWT.java | 5 +-
.../demos/gl2/awt/TestGearsAWTAnalyzeBug455.java | 7 +-
.../jogl/demos/gl2/awt/TestGearsGLJPanelAWT.java | 175 ++-
.../junit/jogl/demos/gl2/newt/TestGearsNEWT.java | 5 +-
.../demos/gl2/newt/TestGearsNewtAWTWrapper.java | 68 +-
.../{TestGearsNEWT.java => TestTeapotNEWT.java} | 100 +-
.../jogl/demos/gl3/GeomShader01TextureGL3.java | 293 ++++
.../newt/TestGeomShader01TextureGL3NEWT.java} | 145 +-
.../junit/jogl/demos/gl3/shader/flipXYZ01_xxx.gp | 32 +
.../jogl/demos/gl3/shader/passthrough01_xxx.gp | 31 +
.../junit/jogl/demos/gl3/shader/texture01_xxx.fp | 20 +
.../junit/jogl/demos/gl3/shader/texture01_xxx.vp | 20 +
.../test/junit/jogl/glsl/GLSLMiscHelper.java | 167 ++-
.../junit/jogl/glsl/TestGLSLShaderState01NEWT.java | 190 ++-
.../junit/jogl/glsl/TestGLSLShaderState02NEWT.java | 57 +-
.../test/junit/jogl/glsl/TestRulerNEWT01.java | 20 +-
.../jogl/glsl/TestShaderCompilationBug459AWT.java | 11 +-
.../TestBug694ScaleImageUnpackBufferSizeAWT.java | 160 ++
.../TestFloatUtil01MatrixMatrixMultNOUI.java | 4 +-
.../{glu => math}/TestGluUnprojectDoubleNOUI.java | 2 +-
.../{glu => math}/TestGluUnprojectFloatNOUI.java | 2 +-
.../jogl/{acore => math}/TestPMVMatrix01NEWT.java | 46 +-
.../TestPMVMatrix02NOUI.java} | 6 +-
.../test/junit/jogl/math/TestPMVMatrix03NOUI.java | 125 ++
...TestSwingAWTRobotUsageBeforeJOGLInitBug411.java | 29 +-
.../TestNewtCanvasSWTBug628ResizeDeadlockAWT.java | 405 +++++
.../test/junit/jogl/swt/TestNewtCanvasSWTGLn.java | 21 +-
.../junit/jogl/swt/TestSWTAccessor03AWTGLn.java | 21 +-
.../junit/jogl/swt/TestSWTBug643AsyncExec.java | 342 +++++
.../junit/jogl/swt/TestSWTJOGLGLCanvas01GLn.java | 45 +-
.../junit/jogl/util/DemoGL2ES1ImmModeSink.java | 35 +-
.../test/junit/jogl/util/DemoGL2ES1Plain.java | 27 +
.../junit/jogl/util/DemoGL2ES2ImmModeSink.java | 207 +++
.../junit/jogl/util/TestImmModeSinkES2NEWT.java | 119 ++
.../test/junit/jogl/util/TestPNGImage01NEWT.java | 41 -
.../jogl/util/texture/TestJPEGImage01NEWT.java | 124 ++
.../texture/TestJPEGJoglAWTBenchmarkNewtAWT.java | 151 ++
.../texture/TestJPEGJoglAWTCompareNewtAWT.java | 267 ++++
.../util/texture/TestJPEGTextureFromFileNEWT.java | 281 ++++
.../jogl/util/texture/TestPNGImage01NEWT.java | 62 +
.../util/texture/TestPNGTextureFromFileAWT.java | 10 +-
.../util/texture/TestPNGTextureFromFileNEWT.java | 134 +-
.../junit/jogl/util/texture/TestTexture01AWT.java | 93 +-
...TestTexture01AWT.java => TestTexture02AWT.java} | 139 +-
.../util/texture/TestTextureSequence01AWT.java | 12 +-
.../jogl/util/texture/bug745_qttdef_post_frame.jpg | Bin 0 -> 8415 bytes
.../junit/jogl/util/texture/grayscale_texture.png | Bin
.../test/junit/jogl/util/texture/j1-baseline.jpg | Bin 0 -> 21257 bytes
.../junit/jogl/util/texture/j2-progressive.jpg | Bin 0 -> 22306 bytes
.../junit/jogl/util/texture/j3-baseline_gray.jpg | Bin 0 -> 17776 bytes
.../test/junit/jogl/util/texture/test-cmyk-01.jpg | Bin 0 -> 10445 bytes
.../jogl/util/texture/test-ntscIG3-01-160x90.png | Bin 0 -> 3745 bytes
.../jogl/util/texture/test-ntscIG4-01-160x90.png | Bin 0 -> 4240 bytes
.../jogl/util/texture/test-ntscI_3-01-160x90.png | Bin 0 -> 3729 bytes
.../jogl/util/texture/test-ntscI_4-01-160x90.png | Bin 0 -> 4224 bytes
.../jogl/util/texture/test-ntscNG4-01-160x90.png | Bin 0 -> 4240 bytes
.../test-ntscN_3-01-160x90-60pct-yuv422h-base.jpg | Bin 0 -> 2628 bytes
.../test-ntscN_3-01-160x90-60pct-yuv422h-prog.jpg | Bin 0 -> 2376 bytes
.../test-ntscN_3-01-160x90-90pct-yuv444-base.jpg | Bin 0 -> 4122 bytes
.../test-ntscN_3-01-160x90-90pct-yuv444-prog.jpg | Bin 0 -> 4411 bytes
.../jogl/util/texture/test-ntscN_3-01-160x90.png | Bin 0 -> 2785 bytes
.../jogl/util/texture/test-ntscN_4-01-160x90.png | Bin 0 -> 3177 bytes
.../jogl/util/texture/test-ntscP_3-01-160x90.png | Bin 0 -> 1898 bytes
.../jogl/util/texture/test-ntscP_4-01-160x90.png | Bin 0 -> 1911 bytes
.../test/junit/jogl/util/texture/test-ycck-01.jpg | Bin 0 -> 62492 bytes
.../test/junit/newt/ManualScreenMode03NEWT.java | 32 +-
.../opengl/test/junit/newt/TestCloseNewtAWT.java | 7 +-
.../junit/newt/TestDisplayLifecycle01NEWT.java | 4 +-
.../test/junit/newt/TestFocus01SwingAWTRobot.java | 19 +-
.../test/junit/newt/TestFocus02SwingAWTRobot.java | 57 +-
.../newt/TestGLWindowInvisiblePointer01NEWT.java | 114 ++
.../junit/newt/TestGLWindowWarpPointer01NEWT.java | 171 +++
.../junit/newt/TestGLWindows02NEWTAnimated.java | 46 +-
.../test/junit/newt/TestScreenMode00NEWT.java | 119 +-
.../test/junit/newt/TestScreenMode00bNEWT.java | 26 +-
.../test/junit/newt/TestScreenMode01NEWT.java | 135 +-
...Mode01bNEWT.java => TestScreenMode01aNEWT.java} | 95 +-
.../test/junit/newt/TestScreenMode01bNEWT.java | 210 ++-
.../test/junit/newt/TestScreenMode01cNEWT.java | 249 ++++
.../test/junit/newt/TestScreenMode02NEWT.java | 76 +-
.../junit/newt/TestWindowClosingProtocol01AWT.java | 48 +-
.../newt/TestWindowClosingProtocol02NEWT.java | 14 +-
.../newt/TestWindowClosingProtocol03NewtAWT.java | 48 +-
.../junit/newt/event/BaseNewtEventModifiers.java | 781 ++++++++++
.../event/TestNewtEventModifiersAWTCanvas.java | 103 ++
.../event/TestNewtEventModifiersNEWTWindowAWT.java | 84 ++
.../event/TestNewtEventModifiersNewtCanvasAWT.java | 118 ++
.../TestNewtEventModifiersNewtCanvasSWTAWT.java | 180 +++
.../{ => event}/TestNewtKeyCodeModifiersAWT.java | 152 +-
.../newt/{ => event}/TestNewtKeyCodesAWT.java | 112 +-
.../{ => event}/TestNewtKeyEventAutoRepeatAWT.java | 72 +-
.../newt/{ => event}/TestNewtKeyEventOrderAWT.java | 47 +-
.../TestNewtKeyPressReleaseUnmaskRepeatAWT.java | 36 +-
.../test/junit/newt/parenting/KeyAction.java | 5 +-
.../parenting/NewtAWTReparentingKeyAdapter.java | 5 +-
.../junit/newt/parenting/TestParenting01NEWT.java | 6 +
.../junit/newt/parenting/TestParenting01aAWT.java | 32 +-
.../junit/newt/parenting/TestParenting01bAWT.java | 8 +-
.../junit/newt/parenting/TestParenting01cAWT.java | 20 +-
.../newt/parenting/TestParenting01cSwingAWT.java | 27 +-
.../junit/newt/parenting/TestParenting02AWT.java | 11 +-
.../junit/newt/parenting/TestParenting03AWT.java | 4 +-
.../junit/newt/parenting/TestParenting04AWT.java | 12 +-
.../TestParentingFocusTraversal01AWT.java | 10 +-
.../TestTranslucentChildWindowBug632NEWT.java | 132 ++
.../parenting/TestTranslucentParentingAWT.java | 21 +-
.../opengl/test/junit/util/AWTKeyAdapter.java | 19 +-
.../opengl/test/junit/util/AWTRobotUtil.java | 449 ++++--
.../test/junit/util/GLEventListenerCounter.java} | 50 +-
.../test/junit/util/KeyEventCountAdapter.java | 4 +-
.../jogamp/opengl/test/junit/util/MiscUtils.java | 34 +
.../opengl/test/junit/util/NEWTKeyAdapter.java | 30 +-
.../jogamp/opengl/test/junit/util/NEWTKeyUtil.java | 130 +-
.../jogamp/opengl/test/junit/util/QuitAdapter.java | 25 +-
.../jogamp/opengl/test/junit/util/UITestCase.java | 21 +-
www/index.html | 1038 +++++++------
www/media/Java3d.png | Bin 0 -> 8675 bytes
www/media/ardor3d.png | Bin 0 -> 3007 bytes
www/media/dyn4j.png | Bin 0 -> 5373 bytes
www/media/jmonkeyengine.png | Bin 0 -> 38087 bytes
www/media/nifty-logo-new.png | Bin 0 -> 10305 bytes
www/media/ticket2ride_picture4.jpg | Bin 0 -> 71952 bytes
786 files changed, 57710 insertions(+), 19359 deletions(-)
diff --cc debian/changelog
index b55a4c3,0000000..8d59010
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,229 -1,0 +1,235 @@@
++libjogl2-java (2.0-rc12-1) unstable; urgency=low
++
++ * New upstream release
++
++ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 01 Jul 2013 14:26:13 +0200
++
+libjogl2-java (2.0-rc11-1) unstable; urgency=low
+
+ * Upload to unstable
+ * Standards-Version updated to 3.9.4
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Wed, 15 May 2013 10:18:59 +0200
+
+libjogl2-java (2.0-rc11-1~exp5) experimental; urgency=low
+
+ [ Colin Watson ]
+ * Define isAbiEabiGnuArmhf=true when building for armhf.
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sun, 03 Mar 2013 13:54:53 +0100
+
+libjogl2-java (2.0-rc11-1~exp4.3) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * Search libs in default system paths in make/build-newt.xml
+ * Combine TARGET_PLATFORM_LIBS_2.diff, armhfbuild.diff and armhf-build.diff
+ patches into arm-build.diff patch.
+
+ -- Thomas Preud'homme <robotux at debian.org> Wed, 26 Dec 2012 15:23:17 +0100
+
+libjogl2-java (2.0-rc11-1~exp4.2) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * Fix wrong copy/paste in changes made in previous upload.
+
+ -- Thomas Preud'homme <robotux at debian.org> Wed, 26 Dec 2012 10:11:00 +0100
+
+libjogl2-java (2.0-rc11-1~exp4.1) experimental; urgency=low
+
+ * Fix armhf FTBFS by generalizing changes to build-nativewindow.xml to
+ build-jogl.xml and build-newt.xml.
+
+ -- Thomas Preud'homme <robotux at debian.org> Tue, 25 Dec 2012 20:18:58 +0100
+
+libjogl2-java (2.0-rc11-1~exp4) experimental; urgency=low
+
+ * Try again to fix the armhf FTBFS (thanks again to Thomas Preud'homme)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 24 Dec 2012 09:12:34 +0100
+
+libjogl2-java (2.0-rc11-1~exp3) experimental; urgency=low
+
+ * Apply Ubuntu changes introduced in 2.0-rc8-1ubuntu1
+ * Set source and target to 1.5 for OpenJDK 6 compatibility (LP: #1049719).
+ * Try something with Thomas Preud'homme to see if we can fix the armhf
+ build
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Thu, 20 Dec 2012 17:04:08 +0100
+
+libjogl2-java (2.0-rc11-1~exp2) experimental; urgency=low
+
+ * Enable the verbose mode to find out the reason of the FTBFS under armhf
+ (libXrender.so uses VFP register arguments, libnativewindow_x11.so does not)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Fri, 30 Nov 2012 17:11:16 +0100
+
+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 c341d7f,0000000..c5894fc
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-rc11-1~), libgluegen2-rt-java (>= 2.0-rc11-1~),
++ libgluegen2-build-java (>= 2.0-rc12-1~), libgluegen2-rt-java (>= 2.0-rc12-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.4
+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-rc11), libjogl2-jni (>= ${source:Version})
++ libgluegen2-rt-java (>= 2.0-rc12), 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/arm-build.diff
index 2d587a4,0000000..adbf5f8
mode 100644,000000..100644
--- a/debian/patches/arm-build.diff
+++ b/debian/patches/arm-build.diff
@@@ -1,276 -1,0 +1,273 @@@
- diff --git a/make/build-jogl.xml b/make/build-jogl.xml
- index a071441..aa7aa6e 100644
- --- a/make/build-jogl.xml
- +++ b/make/build-jogl.xml
- @@ -197,6 +197,19 @@
++Index: jogl-v2.0-rc12/make/build-jogl.xml
++===================================================================
++--- jogl-v2.0-rc12.orig/make/build-jogl.xml 2013-07-01 14:29:18.000000000 +0200
+++++ jogl-v2.0-rc12/make/build-jogl.xml 2013-07-01 14:29:17.000000000 +0200
++@@ -200,6 +200,19 @@
+ <isset property="setup.noSWT"/>
+ </condition>
+
++ <condition property="isLinuxARM">
++ <and>
++ <istrue value="${isLinux}" />
++ <or>
++ <os arch="arm" />
++ <os arch="armv4" />
++ <os arch="armv5" />
++ <os arch="armv6" />
++ <os arch="armv7" />
++ </or>
++ </and>
++ </condition>
++
+ <property name="java.excludes.javadoc.packagenames"
+ value="jogamp.opengl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/>
+
- @@ -1122,7 +1135,7 @@
++@@ -1129,7 +1142,7 @@
+ <includepath path="/usr/local/include" />
+ </compiler>
+
+- <compiler id="compiler.cfg.linux.armv6.jogl.x11" extends="compiler.cfg.linux.armv6">
++ <compiler id="compiler.cfg.linux.arm.jogl.x11" extends="compiler.cfg.linux">
+ <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
+ <compilerarg value="-idirafter" />
+ <compilerarg value="/usr/include" />
- @@ -1150,8 +1163,8 @@
++@@ -1157,8 +1170,8 @@
+ <syslibset libs="X11"/>
+ </linker>
+
+- <linker id="linker.cfg.linux.armv6.jogl.x11" extends="linker.cfg.linux.armv6">
+- <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11"/>
++ <linker id="linker.cfg.linux.arm.jogl.x11" extends="linker.cfg.linux">
++ <syslibset libs="X11"/>
+ </linker>
+
+ <linker id="linker.cfg.android.jogl" extends="linker.cfg.android">
- @@ -1239,10 +1252,10 @@
++@@ -1246,10 +1259,10 @@
+ <property name="linker.cfg.id.os" value="linker.cfg.linux.amd64.jogl.x11" />
+ </target>
+
+- <target name="c.configure.linux.armv6" if="isLinuxARMv6">
+- <echo message="Linux.armv6" />
+- <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6.jogl.x11" />
+- <property name="linker.cfg.id.os" value="linker.cfg.linux.armv6.jogl.x11" />
++ <target name="c.configure.linux.arm" if="isLinuxARM">
++ <echo message="Linux.arm" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux.arm.jogl.x11" />
++ <property name="linker.cfg.id.os" value="linker.cfg.linux.arm.jogl.x11" />
+ </target>
+
+ <target name="c.configure.linux.ia64" if="isLinuxIA64">
- @@ -1293,7 +1306,7 @@
++@@ -1300,7 +1313,7 @@
+ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" />
+ </target>
+
+- <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.linux" depends="c.configure.linux.arm,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" />
- diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
- index 26cf237..d49ef21 100644
- --- a/make/build-nativewindow.xml
- +++ b/make/build-nativewindow.xml
++Index: jogl-v2.0-rc12/make/build-nativewindow.xml
++===================================================================
++--- jogl-v2.0-rc12.orig/make/build-nativewindow.xml 2013-07-01 14:29:18.000000000 +0200
+++++ jogl-v2.0-rc12/make/build-nativewindow.xml 2013-07-01 14:29:17.000000000 +0200
+@@ -88,6 +88,19 @@
+ <isset property="setup.noAWT"/>
+ </condition>
+
++ <condition property="isLinuxARM">
++ <and>
++ <istrue value="${isLinux}" />
++ <or>
++ <os arch="arm" />
++ <os arch="armv4" />
++ <os arch="armv5" />
++ <os arch="armv6" />
++ <os arch="armv7" />
++ </or>
++ </and>
++ </condition>
++
+ <property name="java.excludes.all" value="${java.excludes.awt}" />
+ <echo message="java.excludes.all: ${java.excludes.all}" />
+ </target>
+@@ -342,7 +355,7 @@
+ <includepath path="/usr/local/include" />
+ </compiler>
+
+- <compiler id="compiler.cfg.linux.armv6.nativewindow.x11" extends="compiler.cfg.linux.armv6">
++ <compiler id="compiler.cfg.linux.arm.nativewindow.x11" extends="compiler.cfg.linux">
+ <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
+ <compilerarg value="-idirafter" />
+ <compilerarg value="/usr/include" />
- @@ -396,10 +409,10 @@
++@@ -395,10 +408,10 @@
+ <syslibset libs="Xrender"/>
+ </linker>
+
+- <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" />
++ <linker id="linker.cfg.linux.arm.nativewindow.x11" extends="linker.cfg.linux">
++ <syslibset libs="X11" />
++ <syslibset libs="Xxf86vm" />
++ <syslibset libs="Xrender" />
+ </linker>
+
+ <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris">
- @@ -487,10 +500,10 @@
++@@ -483,10 +496,10 @@
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.amd64.nativewindow.x11" />
+ </target>
+
+- <target name="c.configure.linux.armv6" if="isLinuxARMv6">
+- <echo message="Linux.armv6" />
+- <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6.nativewindow.x11" />
+- <property name="linker.cfg.id.oswin" value="linker.cfg.linux.armv6.nativewindow.x11" />
++ <target name="c.configure.linux.arm" if="isLinuxARM">
++ <echo message="Linux.arm" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux.arm.nativewindow.x11" />
++ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.arm.nativewindow.x11" />
+ </target>
+
+ <target name="c.configure.linux.ia64" if="isLinuxIA64">
- @@ -541,7 +554,7 @@
++@@ -537,7 +550,7 @@
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" />
+ </target>
+
+- <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.linux" depends="c.configure.linux.arm,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" />
- diff --git a/make/build-newt.xml b/make/build-newt.xml
- index 9872912..c4f4c6b 100644
- --- a/make/build-newt.xml
- +++ b/make/build-newt.xml
++Index: jogl-v2.0-rc12/make/build-newt.xml
++===================================================================
++--- jogl-v2.0-rc12.orig/make/build-newt.xml 2013-07-01 14:29:18.000000000 +0200
+++++ jogl-v2.0-rc12/make/build-newt.xml 2013-07-01 14:29:17.000000000 +0200
+@@ -157,6 +157,19 @@
+ <isset property="setup.noOpenGL"/>
+ </condition>
+
++ <condition property="isLinuxARM">
++ <and>
++ <istrue value="${isLinux}" />
++ <or>
++ <os arch="arm" />
++ <os arch="armv4" />
++ <os arch="armv5" />
++ <os arch="armv6" />
++ <os arch="armv7" />
++ </or>
++ </and>
++ </condition>
++
+ <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.swt}, ${java.excludes.opengl}" />
+ <echo message="java.excludes.all: ${java.excludes.all}" />
+
+@@ -265,7 +278,7 @@
+ <includepath path="/usr/local/include" />
+ </compiler>
+
+- <compiler id="compiler.cfg.linux.armv6.newt.x11" extends="compiler.cfg.linux.armv6">
++ <compiler id="compiler.cfg.linux.arm.newt.x11" extends="compiler.cfg.linux">
+ <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
+ <compilerarg value="-idirafter" />
+ <compilerarg value="/usr/include" />
+@@ -320,13 +333,13 @@
+ <!--syslibset libs="X11-xcb" /-->
+ </linker>
+
+- <linker id="linker.cfg.linux.armv6.newt.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="Xrandr" />
++ <linker id="linker.cfg.linux.arm.newt.x11" extends="linker.cfg.linux">
++ <syslibset libs="X11" />
++ <syslibset libs="Xrandr" />
+ </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">
- @@ -410,11 +423,11 @@
++@@ -412,11 +425,11 @@
+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
+ </target>
+
+- <target name="c.configure.linux.armv6" if="isLinuxARMv6">
+- <echo message="Linux.armv6" />
+- <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6.newt.x11" />
+- <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.armv6.newt.x11"
+- else="linker.cfg.linux.armv6">
++ <target name="c.configure.linux.arm" if="isLinuxARM">
++ <echo message="Linux.arm" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux.arm.newt.x11" />
++ <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.arm.newt.x11"
++ else="linker.cfg.linux.arm">
+ <isset property="isX11" />
+ </condition>
+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
- @@ -496,7 +509,7 @@
++@@ -498,7 +511,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.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.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.arm,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 --git a/make/scripts/make.jogl.all.linux-armv7hf.sh b/make/scripts/make.jogl.all.linux-armv7hf.sh
- new file mode 100644
- index 0000000..5170810
- --- /dev/null
- +++ b/make/scripts/make.jogl.all.linux-armv7hf.sh
++Index: jogl-v2.0-rc12/make/scripts/make.jogl.all.linux-armv7hf.sh
++===================================================================
++--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++++ jogl-v2.0-rc12/make/scripts/make.jogl.all.linux-armv7hf.sh 2013-07-01 14:29:17.000000000 +0200
+@@ -0,0 +1,27 @@
++#! /bin/sh
++
++# arm-linux-gnueabihf == armhf triplet
++PATH=`pwd`/../../gluegen/make/lib/linux/arm-linux-gnueabihf/bin:$PATH
++export PATH
++
++# -Dc.compiler.debug=true
++# -Dgluegen.cpptasks.detected.os=true \
++# -DisUnix=true \
++# -DisLinux=true \
++# -DisLinuxARMv7=true \
++# -DisX11=false \
++
++export TARGET_PLATFORM_ROOT=/
++export TARGET_PLATFORM_LIBS=/usr/lib/arm-linux-gnueabihf
++export TARGET_JAVA_LIBS=/usr/lib/jvm/java-6-openjdk-armhf/jre/lib/arm
++
++export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv7hf.xml"
++
++ant \
++ -Drootrel.build=build-linux-armv7hf \
++ -Dsetup.addNativeKD=true \
++ -Dsetup.addNativeOpenMAX=true \
++ -Dsetup.addNativeBroadcom=true \
++ -Djunit.run.arg0="-Dnewt.test.Screen.disableScreenMode" \
++ $* 2>&1 | tee make.jogl.all.linux-armv7hf.log
++
- diff --git a/make/scripts/tests-armv7_armhf.sh b/make/scripts/tests-armv7_armhf.sh
- new file mode 100644
- index 0000000..5526e81
- --- /dev/null
- +++ b/make/scripts/tests-armv7_armhf.sh
++Index: jogl-v2.0-rc12/make/scripts/tests-armv7_armhf.sh
++===================================================================
++--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++++ jogl-v2.0-rc12/make/scripts/tests-armv7_armhf.sh 2013-07-01 14:29:17.000000000 +0200
+@@ -0,0 +1,7 @@
++#! /bin/bash
++
++spath=`dirname $0`
++
++. $spath/tests.sh `which java` -DummyArg ../build-linux-armv7hf $*
++
++
- diff --git a/make/scripts/tests-linux-armv7hf.sh b/make/scripts/tests-linux-armv7hf.sh
- new file mode 100644
- index 0000000..5526e81
- --- /dev/null
- +++ b/make/scripts/tests-linux-armv7hf.sh
++Index: jogl-v2.0-rc12/make/scripts/tests-linux-armv7hf.sh
++===================================================================
++--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++++ jogl-v2.0-rc12/make/scripts/tests-linux-armv7hf.sh 2013-07-01 14:29:17.000000000 +0200
+@@ -0,0 +1,7 @@
++#! /bin/bash
++
++spath=`dirname $0`
++
++. $spath/tests.sh `which java` -DummyArg ../build-linux-armv7hf $*
++
++
diff --cc debian/patches/disable_android_2.diff
index 3ab5d1c,0000000..d5d39c6
mode 100644,000000..100644
--- a/debian/patches/disable_android_2.diff
+++ b/debian/patches/disable_android_2.diff
@@@ -1,13 -1,0 +1,13 @@@
- Index: libjogl2-java-2.0-rc3/make/build-common.xml
++Index: jogl-v2.0-rc12/make/build-common.xml
+===================================================================
- --- libjogl2-java-2.0-rc3.orig/make/build-common.xml 2011-10-08 11:32:04.000000000 +0200
- +++ libjogl2-java-2.0-rc3/make/build-common.xml 2011-10-08 11:32:28.000000000 +0200
++--- jogl-v2.0-rc12.orig/make/build-common.xml 2013-07-01 14:28:38.000000000 +0200
+++++ jogl-v2.0-rc12/make/build-common.xml 2013-07-01 14:28:38.000000000 +0200
+@@ -16,7 +16,7 @@
+ <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-androidtasks.xml" />-->
+ <import file="${gluegen.root}/make/jogamp-env.xml" />
+
- <property name="ant-contrib.jar" value="/usr/share/java/ant-contrib.jar" />
++ <!-- Add JOAL (optional) -->
diff --cc debian/patches/disable_git_call.diff
index 1783c12,0000000..8fff677
mode 100644,000000..100644
--- a/debian/patches/disable_git_call.diff
+++ b/debian/patches/disable_git_call.diff
@@@ -1,24 -1,0 +1,24 @@@
- Index: libjogl2-java-2.0-rc3/make/build-common.xml
++Index: jogl-v2.0-rc12/make/build-common.xml
+===================================================================
- --- libjogl2-java-2.0-rc3.orig/make/build-common.xml 2011-10-08 11:34:17.000000000 +0200
- +++ libjogl2-java-2.0-rc3/make/build-common.xml 2011-10-08 11:47:45.000000000 +0200
- @@ -70,19 +70,7 @@
++--- jogl-v2.0-rc12.orig/make/build-common.xml 2013-07-01 14:28:35.000000000 +0200
+++++ jogl-v2.0-rc12/make/build-common.xml 2013-07-01 14:28:35.000000000 +0200
++@@ -67,19 +67,7 @@
+ <property name="jogl.build.number" value="manual"/>
+ <property name="jogl.build.id" value="${version.timestamp}"/>
+ <mkdir dir="${tempdir}" />
+- <exec dir="." executable="git" logError="true" failonerror="false" failifexecutionfails="false"
+- output="${tempdir}/localbranch.raw">
+- <arg line="branch --no-color"/>
+- </exec>
+- <exec dir="." executable="sed" logError="true" failonerror="false" failifexecutionfails="false"
+- outputproperty="jogl.build.branch">
+- <arg line="-e '/^[^*]/d' -e 's/* \(.*\)/\1/' ${tempdir}/localbranch.raw"/>
+- </exec>
+ <property name="jogl.build.branch" value="manual"/> <!-- fallback -->
+- <exec dir="${project.root}" executable="git" logError="true" failonerror="false" failifexecutionfails="false"
+- outputproperty="jogl.build.commit">
+- <arg line="rev-parse HEAD"/>
+- </exec>
+ <property name="jogl.build.commit" value="manual"/> <!-- fallback -->
+
- <property name="nativewindow.version" value="${nativewindow_base_version}-b${jogl.build.number}-${version.timestamp}" />
++ <property name="jogl.version" value="${jogamp.version.base}-b${jogl.build.number}-${version.timestamp}" />
diff --cc debian/patches/manifest.diff
index eb3c254,0000000..103598e
mode 100644,000000..100644
--- a/debian/patches/manifest.diff
+++ b/debian/patches/manifest.diff
@@@ -1,15 -1,0 +1,18 @@@
- Index: libjogl2-java-2.0-rc8/make/joglversion
++Index: libjogl2-java-2.0-rc12/make/joglversion
+===================================================================
- --- libjogl2-java-2.0-rc8.orig/make/joglversion 2012-05-02 03:28:29.000000000 +0200
- +++ libjogl2-java-2.0-rc8/make/joglversion 2012-05-23 17:49:42.000000000 +0200
- @@ -6,8 +6,9 @@
- Implementation-Version: @VERSION@
++--- libjogl2-java-2.0-rc12.orig/make/joglversion 2013-06-25 16:35:52.000000000 +0200
+++++ libjogl2-java-2.0-rc12/make/joglversion 2013-07-01 18:14:24.000000000 +0200
++@@ -7,10 +7,12 @@
++ Implementation-Build: @BUILD_VERSION@
+ Implementation-Branch: @SCM_BRANCH@
+ Implementation-Commit: @SCM_COMMIT@
+-Implementation-Vendor: JogAmp Community
++Implementation-Vendor: JogAmp Community - Debian package
+ Implementation-URL: http://jogamp.org/
+ Extension-Name: javax.media.opengl
+ Implementation-Vendor-Id: com.jogamp
+ Trusted-Library: true
++ Permissions: all-permissions
++Class-Path: /usr/share/java/gluegen2-rt.jar
++ @JAR_CODEBASE_TAG@
+++
diff --cc debian/patches/s390x.diff
index 9af0d95,0000000..aa9fa6a
mode 100644,000000..100644
--- a/debian/patches/s390x.diff
+++ b/debian/patches/s390x.diff
@@@ -1,81 -1,0 +1,81 @@@
- Index: jogl-v2.0-rc11/make/build-jogl.xml
++Index: jogl-v2.0-rc12/make/build-jogl.xml
+===================================================================
- --- 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 @@
++--- jogl-v2.0-rc12.orig/make/build-jogl.xml 2013-07-01 14:29:14.000000000 +0200
+++++ jogl-v2.0-rc12/make/build-jogl.xml 2013-07-01 14:29:14.000000000 +0200
++@@ -1287,6 +1287,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" />
- @@ -1287,7 +1293,7 @@
++@@ -1294,7 +1300,7 @@
+ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" />
+ </target>
+
+- <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-rc11/make/build-nativewindow.xml
++Index: jogl-v2.0-rc12/make/build-nativewindow.xml
+===================================================================
- --- 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 @@
++--- jogl-v2.0-rc12.orig/make/build-nativewindow.xml 2013-07-01 14:29:14.000000000 +0200
+++++ jogl-v2.0-rc12/make/build-nativewindow.xml 2013-07-01 14:29:14.000000000 +0200
++@@ -525,13 +525,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.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-rc11/make/build-newt.xml
++Index: jogl-v2.0-rc12/make/build-newt.xml
+===================================================================
- --- 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 @@
++--- jogl-v2.0-rc12.orig/make/build-newt.xml 2013-07-01 14:29:14.000000000 +0200
+++++ jogl-v2.0-rc12/make/build-newt.xml 2013-07-01 14:29:14.000000000 +0200
++@@ -472,6 +472,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" />
- @@ -486,7 +496,7 @@
++@@ -488,7 +498,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.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 3496224,0000000..3d16cda
mode 100644,000000..100644
--- a/debian/patches/swt.diff
+++ b/debian/patches/swt.diff
@@@ -1,23 -1,0 +1,23 @@@
- Index: jogl-v2.0-rc11/make/build-common.xml
++Index: jogl-v2.0-rc12/make/build-common.xml
+===================================================================
- --- 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 @@
++--- jogl-v2.0-rc12.orig/make/build-common.xml 2013-07-01 14:28:32.000000000 +0200
+++++ jogl-v2.0-rc12/make/build-common.xml 2013-07-01 14:28:32.000000000 +0200
++@@ -127,15 +127,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="${isLinuxARMv6}" /> <!-- FIXME JAU .. hack -->
+- </condition>
++ <condition property="swt.jar" value="/usr/share/java/swt.jar">
++ <istrue value="${isLinux}" />
++ </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 303fc21,0000000..abb8fb7
mode 100644,000000..100644
--- a/debian/patches/variousFixes.diff
+++ b/debian/patches/variousFixes.diff
@@@ -1,63 -1,0 +1,65 @@@
- Index: jogl-v2.0-rc11/make/build-common.xml
++Index: jogl-v2.0-rc12/make/build-common.xml
+===================================================================
- --- 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 @@
++--- jogl-v2.0-rc12.orig/make/build-common.xml 2013-07-01 14:27:33.000000000 +0200
+++++ jogl-v2.0-rc12/make/build-common.xml 2013-07-01 14:28:22.000000000 +0200
++@@ -13,7 +13,7 @@
+ </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" />
++@@ -22,7 +22,7 @@
++ <!-- Add JOAL (optional) -->
++ <property name="joal.root" value="../../joal" />
+
+- <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 @@
++@@ -201,7 +201,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" />
+
- @@ -413,7 +413,7 @@
++@@ -404,7 +404,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"/>
- @@ -568,7 +568,10 @@
++@@ -574,7 +574,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-rc11/make/build.xml
++Index: jogl-v2.0-rc12/make/build.xml
+===================================================================
- --- 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 @@
++--- jogl-v2.0-rc12.orig/make/build.xml 2013-07-01 14:27:33.000000000 +0200
+++++ jogl-v2.0-rc12/make/build.xml 2013-07-01 14:27:33.000000000 +0200
++@@ -291,7 +291,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"/>
diff --cc debian/rules
index 21501e0,0000000..1bc9f40
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,33 -1,0 +1,33 @@@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java/
+DEB_JARS := ant-contrib ant-contrib-cpptasks ant-nodeps antlr ant-antlr swt
- DEB_ANT_ARGS := -Dsetup.noCDC=true -verbose
++DEB_ANT_ARGS := -Dsetup.noCDC=true -verbose -Dcommon.gluegen.build.done=true
+DEB_ANT_CLEAN_TARGET := clean
+DEB_ANT_BUILD_TARGET := all
+DEB_ANT_BUILDFILE := make/build.xml
+ENABLE_BUILD_HELP_ARCHS := amd64 i386
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+ifeq ($(DEB_HOST_ARCH),armhf)
+DEB_ANT_ARGS += -DisAbiEabiGnuArmhf=true
+endif
+
+build-indep:
+# Disable the build of the help on slow archs. It takes forever (a few hours)
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(ENABLE_BUILD_HELP_ARCHS)))
+ $(DEB_ANT_INVOKE) javadoc.all
+endif
+
+common-install-prehook-indep::
+ mv build/jar/jogl-all.jar build/jar/jogl2.jar
+
+clean::
+ $(RM) -r gluegen/build
+
+get-orig-source::
+ -uscan --upstream-version 0
--
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