commit: feb81c5ece2ff55e856be4cda798f7352757c46f
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Fri Apr 3 17:48:25 2015 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Fri Apr 3 17:50:21 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=feb81c5e
dev-java/jogl: version bump
Package-Manager: portage-2.2.18
dev-java/jogl/ChangeLog | 9 ++-
dev-java/jogl/files/disable-applet.diff | 22 ++++++
dev-java/jogl/files/jogl-2.2.4-notests.patch | 12 ++++
dev-java/jogl/jogl-2.2.4.ebuild | 104 +++++++++++++++++++++++++++
4 files changed, 146 insertions(+), 1 deletion(-)
diff --git a/dev-java/jogl/ChangeLog b/dev-java/jogl/ChangeLog
index 11ee69f..91f7b86 100644
--- a/dev-java/jogl/ChangeLog
+++ b/dev-java/jogl/ChangeLog
@@ -1,7 +1,14 @@
# ChangeLog for dev-java/jogl
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*jogl-2.2.4 (03 Apr 2015)
+
+ 03 Apr 2015; Guillaume Horel <guillaume.ho...@gmail.com>
+ +files/disable-applet.diff, +files/jogl-2.2.4-notests.patch,
+ +jogl-2.2.4.ebuild:
+ dev-java/jogl: version bump
+
03 Nov 2014; Justin Lecher <j...@gentoo.org> jogl-2.0_rc8-r1.ebuild,
-jogl-2.1.2.ebuild, jogl-2.1.4.ebuild:
Bump to EAPI=5; drop old
diff --git a/dev-java/jogl/files/disable-applet.diff
b/dev-java/jogl/files/disable-applet.diff
new file mode 100644
index 0000000..ecbd82a
--- /dev/null
+++ b/dev-java/jogl/files/disable-applet.diff
@@ -0,0 +1,22 @@
+Index: libjogl2-java-2.1.4/make/build-newt.xml
+===================================================================
+--- libjogl2-java-2.1.4.orig/make/build-newt.xml 2014-02-27
23:21:42.000000000 +0100
++++ libjogl2-java-2.1.4/make/build-newt.xml 2014-02-27 23:32:11.638399263
+0100
+@@ -100,7 +100,7 @@
+ <!-- partitioning -->
+
+ <property name="java.part.core"
+- value="com/jogamp/newt/* com/jogamp/newt/event/*
com/jogamp/newt/util/* com/jogamp/newt/util/applet/* jogamp/newt/*
jogamp/newt/event/* jogamp/newt/driver/*"/>
++ value="com/jogamp/newt/* com/jogamp/newt/event/*
com/jogamp/newt/util/* jogamp/newt/* jogamp/newt/event/* jogamp/newt/driver/*"/>
+
+ <property name="java.part.opengl"
+ value="com/jogamp/newt/opengl/**
jogamp/newt/driver/opengl/**"/>
+@@ -236,7 +236,7 @@
+ -->
+ <target name="java.compile.javase">
+ <javac destdir="${classes}"
+- excludes="${java.excludes.all} ${java.part.driver.android}"
++ excludes="${java.excludes.all} ${java.part.driver.android}
com/jogamp/newt/util/applet/*"
+ fork="yes"
+ includeAntRuntime="false"
+ memoryMaximumSize="${javac.memorymax}"
diff --git a/dev-java/jogl/files/jogl-2.2.4-notests.patch
b/dev-java/jogl/files/jogl-2.2.4-notests.patch
new file mode 100644
index 0000000..8d24e57
--- /dev/null
+++ b/dev-java/jogl/files/jogl-2.2.4-notests.patch
@@ -0,0 +1,12 @@
+diff -urN jogl-v2.2.4.orig/make/build.xml jogl-v2.2.4/make/build.xml
+--- jogl-v2.2.4.orig/make/build.xml 2015-04-03 10:09:28.730409643 -0400
++++ jogl-v2.2.4/make/build.xml 2015-04-03 10:10:57.040418430 -0400
+@@ -8,7 +8,7 @@
+ - Main build target.
+ -->
+
+- <target name="all" description="Build nativewindow, jogl and newt
projects, incl. all junit tests "
depends="init,build.nativewindow,build.jogl,build.newt,build.oculusvr,one.dir,tag.build,test.compile,developer-zip-archive"
/>
++ <target name="all" description="Build nativewindow, jogl and newt
projects"
depends="init,build.nativewindow,build.jogl,build.newt,build.oculusvr,one.dir,tag.build"
/>
+
+ <target name="all.debug" description="Debug build nativewindow, jogl and
newt projects, incl. all junit tests "
depends="init.debug,build.nativewindow,build.jogl,build.newt,build.oculusvr,one.dir,tag.build,test.compile,developer-zip-archive"
/>
+
diff --git a/dev-java/jogl/jogl-2.2.4.ebuild b/dev-java/jogl/jogl-2.2.4.ebuild
new file mode 100644
index 0000000..9455a6b
--- /dev/null
+++ b/dev-java/jogl/jogl-2.2.4.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+###############################################################################
+# WARNING: don't add to main tree without fixing QA issues first!
+###############################################################################
+
+EAPI=5
+
+RESTRICT="test"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PV=v${PV}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Java(TM) Binding fot the OpenGL(TM) API"
+HOMEPAGE="http://jogamp.org/jogl/www/";
+SRC_URI="http://jogamp.org/deployment/${MY_PV}/archive/Sources/${MY_P}.tar.7z";
+
+LICENSE="BSD"
+SLOT="2.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="cg"
+
+COMMON_DEP="
+ dev-java/ant-core:0
+ dev-java/ant-junit:0
+ dev-java/antlr:0
+ dev-java/cpptasks:0
+ =dev-java/gluegen-${PV}:${SLOT}
+ dev-java/junit:4
+ dev-java/swt:3.7
+ x11-libs/libX11
+ x11-libs/libXxf86vm
+ virtual/opengl
+ cg? ( media-gfx/nvidia-cg-toolkit )"
+RDEPEND="${COMMON_DEP}
+ >=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+ >=virtual/jdk-1.5
+ app-arch/p7zip
+ dev-java/ant-antlr:0
+ dev-java/ant-contrib:0
+ dev-java/ant-nodeps:0
+ dev-java/cpptasks:0"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+ default
+ unpack ./${MY_P}.tar
+}
+
+java_prepare() {
+ find -name '*.jar' -exec rm -v {} + || die
+
+ # Empty filesets are never out of date!
+ sed -i -e 's/<outofdate>/<outofdate force="true">/' make/build*xml ||
die
+ epatch "${FILESDIR}/disable-applet.diff" \
+ "${FILESDIR}/${P}-notests.patch"
+}
+
+JAVA_PKG_BSFIX_NAME+=" build-jogl.xml build-nativewindow.xml build-newt.xml
build-test.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_BUILD_XML="make/build.xml"
+EANT_BUILD_TARGET="all"
+EANT_DOC_TARGET="" # FIXME there are a couple javadoc targets, pick one
+EANT_GENTOO_CLASSPATH="ant-core,antlr,swt-3.7,ant-junit"
+EANT_NEEDS_TOOLS="yes"
+EANT_ANT_TASKS="ant-antlr ant-contrib ant-junit ant-nodeps cpptasks"
+
+src_compile() {
+ EANT_EXTRA_ARGS+=" -Dcommon.gluegen.build.done=true"
+ EANT_EXTRA_ARGS+=" -Dgluegen.root=/usr/share/gluegen-${SLOT}/"
+ EANT_EXTRA_ARGS+=" -Dgluegen.jar=$(java-pkg_getjar gluegen-${SLOT}
gluegen.jar)"
+ EANT_EXTRA_ARGS+=" -Dgluegen-rt.jar=$(java-pkg_getjar gluegen-${SLOT}
gluegen-rt.jar)"
+
+ # FIXME don't build tests just yet
+ use test & EANT_EXTRA_ARGS+=" -Djunit.jar=$(java-pkg_getjar
--build-only junit-4 junit.jar)"
+
+ use cg && EANT_EXTRA_ARGS+=" -Djogl.cg=1 -Dx11.cg.lib=/usr/lib"
+
+ java-pkg-2_src_compile
+}
+
+EANT_TEST_TARGET="junit.run"
+# FIXME src_test
+
+src_install() {
+ # There are many more
+ java-pkg_dojar build/jar/*.jar
+ java-pkg_doso build/lib/*.so
+
+ if use doc; then
+ #java-pkg_dojavadoc javadoc_public
+ dodoc -r doc
+ fi
+ use source && java-pkg_dosrc src/jogl/classes/*
+}
