Commit debian/2.7.1+dfsg-3 - lwjgl

+10

-7

build.xml less more

136	136	<fileset refid="lwjgl.fileset" />
137	137	<manifest>
138	138	<attribute name="Sealed" value="true"/>
	139	<attribute name="Class-Path" value="/usr/share/java/jinput.jar"/>
139	140	</manifest>
140	141	</jar>
141	142

145	146	<fileset refid="lwjgl_util_applet.fileset" />
146	147	<manifest>
147	148	<attribute name="Sealed" value="true"/>
	149	<attribute name="Class-Path" value="/usr/share/java/jinput.jar"/>
148	150	</manifest>
149	151	</jar>
150	152

245	247	<class name="org.lwjgl.opengl.WindowsContextImplementation" />
246	248	</javah>
247	249
248		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
	250	<!-- <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
249	251	<class name="org.lwjgl.MacOSXSysImplementation" />
250	252	<class name="org.lwjgl.opengl.MacOSXMouseEventQueue" />
251	253	<class name="org.lwjgl.opengl.MacOSXCanvasPeerInfo" />

253	255	<class name="org.lwjgl.opengl.MacOSXPbufferPeerInfo" />
254	256	<class name="org.lwjgl.opengl.MacOSXDisplay" />
255	257	<class name="org.lwjgl.opengl.MacOSXContextImplementation" />
256		</javah>
	258	</javah> -->
257	259
258	260	<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes">
259	261	<class name="org.lwjgl.opengl.AWTSurfaceLock" />

292	294	</tokenfilter>
293	295	</filterchain>
294	296	</loadfile>
295		<loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version">
	297	<!-- <loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version">
296	298	<filterchain>
297	299	<tokenfilter>
298	300	<containsstring contains="JNI_VERSION ="/>
299	301	</tokenfilter>
300	302	</filterchain>
301		</loadfile>
	303	</loadfile> -->
302	304	<loadfile srcfile="${lwjgl.src.native}/windows/org_lwjgl_WindowsSysImplementation.h" property="lwjgl.native.windows.version">
303	305	<filterchain>
304	306	<tokenfilter>

313	315	</tokenfilter>
314	316	</filterchain>
315	317	</loadfile>
316		<loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
	318	<!-- <loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
317	319	<filterchain>
318	320	<tokenfilter>
319	321	<containsstring contains="#define org_lwjgl_MacOSXSysImplementation_JNI_VERSION"/>
320	322	</tokenfilter>
321	323	</filterchain>
322		</loadfile>
	324	</loadfile> -->
323	325	<echo>
324	326	lwjgl.java.windows.version = ${lwjgl.java.windows.version}
325	327	lwjgl.native.windows.version = ${lwjgl.native.windows.version}

500	502	<os name="Mac OS X" />
501	503	</condition>
502	504	<property name="native_path_expanded" location="${native_path}"/>
503		<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">
	505	<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" fork="true">
504	506	<sysproperty key="org.lwjgl.util.Debug" value="true"/>
505	507	<sysproperty key="java.library.path" value="${native_path_expanded}"/>
506	508	<arg line="${args}"/>

510	512	<!-- Creates the Javadoc -->
511	513	<target name="javadoc" description="Creates javadoc from java source code">
512	514	<javadoc destdir="${lwjgl.docs}/javadoc" classpath="${lwjgl.lib}/jinput.jar" author="true" version="true" use="true" source="1.5" windowtitle="LWJGL API" useexternalfile="true">
	515	<link href="/usr/share/doc/default-jdk-doc/api/" />
513	516	<fileset refid="lwjgl.javadoc.fileset" />
514	517	<doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle>
515	518	<bottom><![CDATA[<i>Copyright © 2002-2009 lwjgl.org. All Rights Reserved.</i>]]></bottom>

+11

-0

