[libjogl2-java] 17/58: Imported Debian patch 2.0-rc5-1~exp1
Tony Mancill
tmancill at moszumanska.debian.org
Thu Sep 4 03:59:10 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 4bad63a17b599593849f08ff7c227e99c6d9fc5a
Merge: f3cd352 ca5717a
Author: Sylvestre Ledru <sylvestre at debian.org>
Date: Mon Dec 26 02:06:41 2011 +0100
Imported Debian patch 2.0-rc5-1~exp1
debian/changelog | 7 +
debian/control | 5 +-
debian/orig-tar.sh | 21 +-
debian/patches/disable_android_3.diff | 64 ++
debian/patches/otherArchsoswin_2.diff | 24 +-
debian/patches/series | 1 +
debian/patches/swt.diff | 12 +-
debian/rules | 4 +
debian/watch | 7 +-
doc/HowToBuild.html | 5 +-
doc/Implementation/Lifecycle.txt | 41 ++
etc/profile.jogl | 18 +-
etc/test.bat | 17 +-
etc/test.sh | 10 +-
etc/test_dbg.bat | 13 +
etc/{test.sh => test_dbg.sh} | 10 +-
jnlp-files/jogl-all-awt-cg.jnlp | 89 +++
make/build-common.xml | 30 +-
make/build-jogl.xml | 44 +-
make/build-nativewindow.xml | 67 +-
make/build-newt.xml | 23 +-
make/build-test.xml | 87 ++-
make/config/jogl/cg-common.cfg | 1 +
make/config/jogl/cgl-macosx.cfg | 7 +
.../config/jogl/gl-impl-CustomJavaCode-common.java | 5 +
make/config/nativewindow/jawt-CustomJavaCode.java | 57 +-
.../jawt-DrawingSurfaceInfo-CustomJavaCode.java | 37 +-
make/config/nativewindow/jawt-common.cfg | 2 +
make/config/nativewindow/jawt-macosx.cfg | 5 +
make/config/nativewindow/win32-CustomJavaCode.java | 58 --
make/config/nativewindow/win32-lib.cfg | 4 +-
.../resources/android/AndroidManifest-launcher.xml | 2 +
make/scripts/adb-logcat.sh | 4 +
make/scripts/adb-reinstall-all.sh | 1 +
make/scripts/check-junit.sh | 53 +-
make/scripts/java-win32-dbg.bat | 7 +-
make/scripts/java-win32.bat | 4 +-
make/scripts/java-win64-dbg.bat | 4 +-
make/scripts/java-win64.bat | 4 +-
make/scripts/make.jogl.all.solaris-x86.sh | 52 ++
make/scripts/make.jogl.all.solaris-x86_64.sh | 52 ++
make/scripts/make.jogl.all.win32.bat | 4 +-
make/scripts/make.jogl.all.win64.bat | 4 +-
make/scripts/setenv-jogl.sh | 12 +-
make/scripts/tests-armv7l_eabi.sh | 2 +-
make/scripts/tests-javaws-x64.bat | 2 +-
make/scripts/tests-osx-x64.sh | 7 +
make/scripts/tests-osx.sh | 7 -
make/scripts/{tests-x32.sh => tests-solx32.sh} | 3 +-
make/scripts/{tests-x64.sh => tests-solx64.sh} | 2 +-
make/scripts/tests-x32.bat | 5 +-
make/scripts/tests-x32.sh | 2 +-
make/scripts/tests-x64.bat | 10 +-
make/scripts/tests-x64.sh | 2 +-
make/scripts/tests.sh | 85 ++-
make/stub_includes/cg/{CG => Cg}/cg.h | 10 +-
make/stub_includes/cg/{CG => Cg}/cgGL.h | 2 +-
make/stub_includes/cg/{CG => Cg}/cgGL_profiles.h | 0
.../stub_includes/cg/{CG => Cg}/cg_bindlocations.h | 0
make/stub_includes/cg/{CG => Cg}/cg_datatypes.h | 0
make/stub_includes/cg/{CG => Cg}/cg_enums.h | 0
make/stub_includes/cg/{CG => Cg}/cg_errors.h | 0
make/stub_includes/cg/{CG => Cg}/cg_profiles.h | 2 +-
make/stub_includes/jni/macosx/jawt_md.h | 20 +-
make/stub_includes/macosx/AppKit/NSOpenGL.h | 3 +
make/stub_includes/macosx/AppKit/NSOpenGLLayer.h | 1 +
make/stub_includes/macosx/AppKit/NSOpenGLView.h | 1 +
make/stub_includes/macosx/OpenGL/CGLDevice.h | 2 +
make/stub_includes/macosx/OpenGL/OpenGL.h | 45 +-
make/stub_includes/macosx/QuartzCore/CALayer.h | 1 +
make/stub_includes/opengl/GL/glxext.h | 33 +-
make/stub_includes/opengl/cg.c | 2 +-
make/stub_includes/opengl/macosx-window-system.h | 71 +-
make/stub_includes/win32/wingdi.h | 2 +
nbproject/.gitignore | 1 +
.../classes/com/jogamp/opengl/JoglVersion.java | 2 +-
.../opengl/cg/CgDynamicLibraryBundleInfo.java | 18 +
.../com/jogamp/opengl/util/AWTAnimatorImpl.java | 4 +-
.../classes/com/jogamp/opengl/util/Animator.java | 24 +-
.../com/jogamp/opengl/util/AnimatorBase.java | 6 +-
.../jogamp/opengl/util/DefaultAnimatorImpl.java | 4 +-
.../com/jogamp/opengl/util/GLArrayDataClient.java | 9 +-
.../jogamp/opengl/util/GLArrayDataEditable.java | 2 +-
.../com/jogamp/opengl/util/GLArrayDataServer.java | 16 +-
.../classes/com/jogamp/opengl/util/GLBuffers.java | 45 +-
.../classes/com/jogamp/opengl/util/PMVMatrix.java | 425 ++++++-----
.../com/jogamp/opengl/util/texture/Texture.java | 4 +-
.../media/opengl/DefaultGLCapabilitiesChooser.java | 10 +-
.../classes/javax/media/opengl/GLAutoDrawable.java | 2 +-
src/jogl/classes/javax/media/opengl/GLBase.java | 11 +
.../classes/javax/media/opengl/GLCapabilities.java | 58 +-
.../media/opengl/GLCapabilitiesImmutable.java | 34 +-
src/jogl/classes/javax/media/opengl/GLContext.java | 66 +-
.../classes/javax/media/opengl/GLDrawable.java | 6 +
.../javax/media/opengl/GLDrawableFactory.java | 111 +--
src/jogl/classes/javax/media/opengl/GLProfile.java | 428 +++++++-----
.../classes/javax/media/opengl/awt/GLCanvas.java | 109 ++-
.../classes/javax/media/opengl/awt/GLJPanel.java | 19 +-
.../jogamp/graph/curve/text/GlyphString.java | 2 +-
.../opengl/DesktopGLDynamicLookupHelper.java | 2 +-
src/jogl/classes/jogamp/opengl/FPSCounterImpl.java | 6 +-
src/jogl/classes/jogamp/opengl/GLContextImpl.java | 211 ++++--
.../classes/jogamp/opengl/GLContextShareSet.java | 252 ++++---
.../jogamp/opengl/GLDebugMessageHandler.java | 14 +-
.../jogamp/opengl/GLDrawableFactoryImpl.java | 85 ++-
.../classes/jogamp/opengl/GLDrawableHelper.java | 110 ++-
src/jogl/classes/jogamp/opengl/GLDrawableImpl.java | 21 +-
.../jogamp/opengl/GLGraphicsConfigurationUtil.java | 5 +-
src/jogl/classes/jogamp/opengl/GLPbufferImpl.java | 2 +-
src/jogl/classes/jogamp/opengl/ProjectFloat.java | 36 +-
.../jogamp/opengl/SharedResourceRunner.java | 158 +++--
.../classes/jogamp/opengl/awt/VersionApplet.java | 10 +-
src/jogl/classes/jogamp/opengl/egl/EGLContext.java | 42 +-
.../classes/jogamp/opengl/egl/EGLDrawable.java | 12 +-
.../jogamp/opengl/egl/EGLDrawableFactory.java | 126 ++--
.../opengl/egl/EGLDynamicLibraryBundleInfo.java | 7 -
.../opengl/egl/EGLES1DynamicLibraryBundleInfo.java | 4 -
.../opengl/egl/EGLES2DynamicLibraryBundleInfo.java | 4 -
.../jogamp/opengl/egl/EGLExternalContext.java | 4 +-
.../jogamp/opengl/egl/EGLGLCapabilities.java | 15 +-
.../opengl/egl/EGLGraphicsConfiguration.java | 53 +-
.../egl/EGLGraphicsConfigurationFactory.java | 8 +-
.../jogamp/opengl/egl/EGLOnscreenDrawable.java | 10 -
.../jogamp/opengl/egl/EGLPbufferDrawable.java | 39 +-
.../jogamp/opengl/macosx/cgl/MacOSXCGLContext.java | 630 +++++++++++++----
.../opengl/macosx/cgl/MacOSXCGLDrawable.java | 87 ++-
.../macosx/cgl/MacOSXCGLDrawableFactory.java | 277 ++++++--
.../macosx/cgl/MacOSXCGLGraphicsConfiguration.java | 171 ++++-
.../cgl/MacOSXCGLGraphicsConfigurationFactory.java | 6 +-
.../macosx/cgl/MacOSXExternalCGLContext.java | 59 +-
.../macosx/cgl/MacOSXOffscreenCGLDrawable.java | 6 +-
.../macosx/cgl/MacOSXOnscreenCGLContext.java | 76 +-
.../macosx/cgl/MacOSXOnscreenCGLDrawable.java | 46 +-
.../opengl/macosx/cgl/MacOSXPbufferCGLContext.java | 309 +-------
.../macosx/cgl/MacOSXPbufferCGLDrawable.java | 223 +++---
.../MacOSXAWTCGLGraphicsConfigurationFactory.java | 8 +-
.../macosx/cgl/awt/MacOSXJava2DCGLContext.java | 72 +-
.../classes/jogamp/opengl/util/GLArrayHandler.java | 4 +-
...GLArrayHandler.java => GLArrayHandlerFlat.java} | 26 +-
.../opengl/util/GLArrayHandlerInterleaved.java | 18 +-
.../jogamp/opengl/util/GLDataArrayHandler.java | 6 +-
.../jogamp/opengl/util/GLFixedArrayHandler.java | 8 +-
.../opengl/util/GLFixedArrayHandlerFlat.java | 14 +-
.../jogamp/opengl/util/glsl/GLSLArrayHandler.java | 9 +-
.../opengl/util/glsl/GLSLArrayHandlerFlat.java | 39 +-
.../GLSLArrayHandlerInterleaved.java} | 58 +-
.../windows/wgl/WindowsBitmapWGLDrawable.java | 28 +-
.../windows/wgl/WindowsDummyWGLDrawable.java | 8 +-
.../windows/wgl/WindowsExternalWGLContext.java | 4 +-
.../windows/wgl/WindowsPbufferWGLContext.java | 9 +-
.../windows/wgl/WindowsPbufferWGLDrawable.java | 307 ++++----
.../opengl/windows/wgl/WindowsWGLContext.java | 49 +-
.../opengl/windows/wgl/WindowsWGLDrawable.java | 6 +-
.../windows/wgl/WindowsWGLDrawableFactory.java | 184 ++---
.../wgl/WindowsWGLGraphicsConfiguration.java | 10 +-
.../WindowsWGLGraphicsConfigurationFactory.java | 10 +-
.../WindowsAWTWGLGraphicsConfigurationFactory.java | 23 +-
.../classes/jogamp/opengl/x11/glx/GLXUtil.java | 99 ++-
.../jogamp/opengl/x11/glx/X11DummyGLXDrawable.java | 10 +-
.../opengl/x11/glx/X11ExternalGLXContext.java | 8 +-
.../opengl/x11/glx/X11ExternalGLXDrawable.java | 4 +-
.../jogamp/opengl/x11/glx/X11GLXContext.java | 131 ++--
.../jogamp/opengl/x11/glx/X11GLXDrawable.java | 10 +-
.../opengl/x11/glx/X11GLXDrawableFactory.java | 364 ++++++----
.../x11/glx/X11GLXGraphicsConfiguration.java | 38 +-
.../glx/X11GLXGraphicsConfigurationFactory.java | 52 +-
.../opengl/x11/glx/X11OnscreenGLXDrawable.java | 8 +-
.../opengl/x11/glx/X11PbufferGLXDrawable.java | 39 +-
.../jogamp/opengl/x11/glx/X11PixmapGLXContext.java | 2 +-
.../opengl/x11/glx/X11PixmapGLXDrawable.java | 29 +-
src/jogl/native/GLDebugMessageHandler.c | 30 +-
src/jogl/native/macosx/ContextUpdater.h | 17 +-
src/jogl/native/macosx/ContextUpdater.m | 101 ++-
src/jogl/native/macosx/MacOSXCustomCGLCode.c | 5 +-
.../macosx/MacOSXWindowSystemInterface-nsview.m | 140 ++++
.../macosx/MacOSXWindowSystemInterface-pbuffer.m | 480 +++++++++++++
.../native/macosx/MacOSXWindowSystemInterface.h | 20 +
.../native/macosx/MacOSXWindowSystemInterface.m | 345 +++++----
src/jogl/native/timespec.c | 63 ++
src/jogl/native/timespec.h | 19 +
.../AbstractGraphicsConfiguration.java | 13 +-
.../media/nativewindow/AbstractGraphicsDevice.java | 9 +-
.../nativewindow/DefaultGraphicsConfiguration.java | 2 -
.../media/nativewindow/DefaultGraphicsDevice.java | 27 +-
.../nativewindow/GraphicsConfigurationFactory.java | 63 +-
.../javax/media/nativewindow/NativeSurface.java | 23 +
.../javax/media/nativewindow/NativeWindow.java | 15 +-
.../media/nativewindow/NativeWindowFactory.java | 166 +++--
.../media/nativewindow/OffscreenLayerOption.java} | 73 +-
.../media/nativewindow/OffscreenLayerSurface.java} | 51 +-
.../javax/media/nativewindow/ProxySurface.java | 38 +-
.../media/nativewindow/SurfaceChangeable.java | 8 +-
.../media/nativewindow/SurfaceUpdatedListener.java | 6 +-
.../nativewindow/awt/AWTGraphicsConfiguration.java | 61 +-
.../media/nativewindow/awt/AWTGraphicsDevice.java | 38 +-
.../media/nativewindow/awt/AWTGraphicsScreen.java | 10 +-
.../javax/media/nativewindow/util/Point.java | 6 +
.../nativewindow/x11/X11GraphicsConfiguration.java | 6 +-
.../media/nativewindow/x11/X11GraphicsDevice.java | 32 +-
.../media/nativewindow/x11/X11GraphicsScreen.java | 13 +-
.../MutableGraphicsConfiguration.java} | 29 +-
.../jogamp/nativewindow/NWJNILibLoader.java | 4 +-
.../nativewindow/NativeWindowFactoryImpl.java | 19 +-
.../jogamp/nativewindow/SurfaceUpdatedHelper.java | 85 +++
.../jogamp/nativewindow/WrappedSurface.java | 4 +-
.../jogamp/nativewindow/jawt/JAWTJNILibLoader.java | 10 +-
.../classes/jogamp/nativewindow/jawt/JAWTUtil.java | 82 ++-
.../jogamp/nativewindow/jawt/JAWTWindow.java | 297 ++++++--
.../nativewindow/jawt/macosx/MacOSXJAWTWindow.java | 230 ++++--
.../jawt/windows/Win32SunJDKReflection.java | 2 +-
.../jawt/windows/WindowsJAWTWindow.java | 35 +-
.../nativewindow/jawt/x11/X11JAWTToolkitLock.java | 24 +-
.../nativewindow/jawt/x11/X11JAWTWindow.java | 56 +-
.../nativewindow/jawt/x11/X11SunJDKReflection.java | 20 +-
.../jogamp/nativewindow/macosx/OSXUtil.java | 85 +++
.../jogamp/nativewindow/swt/SWTAccessor.java | 69 +-
.../jogamp/nativewindow/windows/GDISurface.java | 14 +-
.../jogamp/nativewindow/windows/GDIUtil.java | 101 +++
.../windows/RegisteredClassFactory.java | 45 +-
.../x11/X11GraphicsConfigurationFactory.java | 20 +-
.../jogamp/nativewindow/x11/X11ToolkitLock.java | 23 +-
.../classes/jogamp/nativewindow/x11/X11Util.java | 406 +++--------
.../awt/X11AWTGraphicsConfigurationFactory.java} | 108 +--
src/nativewindow/native/JAWT_DrawingSurfaceInfo.c | 7 +
src/nativewindow/native/NativewindowCommon.c | 27 +
src/nativewindow/native/NativewindowCommon.h | 2 +
src/nativewindow/native/macosx/OSXmisc.c | 106 ---
src/nativewindow/native/macosx/OSXmisc.m | 442 ++++++++++++
src/nativewindow/native/windows/GDImisc.c | 32 +-
src/nativewindow/native/x11/XineramaHelper.c | 4 +-
src/nativewindow/native/x11/Xmisc.c | 14 +-
src/newt/classes/com/jogamp/newt/Display.java | 7 +-
src/newt/classes/com/jogamp/newt/NewtFactory.java | 140 +++-
src/newt/classes/com/jogamp/newt/Screen.java | 20 +-
src/newt/classes/com/jogamp/newt/Window.java | 114 ++-
.../classes/com/jogamp/newt/awt/NewtCanvasAWT.java | 315 +++++++--
.../jogamp/newt/awt/applet/JOGLNewtApplet1Run.java | 127 +++-
.../jogamp/newt/awt/applet/JOGLNewtAppletBase.java | 52 +-
.../classes/com/jogamp/newt/event/InputEvent.java | 32 +-
.../classes/com/jogamp/newt/event/KeyEvent.java | 4 +
.../classes/com/jogamp/newt/event/MouseEvent.java | 15 +
.../com/jogamp/newt/event/MouseListener.java | 2 +
.../classes/com/jogamp/newt/event/NEWTEvent.java | 1 +
.../jogamp/newt/event/awt/AWTWindowAdapter.java | 6 +
.../classes/com/jogamp/newt/opengl/GLWindow.java | 120 +++-
src/newt/classes/com/jogamp/newt/util/EDTUtil.java | 12 +-
.../classes/com/jogamp/newt/util/MainThread.java | 52 +-
src/newt/classes/jogamp/newt/DefaultEDTUtil.java | 11 +-
src/newt/classes/jogamp/newt/DisplayImpl.java | 8 +-
src/newt/classes/jogamp/newt/NEWTJNILibLoader.java | 4 +-
src/newt/classes/jogamp/newt/OffscreenWindow.java | 37 +-
src/newt/classes/jogamp/newt/ScreenImpl.java | 174 +++--
src/newt/classes/jogamp/newt/ScreenModeStatus.java | 27 +-
src/newt/classes/jogamp/newt/WindowImpl.java | 505 ++++++++-----
.../newt/awt/{event => }/NewtFactoryAWT.java | 36 +-
.../jogamp/newt/awt/event/AWTNewtEventFactory.java | 14 +-
.../newt/awt/event/AWTParentWindowAdapter.java | 24 +-
.../jogamp/newt/driver/DriverClearFocus.java | 12 +
.../jogamp/newt/driver/DriverUpdatePosition.java | 9 +
.../jogamp/newt/driver/android/AndroidWindow.java | 25 +-
.../newt/driver/android/NewtBaseActivity.java | 16 +-
.../android/event/AndroidNewtEventFactory.java | 16 +-
.../classes/jogamp/newt/driver/awt/AWTCanvas.java | 8 +-
.../classes/jogamp/newt/driver/awt/AWTDisplay.java | 4 +-
.../classes/jogamp/newt/driver/awt/AWTEDTUtil.java | 14 +-
.../classes/jogamp/newt/driver/awt/AWTWindow.java | 36 +-
.../jogamp/newt/driver/broadcom/egl/Window.java | 21 +-
.../jogamp/newt/driver/intel/gdl/Window.java | 9 +-
.../classes/jogamp/newt/driver/kd/KDWindow.java | 9 +-
.../jogamp/newt/driver/macosx/MacDisplay.java | 4 +
.../jogamp/newt/driver/macosx/MacKeyUtil.java | 262 +++++++
.../jogamp/newt/driver/macosx/MacWindow.java | 525 +++++++-------
.../jogamp/newt/driver/windows/WindowsScreen.java | 5 -
.../jogamp/newt/driver/windows/WindowsWindow.java | 97 ++-
.../classes/jogamp/newt/driver/x11/X11Display.java | 34 +-
.../classes/jogamp/newt/driver/x11/X11Screen.java | 51 +-
.../classes/jogamp/newt/driver/x11/X11Window.java | 108 ++-
src/newt/native/MacWindow.m | 454 +++++++++---
src/newt/native/NewtMacWindow.h | 64 +-
src/newt/native/NewtMacWindow.m | 520 +++++++++++---
src/newt/native/WindowsWindow.c | 145 +++-
src/newt/native/X11Window.c | 245 +++++--
.../opengl/test/android/NEWTElektronActivity.java | 9 +-
.../opengl/test/android/NEWTGearsES1Activity.java | 7 +-
.../opengl/test/android/NEWTGearsES2Activity.java | 16 +-
.../test/android/NEWTGearsES2TransActivity.java | 6 +-
.../opengl/test/android/NEWTGraphUI1pActivity.java | 2 +-
.../opengl/test/android/NEWTGraphUI2pActivity.java | 2 +-
.../test/android/NEWTRedSquareES1Activity.java | 6 +-
.../test/android/NEWTRedSquareES2Activity.java | 15 +-
.../test/junit/graph/TestRegionRendererNEWT01.java | 5 -
.../test/junit/graph/TestTextRendererNEWT01.java | 5 -
.../junit/graph/demos/GPURegionNewtDemo01.java | 1 -
.../junit/graph/demos/GPURegionNewtDemo02.java | 1 -
.../test/junit/graph/demos/GPUTextNewtDemo01.java | 1 -
.../test/junit/graph/demos/GPUTextNewtDemo02.java | 1 -
.../junit/graph/demos/GPUUISceneGLListener0A.java | 33 +-
.../junit/graph/demos/GPUUISceneNewtDemo01.java | 1 -
.../junit/graph/demos/GPUUISceneNewtDemo02.java | 1 -
.../test/junit/graph/demos/ui/UINewtDemo01.java | 1 -
.../test/junit/jogl/acore/TestGLDebug00NEWT.java | 5 -
.../test/junit/jogl/acore/TestGLDebug01NEWT.java | 6 -
.../jogl/acore/TestGLExtensionQueryOffscreen.java | 7 +-
.../test/junit/jogl/acore/TestGLProfile01NEWT.java | 11 -
.../junit/jogl/acore/TestInitConcurrentNEWT.java | 230 ++++++
.../acore/TestMainVersionGLCanvasAWT.java} | 28 +-
.../acore/TestMainVersionGLWindowNEWT.java} | 26 +-
.../test/junit/jogl/acore/TestNVSwapGroupNEWT.java | 1 -
.../junit/jogl/acore/TestPBufferDeadlockAWT.java | 127 ++++
.../junit/jogl/acore/TestSharedContextListAWT.java | 49 +-
.../jogl/acore/TestSharedContextListNEWT.java | 19 +-
...stNEWT.java => TestSharedContextListNEWT2.java} | 58 +-
.../jogl/acore/TestSharedContextNewtAWTBug523.java | 778 +++++++++++++++++++++
.../jogl/acore/TestSharedContextVBOES1NEWT.java | 15 +-
.../jogl/acore/TestSharedContextVBOES2NEWT.java | 15 +-
...NEWT.java => TestSharedContextVBOES2NEWT2.java} | 63 +-
.../junit/jogl/acore/TestShutdownCompleteAWT.java | 125 ++++
.../junit/jogl/acore/TestShutdownCompleteNEWT.java | 144 ++++
.../junit/jogl/acore/TestShutdownSharedAWT.java | 124 ++++
.../junit/jogl/acore/TestShutdownSharedNEWT.java | 127 ++++
.../TestBug461OffscreenSupersamplingSwingAWT.java | 46 +-
.../test/junit/jogl/caps/MultisampleDemo01.java | 2 +-
.../caps/TestTranslucencyAWT.java} | 155 ++--
.../test/junit/jogl/caps/TestTranslucencyNEWT.java | 1 -
.../opengl/test/junit/jogl/demos/es1/GearsES1.java | 15 +-
.../jogl/demos/es1/newt/TestGearsES1NEWT.java | 1 -
.../jogl/demos/es1/newt/TestRedSquareES1NEWT.java | 1 -
.../opengl/test/junit/jogl/demos/es2/GearsES2.java | 89 ++-
.../test/junit/jogl/demos/es2/RedSquareES2.java | 50 +-
.../es2/newt/TestElektronenMultipliziererNEWT.java | 5 -
.../jogl/demos/es2/newt/TestGearsES2NEWT.java | 144 +++-
.../jogl/demos/es2/newt/TestRedSquareES2NEWT.java | 1 -
.../shader/elektronenmultiplizierer_development.fp | 4 +-
.../test/junit/jogl/demos/es2/shader/gears.fp | 11 +-
.../junit/jogl/demos/gl2/awt/TestGearsAWT.java | 30 +-
...earsAWT.java => TestGearsAWTAnalyzeBug455.java} | 77 +-
.../junit/jogl/demos/gl2/newt/TestGearsNEWT.java | 1 -
.../junit/jogl/drawable/TestDrawable01NEWT.java | 3 +-
.../test/junit/jogl/glsl/GLSLMiscHelper.java | 4 +-
.../test/junit/jogl/glsl/TestFBOMRTNEWT01.java | 13 +-
.../junit/jogl/glsl/TestGLSLShaderState01NEWT.java | 17 +-
.../junit/jogl/glsl/TestGLSLShaderState02NEWT.java | 7 +-
.../test/junit/jogl/glsl/TestGLSLSimple01NEWT.java | 13 -
.../test/junit/jogl/glsl/TestRulerNEWT01.java | 25 +-
.../TestTransformFeedbackVaryingsBug407NEWT.java | 10 -
...TestSwingAWTRobotUsageBeforeJOGLInitBug411.java | 6 +-
.../offscreen/TestOffscreen01GLPBufferNEWT.java | 1 -
.../jogl/offscreen/TestOffscreen02BitmapNEWT.java | 1 -
.../test/junit/jogl/offscreen/WindowUtilNEWT.java | 2 +-
.../opengl/test/junit/jogl/swt/TestSWT01GLn.java | 1 -
.../opengl/test/junit/jogl/swt/TestSWT02GLn.java | 53 +-
.../test/junit/jogl/swt/TestSWTAWT01GLn.java | 92 +--
.../opengl/test/junit/newt/TestCloseNewtAWT.java | 12 +-
.../junit/newt/TestDisplayLifecycle01NEWT.java | 1 -
.../junit/newt/TestDisplayLifecycle02NEWT.java | 1 -
.../test/junit/newt/TestEventSourceNotAWTBug.java | 7 +-
.../test/junit/newt/TestFocus01SwingAWTRobot.java | 35 +-
.../test/junit/newt/TestFocus02SwingAWTRobot.java | 70 +-
.../test/junit/newt/TestGLWindows00NEWT.java | 2 -
.../test/junit/newt/TestGLWindows01NEWT.java | 2 -
.../junit/newt/TestGLWindows02NEWTAnimated.java | 1 -
.../test/junit/newt/TestListenerCom01AWT.java | 17 +-
.../test/junit/newt/TestRemoteGLWindows01NEWT.java | 83 +--
.../test/junit/newt/TestRemoteWindow01NEWT.java | 4 +-
.../test/junit/newt/TestScreenMode00NEWT.java | 33 +-
.../test/junit/newt/TestScreenMode00bNEWT.java | 39 +-
.../test/junit/newt/TestScreenMode01NEWT.java | 9 +-
.../test/junit/newt/TestScreenMode01bNEWT.java | 3 +-
.../test/junit/newt/TestScreenMode02NEWT.java | 3 +-
.../junit/newt/TestWindowClosingProtocol01AWT.java | 8 +-
.../newt/TestWindowClosingProtocol03NewtAWT.java | 4 +-
.../opengl/test/junit/newt/TestWindows01NEWT.java | 2 +-
.../parenting/NewtAWTReparentingKeyAdapter.java | 6 +-
.../junit/newt/parenting/TestParenting01NEWT.java | 3 +-
.../junit/newt/parenting/TestParenting01aAWT.java | 207 ++++--
.../junit/newt/parenting/TestParenting01bAWT.java | 43 +-
.../junit/newt/parenting/TestParenting01cAWT.java | 95 ++-
.../newt/parenting/TestParenting01cSwingAWT.java | 33 +-
.../junit/newt/parenting/TestParenting02AWT.java | 11 +-
.../junit/newt/parenting/TestParenting02NEWT.java | 5 +-
.../junit/newt/parenting/TestParenting03AWT.java | 134 ++--
.../TestParentingFocusTraversal01AWT.java | 334 +++++++++
.../TestParentingOffscreenLayer01GLCanvasAWT.java | 205 ++++++
...TestParentingOffscreenLayer02NewtCanvasAWT.java | 209 ++++++
...3bAWT.java => TestTranslucentParentingAWT.java} | 151 ++--
.../opengl/test/junit/util/AWTFocusAdapter.java | 24 +-
.../opengl/test/junit/util/AWTRobotUtil.java | 101 +--
...ocusAdapter.java => AWTWindowFocusAdapter.java} | 42 +-
.../test/junit/util/FocusEventCountAdapter.java | 3 +-
.../opengl/test/junit/util/NEWTFocusAdapter.java | 24 +-
.../opengl/test/junit/util/NEWTGLContext.java | 6 +-
src/test/jogamp/newt/WindowImplAccess.java | 16 +-
src/test/native/displayMultiple02.c | 86 ++-
tools/jackpotc/.gitignore | 1 +
tools/jackpotc/test/oldgears/.gitignore | 4 +
www/index.html | 13 +-
396 files changed, 14883 insertions(+), 6531 deletions(-)
diff --cc debian/changelog
index 1bb772a,0000000..2e5da4a
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,93 -1,0 +1,100 @@@
++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 4641289,0000000..055a845
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,326 -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-rc5-1~exp2), libgluegen2-rt-java (>= 2.0-rc5-1~exp2),
+ ant-optional, libgl1-mesa-dev, libglu1-mesa-dev, libxxf86vm-dev,
- x11proto-xf86vidmode-dev, libxt-dev, libgluegen2-build-java (>= 2.0-rc3-6),
++ x11proto-xf86vidmode-dev, libxt-dev, junit4, libswt-gtk-3-java,
+ ant-contrib, ant-contrib-cpptasks, libxinerama-dev, libxrandr-dev,
- libgluegen2-rt-java, junit4, libswt-gtk-3-java
++ ant (>= 1.8)
+Standards-Version: 3.9.2
+Homepage: http://jogamp.org/
+Vcs-Svn: svn+ssh://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, libjogl2-jni
+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/orig-tar.sh
index c9bf9e3,0000000..a1d4902
mode 100755,000000..100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@@ -1,26 -1,0 +1,23 @@@
+#!/bin/sh -e
- VERSION="2.0-rc3"
+
- DIR=libjogl2-java-$VERSION
- TAR=libjogl2-java_$VERSION.orig.tar.gz
++VERSION=$2
++DIR=jogl-v$VERSION
++TAR=libjogl2-java_$VERSION.orig.tar.bz2
+
+# clean up the upstream tarball
-
- git clone git://jogamp.org/srv/scm/jogl.git $DIR
- cd $DIR
- git checkout $VERSION
- rm $(find . -name .gitignore)
- rm -rf .git .htaccess make/lib/
++p7zip -d $3
++tar xvf jogl-v$VERSION.tar
++cd $DIR*
++rm -rf .gitignore .htaccess make/lib/
+cd ..
- tar zcvf $TAR $DIR
- rm -rf $DIR
- mv $TAR ../../
++tar jcvf ../$TAR $DIR
++rm -rf $DIR jogl-v$VERSION.tar
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $TAR $origDir
+ echo "moved $TAR to $origDir"
+fi
+
+exit 0
diff --cc debian/patches/disable_android_3.diff
index 0000000,0000000..53302a3
new file mode 100644
--- /dev/null
+++ b/debian/patches/disable_android_3.diff
@@@ -1,0 -1,0 +1,64 @@@
++Index: libjogl2-java-2.0-rc5/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java
++===================================================================
++--- libjogl2-java-2.0-rc5.orig/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java 2011-12-19 03:43:56.000000000 +0100
+++++ libjogl2-java-2.0-rc5/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java 2011-12-26 10:06:08.266867194 +0100
++@@ -200,23 +200,23 @@
++ st.uniform(gl, pmvMatrixUniform);
++ st.useProgram(gl, false);
++
++- if(useAndroidDebug) {
+++/* if(useAndroidDebug) {
++ try {
++ android.os.Debug.startMethodTracing("GearsES2.trace");
++ // android.os.Debug.startAllocCounting();
++ useAndroidDebug = true;
++ } catch (NoClassDefFoundError e) { useAndroidDebug=false; }
++- }
+++ }*/
++
++ System.err.println(Thread.currentThread()+" GearsES2.reshape FIN");
++ }
++ private boolean useAndroidDebug = false;
++
++ public void dispose(GLAutoDrawable drawable) {
++- if(useAndroidDebug) {
+++/* if(useAndroidDebug) {
++ // android.os.Debug.stopAllocCounting();
++ android.os.Debug.stopMethodTracing();
++- }
+++ }*/
++
++ System.err.println(Thread.currentThread()+" GearsES2.dispose ... ");
++ if (drawable instanceof Window) {
++Index: libjogl2-java-2.0-rc5/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java
++===================================================================
++--- libjogl2-java-2.0-rc5.orig/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java 2011-12-19 03:43:56.000000000 +0100
+++++ libjogl2-java-2.0-rc5/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/RedSquareES2.java 2011-12-26 10:01:49.134860058 +0100
++@@ -172,23 +172,23 @@
++ st.uniform(gl, pmvMatrixUniform);
++ st.useProgram(gl, false);
++
++- if(useAndroidDebug) {
+++/* if(useAndroidDebug) {
++ try {
++ android.os.Debug.startMethodTracing("RedSquareES2.trace");
++ // android.os.Debug.startAllocCounting();
++ useAndroidDebug = true;
++ } catch (NoClassDefFoundError e) { useAndroidDebug=false; }
++- }
+++ }*/
++
++ System.err.println(Thread.currentThread()+" RedSquareES2.reshape FIN");
++ }
++ private boolean useAndroidDebug = false;
++
++ public void dispose(GLAutoDrawable glad) {
++- if(useAndroidDebug) {
+++/* if(useAndroidDebug) {
++ // android.os.Debug.stopAllocCounting();
++ android.os.Debug.stopMethodTracing();
++- }
+++ }*/
++ System.err.println(Thread.currentThread()+" RedSquareES2.dispose ... ");
++ if (null != glWindow) {
++ glWindow.removeMouseListener(myMouse);
diff --cc debian/patches/otherArchsoswin_2.diff
index f822676,0000000..5b5fdb3
mode 100644,000000..100644
--- a/debian/patches/otherArchsoswin_2.diff
+++ b/debian/patches/otherArchsoswin_2.diff
@@@ -1,128 -1,0 +1,126 @@@
- Index: libjogl2-java-2.0-rc3/make/build-nativewindow.xml
++Index: jogl-v2.0-rc5/make/build-nativewindow.xml
+===================================================================
- --- libjogl2-java-2.0-rc3.orig/make/build-nativewindow.xml 2011-11-20 17:10:07.000000000 +0100
- +++ libjogl2-java-2.0-rc3/make/build-nativewindow.xml 2011-11-20 21:34:35.923874821 +0100
- @@ -380,10 +380,10 @@
++--- jogl-v2.0-rc5.orig/make/build-nativewindow.xml 2011-12-26 01:56:35.000000000 +0100
+++++ jogl-v2.0-rc5/make/build-nativewindow.xml 2011-12-26 01:57:04.666059156 +0100
++@@ -398,10 +398,10 @@
+ </linker>
+
+ <linker id="linker.cfg.linux.armv7.nativewindow.x11" extends="linker.cfg.linux.armv7">
+- <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11" />
+- <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xxf86vm" />
+- <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xinerama" />
+- <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xrender" />
++ <syslibset libs="X11" />
++ <syslibset libs="Xxf86vm" />
++ <syslibset libs="Xinerama" />
++ <syslibset libs="Xrender" />
+ </linker>
+
+ <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris">
- @@ -627,6 +627,7 @@
++@@ -668,6 +668,7 @@
+ </patternset>
+
+ <echo message="Compiling @{output.lib.name}" />
++ <echo message="java.lib.dir.platform: ${java.lib.dir.platform}" />
+
+ <!-- have to wrap cc task with outofdate, because otherwise cc links a new library
+ even when no files have been compiled -->
- @@ -666,7 +667,7 @@
++@@ -707,7 +708,7 @@
+ <!-- This must come last to not override real include paths -->
+ <!-- includepath path="stub_includes/macosx" if="isOSX" / -->
+ </compiler>
+-
++
+ <linker extends="@{linker.cfg.id}">
+ <syslibset dir="${java.lib.dir.platform}" libs="jawt" if="@{output.lib.name}.useLibJAWT"/>
+ <syslibset dir="${java.lib.dir.platform}/server" libs="jvm" if="@{output.lib.name}.useLibJVM"/>
- Index: libjogl2-java-2.0-rc3/make/build-newt.xml
++Index: jogl-v2.0-rc5/make/build-newt.xml
+===================================================================
- --- libjogl2-java-2.0-rc3.orig/make/build-newt.xml 2011-11-20 17:10:07.000000000 +0100
- +++ libjogl2-java-2.0-rc3/make/build-newt.xml 2011-11-20 18:44:37.728372518 +0100
- @@ -274,9 +274,9 @@
++--- jogl-v2.0-rc5.orig/make/build-newt.xml 2011-12-26 01:56:33.000000000 +0100
+++++ jogl-v2.0-rc5/make/build-newt.xml 2011-12-26 01:58:23.326061322 +0100
++@@ -271,8 +271,8 @@
+ </linker>
+
+ <linker id="linker.cfg.linux.armv7.newt.x11" extends="linker.cfg.linux.armv7">
+- <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11" />
+- <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xrandr" />
- - <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xxf86vm" />
++ <syslibset libs="X11" />
++ <syslibset libs="Xrandr" />
- + <syslibset libs="Xxf86vm" />
+ </linker>
+
+ <linker id="linker.cfg.android.newt" extends="linker.cfg.android">
- @@ -367,13 +367,73 @@
++@@ -368,13 +368,73 @@
+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
+ </target>
+
++ <target name="c.configure.linux.hppa" if="isLinuxHppa">
++ <echo message="Linux.hppa" />
++ <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.mips" if="isLinuxMips">
++ <echo message="Linux.mips" />
++ <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.mipsel" if="isLinuxMipsel">
++ <echo message="Linux.mips" />
++ <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.ppc" if="isLinuxPpc">
++ <echo message="Linux.ppc" />
++ <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.s390" if="isLinuxs390">
++ <echo message="Linux.S390" />
++ <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" />
++ <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.ia64" if="isLinuxIA64">
+ <echo message="Linux.IA64" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" />
+ </target>
+
+- <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv7,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
++ <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv7,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
+
+ <target name="c.configure.android" if="isAndroid">
+ <echo message="Android" />
diff --cc debian/patches/series
index 73312fa,0000000..e2f565c
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,10 -1,0 +1,11 @@@
+variousFixes.diff
+#disableOneDir.diff
+swt.diff
+otherArchsoswin.diff
+disable_android.diff
+disable_git_call.diff
+disable_android_2.diff
+arch_naming.diff
+linker.cfg.id.os.diff
+otherArchsoswin_2.diff
++disable_android_3.diff
diff --cc debian/patches/swt.diff
index 3ceef9d,0000000..97980a6
mode 100644,000000..100644
--- a/debian/patches/swt.diff
+++ b/debian/patches/swt.diff
@@@ -1,21 -1,0 +1,21 @@@
- Index: jogl-v2.0-rc2/make/build-common.xml
++Index: jogl-v2.0-rc5/make/build-common.xml
+===================================================================
- --- jogl-v2.0-rc2.orig/make/build-common.xml 2011-04-19 09:40:43.000000000 +0200
- +++ jogl-v2.0-rc2/make/build-common.xml 2011-04-19 09:42:06.000000000 +0200
- @@ -130,14 +130,8 @@
- <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86/swt-debug.jar">
- <istrue value="${isWindowsX86}" />
++--- jogl-v2.0-rc5.orig/make/build-common.xml 2011-12-26 02:00:28.000000000 +0100
+++++ jogl-v2.0-rc5/make/build-common.xml 2011-12-26 02:00:34.658064939 +0100
++@@ -133,14 +133,8 @@
++ <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-freebsd-x86_64/swt.jar">
++ <istrue value="${isFreeBSDAMD64}" />
+ </condition>
+- <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86_64/swt-debug.jar">
+- <istrue value="${isLinuxAMD64}" />
+- </condition>
+- <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar">
+- <istrue value="${isLinuxX86}" />
+- </condition>
+- <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar">
+- <istrue value="${isLinuxARMv7}" /> <!-- FIXME JAU .. hack -->
++ <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 -->
diff --cc debian/rules
index d723cba,0000000..7605657
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,24 -1,0 +1,28 @@@
+#!/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
+DEB_ANT_CLEAN_TARGET := clean
+DEB_ANT_BUILD_TARGET := all
+DEB_ANT_BUILDFILE := make/build.xml
+
++common-build-indep:: doc-build
++doc-build:
++ $(DEB_ANT_INVOKE) javadoc.all
++
+common-install-prehook-indep::
+ mv build/jar/jogl.all.jar build/jar/jogl2.jar
+
+install/libjogl2-java-doc::
+ $(DEB_ANT_INVOKE) javadoc.all
+
+clean::
+ $(RM) -r gluegen/build
+
+get-orig-source::
+ -uscan --upstream-version 0
diff --cc debian/watch
index 5e771f4,0000000..3e7b072
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,7 -1,0 +1,4 @@@
+version=3
- #opts="uversionmangle=s/-rc/~rc/,dversionmangle=s/\+dak\d+$//" \
- #http://download.java.net/media/jogl/builds/archive/jsr-231-([\d\.]+)/ \
- #jogl-([\d\.]+)-src\.zip debian debian/orig-tar.sh
- http://download.java.net/media/jogl/builds/archive/jsr-231-(.*)/ \
- jogl-(.*)-src\.zip debian debian/orig-tar.sh
++http://jogamp.org/deployment/jogamp-current/archive/Sources/ jogl-v(.*).tar.7z \
++debian debian/orig-tar.sh
+
--
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