[gentoo-commits] proj/java:master commit in: dev-java/lwjgl/, dev-java/lwjgl/files/

[gentoo-commits] proj/java:master commit in: dev-java/lwjgl/, dev-java/lwjgl/files/

[James Le Cuirot]

commit:     a2c06ea424e98ac9e8d785647f237aca103986da
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 22:30:41 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 22:31:24 2016 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=a2c06ea4

dev-java/lwjgl: Version bump to 2.9.3, fix bug #560018

 - Add missing jutils dependency.
 - Patch to use ASM 4 final instead of RC1.
 - Change egl flag to gles. I used to get these confused.
 - Remove useless ant-nodeps dependency.

Package-Manager: portage-2.2.28

 dev-java/lwjgl/Manifest                            |  2 +-
 dev-java/lwjgl/files/asm-4.patch                   | 53 ++++++++++++++++++++++
 .../{lwjgl-2.9.0.ebuild => lwjgl-2.9.3.ebuild}     | 31 ++++++-------
 dev-java/lwjgl/metadata.xml                        | 24 +++++-----
 4 files changed, 80 insertions(+), 30 deletions(-)

diff --git a/dev-java/lwjgl/Manifest b/dev-java/lwjgl/Manifest
index 7af4678..d39eaf7 100644
--- a/dev-java/lwjgl/Manifest
+++ b/dev-java/lwjgl/Manifest
@@ -1 +1 @@
-DIST lwjgl-source-2.9.0.zip 2975604 SHA256 8c7d978ee1c3c5d4a3f8fc8f9774cc9f1b3a371f95ed48bebd4bde8f7fe648ca SHA512 19ee90878348a9ccce7d7f4c1e7e1d4e55b0a4bfdd8430dd33c130b6be52e7d415ba829b8d0688d017a03320af6aae8e925349fcb1495f8ff733bcc44236f0f2 WHIRLPOOL e9eb6bf4dbf0c66fc584f9cadfae70ca3a45b3f2d1a9e1350206d97211048fd6bea06f0a6ae4f02dca0819d2dd04f3f616512be4305e6c1fb5d9693002e2fa5c
+DIST lwjgl-source-2.9.3.zip 3183783 SHA256 098696a3752321979e6b1dc798c694d4d3daf64a71217ee8d7b04123b5b18a5a SHA512 271b1a5f3824265137bfab6144b4c4d28204051ef82a5ae5e08c05077710a70fd445b4778489ed1c18170d84b8a263e721bcd12d0f24e0c44f0b79444fa76f43 WHIRLPOOL a1d5dcf633bd8983cb8d37edaa8034196c78341628f93d7331b2efc8e56b3d8325ffddef181f21fe7642132184647c336eac670b6ffc98d17bad46f014c0b75a

