Commit 4b35d3ceaf0cb0a511b5c4f4dc624917e25f0bee - lwjgl

rebase patches against upstream 2.7.1 Michael Gilbert 12 years ago

4 changed file(s) with 74 addition(s) and 76 deletion(s). Raw diff Collapse all Expand all

+12

-15

debian/patches/p/allarchs.diff less more

8	8	platform_build/linux_ant/build.xml \| 36 ++++++++++++++++++++++++++++++++++--
9	9	1 files changed, 34 insertions(+), 2 deletions(-)
10	10
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
15	15	@@ -6,12 +6,14 @@
16	16	<property name="libname64" value="liblwjgl64.so"/>
17	17	<property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt" />

35	35
36	36	<condition property="build.32bit.only">
37	37	<not>
38		@@ -58,9 +61,12 @@
39		<equals arg1="${hwplatform}" arg2="x86_64"/>
	38	@@ -59,8 +62,11 @@
40	39	</and>
41	40	</condition>
42		+
43		+ <condition property="build.debian">
44		+ <os name="Linux"/>
45		+ </condition>
46
	41
47	42	- <antcall target="compile32"/>
48	43	- <antcall target="compile64"/>
49		+ <antcall target="compiledeb"/>
	44	+ <condition property="build.debian">
	45	+ <os name="Linux" />
	46	+ </condition>
	47	+
	48	+ <antcall target="compiledeb" />
50	49	</target>
51
	50
52	51	<target name="compile32" unless="build.64bit.only">
53	52	@@ -114,4 +120,30 @@
54	53	<fileset file="${libname64}"/>

81	80	+ </apply>
82	81	+ </target>
83	82	</project>
84		--
85		tg: (fcfc69f..) p/allarchs (depends on: master)

-8

debian/patches/p/javadoc.diff less more

8	8	build.xml \| 1 +
9	9	1 files changed, 1 insertions(+), 0 deletions(-)
10	10
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 @@
16	16	<!-- Creates the Javadoc -->
17	17	<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">
19	19	+ <link href="/usr/share/doc/default-jdk-doc/api/" />
20	20	<fileset refid="lwjgl.javadoc.fileset" />
21	21	<doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle>
22	22	<bottom><![CDATA[<i>Copyright © 2002-2009 lwjgl.org. All Rights Reserved.</i>]]></bottom>
23		--
24		tg: (7c6d807..) p/javadoc (depends on: p/systemjinput)

+51

-37

debian/patches/p/nomacosx.diff less more

11	11	src/java/org/lwjgl/opengl/MacOSXDisplay.java \| 10 +++++-----
12	12	4 files changed, 12 insertions(+), 12 deletions(-)
13	13
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 @@
19	19	<class name="org.lwjgl.opengl.WindowsContextImplementation" />
20	20	</javah>
21
	21
22	22	- <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">
24	24	<class name="org.lwjgl.MacOSXSysImplementation" />
25	25	<class name="org.lwjgl.opengl.MacOSXMouseEventQueue" />
26	26	<class name="org.lwjgl.opengl.MacOSXCanvasPeerInfo" />
27		@@ -240,7 +240,7 @@
	27	@@ -254,7 +254,7 @@
28	28	<class name="org.lwjgl.opengl.MacOSXPbufferPeerInfo" />
29	29	<class name="org.lwjgl.opengl.MacOSXDisplay" />
30	30	<class name="org.lwjgl.opengl.MacOSXContextImplementation" />
31	31	- </javah>
32		+ </javah> -->
33
	32	+ </javah> -->
	33
34	34	<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes">
35	35	<class name="org.lwjgl.opengl.AWTSurfaceLock" />
36		@@ -297,13 +297,13 @@
	36	@@ -293,13 +293,13 @@
37	37	</tokenfilter>
38	38	</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>
40	56	- <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">
42	58	<filterchain>
43	59	<tokenfilter>
44	60	<containsstring contains="#define org_lwjgl_MacOSXSysImplementation_JNI_VERSION"/>
45	61	</tokenfilter>
46	62	</filterchain>
47	63	- </loadfile>
48		+ </loadfile> -->
	64	+ </loadfile> -->
49	65	<echo>
50	66	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
56	72	@@ -1,7 +1,7 @@
57	73	<project name="applet">
58	74

60	76	- <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/>
61	77	+<!-- <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/> -->
62	78
63		<target name="applet" depends="all">
	79	<target name="applet">
64	80	<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 @@
70	86
71	87	import java.awt.Toolkit;
72	88

75	91
76	92	/**
77	93	*
78		@@ -55,7 +55,7 @@ final class MacOSXSysImplementation extends J2SESysImplementation {
	94	@@ -55,7 +55,7 @@
79	95
80	96	public boolean openURL(String url) {
81	97	try {

84	100	return true;
85	101	} catch (Exception e) {
86	102	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 @@
92	108	import org.lwjgl.LWJGLException;
93	109	import org.lwjgl.LWJGLUtil;
94	110

99	115	+//import com.apple.eawt.ApplicationAdapter;
100	116	+//import com.apple.eawt.ApplicationEvent;
101	117
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 @@
105	121	try {
106		AccessController.doPrivileged(new PrivilegedExceptionAction() {
	122	AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
107	123	public Object run() throws Exception {
108	124	- Application.getApplication().addApplicationListener(new ApplicationAdapter() {
109	125	+/* Application.getApplication().addApplicationListener(new ApplicationAdapter() {

115	131	return null;
116	132	}
117	133	});
118		--
119		tg: (9d5ff98..) p/nomacosx (depends on: master)

-16

debian/patches/p/systemjinput.diff less more

8	8	build.xml \| 4 ++--
9	9	1 files changed, 2 insertions(+), 2 deletions(-)
10	10
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 @@
25	16	<os name="Mac OS X" />
26	17	</condition>
27	18	<property name="native_path_expanded" location="${native_path}"/>

30	21	<sysproperty key="org.lwjgl.util.Debug" value="true"/>
31	22	<sysproperty key="java.library.path" value="${native_path_expanded}"/>
32	23	<arg line="${args}"/>
33		--
34		tg: (dbd4cc4..) p/systemjinput (depends on: p/nomacosx)