Package list lwjgl / 4b35d3c
rebase patches against upstream 2.7.1 Michael Gilbert 10 years ago
4 changed file(s) with 74 addition(s) and 76 deletion(s). Raw diff Collapse all Expand all
88 platform_build/linux_ant/build.xml | 36 ++++++++++++++++++++++++++++++++++--
99 1 files changed, 34 insertions(+), 2 deletions(-)
1010
11 diff --git a/platform_build/linux_ant/build.xml b/platform_build/linux_ant/build.xml
12 index 7e45c52..2098297 100644
13 --- a/platform_build/linux_ant/build.xml
14 +++ b/platform_build/linux_ant/build.xml
11 Index: lwjgl-2.7.1+dfsg/platform_build/linux_ant/build.xml
12 ===================================================================
13 --- lwjgl-2.7.1+dfsg.orig/platform_build/linux_ant/build.xml 2011-03-26 14:15:36.000000000 -0400
14 +++ lwjgl-2.7.1+dfsg/platform_build/linux_ant/build.xml 2011-03-26 14:20:54.000000000 -0400
1515 @@ -6,12 +6,14 @@
1616 <property name="libname64" value="liblwjgl64.so"/>
1717 <property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt" />
3535
3636 <condition property="build.32bit.only">
3737 <not>
38 @@ -58,9 +61,12 @@
39 <equals arg1="${hwplatform}" arg2="x86_64"/>
38 @@ -59,8 +62,11 @@
4039 </and>
4140 </condition>
42 +
43 + <condition property="build.debian">
44 + <os name="Linux"/>
45 + </condition>
46
41
4742 - <antcall target="compile32"/>
4843 - <antcall target="compile64"/>
49 + <antcall target="compiledeb"/>
44 + <condition property="build.debian">
45 + <os name="Linux" />
46 + </condition>
47 +
48 + <antcall target="compiledeb" />
5049 </target>
51
50
5251 <target name="compile32" unless="build.64bit.only">
5352 @@ -114,4 +120,30 @@
5453 <fileset file="${libname64}"/>
8180 + </apply>
8281 + </target>
8382 </project>
84 --
85 tg: (fcfc69f..) p/allarchs (depends on: master)
88 build.xml | 1 +
99 1 files changed, 1 insertions(+), 0 deletions(-)
1010
11 diff --git a/build.xml b/build.xml
12 index 1c46378..b161b18 100644
13 --- a/build.xml
14 +++ b/build.xml
15 @@ -490,6 +490,7 @@
11 Index: lwjgl-2.7.1+dfsg/build.xml
12 ===================================================================
13 --- lwjgl-2.7.1+dfsg.orig/build.xml 2011-03-26 14:21:11.000000000 -0400
14 +++ lwjgl-2.7.1+dfsg/build.xml 2011-03-26 14:23:33.000000000 -0400
15 @@ -511,6 +511,7 @@
1616 <!-- Creates the Javadoc -->
1717 <target name="javadoc" description="Creates javadoc from java source code">
18 <javadoc destdir="${lwjgl.docs}/javadoc" classpath="${lwjgl.lib}/jinput.jar" author="true" version="true" use="true" source="1.4" windowtitle="LWJGL API" useexternalfile="true">
18 <javadoc destdir="${lwjgl.docs}/javadoc" classpath="${lwjgl.lib}/jinput.jar" author="true" version="true" use="true" source="1.5" windowtitle="LWJGL API" useexternalfile="true">
1919 + <link href="/usr/share/doc/default-jdk-doc/api/" />
2020 <fileset refid="lwjgl.javadoc.fileset" />
2121 <doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle>
2222 <bottom><![CDATA[<i>Copyright &#169; 2002-2009 lwjgl.org. All Rights Reserved.</i>]]></bottom>
23 --
24 tg: (7c6d807..) p/javadoc (depends on: p/systemjinput)
1111 src/java/org/lwjgl/opengl/MacOSXDisplay.java | 10 +++++-----
1212 4 files changed, 12 insertions(+), 12 deletions(-)
1313
14 diff --git a/build.xml b/build.xml
15 index 857af24..842047f 100644
16 --- a/build.xml
17 +++ b/build.xml
18 @@ -232,7 +232,7 @@
14 Index: lwjgl-2.7.1+dfsg/build.xml
15 ===================================================================
16 --- lwjgl-2.7.1+dfsg.orig/build.xml 2011-03-26 14:25:06.000000000 -0400
17 +++ lwjgl-2.7.1+dfsg/build.xml 2011-03-26 14:25:37.000000000 -0400
18 @@ -246,7 +246,7 @@
1919 <class name="org.lwjgl.opengl.WindowsContextImplementation" />
2020 </javah>
21
21
2222 - <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
23 +<!-- <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
23 + <!-- <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
2424 <class name="org.lwjgl.MacOSXSysImplementation" />
2525 <class name="org.lwjgl.opengl.MacOSXMouseEventQueue" />
2626 <class name="org.lwjgl.opengl.MacOSXCanvasPeerInfo" />
27 @@ -240,7 +240,7 @@
27 @@ -254,7 +254,7 @@
2828 <class name="org.lwjgl.opengl.MacOSXPbufferPeerInfo" />
2929 <class name="org.lwjgl.opengl.MacOSXDisplay" />
3030 <class name="org.lwjgl.opengl.MacOSXContextImplementation" />
3131 - </javah>
32 + </javah> -->
33
32 + </javah> -->
33
3434 <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes">
3535 <class name="org.lwjgl.opengl.AWTSurfaceLock" />
36 @@ -297,13 +297,13 @@
36 @@ -293,13 +293,13 @@
3737 </tokenfilter>
3838 </filterchain>
39 </loadfile>
39 </loadfile>
40 - <loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version">
41 + <!-- <loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version">
42 <filterchain>
43 <tokenfilter>
44 <containsstring contains="JNI_VERSION ="/>
45 </tokenfilter>
46 </filterchain>
47 - </loadfile>
48 + </loadfile> -->
49 <loadfile srcfile="${lwjgl.src.native}/windows/org_lwjgl_WindowsSysImplementation.h" property="lwjgl.native.windows.version">
50 <filterchain>
51 <tokenfilter>
52 @@ -314,13 +314,13 @@
53 </tokenfilter>
54 </filterchain>
55 </loadfile>
4056 - <loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
41 +<!-- <loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
57 + <!-- <loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
4258 <filterchain>
4359 <tokenfilter>
4460 <containsstring contains="#define org_lwjgl_MacOSXSysImplementation_JNI_VERSION"/>
4561 </tokenfilter>
4662 </filterchain>
4763 - </loadfile>
48 + </loadfile> -->
64 + </loadfile> -->
4965 <echo>
5066 lwjgl.java.windows.version = ${lwjgl.java.windows.version}
51 lwjgl.native.windows.version = ${lwjgl.native.windows.version}
52 diff --git a/platform_build/build-applet.xml b/platform_build/build-applet.xml
53 index abf00c9..65fbad8 100644
54 --- a/platform_build/build-applet.xml
55 +++ b/platform_build/build-applet.xml
67 lwjgl.native.windows.version = ${lwjgl.native.windows.version}
68 Index: lwjgl-2.7.1+dfsg/platform_build/build-applet.xml
69 ===================================================================
70 --- lwjgl-2.7.1+dfsg.orig/platform_build/build-applet.xml 2011-03-26 14:25:06.000000000 -0400
71 +++ lwjgl-2.7.1+dfsg/platform_build/build-applet.xml 2011-03-26 14:25:09.000000000 -0400
5672 @@ -1,7 +1,7 @@
5773 <project name="applet">
5874
6076 - <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/>
6177 +<!-- <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/> -->
6278
63 <target name="applet" depends="all">
79 <target name="applet">
6480 <antcall target="-applet">
65 diff --git a/src/java/org/lwjgl/MacOSXSysImplementation.java b/src/java/org/lwjgl/MacOSXSysImplementation.java
66 index 8da1e92..8e01d9c 100644
67 --- a/src/java/org/lwjgl/MacOSXSysImplementation.java
68 +++ b/src/java/org/lwjgl/MacOSXSysImplementation.java
69 @@ -33,7 +33,7 @@ package org.lwjgl;
81 Index: lwjgl-2.7.1+dfsg/src/java/org/lwjgl/MacOSXSysImplementation.java
82 ===================================================================
83 --- lwjgl-2.7.1+dfsg.orig/src/java/org/lwjgl/MacOSXSysImplementation.java 2011-03-26 14:25:06.000000000 -0400
84 +++ lwjgl-2.7.1+dfsg/src/java/org/lwjgl/MacOSXSysImplementation.java 2011-03-26 14:25:09.000000000 -0400
85 @@ -33,7 +33,7 @@
7086
7187 import java.awt.Toolkit;
7288
7591
7692 /**
7793 *
78 @@ -55,7 +55,7 @@ final class MacOSXSysImplementation extends J2SESysImplementation {
94 @@ -55,7 +55,7 @@
7995
8096 public boolean openURL(String url) {
8197 try {
84100 return true;
85101 } catch (Exception e) {
86102 LWJGLUtil.log("Exception occurred while trying to invoke browser: " + e);
87 diff --git a/src/java/org/lwjgl/opengl/MacOSXDisplay.java b/src/java/org/lwjgl/opengl/MacOSXDisplay.java
88 index ea58d0e..5266531 100644
89 --- a/src/java/org/lwjgl/opengl/MacOSXDisplay.java
90 +++ b/src/java/org/lwjgl/opengl/MacOSXDisplay.java
91 @@ -54,9 +54,9 @@ import org.lwjgl.BufferUtils;
103 Index: lwjgl-2.7.1+dfsg/src/java/org/lwjgl/opengl/MacOSXDisplay.java
104 ===================================================================
105 --- lwjgl-2.7.1+dfsg.orig/src/java/org/lwjgl/opengl/MacOSXDisplay.java 2011-03-26 14:25:06.000000000 -0400
106 +++ lwjgl-2.7.1+dfsg/src/java/org/lwjgl/opengl/MacOSXDisplay.java 2011-03-26 14:25:09.000000000 -0400
107 @@ -54,9 +54,9 @@
92108 import org.lwjgl.LWJGLException;
93109 import org.lwjgl.LWJGLUtil;
94110
99115 +//import com.apple.eawt.ApplicationAdapter;
100116 +//import com.apple.eawt.ApplicationEvent;
101117
102 final class MacOSXDisplay implements DisplayImplementation {
103 private static final int PBUFFER_HANDLE_SIZE = 24;
104 @@ -77,11 +77,11 @@ final class MacOSXDisplay implements DisplayImplementation {
118 import static org.lwjgl.opengl.GL11.*;
119
120 @@ -79,11 +79,11 @@
105121 try {
106 AccessController.doPrivileged(new PrivilegedExceptionAction() {
122 AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
107123 public Object run() throws Exception {
108124 - Application.getApplication().addApplicationListener(new ApplicationAdapter() {
109125 +/* Application.getApplication().addApplicationListener(new ApplicationAdapter() {
115131 return null;
116132 }
117133 });
118 --
119 tg: (9d5ff98..) p/nomacosx (depends on: master)
88 build.xml | 4 ++--
99 1 files changed, 2 insertions(+), 2 deletions(-)
1010
11 diff --git a/build.xml b/build.xml
12 index 842047f..1c46378 100644
13 --- a/build.xml
14 +++ b/build.xml
15 @@ -339,7 +339,7 @@
16
17 <!-- Compiles the Java source code -->
18 <target name="compile" description="Compiles the java source code" depends="-initialize">
19 - <javac debug="yes" destdir="${lwjgl.bin}" source="1.4" target="1.4" classpath="${lwjgl.lib}/jinput.jar:${lwjgl.lib}/AppleJavaExtensions.jar" taskname="core">
20 + <javac debug="yes" destdir="${lwjgl.bin}" source="1.4" target="1.4" classpath="/usr/share/java/jinput.jar:/usr/share/java/jutils.jar:${lwjgl.lib}/AppleJavaExtensions.jar" taskname="core">
21 <src path="${lwjgl.src}/java/"/>
22 <src path="${lwjgl.src}/generated/"/>
23 <include name="org/lwjgl/*.java"/>
24 @@ -480,7 +480,7 @@
11 Index: lwjgl-2.7.1+dfsg/build.xml
12 ===================================================================
13 --- lwjgl-2.7.1+dfsg.orig/build.xml 2011-03-26 14:19:35.000000000 -0400
14 +++ lwjgl-2.7.1+dfsg/build.xml 2011-03-26 14:21:11.000000000 -0400
15 @@ -501,7 +501,7 @@
2516 <os name="Mac OS X" />
2617 </condition>
2718 <property name="native_path_expanded" location="${native_path}"/>
3021 <sysproperty key="org.lwjgl.util.Debug" value="true"/>
3122 <sysproperty key="java.library.path" value="${native_path_expanded}"/>
3223 <arg line="${args}"/>
33 --
34 tg: (dbd4cc4..) p/systemjinput (depends on: p/nomacosx)