diff --git a/dev-java/lwjgl/files/asm-4.patch b/dev-java/lwjgl/files/asm-4.patch
new file mode 100644
index 0000000..bd44e0d
--- /dev/null
+++ b/dev-java/lwjgl/files/asm-4.patch
@@ -0,0 +1,53 @@
+From 80eda482aaac0baee4ab565544b14fd15e4b9701 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@aura-online.co.uk>
+Date: Tue, 3 Mar 2015 19:52:05 +0000
+Subject: [PATCH] Compatibility with ASM 4 final instead of RC1
+
+---
+ src/java/org/lwjgl/util/mapped/MappedObjectTransformer.java | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/java/org/lwjgl/util/mapped/MappedObjectTransformer.java b/src/java/org/lwjgl/util/mapped/MappedObjectTransformer.java
+index cf2aac8..c2bc9f9 100644
+--- a/src/java/org/lwjgl/util/mapped/MappedObjectTransformer.java
++++ b/src/java/org/lwjgl/util/mapped/MappedObjectTransformer.java
+@@ -265,7 +265,7 @@ public class MappedObjectTransformer {
+ 	static byte[] transformMappedObject(byte[] bytecode) {
+ 		final ClassWriter cw = new ClassWriter(0);
+ 
+-		ClassVisitor cv = new ClassAdapter(cw) {
++		ClassVisitor cv = new ClassVisitor(Opcodes.ASM4, cw) {
+ 
+ 			private final String[] DEFINALIZE_LIST = {
+ 				VIEWADDRESS_METHOD_NAME,
+@@ -322,8 +322,8 @@ public class MappedObjectTransformer {
+ 		return bytecode;
+ 	}
+ 
+-	private static ClassAdapter getMethodGenAdapter(final String className, final ClassVisitor cv) {
+-		return new ClassAdapter(cv) {
++	private static ClassVisitor getMethodGenAdapter(final String className, final ClassVisitor cv) {
++		return new ClassVisitor(Opcodes.ASM4, cv) {
+ 
+ 			@Override
+ 			public void visitEnd() {
+@@ -493,14 +493,14 @@ public class MappedObjectTransformer {
+ 		};
+ 	}
+ 
+-	private static class TransformationAdapter extends ClassAdapter {
++	private static class TransformationAdapter extends ClassVisitor {
+ 
+ 		final String className;
+ 
+ 		boolean transformed;
+ 
+ 		TransformationAdapter(final ClassVisitor cv, final String className) {
+-			super(cv);
++			super(Opcodes.ASM4, cv);
+ 			this.className = className;
+ 		}
+ 
+-- 
+2.0.4
+

diff --git a/dev-java/lwjgl/lwjgl-2.9.0.ebuild b/dev-java/lwjgl/lwjgl-2.9.3.ebuild
similarity index 77%
rename from dev-java/lwjgl/lwjgl-2.9.0.ebuild
rename to dev-java/lwjgl/lwjgl-2.9.3.ebuild
index a9f2955..2b0271e 100644
--- a/dev-java/lwjgl/lwjgl-2.9.0.ebuild
+++ b/dev-java/lwjgl/lwjgl-2.9.3.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-# Uses the javah task.
-WANT_ANT_TASKS="ant-nodeps"
 JAVA_PKG_IUSE="doc source"
 
-inherit java-pkg-2 java-ant-2
+inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="The Lightweight Java Game Library (LWJGL)"
 HOMEPAGE="http://www.lwjgl.org"
@@ -16,24 +14,25 @@ SRC_URI="mirror://sourceforge/java-game-lib/Official%20Releases/LWJGL%20${PV}/${
 LICENSE="BSD"
 SLOT="2.9"
 KEYWORDS="~amd64 ~x86"
-IUSE="egl"
+IUSE="gles"
 
 CDEPEND="dev-java/apple-java-extensions-bin:0
 	dev-java/apt-mirror:0
-	dev-java/asm:3.999
+	dev-java/asm:4
 	dev-java/jinput:0
+	dev-java/jutils:0
 	x11-libs/libX11
 	x11-libs/libXcursor
 	x11-libs/libXrandr
 	x11-libs/libXxf86vm
-	egl? ( media-libs/mesa[egl] )"
+	gles? ( media-libs/mesa[egl,gles2] )"
 
 DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5
+	>=virtual/jdk-1.7
 	x11-proto/xproto"
 
 RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5
+	>=virtual/jre-1.7
 	media-libs/openal
 	virtual/opengl
 	x11-apps/xrandr"
@@ -42,18 +41,18 @@ S="${WORKDIR}"
 
 JAVA_PKG_BSFIX_NAME="build.xml build-generator.xml"
 JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="apple-java-extensions-bin apt-mirror asm-3.999 jinput"
+EANT_GENTOO_CLASSPATH="apple-java-extensions-bin,apt-mirror,asm-4,jinput,jutils"
 
 java_prepare() {
+	# We don't want a prerelease in the tree.
+	epatch "${FILESDIR}/asm-4.patch"
+
 	# This file is missing.
-	# Output separate JARs for EGL.
+	# Output separate JARs for GLES.
 	sed -i -r \
 		-e "/build-updatesite\.xml/d" \
 		-e '/<target name="-createjars_es">/,/<\/target>/s/lwjgl([^.]*\.jar)/lwjgles\1/g' \
 		build.xml || die
-
-	# Fix EGL build.
-	sed -i "s/\bAPIENTRY/GL_\0/g" src/native/common/opengles/*.{c,h} || die
 }
 
 compile_native() {
@@ -64,7 +63,7 @@ compile_native() {
 
 src_compile() {
 	EANT_BUILD_TARGET="headers jars"
-	use egl && EANT_BUILD_TARGET+=" jars_es"
+	use gles && EANT_BUILD_TARGET+=" jars_es"
 
 	# Build the JARs and headers.
 	java-pkg-2_src_compile
@@ -74,7 +73,7 @@ src_compile() {
 	use amd64 && BITS=64
 
 	compile_native "${BITS}" "gl" ""
-	use egl && compile_native "${BITS}" "gles" "-lEGL"
+	use gles && compile_native "${BITS}" "gles" "-lEGL"
 }
 
 src_install() {

diff --git a/dev-java/lwjgl/metadata.xml b/dev-java/lwjgl/metadata.xml
index bb8312d..7d1492c 100644
--- a/dev-java/lwjgl/metadata.xml
+++ b/dev-java/lwjgl/metadata.xml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
-<email>alistair.bush at gmail.com</email>
-<name>Alistair Bush</name>
-</maintainer>
-<longdescription lang="en">
-The Lightweight Java Game Library (LWJGL) is a solution aimed directly at
-professional and amateur Java programmers alike to enable commercial quality
-games to be written in Java. LWJGL provides developers access to high
-performance crossplatform libraries such as OpenGL (Open Graphics Library) and
-OpenAL (Open Audio Library) allowing for state of the art 3D games and 3D sound
-</longdescription>
-<use><flag name="egl">Build with OpenGL ES support as well as OpenGL support</flag></use>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>The Lightweight Java Game Library (LWJGL) is a solution aimed directly at professional and amateur Java programmers alike to enable commercial quality games to be written in Java. LWJGL provides developers access to high performance crossplatform libraries such as OpenGL (Open Graphics Library) and OpenAL (Open Audio Library) allowing for state of the art 3D games and 3D sound.</longdescription>
+	<upstream>
+		<remote-id type="github">LWJGL/lwjgl</remote-id>
+	</upstream>
+	<use>
+		<flag name="gles">Build with OpenGL ES support as well as OpenGL support</flag>
+	</use>
 </pkgmetadata>