Author: twerner Date: 2009-06-29 17:48:59 +0000 (Mon, 29 Jun 2009) New Revision: 8664
Added: trunk/libjogl-java/ trunk/libjogl-java/debian/ trunk/libjogl-java/debian/README.Debian trunk/libjogl-java/debian/ant.properties trunk/libjogl-java/debian/changelog trunk/libjogl-java/debian/compat trunk/libjogl-java/debian/control trunk/libjogl-java/debian/copyright trunk/libjogl-java/debian/libjogl-java-doc.docs trunk/libjogl-java/debian/orig-tar.sh trunk/libjogl-java/debian/patches/ trunk/libjogl-java/debian/patches/build-java.diff trunk/libjogl-java/debian/patches/build.diff trunk/libjogl-java/debian/patches/cg-common.cfg.diff trunk/libjogl-java/debian/patches/defaultDebianPath.diff trunk/libjogl-java/debian/patches/series trunk/libjogl-java/debian/rules trunk/libjogl-java/debian/watch Log: move package to pkg-java Added: trunk/libjogl-java/debian/README.Debian =================================================================== --- trunk/libjogl-java/debian/README.Debian (rev 0) +++ trunk/libjogl-java/debian/README.Debian 2009-06-29 17:48:59 UTC (rev 8664) @@ -0,0 +1,8 @@ +The homepage of jogl is <http://jogl.dev.java.net>. Please check the +licence of the package if you are about to upload a new upstream version +of the package to the Debian archive. If the licence has changed in a +way that forbids autobuilding the package you have to contact Andreas +Barth <[email protected]> before uploading it. + + -- Torsten Werner <[email protected]> + Added: trunk/libjogl-java/debian/ant.properties =================================================================== --- trunk/libjogl-java/debian/ant.properties (rev 0) +++ trunk/libjogl-java/debian/ant.properties 2009-06-29 17:48:59 UTC (rev 8664) @@ -0,0 +1,54 @@ +############################################################################### +# The host specific properties. The build will inform you of required +# properties. This file must be copied into your home directory (pointed +# to by the Java system property user.home) and the copy modified appropriately. +############################################################################### +# +# java.home.dir is usually inferred from the java.home variable. +# If it appears the build is failing because of an inability to +# find e.g. JAWT or JNI headers, override this to point to the +# root directory of your JDK. +# +# java.home.dir=C:/jdk1.4.2 + +# If you are building on Windows and have the Microsoft Visual C++ +# compilers installed, you can choose an alternate compiler with which +# to build the JOGL native code. Valid strings here are "vc6", "vc7", +# "vc8", and "mingw". +win32.c.compiler=vc6 + +# If you are building on a Mac OS X system supporting +# cross-compilation and want to generate fat (PPC and x86) binaries, +# uncomment the property below +# macosxfat=true + +# +# If you are building the Cg binding (by specifying -Djogl.cg=1 to the +# Ant build) and have installed the Cg SDK in somewhere other than the +# default location, modify the appropriate variable to point to the +# absolute path of the lib directory +# +windows.cg.lib=C:/Program Files/Nvidia Corporation/Cg/lib +x11.cg.lib=/usr/lib + +# +# The required antlr.jar property that is the full path to the antlr.jar +# including the name of the jar +# +# Windows +#antlr.jar=C:/Users/kbr/ANTLR/antlr-2.7.2/antlr.jar +# Linux +# antlr.jar=/home/kbr/antlr-2.7.2/antlr.jar +# Mac OS X +# antlr.jar=/Users/kbr/antlr-2.7.2/antlr.jar +# Solaris +# antlr.jar=/export/kbr/ANTLR/antlr-2.7.2/antlr.jar + +antlr.jar=/usr/share/java/antlrall.jar + +# commented because cg lib is not available under Debian +# jogl.cg=1 + + + +user.properties.file=true Added: trunk/libjogl-java/debian/changelog =================================================================== --- trunk/libjogl-java/debian/changelog (rev 0) +++ trunk/libjogl-java/debian/changelog 2009-06-29 17:48:59 UTC (rev 8664) @@ -0,0 +1,135 @@ +libjogl-java (1.1.1+dak1-5) unstable; urgency=low + + * Standards-Version updated to version 3.8.1 + * Disable the build of the javadoc under arm mipsel mips armel because of + a timeout issue + * Also handle the antlr package as dep (to simplify the backport) + + -- Sylvestre Ledru <[email protected]> Fri, 01 May 2009 12:40:17 +0200 + +libjogl-java (1.1.1+dak1-4) unstable; urgency=low + + * javadoc had problems to find gluegen when building the doc of jogl + * misc depends added + * /usr/lib/jni & /usr/lib64/jni are now scanned automatically by jogl on + startup (Closes: #509721) + + -- Sylvestre Ledru <[email protected]> Mon, 29 Dec 2008 12:04:05 +0100 + +libjogl-java (1.1.1+dak1-3) experimental; urgency=low + + * Dep to antlr changed to libantlr-java and move to build-depends + (instead of Build-Depends-Indep) (Closes: #503676) + + -- Sylvestre Ledru <[email protected]> Mon, 27 Oct 2008 15:14:48 +0100 + +libjogl-java (1.1.1+dak1-2) experimental; urgency=low + + [ Torsten Werner ] + * Remove header XS-Autobuild from debian/control because the package is in + main now. + + [ Sylvestre Ledru ] + * Standards-Version updated to version 3.8.0 + * jogl is now built with OpenJDK + * Update of the ant tasks files to build on the Debian archs (=> + experimental) (Closes: #503380) + + -- Sylvestre Ledru <[email protected]> Sun, 26 Oct 2008 19:41:44 +0100 + +libjogl-java (1.1.1+dak1-1) unstable; urgency=low + + [ Sylvestre Ledru ] + * Update debian/copyright to the SGI Free Software License B, version 2.0. + See: + http://www.sgi.com/company_info/newsroom/press_releases/2008/september/opengl.html + Thanks to this change (JoGL is based on code from mesa), this package + is now free. + * Package moving to main instead of non-free + + [ Torsten Werner ] + * Fake a new upstream version because of a bug in dak. + + -- Torsten Werner <[email protected]> Sun, 21 Sep 2008 19:39:02 +0200 + +libjogl-java (1.1.1-2) unstable; urgency=low + + * Missing detection of the PowerPC in the Java code. Thanks Michel + Dänzer (Closes: #499248) + + -- Sylvestre Ledru <[email protected]> Wed, 17 Sep 2008 13:28:09 +0200 + +libjogl-java (1.1.1-1) unstable; urgency=low + + [ Sylvestre Ledru ] + * New upstream version + + [ Torsten Werner ] + * Add DM-Upload-Allowed: yes to enable uploads by Sylvestre. + + -- Sylvestre Ledru <[email protected]> Tue, 27 May 2008 15:23:43 +0200 + +libjogl-java (1.1.1~rc8-4) unstable; urgency=low + + * Build dep java-gcj-compat-dev changed to default-jdk-builddep + (Closes: #477876) + * JAVA_HOME changed to /usr/lib/jvm/default-java + + -- Sylvestre Ledru <[email protected]> Sat, 26 Apr 2008 00:04:30 +0200 + +libjogl-java (1.1.1~rc8-3) unstable; urgency=low + + * Extended detection of PPC. (Closes: #465724) + + -- Sylvestre Ledru <[email protected]> Sun, 09 Mar 2008 18:48:38 +0100 + +libjogl-java (1.1.1~rc8-2) unstable; urgency=low + + * Add support for cpu ppc. (Closes: #465724) + + -- Torsten Werner <[email protected]> Fri, 07 Mar 2008 20:33:22 +0100 + +libjogl-java (1.1.1~rc8-1) unstable; urgency=low + + [ Sylvestre Ledru ] + * New upstream version + * Better watch file + + [ Torsten Werner ] + * Make Depends: libjogl-jni versioned. + + -- Torsten Werner <[email protected]> Thu, 28 Feb 2008 22:48:21 +0100 + +libjogl-java (1.1.1~rc7-4) unstable; urgency=low + + * PowerPC arch detection was missing (Closes: #465724) + + -- Sylvestre Ledru <[email protected]> Sat, 16 Feb 2008 16:53:19 +0100 + +libjogl-java (1.1.1~rc7-3) unstable; urgency=low + + * FTBFS issue fixed (some Build-Depends were in Build-Depends-Indep), thanks + Michael Koch (closes: #460126) + + -- Sylvestre Ledru <[email protected]> Thu, 10 Jan 2008 22:35:55 +0100 + +libjogl-java (1.1.1~rc7-2) unstable; urgency=low + + [ Sylvestre Ledru ] + * A library was missing + * Clean ant target added + * Facilitate the future use of Cg (C for Graphics from NVIDIA) when/if + available + * Updated to Standards-Version: 3.7.3 (no changes needed). + + [ Torsten Werner ] + * Enable autobuilding the non-free package. + + -- Torsten Werner <[email protected]> Sat, 29 Dec 2007 13:58:15 +0100 + +libjogl-java (1.1.1~rc7-1) unstable; urgency=low + + * Initial Release (closes: #337828, #456177) + + -- Sylvestre Ledru <[email protected]> Thu, 13 Dec 2007 16:26:17 +0100 + Added: trunk/libjogl-java/debian/compat =================================================================== --- trunk/libjogl-java/debian/compat (rev 0) +++ trunk/libjogl-java/debian/compat 2009-06-29 17:48:59 UTC (rev 8664) @@ -0,0 +1 @@ +5 Added: trunk/libjogl-java/debian/control =================================================================== --- trunk/libjogl-java/debian/control (rev 0) +++ trunk/libjogl-java/debian/control 2009-06-29 17:48:59 UTC (rev 8664) @@ -0,0 +1,75 @@ +Source: libjogl-java +Section: libs +Priority: optional +Maintainer: Sylvestre Ledru <[email protected]> +Uploaders: Torsten Werner <[email protected]> +Build-Depends: debhelper (>= 5), cdbs, quilt, openjdk-6-jdk, + ant-optional, libgl1-mesa-dev, libglu1-mesa-dev, libxxf86vm-dev, + x11proto-xf86vidmode-dev, libxt-dev, +# antlr java packages started to exist at version 2.7.7-8. Before, it +# was included in the antlr package + libantlr-java | antlr ( <= 2.7.7-7 ) +Standards-Version: 3.8.1 +Homepage: http://jogl.dev.java.net +Vcs-Svn: https://bollin.googlecode.com/svn/libjogl-java/trunk +Vcs-Browser: http://bollin.googlecode.com/svn/libjogl-java/trunk +DM-Upload-Allowed: yes + +Package: libjogl-java +Architecture: all +Suggests: libjogl-java-doc +Depends: ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime, + libjogl-jni (>= ${source:Version}), + antlr +Description: Java bindings for OpenGL API (java library) + 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: libjogl-jni +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: Java bindings for OpenGL API (java jni library) + 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 part + for the Java bindings for OpenGL. For an extended description have a look + at package libjogl-java. + +Package: libjogl-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Suggests: libjogl-java +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 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 API documentation for JOGL package. Added: trunk/libjogl-java/debian/copyright =================================================================== --- trunk/libjogl-java/debian/copyright (rev 0) +++ trunk/libjogl-java/debian/copyright 2009-06-29 17:48:59 UTC (rev 8664) @@ -0,0 +1,156 @@ +This package was intially debianized by Wolfgang Baer <[email protected]> on +Fri, 4 Feb 2005 09:55:31 +0100. It has since been repackaged by Sylvestre Ledru +<[email protected]> on Fri, 07 Dec 2007 23:17:49 +0100. + +It was downloaded from <https://jogl.dev.java.net/> + +Copyright: + +Copyright (c) 2003 Sun Microsystems, Inc. + +Upstream Authors: Kenneth Bradley Russell + Christopher John Kline + and others + +License: + +This package is licensed under the terms of the Berkeley Software Distribution +(BSD) License. + +/* + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistribution of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistribution in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * Neither the name of Sun Microsystems, Inc. or the names of + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * This software is provided "AS IS," without a warranty of any kind. ALL + * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, + * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A + * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN + * MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR + * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR + * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR + * ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR + * DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE + * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, + * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF + * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * + * You acknowledge that this software is not designed or intended for use + * in the design, construction, operation or maintenance of any nuclear + * facility. + */ + +Some code is under the SGI Free Software License B V2.0 + +SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) + + Copyright (C) [dates of first publication] Silicon Graphics, Inc. All Rights + Reserved. + + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + The above copyright notice including the dates of first publication and either + this permission notice or a reference to http://oss.sgi.com/projects/FreeB/ + shall be included in all copies or substantial portions of the Software. + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL SILICON GRAPHICS, INC. BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR + IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + IN THE SOFTWARE. + Except as contained in this notice, the name of Silicon Graphics, Inc. shall + not be used in advertising or otherwise to promote the sale, use or other + dealings in this Software without prior written authorization from Silicon + Graphics, Inc. + +The files which are under this license are : +make/stub_includes/opengl/GL/glext.h +make/stub_includes/opengl/GL/glu.h +make/stub_includes/opengl/GL/glxext.h +make/stub_includes/opengl/GL/wglext.h +src/classes/com/sun/opengl/impl/error/Error.java +src/classes/com/sun/opengl/impl/glue/Glue.java +src/classes/com/sun/opengl/impl/GLUquadricImpl.java +src/classes/com/sun/opengl/impl/mipmap/BuildMipmap.java +src/classes/com/sun/opengl/impl/mipmap/Extract1010102.java +src/classes/com/sun/opengl/impl/mipmap/Extract1555rev.java +src/classes/com/sun/opengl/impl/mipmap/Extract2101010rev.java +src/classes/com/sun/opengl/impl/mipmap/Extract233rev.java +src/classes/com/sun/opengl/impl/mipmap/Extract332.java +src/classes/com/sun/opengl/impl/mipmap/Extract4444.java +src/classes/com/sun/opengl/impl/mipmap/Extract4444rev.java +src/classes/com/sun/opengl/impl/mipmap/Extract5551.java +src/classes/com/sun/opengl/impl/mipmap/Extract565.java +src/classes/com/sun/opengl/impl/mipmap/Extract565rev.java +src/classes/com/sun/opengl/impl/mipmap/Extract8888.java +src/classes/com/sun/opengl/impl/mipmap/Extract8888rev.java +src/classes/com/sun/opengl/impl/mipmap/ExtractFloat.java +src/classes/com/sun/opengl/impl/mipmap/Extract.java +src/classes/com/sun/opengl/impl/mipmap/ExtractPrimitive.java +src/classes/com/sun/opengl/impl/mipmap/ExtractSByte.java +src/classes/com/sun/opengl/impl/mipmap/ExtractSInt.java +src/classes/com/sun/opengl/impl/mipmap/ExtractSShort.java +src/classes/com/sun/opengl/impl/mipmap/ExtractUByte.java +src/classes/com/sun/opengl/impl/mipmap/ExtractUInt.java +src/classes/com/sun/opengl/impl/mipmap/ExtractUShort.java +src/classes/com/sun/opengl/impl/mipmap/HalveImage.java +src/classes/com/sun/opengl/impl/mipmap/Image.java +src/classes/com/sun/opengl/impl/mipmap/Mipmap.java +src/classes/com/sun/opengl/impl/mipmap/PixelStorageModes.java +src/classes/com/sun/opengl/impl/mipmap/ScaleInternal.java +src/classes/com/sun/opengl/impl/mipmap/Type_Widget.java +src/classes/com/sun/opengl/impl/nurbs/internals/Arc.java +src/classes/com/sun/opengl/impl/nurbs/internals/ArcTesselator.java +src/classes/com/sun/opengl/impl/nurbs/internals/Backend.java +src/classes/com/sun/opengl/impl/nurbs/internals/BasicCurveEvaluator.java +src/classes/com/sun/opengl/impl/nurbs/internals/BasicSurfaceEvaluator.java +src/classes/com/sun/opengl/impl/nurbs/internals/BezierArc.java +src/classes/com/sun/opengl/impl/nurbs/internals/Bin.java +src/classes/com/sun/opengl/impl/nurbs/internals/CachingEvaluator.java +src/classes/com/sun/opengl/impl/nurbs/internals/Defines.java +src/classes/com/sun/opengl/impl/nurbs/internals/NurbsConsts.java +src/classes/com/sun/opengl/impl/nurbs/internals/Subdivider.java +src/classes/com/sun/opengl/impl/Project.java +src/classes/com/sun/opengl/impl/registry/Registry.java +src/classes/com/sun/opengl/impl/tessellator/ActiveRegion.java +src/classes/com/sun/opengl/impl/tessellator/CachedVertex.java +src/classes/com/sun/opengl/impl/tessellator/Dict.java +src/classes/com/sun/opengl/impl/tessellator/DictNode.java +src/classes/com/sun/opengl/impl/tessellator/Geom.java +src/classes/com/sun/opengl/impl/tessellator/GLUface.java +src/classes/com/sun/opengl/impl/tessellator/GLUhalfEdge.java +src/classes/com/sun/opengl/impl/tessellator/GLUmesh.java +src/classes/com/sun/opengl/impl/tessellator/GLUtessellatorImpl.java +src/classes/com/sun/opengl/impl/tessellator/GLUvertex.java +src/classes/com/sun/opengl/impl/tessellator/Mesh.java +src/classes/com/sun/opengl/impl/tessellator/Normal.java +src/classes/com/sun/opengl/impl/tessellator/PriorityQHeap.java +src/classes/com/sun/opengl/impl/tessellator/PriorityQ.java +src/classes/com/sun/opengl/impl/tessellator/PriorityQSort.java +src/classes/com/sun/opengl/impl/tessellator/Render.java +src/classes/com/sun/opengl/impl/tessellator/Sweep.java +src/classes/com/sun/opengl/impl/tessellator/TessMono.java +src/classes/com/sun/opengl/impl/tessellator/TessState.java +src/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java +src/classes/javax/media/opengl/glu/GLUtessellatorCallback.java +src/classes/javax/media/opengl/glu/GLUtessellator.java + + Added: trunk/libjogl-java/debian/libjogl-java-doc.docs =================================================================== --- trunk/libjogl-java/debian/libjogl-java-doc.docs (rev 0) +++ trunk/libjogl-java/debian/libjogl-java-doc.docs 2009-06-29 17:48:59 UTC (rev 8664) @@ -0,0 +1,2 @@ +jogl/doc/userguide/ +jogl/javadoc_public Added: trunk/libjogl-java/debian/orig-tar.sh =================================================================== --- trunk/libjogl-java/debian/orig-tar.sh (rev 0) +++ trunk/libjogl-java/debian/orig-tar.sh 2009-06-29 17:48:59 UTC (rev 8664) @@ -0,0 +1,19 @@ +#!/bin/sh -e + +# called by uscan with '--upstream-version' <version> <file> +DIR=jogl-$2 +TAR=../libjogl-java_$2.orig.tar.gz + +# clean up the upstream tarball +unzip $3 -d $DIR +tar -c -z -f $TAR $DIR +rm -rf $DIR $3 + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $TAR $origDir + echo "moved $TAR to $origDir" +fi + +exit 0 Property changes on: trunk/libjogl-java/debian/orig-tar.sh ___________________________________________________________________ Added: svn:executable + Added: trunk/libjogl-java/debian/patches/build-java.diff =================================================================== --- trunk/libjogl-java/debian/patches/build-java.diff (rev 0) +++ trunk/libjogl-java/debian/patches/build-java.diff 2009-06-29 17:48:59 UTC (rev 8664) @@ -0,0 +1,85 @@ +diff -ur libjogl-java-1.1.1.orig/gluegen/src/java/com/sun/gluegen/runtime/CPU.java libjogl-java-1.1.1+dak1/gluegen/src/java/com/sun/gluegen/runtime/CPU.java +--- libjogl-java-1.1.1.orig/gluegen/src/java/com/sun/gluegen/runtime/CPU.java 2008-02-23 06:46:44.000000000 +0100 ++++ libjogl-java-1.1.1+dak1/gluegen/src/java/com/sun/gluegen/runtime/CPU.java 2008-10-26 23:56:09.000000000 +0100 +@@ -1,3 +1,4 @@ ++ + /* + * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved. + * +@@ -44,38 +45,27 @@ + running process. */ + + public class CPU { +- private static boolean is32Bit; ++ private static boolean is32Bit=true; ++ ++ static { ++ // We don't seem to need an AccessController.doPrivileged() block ++ // here as these system properties are visible even to unsigned ++ // applets ++ // Note: this code is replicated in StructLayout.java ++ String os = System.getProperty("os.name").toLowerCase(); ++ String cpu = System.getProperty("os.arch").toLowerCase(); ++ ++ if ((os.startsWith("windows") && cpu.equals("amd64")) || ++ (os.startsWith("linux") && cpu.indexOf("64") != -1) || ++ (os.startsWith("linux") && cpu.indexOf("alpha") != -1) || ++ (os.startsWith("mac os") && cpu.equals("x86_64")) || ++ (os.startsWith("sunos") && cpu.equals("sparcv9")) || ++ (os.startsWith("sunos") && cpu.equals("amd64"))) { ++ is32Bit=false; ++ } ++ } + +- static { +- // We don't seem to need an AccessController.doPrivileged() block +- // here as these system properties are visible even to unsigned +- // applets +- // Note: this code is replicated in StructLayout.java +- String os = System.getProperty("os.name").toLowerCase(); +- String cpu = System.getProperty("os.arch").toLowerCase(); +- if ((os.startsWith("windows") && cpu.equals("x86")) || +- (os.startsWith("linux") && cpu.equals("i386")) || +- (os.startsWith("linux") && cpu.equals("x86")) || +- (os.startsWith("mac os") && cpu.equals("ppc")) || +- (os.startsWith("mac os") && cpu.equals("i386")) || +- (os.startsWith("sunos") && cpu.equals("sparc")) || +- (os.startsWith("sunos") && cpu.equals("x86")) || +- (os.startsWith("freebsd") && cpu.equals("i386")) || +- (os.startsWith("hp-ux") && cpu.equals("pa_risc2.0"))) { +- is32Bit = true; +- } else if ((os.startsWith("windows") && cpu.equals("amd64")) || +- (os.startsWith("linux") && cpu.equals("amd64")) || +- (os.startsWith("linux") && cpu.equals("x86_64")) || +- (os.startsWith("linux") && cpu.equals("ia64")) || +- (os.startsWith("mac os") && cpu.equals("x86_64")) || +- (os.startsWith("sunos") && cpu.equals("sparcv9")) || +- (os.startsWith("sunos") && cpu.equals("amd64"))) { +- } else { +- throw new RuntimeException("Please port CPU detection (32/64 bit) to your platform (" + os + "/" + cpu + ")"); +- } +- } +- +- public static boolean is32Bit() { +- return is32Bit; +- } ++ public static boolean is32Bit() { ++ return is32Bit; ++ } + } +diff -ur libjogl-java-1.1.1.orig/gluegen/src/java/com/sun/gluegen/StructLayout.java libjogl-java-1.1.1+dak1/gluegen/src/java/com/sun/gluegen/StructLayout.java +--- libjogl-java-1.1.1.orig/gluegen/src/java/com/sun/gluegen/StructLayout.java 2008-02-23 06:46:44.000000000 +0100 ++++ libjogl-java-1.1.1+dak1/gluegen/src/java/com/sun/gluegen/StructLayout.java 2008-10-26 23:43:56.000000000 +0100 +@@ -127,11 +127,7 @@ + // It appears that Windows uses a packing alignment of 4 bytes in 32-bit mode + return new StructLayout(0, 4); + } else if ((os.startsWith("windows") && cpu.equals("amd64")) || +- (os.startsWith("linux") && cpu.equals("i386")) || +- (os.startsWith("linux") && cpu.equals("x86")) || +- (os.startsWith("linux") && cpu.equals("amd64")) || +- (os.startsWith("linux") && cpu.equals("x86_64")) || +- (os.startsWith("linux") && cpu.equals("ia64")) || ++ (os.startsWith("linux")) || + (os.startsWith("sunos") && cpu.equals("sparc")) || + (os.startsWith("sunos") && cpu.equals("sparcv9")) || + (os.startsWith("sunos") && cpu.equals("x86")) || Added: trunk/libjogl-java/debian/patches/build.diff =================================================================== --- trunk/libjogl-java/debian/patches/build.diff (rev 0) +++ trunk/libjogl-java/debian/patches/build.diff 2009-06-29 17:48:59 UTC (rev 8664) @@ -0,0 +1,182 @@ +--- jogl-1.1.1.orig/gluegen/make/build.xml 2008-05-14 18:54:48.000000000 +0200 ++++ jogl-1.1.1/gluegen/make/build.xml 2008-12-29 11:41:54.000000000 +0100 +@@ -222,11 +222,6 @@ + <property name="java.includes.dir.platform" value="${java.includes.dir}/win32" /> + </target> + +- <target name="declare.linux.x86" if="isLinuxX86"> +- <echo message="Linux.x86" /> +- <property name="compiler.cfg.id" value="compiler.cfg.linux" /> +- <property name="linker.cfg.id" value="linker.cfg.linux" /> +- </target> + + <target name="declare.linux.amd64" if="isLinuxAMD64"> + <echo message="Linux.AMD64" /> +@@ -239,8 +234,17 @@ + <property name="compiler.cfg.id" value="compiler.cfg.linux" /> + <property name="linker.cfg.id" value="linker.cfg.linux" /> + </target> ++ ++ <target name="declare.linux.ppc" if="isLinuxPPC"> ++ <echo message="Linux.ppc" /> ++ <property name="compiler.cfg.id" value="compiler.cfg.linux" /> ++ <property name="linker.cfg.id" value="linker.cfg.linux" /> ++ </target> + +- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64" if="isLinux" > ++ <target name="declare.linux" if="isLinux" > ++ <echo message="Linux" /> ++ <property name="compiler.cfg.id" value="compiler.cfg.linux" /> ++ <property name="linker.cfg.id" value="linker.cfg.linux" /> + <property name="c.src.dir" value="unix" /> + <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" /> + </target> +--- jogl-1.1.1.orig/gluegen/make/gluegen-cpptasks.xml 2008-02-08 20:47:30.000000000 +0100 ++++ jogl-1.1.1/gluegen/make/gluegen-cpptasks.xml 2008-12-29 11:41:54.000000000 +0100 +@@ -36,6 +36,7 @@ + - isLinuxAMD64 + - isLinuxIA64 + - isLinuxX86 ++ - isLinuxPPC + - isOSX + - isOSXPPC + - isOSXUniversal (if macosxfat=true) +@@ -161,33 +162,6 @@ + <condition property="isHPUX"> + <os name="HP-UX" /> + </condition> +- <condition property="isLinuxX86"> +- <and> +- <istrue value="${isLinux}" /> +- <or> +- <os arch="i386" /> +- <os arch="x86" /> +- </or> +- </and> +- </condition> +- <condition property="isLinuxAMD64"> +- <and> +- <istrue value="${isLinux}" /> +- <or> +- <os arch="AMD64" /> +- <os arch="x86_64" /> +- </or> +- </and> +- </condition> +- <condition property="isLinuxIA64"> +- <and> +- <istrue value="${isLinux}" /> +- <os arch="IA64" /> +- </and> +- </condition> +- <condition property="isIA64"> +- <os arch="IA64" /> +- </condition> + <condition property="isSolaris32Bit"> + <and> + <istrue value="${isSolaris}" /> +@@ -238,9 +212,7 @@ + <echo message="HPUX=${isHPUX}" /> + <echo message="IA64=${isIA64}" /> + <echo message="Linux=${isLinux}" /> +- <echo message="LinuxAMD64=${isLinuxAMD64}" /> +- <echo message="LinuxIA64=${isLinuxIA64}" /> +- <echo message="LinuxX86=${isLinuxX86}" /> ++ <echo message="Arch=${os.arch}" /> + <echo message="OS X=${isOSX}" /> + <echo message="Solaris=${isSolaris}" /> + <echo message="Solaris32Bit=${isSolaris32Bit}" /> +@@ -261,20 +233,10 @@ + <property name="os.and.arch" value="hpux-hppa" /> + </target> + +- <target name="gluegen.cpptasks.detect.os.linux.amd64" unless="gluegen.cpptasks.detected.os" if="isLinuxAMD64"> +- <property name="os.and.arch" value="linux-amd64" /> ++ <target name="gluegen.cpptasks.detect.os.linux" unless="gluegen.cpptasks.detected.os" if="isLinux"> ++ <property name="os.and.arch" value="linux-all" /> + </target> + +- <target name="gluegen.cpptasks.detect.os.linux.ia64" unless="gluegen.cpptasks.detected.os" if="isLinuxIA64"> +- <property name="os.and.arch" value="linux-ia64" /> +- </target> +- +- <target name="gluegen.cpptasks.detect.os.linux.x86" unless="gluegen.cpptasks.detected.os" if="isLinuxX86"> +- <property name="os.and.arch" value="linux-i586" /> +- </target> +- +- <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86" unless="gluegen.cpptasks.detected.os" /> +- + <target name="gluegen.cpptasks.detect.os.osx.ppc" unless="gluegen.cpptasks.detected.os" if="isOSXPPC"> + <property name="os.and.arch" value="macosx-ppc" /> + </target> +--- jogl-1.1.1.orig/jogl/make/build.xml 2008-04-29 17:18:50.000000000 +0200 ++++ jogl-1.1.1/jogl/make/build.xml 2008-12-29 11:58:59.000000000 +0100 +@@ -210,8 +210,10 @@ + <property name="java.includes.dir.freebsd" value="${java.includes.dir}/freebsd" /> + <property name="java.includes.dir.hpux" value="${java.includes.dir}/hp-ux" /> + <property name="java.lib.dir.win32" value="${java.home.dir}/lib" /> +- <property name="java.lib.dir.linux" value="${java.home.dir}/jre/lib/i386" /> ++ <property name="java.lib.dir.linux" value="${java.home.dir}/jre/lib/${os.arch}/" /> ++<!-- <property name="java.lib.dir.linux" value="${java.home.dir}/jre/lib/i386" />--> + <property name="java.lib.dir.linux.amd64" value="${java.home.dir}/jre/lib/amd64" /> ++ <property name="java.lib.dir.linux.ppc" value="${java.home.dir}/jre/lib/ppc" /> + <property name="java.lib.dir.linux.ia64" value="${java.home.dir}/jre/lib/ia64" /> + <property name="java.lib.dir.hpux" value="${java.home.dir}/jre/lib/PA_RISC2.0" /> + <condition property="cpu" value="sparc"> +@@ -369,6 +371,15 @@ + <property name="linker.cfg.id.core" value="linker.cfg.linux.amd64.jogl" /> + </target> + ++ <target name="declare.linux" if="isLinux"> ++ <echo message="Linux" /> ++ <property name="java.includes.dir.platform" value="${java.includes.dir.linux}" /> ++ <property name="java.lib.dir.platform" value="${java.lib.dir.linux}" /> ++ ++ <property name="compiler.cfg.id" value="compiler.cfg.linux" /> ++ <property name="linker.cfg.id.core" value="linker.cfg.linux.jogl" /> ++ </target> ++ + <target name="declare.linux.ia64" if="isLinuxIA64"> + <echo message="Linux.IA64" /> + <property name="java.includes.dir.platform" value="${java.includes.dir.linux}" /> +@@ -378,7 +389,6 @@ + <property name="linker.cfg.id.core" value="linker.cfg.linux.jogl" /> + </target> + +- <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.x11" if="isLinux" /> + + <target name="declare.solaris32" depends="declare.x11" if="isSolaris32Bit"> + <echo message="Solaris" /> +@@ -727,20 +737,19 @@ + <compiler id="compiler.cfg.freebsd.jogl" extends="compiler.cfg.freebsd"> + <!-- Need to force X11R6 headers on to include path after stub_includes --> + <includepath path="stub_includes/opengl"/> +- <includepath path="/usr/X11R6/include" /> + </compiler> + + <!-- linker configuration --> + + <linker id="linker.cfg.linux.jogl" extends="linker.cfg.linux"> +- <syslibset dir="/usr/X11R6/lib" libs="GL, X11"/> +- <syslibset dir="/usr/X11R6/lib" libs="Xxf86vm" /> ++ <syslibset libs="GL, X11"/> ++ <syslibset libs="Xxf86vm" /> + <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL" if="c.compiler.use-cglib"/> + </linker> + + <linker id="linker.cfg.linux.amd64.jogl" name="gcc"> +- <syslibset dir="/usr/X11R6/lib64" libs="GL, X11"/> +- <syslibset dir="/usr/X11R6/lib64" libs="Xxf86vm" /> ++ <syslibset libs="GL, X11"/> ++ <syslibset libs="Xxf86vm" /> + <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL" if="c.compiler.use-cglib"/> + </linker> + +@@ -1018,6 +1027,7 @@ + destdir="${javadoc}" windowtitle="${javadoc.windowtitle}" + overview="${javadoc.overview}" + source="1.4" ++ classpath="${gluegen.jar}" + linkoffline="${javadoc.link} 142-packages" + bottom="${javadoc.bottom}" > + <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.jar}" /> Added: trunk/libjogl-java/debian/patches/cg-common.cfg.diff =================================================================== --- trunk/libjogl-java/debian/patches/cg-common.cfg.diff (rev 0) +++ trunk/libjogl-java/debian/patches/cg-common.cfg.diff 2009-06-29 17:48:59 UTC (rev 8664) @@ -0,0 +1,10 @@ +--- libjogl-java-1.1.1~rc7/jogl/make/cg-common.cfg.orig 2007-12-26 01:28:24.000000000 +0100 ++++ libjogl-java-1.1.1~rc7/jogl/make/cg-common.cfg 2007-12-26 01:28:34.000000000 +0100 +@@ -113,6 +113,6 @@ + # + + CustomCCode #include <stdlib.h> +-CustomCCode #include <Cg/cgGL.h> ++CustomCCode #include <CG/cgGL.h> + + IncludeAs CustomJavaCode CgGL cg-common-CustomJavaCode.java Added: trunk/libjogl-java/debian/patches/defaultDebianPath.diff =================================================================== --- trunk/libjogl-java/debian/patches/defaultDebianPath.diff (rev 0) +++ trunk/libjogl-java/debian/patches/defaultDebianPath.diff 2009-06-29 17:48:59 UTC (rev 8664) @@ -0,0 +1,13 @@ +--- jogl-1.1.1.orig/jogl/src/classes/com/sun/opengl/impl/NativeLibLoader.java 2007-07-20 17:06:04.000000000 +0200 ++++ jogl-1.1.1/jogl/src/classes/com/sun/opengl/impl/NativeLibLoader.java 2008-12-29 13:42:13.000000000 +0100 +@@ -186,7 +186,9 @@ + throw (UnsatisfiedLinkError) new UnsatisfiedLinkError().initCause(e); + } + } else { +- System.loadLibrary(libraryName); ++ String javaLibPath = System.getProperty("java.library.path") + File.pathSeparator + "/usr/lib/jni" + File.pathSeparator + "/usr/lib64/jni"; ++ System.setProperty("java.library.path", javaLibPath); ++ System.loadLibrary(libraryName); + } + } + } Added: trunk/libjogl-java/debian/patches/series =================================================================== --- trunk/libjogl-java/debian/patches/series (rev 0) +++ trunk/libjogl-java/debian/patches/series 2009-06-29 17:48:59 UTC (rev 8664) @@ -0,0 +1,5 @@ +build.diff +build-java.diff +cg-common.cfg.diff + + Added: trunk/libjogl-java/debian/rules =================================================================== --- trunk/libjogl-java/debian/rules (rev 0) +++ trunk/libjogl-java/debian/rules 2009-06-29 17:48:59 UTC (rev 8664) @@ -0,0 +1,36 @@ +#!/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/java-6-openjdk/ +DEB_JARS := ant-launcher antlrall ant-antlr +DEB_ANT_CLEAN_TARGET := clean +DEB_ANT_BUILD_TARGET := all +DEB_BUILDDIR := jogl/make +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) + +ifneq ( ,$(filter-out $(DEB_HOST_ARCH), arm mipsel mips armel)) +# Disable the javadoc on this arch. it timeouts for the archs +DEB_ANT_BUILD_TARGET += javadoc +endif + +install/libjogl-java:: + install -m 644 -D jogl/build/jogl.jar debian/libjogl-java/usr/share/java/jogl-$(DEB_UPSTREAM_VERSION).jar + ln -s jogl-$(DEB_UPSTREAM_VERSION).jar debian/libjogl-java/usr/share/java/jogl.jar + install -m 644 -D gluegen/build/gluegen-rt.jar debian/libjogl-java/usr/share/java/gluegen-rt-$(DEB_UPSTREAM_VERSION).jar + ln -s gluegen-rt-$(DEB_UPSTREAM_VERSION).jar debian/libjogl-java/usr/share/java/gluegen-rt.jar + +install/libjogl-jni:: + install -m 644 -D jogl/build/obj/libjogl.so debian/libjogl-jni/usr/lib/jni/libjogl.so + install -m 644 -D jogl/build/obj/libjogl_awt.so debian/libjogl-jni/usr/lib/jni/libjogl_awt.so +# Commented since Cg is not available under Debian +# install -m 644 -D jogl/build/obj/libjogl_cg.so debian/libjogl-jni/usr/lib/jni/libjogl_cg.so + install -m 644 -D gluegen/build/obj/libgluegen-rt.so debian/libjogl-jni/usr/lib/jni/libgluegen-rt.so + +clean:: + $(RM) -r gluegen/build + +get-orig-source:: + -uscan --upstream-version 0 Property changes on: trunk/libjogl-java/debian/rules ___________________________________________________________________ Added: svn:executable + Added: trunk/libjogl-java/debian/watch =================================================================== --- trunk/libjogl-java/debian/watch (rev 0) +++ trunk/libjogl-java/debian/watch 2009-06-29 17:48:59 UTC (rev 8664) @@ -0,0 +1,4 @@ +version=3 +opts=uversionmangle=s/-rc/~rc/ \ +http://download.java.net/media/jogl/builds/archive/jsr-231-(\d.*)/ \ +jogl-(\d.*)-src\.zip debian debian/orig-tar.sh _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
