Package list lwjgl / 717a871
added topgit, removed d/patches Gabriele Giacone 11 years ago
6 changed file(s) with 2 addition(s) and 213 deletion(s). Raw diff Collapse all Expand all
+0
-99
debian/patches/00nomacosx less more
0 Description: Removes references to macosx-related classes.
1 Author: Gabriele Giacone <1o5g4r8o@gmail.com>
2
3 --- a/build.xml
4 +++ b/build.xml
5 @@ -234,7 +234,7 @@
6 <class name="org.lwjgl.opengl.WindowsContextImplementation" />
7 </javah>
8
9 - <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
10 +<!-- <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
11 <class name="org.lwjgl.MacOSXSysImplementation" />
12 <class name="org.lwjgl.opengl.MacOSXMouseEventQueue" />
13 <class name="org.lwjgl.opengl.MacOSXCanvasPeerInfo" />
14 @@ -242,7 +242,7 @@
15 <class name="org.lwjgl.opengl.MacOSXPbufferPeerInfo" />
16 <class name="org.lwjgl.opengl.MacOSXDisplay" />
17 <class name="org.lwjgl.opengl.MacOSXContextImplementation" />
18 - </javah>
19 + </javah> -->
20
21 <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes">
22 <class name="org.lwjgl.opengl.AWTSurfaceLock" />
23 @@ -298,13 +298,13 @@
24 </tokenfilter>
25 </filterchain>
26 </loadfile>
27 - <loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
28 +<!-- <loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
29 <filterchain>
30 <tokenfilter>
31 <containsstring contains="#define org_lwjgl_MacOSXSysImplementation_JNI_VERSION"/>
32 </tokenfilter>
33 </filterchain>
34 - </loadfile>
35 + </loadfile> -->
36 <echo>
37 lwjgl.java.windows.version = ${lwjgl.java.windows.version}
38 lwjgl.native.windows.version = ${lwjgl.native.windows.version}
39 --- a/platform_build/build-applet.xml
40 +++ b/platform_build/build-applet.xml
41 @@ -1,7 +1,7 @@
42 <project name="applet">
43
44 <!-- Create our packer task -->
45 - <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/>
46 +<!-- <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/> -->
47
48 <target name="applet" depends="all">
49 <antcall target="-applet">
50 --- a/src/java/org/lwjgl/MacOSXSysImplementation.java
51 +++ b/src/java/org/lwjgl/MacOSXSysImplementation.java
52 @@ -33,7 +33,7 @@
53
54 import java.awt.Toolkit;
55
56 -import com.apple.eio.FileManager;
57 +//import com.apple.eio.FileManager;
58
59 /**
60 *
61 @@ -55,7 +55,7 @@
62
63 public boolean openURL(String url) {
64 try {
65 - FileManager.openURL(url);
66 +// FileManager.openURL(url);
67 return true;
68 } catch (Exception e) {
69 LWJGLUtil.log("Exception occurred while trying to invoke browser: " + e);
70 --- a/src/java/org/lwjgl/opengl/MacOSXDisplay.java
71 +++ b/src/java/org/lwjgl/opengl/MacOSXDisplay.java
72 @@ -54,9 +54,9 @@
73 import org.lwjgl.LWJGLException;
74 import org.lwjgl.LWJGLUtil;
75
76 -import com.apple.eawt.Application;
77 -import com.apple.eawt.ApplicationAdapter;
78 -import com.apple.eawt.ApplicationEvent;
79 +//import com.apple.eawt.Application;
80 +//import com.apple.eawt.ApplicationAdapter;
81 +//import com.apple.eawt.ApplicationEvent;
82
83 final class MacOSXDisplay implements DisplayImplementation {
84 private static final int PBUFFER_HANDLE_SIZE = 24;
85 @@ -77,11 +77,11 @@
86 try {
87 AccessController.doPrivileged(new PrivilegedExceptionAction() {
88 public Object run() throws Exception {
89 - Application.getApplication().addApplicationListener(new ApplicationAdapter() {
90 +/* Application.getApplication().addApplicationListener(new ApplicationAdapter() {
91 public final void handleQuit(ApplicationEvent event) {
92 doHandleQuit();
93 }
94 - });
95 + }); */
96 return null;
97 }
98 });
+0
-74
debian/patches/01allarchs less more
0 Description: To build on all archs
1 Author: Gabriele Giacone <1o5g4r8o@gmail.com>
2
3 --- a/platform_build/linux_ant/build.xml
4 +++ b/platform_build/linux_ant/build.xml
5 @@ -6,12 +6,14 @@
6 <property name="libname64" value="liblwjgl64.so"/>
7 <property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt" />
8 <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" />
9 + <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" />
10 <property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/>
11
12 <target name="clean">
13 <delete>
14 <fileset dir="x32"/>
15 <fileset dir="x64"/>
16 + <fileset dir="deb"/>
17 <fileset dir="." includes="*.o"/>
18 <fileset dir="." includes="*.so"/>
19 </delete>
20 @@ -41,6 +43,7 @@
21
22 <property name="linker_flags32" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs32} ${xf86vm_lib}"/>
23 <property name="linker_flags64" value="${version_script_flags64} -shared -O2 -Wall -o ${libname64} ${libs64} ${xf86vm_lib}"/>
24 + <property name="linker_flagsdeb" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs} ${xf86vm_lib}"/>
25
26 <condition property="build.32bit.only">
27 <not>
28 @@ -58,9 +61,12 @@
29 <equals arg1="${hwplatform}" arg2="x86_64"/>
30 </and>
31 </condition>
32 +
33 + <condition property="build.debian">
34 + <os name="Linux"/>
35 + </condition>
36
37 - <antcall target="compile32"/>
38 - <antcall target="compile64"/>
39 + <antcall target="compiledeb"/>
40 </target>
41
42 <target name="compile32" unless="build.64bit.only">
43 @@ -114,4 +120,30 @@
44 <fileset file="${libname64}"/>
45 </apply>
46 </target>
47 +
48 + <target name="compiledeb">
49 + <mkdir dir="deb"/>
50 + <apply dir="deb" executable="gcc" skipemptyfilesets="true" failonerror="true">
51 + <arg line="${cflags32} ${cflags_pthread}"/>
52 + <arg value="-I${java.home}/include"/>
53 + <arg value="-I${java.home}/include/linux"/>
54 + <arg value="-I${java.home}/../include"/>
55 + <arg value="-I${java.home}/../include/linux"/>
56 + <arg value="-I${java.home}/../include/solaris"/>
57 + <arg value="-I${native}/common"/>
58 + <arg value="-I${native}/linux"/>
59 + <mapper type="glob" from="*.c" to="*.o"/>
60 + <fileset dir="${native}/linux" includes="*.c"/>
61 + <fileset dir="${native}/generated" includes="*.c"/>
62 + <fileset dir="${native}/common" includes="*.c"/>
63 + </apply>
64 + <apply dir="." parallel="true" executable="gcc" failonerror="true">
65 + <srcfile/>
66 + <arg line="${linker_flagsdeb}"/>
67 + <fileset dir="deb" includes="*.o"/>
68 + </apply>
69 + <apply dir="." parallel="true" executable="strip" failonerror="true">
70 + <fileset file="${libname32}"/>
71 + </apply>
72 + </target>
73 </project>
+0
-23
debian/patches/02systemjinput less more
0 Description: To find system jinput libraries
1 Author: Gabriele Giacone <1o5g4r8o@gmail.com>
2
3 --- a/build.xml
4 +++ b/build.xml
5 @@ -340,7 +340,7 @@
6
7 <!-- Compiles the Java source code -->
8 <target name="compile" description="Compiles the java source code" depends="-initialize">
9 - <javac debug="yes" destdir="${lwjgl.bin}" source="1.4" target="1.4" classpath="${lwjgl.lib}/jinput.jar:${lwjgl.lib}/AppleJavaExtensions.jar" taskname="core">
10 + <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">
11 <src path="${lwjgl.src}/java/"/>
12 <src path="${lwjgl.src}/generated/"/>
13 <include name="org/lwjgl/*.java"/>
14 @@ -481,7 +481,7 @@
15 <os name="Mac OS X" />
16 </condition>
17 <property name="native_path_expanded" location="${native_path}"/>
18 - <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">
19 + <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">
20 <sysproperty key="org.lwjgl.util.Debug" value="true"/>
21 <sysproperty key="java.library.path" value="${native_path_expanded}"/>
22 <arg line="${args}"/>
+0
-13
debian/patches/03javadoc less more
0 Description: Links javadoc to system javadoc
1 Author: Gabriele Giacone <1o5g4r8o@gmail.com>
2
3 --- lwjgl-2.4.2+dfsg.orig/build.xml
4 +++ lwjgl-2.4.2+dfsg/build.xml
5 @@ -491,6 +491,7 @@
6 <!-- Creates the Javadoc -->
7 <target name="javadoc" description="Creates javadoc from java source code">
8 <javadoc destdir="${lwjgl.docs}/javadoc" classpath="${lwjgl.lib}/jinput.jar" author="true" version="true" use="true" source="1.4" windowtitle="LWJGL API" useexternalfile="true">
9 + <link href="/usr/share/doc/default-jdk-doc/api/" />
10 <fileset refid="lwjgl.javadoc.fileset" />
11 <doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle>
12 <bottom><![CDATA[<i>Copyright &#169; 2002-2009 lwjgl.org. All Rights Reserved.</i>]]></bottom>
+0
-4
debian/patches/series less more
0 00nomacosx
1 01allarchs
2 02systemjinput
3 03javadoc
00 #!/usr/bin/make -f
1
2 -include /usr/share/topgit/tg2quilt.mk
13
24 NAME := $(shell dpkg-parsechangelog| sed -n '/^Source/{s/Source: \(.*\)/\1/p}')
35 VERSION := $(shell dpkg-parsechangelog| sed -n '/^Version/{s/Version: \(.*\)-[0-9]*$$/\1/;s/+dfsg//p}')