debian/changelog less more

	0	lwjgl (2.7.1+dfsg-3) unstable; urgency=low
	1
	2	* add java bin dir to the PATH environment (closes: #664180)
	3	* update my email address
	4	* build-conflict with binutils-gold
	5	* bump standards to 3.9.3
	6	* add a .gitignore file
	7	* utilize jutils.jar via jinput.jar's classpath
	8
	9	-- Michael Gilbert <mgilbert@debian.org> Mon, 07 May 2012 15:06:23 -0400
	10
0	11	lwjgl (2.7.1+dfsg-2) unstable; urgency=low
1	12
2	13	[ Miguel Landaeta ]

+9

-4

debian/control less more

1	1	Section: java
2	2	Priority: optional
3	3	Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
4		Uploaders: Gabriele Giacone <1o5g4r8o@gmail.com>, Michael Gilbert <michael.s.gilbert@gmail.com>
	4	Uploaders:
	5	Gabriele Giacone <1o5g4r8o@gmail.com>,
	6	Michael Gilbert <mgilbert@debian.org>,
5	7	Build-Depends:
6	8	debhelper (>= 8),
7	9	javahelper,

12	14	libxrandr-dev,
13	15	libxxf86vm-dev,
14	16	libxcursor-dev,
15		libxt-dev
16		Build-Depends-Indep: default-jdk-doc
17		Standards-Version: 3.9.2
	17	libxt-dev,
	18	Build-Depends-Indep:
	19	default-jdk-doc,
	20	Build-Conflicts:
	21	binutils-gold,
	22	Standards-Version: 3.9.3
18	23	Vcs-Git: git://git.debian.org/git/pkg-java/lwjgl.git
19	24	Vcs-Browser: http://git.debian.org/?p=pkg-java/lwjgl.git
20	25	Homepage: http://lwjgl.org/

+3

-3

debian/patches/p/systemjinput.diff less more

16	16	<fileset refid="lwjgl.fileset" />
17	17	<manifest>
18	18	<attribute name="Sealed" value="true"/>
19		+ <attribute name="Class-Path" value="/usr/share/java/jinput.jar /usr/share/java/jutils.jar"/>
	19	+ <attribute name="Class-Path" value="/usr/share/java/jinput.jar"/>
20	20	</manifest>
21	21	</jar>
22	22

24	24	<fileset refid="lwjgl_util_applet.fileset" />
25	25	<manifest>
26	26	<attribute name="Sealed" value="true"/>
27		+ <attribute name="Class-Path" value="/usr/share/java/jinput.jar /usr/share/java/jutils.jar"/>
	27	+ <attribute name="Class-Path" value="/usr/share/java/jinput.jar"/>
28	28	</manifest>
29	29	</jar>
30	30

33	33	</condition>
34	34	<property name="native_path_expanded" location="${native_path}"/>
35	35	- <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">
36		+ <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">
	36	+ <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" fork="true">
37	37	<sysproperty key="org.lwjgl.util.Debug" value="true"/>
38	38	<sysproperty key="java.library.path" value="${native_path_expanded}"/>
39	39	<arg line="${args}"/>

+1

-0

debian/rules less more

6	6	TARDFSG := ../$(NAME)_$(VERSION)+dfsg.orig.tar.gz
7	7
8	8	export JAVA_HOME=/usr/lib/jvm/default-java
	9	export PATH:=${PATH}:${JAVA_HOME}/bin
9	10
10	11	# NOTE: jutils is explicitly included here (without a depends in our control
11	12	# file) because jinput.jar lacks jutils in its own "Class-Path" (bug #626002)

+1

-1

platform_build/build-applet.xml less more

0	0	<project name="applet">
1	1
2	2	<!-- Create our packer task -->
3		<taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/>
	3	<!-- <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/> -->
4	4
5	5	<target name="applet">
6	6	<antcall target="-applet">

+34

-2

platform_build/linux_ant/build.xml less more

5	5	<property name="libname64" value="liblwjgl64.so"/>
6	6	<property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt" />
7	7	<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" />
	8	<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" />
8	9	<property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/>
9	10
10	11	<target name="clean">
11	12	<delete>
12	13	<fileset dir="x32"/>
13	14	<fileset dir="x64"/>
	15	<fileset dir="deb"/>
14	16	<fileset dir="." includes="*.o"/>
15	17	<fileset dir="." includes="*.so"/>
16	18	</delete>

40	42
41	43	<property name="linker_flags32" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs32} ${xf86vm_lib}"/>
42	44	<property name="linker_flags64" value="${version_script_flags64} -shared -O2 -Wall -o ${libname64} ${libs64} ${xf86vm_lib}"/>
	45	<property name="linker_flagsdeb" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs} ${xf86vm_lib}"/>
