[libjogl2-java] 54/58: Imported Debian patch 2.1.5-1
Tony Mancill
tmancill at moszumanska.debian.org
Thu Sep 4 03:59:30 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 61346bc1408a9a1fc4e6bff69a8e1c2c741cc7f9
Merge: 4be5974 5698a91
Author: Sylvestre Ledru <sylvestre at debian.org>
Date: Mon Mar 24 14:33:05 2014 +0100
Imported Debian patch 2.1.5-1
debian/changelog | 7 +
debian/control | 4 +-
debian/patches/add-ports.diff | 147 +++++++++++
debian/patches/series | 1 +
doc/HowToBuild.html | 13 +-
doc/Platforms.txt | 28 ++
make/config/jogl/gl-common-gpubufferonly.cfg | 1 +
make/config/jogl/gl-common.cfg | 1 +
.../jogl/gl4bc-common-cpubufferJavaCode.java | 4 +
make/config/jogl/glx-CustomCCode.c | 69 ++++-
make/config/jogl/glx-CustomJavaCode.java | 19 ++
make/config/jogl/glx-x11.cfg | 2 +
make/config/jogl/glxext.cfg | 2 +-
make/scripts/make.jogl.all.macosx-clang.sh | 1 +
make/scripts/tests-win.bat | 6 +-
make/scripts/tests-x64-dbg.bat | 5 +-
make/scripts/tests.sh | 27 +-
.../com/jogamp/graph/curve/opengl/RenderState.java | 6 +-
.../com/jogamp/graph/curve/opengl/Renderer.java | 8 +
.../com/jogamp/opengl/util/GLDrawableUtil.java | 21 ++
.../com/jogamp/opengl/util/GLPixelBuffer.java | 14 +-
.../jogamp/opengl/util/GLPixelStorageModes.java | 70 ++---
.../com/jogamp/opengl/util/GLReadBufferUtil.java | 35 ++-
.../com/jogamp/opengl/util/PNGPixelRect.java | 80 +++++-
.../com/jogamp/opengl/util/TileRendererBase.java | 15 +-
.../com/jogamp/opengl/util/av/GLMediaPlayer.java | 8 +-
.../opengl/util/awt/AWTGLReadBufferUtil.java | 46 +++-
.../com/jogamp/opengl/util/texture/TextureIO.java | 40 ++-
.../opengl/util/texture/TextureSequence.java | 12 +-
src/jogl/classes/javax/media/opengl/GLBase.java | 14 +-
src/jogl/classes/javax/media/opengl/GLContext.java | 13 +-
src/jogl/classes/javax/media/opengl/GLProfile.java | 141 +++++++---
.../classes/javax/media/opengl/awt/GLCanvas.java | 4 +-
.../classes/javax/media/opengl/awt/GLJPanel.java | 127 ++++++---
.../jogamp/graph/curve/opengl/RenderStateImpl.java | 4 -
.../jogamp/opengl/GLBufferObjectTracker.java | 4 +-
src/jogl/classes/jogamp/opengl/GLContextImpl.java | 14 +-
src/jogl/classes/jogamp/opengl/GLDrawableImpl.java | 4 +-
.../classes/jogamp/opengl/GLFBODrawableImpl.java | 4 +-
src/jogl/classes/jogamp/opengl/GLStateTracker.java | 16 +-
.../jogamp/opengl/openal/av/ALAudioSink.java | 286 ++++++++++++++-------
.../jogamp/opengl/util/av/GLMediaPlayerImpl.java | 4 +-
.../jogamp/opengl/util/av/impl/FFMPEGNatives.java | 43 ++--
.../opengl/util/av/impl/FFMPEGv08Natives.java | 34 +--
.../opengl/util/av/impl/FFMPEGv09Natives.java | 34 +--
.../opengl/util/av/impl/FFMPEGv10Natives.java | 34 +--
.../jogamp/opengl/util/jpeg/JPEGDecoder.java | 167 +++++-------
.../x11/glx/X11GLXGraphicsConfiguration.java | 39 ++-
.../glx/X11GLXGraphicsConfigurationFactory.java | 8 +-
src/jogl/native/libav/ffmpeg_impl_template.c | 131 +++++++---
src/jogl/native/libav/ffmpeg_tool.h | 1 -
.../com/jogamp/nativewindow/awt/JAWTWindow.java | 49 ++--
.../media/nativewindow/NativeWindowFactory.java | 23 +-
.../media/nativewindow/util/PixelFormatUtil.java | 3 +-
.../jogamp/nativewindow/SurfaceUpdatedHelper.java | 25 +-
.../classes/jogamp/nativewindow/awt/AWTMisc.java | 19 +-
.../classes/jogamp/nativewindow/jawt/JAWTUtil.java | 95 ++++---
.../classes/com/jogamp/newt/awt/NewtCanvasAWT.java | 4 +-
.../classes/com/jogamp/newt/opengl/GLWindow.java | 40 +--
.../classes/com/jogamp/newt/swt/NewtCanvasSWT.java | 32 ++-
src/newt/classes/jogamp/newt/DisplayImpl.java | 3 +-
src/newt/classes/jogamp/newt/WindowImpl.java | 46 ++--
src/newt/native/MacWindow.m | 20 +-
.../opengl/test/android/MovieCubeActivity0.java | 47 ++--
.../test/junit/graph/TextRendererGLELBase.java | 195 ++++++++++++++
.../test/junit/jogl/acore/GLReadBuffer00Base.java | 117 +++++++++
.../jogl/acore/TestGLReadBuffer01GLCanvasAWT.java | 252 ++++++++++++++++++
.../jogl/acore/TestGLReadBuffer01GLJPanelAWT.java | 254 ++++++++++++++++++
.../jogl/acore/TestGLReadBuffer01GLWindowNEWT.java | 195 ++++++++++++++
.../junit/jogl/acore/TestMapBufferRead01NEWT.java | 82 ++++--
.../jogl/demos/es2/TextureSequenceCubeES2.java | 6 +-
.../junit/jogl/demos/es2/av/CrossFadePlayer.java | 211 +++++++++++++++
.../test/junit/jogl/demos/es2/av/MovieCube.java | 127 ++++++++-
.../test/junit/jogl/demos/es2/av/MovieSimple.java | 136 +++++++---
.../junit/newt/parenting/TestParenting01NEWT.java | 83 +++++-
.../jogamp/opengl/test/junit/util/UITestCase.java | 76 +++---
76 files changed, 3165 insertions(+), 793 deletions(-)
diff --cc debian/changelog
index 9337ede,0000000..87f5060
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,269 -1,0 +1,276 @@@
++libjogl2-java (2.1.5-1) unstable; urgency=medium
++
++ * New upstream release
++ * Cherry-pick of the add-port.diff patch
++
++ -- Sylvestre Ledru <sylvestre at debian.org> Mon, 24 Mar 2014 14:33:05 +0100
++
+libjogl2-java (2.1.4-1) unstable; urgency=medium
+
+ * New upstream release
+ * Disable the build of com/jogamp/newt/util/applet/
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Thu, 27 Feb 2014 23:42:51 +0100
+
+libjogl2-java (2.1.3-2) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Add patch (alpha.diff) to allow compilation on alpha. (Closes: #739397)
+ - Thanks to Michael Cree for the patch.
+
+ -- tony mancill <tmancill at debian.org> Tue, 18 Feb 2014 21:22:22 -0800
+
+libjogl2-java (2.1.3-1) unstable; urgency=low
+
+ * New upstream release
+ * Repack script updated to remove www/
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Tue, 17 Dec 2013 09:26:26 +0100
+
+libjogl2-java (2.1.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Fri, 08 Nov 2013 10:53:16 +0100
+
+libjogl2-java (2.0.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sat, 28 Sep 2013 19:08:07 +0200
+
+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 fe28330,0000000..4b3e038
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,92 -1,0 +1,92 @@@
+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.1.3), libgluegen2-rt-java (>= 2.1.4),
++ libgluegen2-build-java (>= 2.1.3), libgluegen2-rt-java (>= 2.1.5),
+ 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), libxcursor-dev
+Standards-Version: 3.9.5
+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.1.4), libjogl2-jni (>= ${source:Version})
++ libgluegen2-rt-java (>= 2.1.5), 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-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/add-ports.diff
index 0000000,0000000..aa56fbb
new file mode 100644
--- /dev/null
+++ b/debian/patches/add-ports.diff
@@@ -1,0 -1,0 +1,147 @@@
++Index: b/make/build-jogl.xml
++===================================================================
++--- a/make/build-jogl.xml
+++++ b/make/build-jogl.xml
++@@ -1329,6 +1329,12 @@
++ <property name="linker.cfg.id.os" value="linker.cfg.linux.arm.jogl.x11" />
++ </target>
++
+++ <target name="c.configure.linux.aarch64" if="isLinuxAarch64">
+++ <echo message="Linux.aarch64" />
+++ <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.ia64" if="isLinuxIA64">
++ <echo message="Linux.IA64" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
++@@ -1359,6 +1365,18 @@
++ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" />
++ </target>
++
+++ <target name="c.configure.linux.ppc64" if="isLinuxPpc64">
+++ <echo message="Linux.PPC64" />
+++ <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.ppc64le" if="isLinuxPpc64le">
+++ <echo message="Linux.PPC64le" />
+++ <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.s390" if="isLinuxs390">
++ <echo message="Linux.S390" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
++@@ -1377,7 +1395,7 @@
++ <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" />
++ </target>
++
++- <target name="c.configure.linux" depends="c.configure.linux.arm,c.configure.linux.x86,c.configure.linux.alpha,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.aarch64,c.configure.linux.x86,c.configure.linux.alpha,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.ppc64,c.configure.linux.ppc64le,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: b/make/build-nativewindow.xml
++===================================================================
++--- a/make/build-nativewindow.xml
+++++ b/make/build-nativewindow.xml
++@@ -508,6 +508,12 @@
++ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.arm.nativewindow.x11" />
++ </target>
++
+++ <target name="c.configure.linux.aarch64" if="isLinuxAarch64">
+++ <echo message="Linux.Aarch64" />
+++ <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.ia64" if="isLinuxIA64">
++ <echo message="Linux.IA64" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
++@@ -538,6 +544,18 @@
++ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" />
++ </target>
++
+++ <target name="c.configure.linux.ppc64" if="isLinuxPpc64">
+++ <echo message="Linux.PPC64" />
+++ <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.ppc64le" if="isLinuxPpc64le">
+++ <echo message="Linux.PPC64le" />
+++ <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.s390" if="isLinuxs390">
++ <echo message="Linux.S390" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
++@@ -556,7 +574,7 @@
++ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" />
++ </target>
++
++- <target name="c.configure.linux" depends="c.configure.linux.arm,c.configure.linux.x86,c.configure.linux.alpha,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.aarch64,c.configure.linux.x86,c.configure.linux.alpha,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.ppc64,c.configure.linux.ppc64le,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: b/make/build-newt.xml
++===================================================================
++--- a/make/build-newt.xml
+++++ b/make/build-newt.xml
++@@ -453,6 +453,16 @@
++ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
++ </target>
++
+++ <target name="c.configure.linux.aarch64" if="isLinuxAarch64">
+++ <echo message="Linux.aarch64" />
+++ <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.hppa" if="isLinuxHppa">
++ <echo message="Linux.hppa" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
++@@ -493,6 +503,26 @@
++ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
++ </target>
++
+++ <target name="c.configure.linux.ppc64" if="isLinuxPpc64">
+++ <echo message="Linux.ppc64" />
+++ <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.ppc64le" if="isLinuxPpc64le">
+++ <echo message="Linux.ppc64le" />
+++ <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" />
++@@ -529,7 +559,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.alpha,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.linux" depends="c.configure.linux.arm,c.configure.linux.aarch64,c.configure.linux.x86,c.configure.linux.alpha,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.ppc64,c.configure.linux.ppc64le,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 --cc debian/patches/series
index 9bef941,0000000..f9d787b
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,17 -1,0 +1,18 @@@
+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
+manifest.diff
+s390x.diff
+arm-build.diff
+disable-applet.diff
+alpha.diff
+
++add-ports.diff
--
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