Markus Koschany pushed to branch master at Debian Java Maintainers / lwjgl
Commits: dbde013c by Markus Koschany at 2018-12-28T21:20:09Z Fix broken liblwjgl-java-jni package by compiling all needed source files. - - - - - e441775a by Markus Koschany at 2018-12-28T21:22:48Z Declare compliance with Debian Policy 4.3.0. - - - - - 7393fb45 by Markus Koschany at 2018-12-28T21:36:34Z Update changelog - - - - - 28abf7df by Markus Koschany at 2019-01-02T09:33:06Z Revert "Fix broken liblwjgl-java-jni package by compiling all needed source files." This reverts commit dbde013c25e1c4f95d54c9d5e58083a70f540eb7. - - - - - f57d3845 by Markus Koschany at 2019-01-02T09:42:32Z Add add-missing-symbols-in-native-lib-v2.patch. Readd the missing symbols in lwjgl's native library. Closes: #912631 Thanks: Petr Cvek for the report and Le Gall Guillaume for the patch. - - - - - e5b28006 by Markus Koschany at 2019-01-02T09:46:03Z Update changelog - - - - - 9cc5dad0 by Markus Koschany at 2019-01-02T12:30:17Z Override dh_shlibdeps and fix broken link against libawt.so. - - - - - 5 changed files: - debian/changelog - debian/control - + debian/patches/add-missing-symbols-in-native-lib-v2.patch - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,14 @@ +lwjgl (2.9.3+dfsg-5) unstable; urgency=medium + + * Team upload. + * Fix broken liblwjgl-java-jni package by compiling all needed source files. + Thanks to Petr Cvek for the report and Le Gall Guillaume for further + investigations and the patch. (Closes: #912631) + * Declare compliance with Debian Policy 4.3.0. + * Override dh_shlibdeps and fix broken link against libjawt.so. + + -- Markus Koschany <[email protected]> Fri, 28 Dec 2018 22:35:13 +0100 + lwjgl (2.9.3+dfsg-4) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -17,7 +17,7 @@ Build-Depends: libxrandr-dev, libxt-dev, libxxf86vm-dev -Standards-Version: 4.2.1 +Standards-Version: 4.3.0 Vcs-Git: https://salsa.debian.org/java-team/lwjgl.git Vcs-Browser: https://salsa.debian.org/java-team/lwjgl Homepage: https://www.lwjgl.org ===================================== debian/patches/add-missing-symbols-in-native-lib-v2.patch ===================================== @@ -0,0 +1,57 @@ +Description: Compile and add to library missing object files + Some C files present in "src/native/common", and "src/native/linux" + were not included in the native library build. This patch should include them + back. + . + Also, when building the Debian package, the library "jawt", which is a + dependency, was missing as well when building the native library. + . + This patch should allow building the Debian package with OpenJDK 11. +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=912631#5 +Last-Update: 2018-12-31 + +--- lwjgl-2.9.3+dfsg.orig/platform_build/linux_ant/build.xml ++++ lwjgl-2.9.3+dfsg/platform_build/linux_ant/build.xml +@@ -6,7 +6,7 @@ + <property name="libname64" value="liblwjgl64.so"/> + <property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/i386 -ljawt" /> + <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" /> +- <property name="libs" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXcursor -lXrandr -lXxf86vm -L${java.home}/lib/${os.arch}" /> ++ <property name="libs" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXcursor -lXrandr -lXxf86vm -L${java.home}/lib -ljawt" /> + <property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/> + + <target name="clean"> +@@ -148,8 +148,12 @@ + <arg value="-I${native}/linux/opengl"/> + <mapper type="glob" from="*.c" to="*.o"/> + <fileset dir="${native}/linux" includes="*.c"/> ++ <fileset dir="${native}/linux/opengl" includes="*.c"/> + <fileset dir="${native}/generated" includes="*.c"/> +- <fileset dir="${native}/common" includes="*.c"/> ++ <fileset dir="${native}/common" includes="**/*.c" excludes="opengles/**/*"/> ++ <fileset dir="${native}/generated/openal" includes="*.c"/> ++ <fileset dir="${native}/generated/opencl" includes="*.c"/> ++ <fileset dir="${native}/generated/opengl" includes="*.c"/> + </apply> + <apply dir="." parallel="true" executable="gcc" failonerror="true"> + <srcfile/> +--- lwjgl-2.9.3+dfsg.orig/src/java/org/lwjgl/opengl/Pbuffer.java ++++ lwjgl-2.9.3+dfsg/src/java/org/lwjgl/opengl/Pbuffer.java +@@ -52,6 +52,7 @@ public final class Pbuffer extends Drawa + /** + * Indicates that Pbuffers can be created. + */ ++ @java.lang.annotation.Native + public static final int PBUFFER_SUPPORTED = 1 << 0; + + /** +--- lwjgl-2.9.3+dfsg.orig/src/native/linux/opengl/org_lwjgl_opengl_Pbuffer.c ++++ lwjgl-2.9.3+dfsg/src/native/linux/opengl/org_lwjgl_opengl_Pbuffer.c +@@ -42,6 +42,7 @@ + #include <stdlib.h> + #include "org_lwjgl_opengl_LinuxPbufferPeerInfo.h" + #include "org_lwjgl_opengl_Pbuffer.h" ++#include "org_lwjgl_opengl_LinuxDisplay.h" + #include "extgl.h" + #include "context.h" + #include "common_tools.h" ===================================== debian/patches/series ===================================== @@ -9,3 +9,4 @@ no-asm-support.patch java9-compatibility.patch annotation-processor-workaround.patch javah.patch +add-missing-symbols-in-native-lib-v2.patch ===================================== debian/rules ===================================== @@ -18,3 +18,8 @@ override_dh_auto_install: override_dh_auto_clean: find src/native/ -name '*org_lwjgl_*.h' -delete + +override_dh_shlibdeps: + #workaround for "couldn't find libjawt.so" + LD_LIBRARY_PATH="/usr/lib/jvm/default-java/lib:$(LD_LIBRARY_PATH)" dh_shlibdeps + View it on GitLab: https://salsa.debian.org/java-team/lwjgl/compare/e9807a3f4331697f990a99479804b6083e1f2a2a...9cc5dad02e6252af3ae96e057f648434c54e63cc -- View it on GitLab: https://salsa.debian.org/java-team/lwjgl/compare/e9807a3f4331697f990a99479804b6083e1f2a2a...9cc5dad02e6252af3ae96e057f648434c54e63cc You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