43	46
44	47	<condition property="build.32bit.only">
45	48	<not>

58	61	</and>
59	62	</condition>
60	63
61		<antcall target="compile32"/>
62		<antcall target="compile64"/>
	64	<condition property="build.debian">
	65	<os name="Linux" />
	66	</condition>
	67
	68	<antcall target="compiledeb" />
63	69	</target>
64	70
65	71	<target name="compile32" unless="build.64bit.only">

113	119	<fileset file="${libname64}"/>
114	120	</apply>
115	121	</target>
	122
	123	<target name="compiledeb">
	124	<mkdir dir="deb"/>
	125	<apply dir="deb" executable="gcc" skipemptyfilesets="true" failonerror="true">
	126	<arg line="${cflags32} ${cflags_pthread}"/>
	127	<arg value="-I${java.home}/include"/>
	128	<arg value="-I${java.home}/include/linux"/>
	129	<arg value="-I${java.home}/../include"/>
	130	<arg value="-I${java.home}/../include/linux"/>
	131	<arg value="-I${java.home}/../include/solaris"/>
	132	<arg value="-I${native}/common"/>
	133	<arg value="-I${native}/linux"/>
	134	<mapper type="glob" from=".c" to=".o"/>
	135	<fileset dir="${native}/linux" includes="*.c"/>
	136	<fileset dir="${native}/generated" includes="*.c"/>
	137	<fileset dir="${native}/common" includes="*.c"/>
	138	</apply>
	139	<apply dir="." parallel="true" executable="gcc" failonerror="true">
	140	<srcfile/>
	141	<arg line="${linker_flagsdeb}"/>
	142	<fileset dir="deb" includes="*.o"/>
	143	</apply>
	144	<apply dir="." parallel="true" executable="strip" failonerror="true">
	145	<fileset file="${libname32}"/>
	146	</apply>
	147	</target>
116	148	</project>

+2

-2

src/java/org/lwjgl/MacOSXSysImplementation.java less more

32	32
33	33	import java.awt.Toolkit;
34	34
35		import com.apple.eio.FileManager;
	35	//import com.apple.eio.FileManager;
36	36
37	37	/**
38	38	*

54	54
55	55	public boolean openURL(String url) {
56	56	try {
57		FileManager.openURL(url);
	57	// FileManager.openURL(url);
58	58	return true;
59	59	} catch (Exception e) {
60	60	LWJGLUtil.log("Exception occurred while trying to invoke browser: " + e);

+5

-5

src/java/org/lwjgl/opengl/MacOSXDisplay.java less more

53	53	import org.lwjgl.LWJGLException;
54	54	import org.lwjgl.LWJGLUtil;
55	55
56		import com.apple.eawt.Application;
57		import com.apple.eawt.ApplicationAdapter;
58		import com.apple.eawt.ApplicationEvent;
	56	//import com.apple.eawt.Application;
	57	//import com.apple.eawt.ApplicationAdapter;
	58	//import com.apple.eawt.ApplicationEvent;
59	59
60	60	import static org.lwjgl.opengl.GL11.*;
61	61

78	78	try {
79	79	AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
80	80	public Object run() throws Exception {
81		Application.getApplication().addApplicationListener(new ApplicationAdapter() {
	81	/* Application.getApplication().addApplicationListener(new ApplicationAdapter() {
82	82	public void handleQuit(ApplicationEvent event) {
83	83	doHandleQuit();
84	84	}
85		});
	85	}); */
86	86	return null;
87	87	}
88	88	});