Package list lwjgl / 6fd86c7
directly commit quilt patches and drop topgit Michael Gilbert 10 years ago
6 changed file(s) with 270 addition(s) and 3 deletion(s). Raw diff Collapse all Expand all
0 From: Gabriele Giacone <1o5g4r8o@gmail.com>
1 Subject: [PATCH] p/allarchs
2
3 This patch to build on all archs.
4
5 Signed-off-by: Gabriele Giacone <1o5g4r8o@gmail.com>
6
7 ---
8 platform_build/linux_ant/build.xml | 36 ++++++++++++++++++++++++++++++++++--
9 1 files changed, 34 insertions(+), 2 deletions(-)
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
15 @@ -6,12 +6,14 @@
16 <property name="libname64" value="liblwjgl64.so"/>
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" />
18 <property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt" />
19 + <property name="libs" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/${os.arch} -ljawt" />
20 <property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/>
21
22 <target name="clean">
23 <delete>
24 <fileset dir="x32"/>
25 <fileset dir="x64"/>
26 + <fileset dir="deb"/>
27 <fileset dir="." includes="*.o"/>
28 <fileset dir="." includes="*.so"/>
29 </delete>
30 @@ -41,6 +43,7 @@
31
32 <property name="linker_flags32" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs32} ${xf86vm_lib}"/>
33 <property name="linker_flags64" value="${version_script_flags64} -shared -O2 -Wall -o ${libname64} ${libs64} ${xf86vm_lib}"/>
34 + <property name="linker_flagsdeb" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs} ${xf86vm_lib}"/>
35
36 <condition property="build.32bit.only">
37 <not>
38 @@ -58,9 +61,12 @@
39 <equals arg1="${hwplatform}" arg2="x86_64"/>
40 </and>
41 </condition>
42 +
43 + <condition property="build.debian">
44 + <os name="Linux"/>
45 + </condition>
46
47 - <antcall target="compile32"/>
48 - <antcall target="compile64"/>
49 + <antcall target="compiledeb"/>
50 </target>
51
52 <target name="compile32" unless="build.64bit.only">
53 @@ -114,4 +120,30 @@
54 <fileset file="${libname64}"/>
55 </apply>
56 </target>
57 +
58 + <target name="compiledeb">
59 + <mkdir dir="deb"/>
60 + <apply dir="deb" executable="gcc" skipemptyfilesets="true" failonerror="true">
61 + <arg line="${cflags32} ${cflags_pthread}"/>
62 + <arg value="-I${java.home}/include"/>
63 + <arg value="-I${java.home}/include/linux"/>
64 + <arg value="-I${java.home}/../include"/>
65 + <arg value="-I${java.home}/../include/linux"/>
66 + <arg value="-I${java.home}/../include/solaris"/>
67 + <arg value="-I${native}/common"/>
68 + <arg value="-I${native}/linux"/>
69 + <mapper type="glob" from="*.c" to="*.o"/>
70 + <fileset dir="${native}/linux" includes="*.c"/>
71 + <fileset dir="${native}/generated" includes="*.c"/>
72 + <fileset dir="${native}/common" includes="*.c"/>
73 + </apply>
74 + <apply dir="." parallel="true" executable="gcc" failonerror="true">
75 + <srcfile/>
76 + <arg line="${linker_flagsdeb}"/>
77 + <fileset dir="deb" includes="*.o"/>
78 + </apply>
79 + <apply dir="." parallel="true" executable="strip" failonerror="true">
80 + <fileset file="${libname32}"/>
81 + </apply>
82 + </target>
83 </project>
84 --
85 tg: (fcfc69f..) p/allarchs (depends on: master)
0 From: Gabriele Giacone <1o5g4r8o@gmail.com>
1 Subject: [PATCH] p/javadoc
2
3 This patch links javadoc to system javadoc.
4
5 Signed-off-by: Gabriele Giacone <1o5g4r8o@gmail.com>
6
7 ---
8 build.xml | 1 +
9 1 files changed, 1 insertions(+), 0 deletions(-)
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 @@
16 <!-- Creates the Javadoc -->
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">
19 + <link href="/usr/share/doc/default-jdk-doc/api/" />
20 <fileset refid="lwjgl.javadoc.fileset" />
21 <doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle>
22 <bottom><![CDATA[<i>Copyright &#169; 2002-2009 lwjgl.org. All Rights Reserved.</i>]]></bottom>
23 --
24 tg: (7c6d807..) p/javadoc (depends on: p/systemjinput)
0 From: Gabriele Giacone <1o5g4r8o@gmail.com>
1 Subject: [PATCH] p/nomacosx
2
3 This patch removes references to macosx-related classes.
4
5 Signed-off-by: Gabriele Giacone <1o5g4r8o@gmail.com>
6
7 ---
8 build.xml | 8 ++++----
9 platform_build/build-applet.xml | 2 +-
10 src/java/org/lwjgl/MacOSXSysImplementation.java | 4 ++--
11 src/java/org/lwjgl/opengl/MacOSXDisplay.java | 10 +++++-----
12 4 files changed, 12 insertions(+), 12 deletions(-)
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 @@
19 <class name="org.lwjgl.opengl.WindowsContextImplementation" />
20 </javah>
21
22 - <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
23 +<!-- <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
24 <class name="org.lwjgl.MacOSXSysImplementation" />
25 <class name="org.lwjgl.opengl.MacOSXMouseEventQueue" />
26 <class name="org.lwjgl.opengl.MacOSXCanvasPeerInfo" />
27 @@ -240,7 +240,7 @@
28 <class name="org.lwjgl.opengl.MacOSXPbufferPeerInfo" />
29 <class name="org.lwjgl.opengl.MacOSXDisplay" />
30 <class name="org.lwjgl.opengl.MacOSXContextImplementation" />
31 - </javah>
32 + </javah> -->
33
34 <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes">
35 <class name="org.lwjgl.opengl.AWTSurfaceLock" />
36 @@ -297,13 +297,13 @@
37 </tokenfilter>
38 </filterchain>
39 </loadfile>
40 - <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">
42 <filterchain>
43 <tokenfilter>
44 <containsstring contains="#define org_lwjgl_MacOSXSysImplementation_JNI_VERSION"/>
45 </tokenfilter>
46 </filterchain>
47 - </loadfile>
48 + </loadfile> -->
49 <echo>
50 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
56 @@ -1,7 +1,7 @@
57 <project name="applet">
58
59 <!-- Create our packer task -->
60 - <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/>
61 +<!-- <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/> -->
62
63 <target name="applet" depends="all">
64 <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;
70
71 import java.awt.Toolkit;
72
73 -import com.apple.eio.FileManager;
74 +//import com.apple.eio.FileManager;
75
76 /**
77 *
78 @@ -55,7 +55,7 @@ final class MacOSXSysImplementation extends J2SESysImplementation {
79
80 public boolean openURL(String url) {
81 try {
82 - FileManager.openURL(url);
83 +// FileManager.openURL(url);
84 return true;
85 } catch (Exception e) {
86 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;
92 import org.lwjgl.LWJGLException;
93 import org.lwjgl.LWJGLUtil;
94
95 -import com.apple.eawt.Application;
96 -import com.apple.eawt.ApplicationAdapter;
97 -import com.apple.eawt.ApplicationEvent;
98 +//import com.apple.eawt.Application;
99 +//import com.apple.eawt.ApplicationAdapter;
100 +//import com.apple.eawt.ApplicationEvent;
101
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 {
105 try {
106 AccessController.doPrivileged(new PrivilegedExceptionAction() {
107 public Object run() throws Exception {
108 - Application.getApplication().addApplicationListener(new ApplicationAdapter() {
109 +/* Application.getApplication().addApplicationListener(new ApplicationAdapter() {
110 public void handleQuit(ApplicationEvent event) {
111 doHandleQuit();
112 }
113 - });
114 + }); */
115 return null;
116 }
117 });
118 --
119 tg: (9d5ff98..) p/nomacosx (depends on: master)
0 From: Gabriele Giacone <1o5g4r8o@gmail.com>
1 Subject: [PATCH] p/systemjinput
2
3 This patch to build against system jinput libraries
4
5 Signed-off-by: Gabriele Giacone <1o5g4r8o@gmail.com>
6
7 ---
8 build.xml | 4 ++--
9 1 files changed, 2 insertions(+), 2 deletions(-)
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 @@
25 <os name="Mac OS X" />
26 </condition>
27 <property name="native_path_expanded" location="${native_path}"/>
28 - <java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:${lwjgl.lib}/jinput.jar" fork="true">
29 + <java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:/usr/share/java/jinput.jar:/usr/share/java/jutils.jar" fork="true">
30 <sysproperty key="org.lwjgl.util.Debug" value="true"/>
31 <sysproperty key="java.library.path" value="${native_path_expanded}"/>
32 <arg line="${args}"/>
33 --
34 tg: (dbd4cc4..) p/systemjinput (depends on: p/nomacosx)
0 p/nomacosx.diff -p1
1 p/allarchs.diff -p1
2 p/systemjinput.diff -p1
3 p/javadoc.diff -p1
00 #!/usr/bin/make -f
1
2 TG_BRANCHES=p/nomacosx p/allarchs p/systemjinput p/javadoc
3 -include /usr/share/topgit/tg2quilt.mk
41
52 NAME := $(shell dpkg-parsechangelog| sed -n '/^Source/{s/Source: \(.*\)/\1/p}')
63 VERSION := $(shell dpkg-parsechangelog| sed -n '/^Version/{s/Version: \(.*\)-[0-9]*$$/\1/;s/+dfsg//p}')