[jogl2] Update version to 2.2.4
Clément David
davidcl at fedoraproject.org
Fri Oct 17 12:13:13 UTC 2014
commit 6e33288d6c4a6de1047a34bf36fcbab06f88cd1e
Author: Clément DAVID <clement.david at scilab-enterprises.com>
Date: Fri Oct 17 13:45:45 2014 +0200
Update version to 2.2.4
jogl2-0001-fix-gluegen-gl-classpath.patch | 2 +-
jogl2-0002-deactivate-debug-printf.patch | 6 +-
jogl2-0003-delete-not-supported-API.patch | 115 +++++++++++++++++++++++++++++
jogl2-0004-disable-some-tests.patch | 19 +++++
jogl2.spec | 22 ++++--
5 files changed, 154 insertions(+), 10 deletions(-)
---
diff --git a/jogl2-0001-fix-gluegen-gl-classpath.patch b/jogl2-0001-fix-gluegen-gl-classpath.patch
index 80f033b..0f49b23 100644
--- a/jogl2-0001-fix-gluegen-gl-classpath.patch
+++ b/jogl2-0001-fix-gluegen-gl-classpath.patch
@@ -1,6 +1,6 @@
--- a/make/build-common.xml
+++ b/make/build-common.xml
-@@ -241,6 +241,7 @@
+@@ -263,6 +263,7 @@
<path id="gluegen-gl.classpath">
<pathelement location="${gluegen.jar}" />
diff --git a/jogl2-0002-deactivate-debug-printf.patch b/jogl2-0002-deactivate-debug-printf.patch
index efbcea4..9a7ba89 100644
--- a/jogl2-0002-deactivate-debug-printf.patch
+++ b/jogl2-0002-deactivate-debug-printf.patch
@@ -59,7 +59,7 @@
--- a/src/nativewindow/native/x11/Xmisc.c
+++ b/src/nativewindow/native/x11/Xmisc.c
-@@ -191,10 +191,12 @@ static int x11ErrorHandler(Display *dpy,
+@@ -184,10 +184,12 @@ static int x11ErrorHandler(Display *dpy,
XGetErrorDatabaseText(dpy, "XRequest", errCodeStr, "Unknown", reqCodeStr, sizeof(reqCodeStr));
XGetErrorText(dpy, e->error_code, errCodeStr, sizeof(errCodeStr));
@@ -70,5 +70,5 @@
fflush(stderr);
+*/
- if( NULL != jvmHandle && ( errorHandlerDebug || errorHandlerThrowException ) ) {
- jniEnv = NativewindowCommon_GetJNIEnv(jvmHandle, jvmVersion, 0 /* asDaemon */, &shallBeDetached);
+ if( errorHandlerDebug || errorHandlerThrowException ) {
+ jniEnv = NativewindowCommon_GetJNIEnv(0 /* asDaemon */, &shallBeDetached);
diff --git a/jogl2-0003-delete-not-supported-API.patch b/jogl2-0003-delete-not-supported-API.patch
new file mode 100644
index 0000000..86d4c6c
--- /dev/null
+++ b/jogl2-0003-delete-not-supported-API.patch
@@ -0,0 +1,115 @@
+--- a/src/jogl/classes/jogamp/opengl/gl2/fixme/GLObjectTracker.java
++++ b/src/jogl/classes/jogamp/opengl/gl2/fixme/GLObjectTracker.java
+@@ -436,8 +436,7 @@ public class GLObjectTracker {
+ if ((cur != null) &&
+ (cur instanceof GLContextImpl)) {
+ GLContextImpl curImpl = (GLContextImpl) cur;
+- if (deletedObjectPool != null &&
+- deletedObjectPool == curImpl.getDeletedObjectTracker()) {
++ if (deletedObjectPool != null) {
+ // Should be safe to delete these objects now
+ try {
+ delete((GL2)curImpl.getGL());
+@@ -464,11 +463,6 @@ public class GLObjectTracker {
+ s = "current context was not a GLContextImpl";
+ } else if (deletedObjectPool == null) {
+ s = "no current deletedObjectPool";
+- } else if (deletedObjectPool != ((GLContextImpl) cur).getDeletedObjectTracker()) {
+- s = "deletedObjectTracker didn't match";
+- if (((GLContextImpl) cur).getDeletedObjectTracker() == null) {
+- s += " (other was null)";
+- }
+ } else {
+ s = "unknown reason";
+ }
+@@ -668,14 +662,6 @@ public class GLObjectTracker {
+ };
+ name = "buffer";
+ break;
+- case BUFFERS_ARB:
+- deleter = new Deleter() {
+- public void delete(GL2 gl, int obj) {
+- gl.glDeleteBuffersARB(1, new int[] { obj }, 0);
+- }
+- };
+- name = "ARB buffer";
+- break;
+ case FENCES_APPLE:
+ deleter = new Deleter() {
+ public void delete(GL2 gl, int obj) {
+@@ -692,22 +678,6 @@ public class GLObjectTracker {
+ };
+ name = "NV fence";
+ break;
+- case FRAGMENT_SHADERS_ATI:
+- deleter = new Deleter() {
+- public void delete(GL2 gl, int obj) {
+- gl.glDeleteFragmentShaderATI(obj);
+- }
+- };
+- name = "ATI fragment shader";
+- break;
+- case FRAMEBUFFERS_EXT:
+- deleter = new Deleter() {
+- public void delete(GL2 gl, int obj) {
+- gl.glDeleteFramebuffersEXT(1, new int[] { obj }, 0);
+- }
+- };
+- name = "EXT framebuffer";
+- break;
+ case LISTS:
+ deleter = new Deleter() {
+ public void delete(GL2 gl, int obj) {
+@@ -748,14 +718,6 @@ public class GLObjectTracker {
+ };
+ name = "ARB program object";
+ break;
+- case PROGRAMS_NV:
+- deleter = new Deleter() {
+- public void delete(GL2 gl, int obj) {
+- gl.glDeleteProgramsNV(1, new int[] { obj }, 0);
+- }
+- };
+- name = "NV program";
+- break;
+ case QUERIES:
+ deleter = new Deleter() {
+ public void delete(GL2 gl, int obj) {
+@@ -764,22 +726,6 @@ public class GLObjectTracker {
+ };
+ name = "query";
+ break;
+- case QUERIES_ARB:
+- deleter = new Deleter() {
+- public void delete(GL2 gl, int obj) {
+- gl.glDeleteQueriesARB(1, new int[] { obj }, 0);
+- }
+- };
+- name = "ARB query";
+- break;
+- case RENDERBUFFERS_EXT:
+- deleter = new Deleter() {
+- public void delete(GL2 gl, int obj) {
+- gl.glDeleteRenderbuffersEXT(1, new int[] { obj }, 0);
+- }
+- };
+- name = "EXT renderbuffer";
+- break;
+ case SHADER_OBJECTS:
+ deleter = new Deleter() {
+ public void delete(GL2 gl, int obj) {
+@@ -796,14 +742,6 @@ public class GLObjectTracker {
+ };
+ name = "texture";
+ break;
+- case VERTEX_ARRAYS_APPLE:
+- deleter = new Deleter() {
+- public void delete(GL2 gl, int obj) {
+- gl.glDeleteVertexArraysAPPLE(1, new int[] { obj }, 0);
+- }
+- };
+- name = "APPLE vertex array";
+- break;
+ case VERTEX_SHADERS_EXT:
+ deleter = new Deleter() {
+ public void delete(GL2 gl, int obj) {
diff --git a/jogl2-0004-disable-some-tests.patch b/jogl2-0004-disable-some-tests.patch
new file mode 100644
index 0000000..af12bb2
--- /dev/null
+++ b/jogl2-0004-disable-some-tests.patch
@@ -0,0 +1,19 @@
+--- a/make/build-test.xml
++++ b/make/build-test.xml
+@@ -29,6 +29,7 @@
+ <property name="java.part.test.all" value="com/jogamp/** jogamp/**"/>
+ <property name="java.part.test.android" value="com/jogamp/opengl/test/android/**"/>
+ <property name="java.part.test.oculusvr" value="com/jogamp/opengl/test/junit/jogl/stereo/ovr/**"/>
++ <property name="java.part.test.fedora" value="com/jogamp/opengl/test/junit/jogl/acore/TestVersionSemanticsNOUI.java com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java"/>
+ <property name="java.dir.test" value="com/jogamp/opengl/test"/>
+ <property name="java.dir.junit" value="${java.dir.test}/junit"/>
+ <property name="java.dir.bugs" value="${java.dir.test}/bugs"/>
+@@ -66,7 +67,7 @@
+
+ <target name="test.compile.javase.generic">
+ <javac destdir="${classes}"
+- excludes="${java.part.test.android} ${java.part.test.oculusvr}"
++ excludes="${java.part.test.fedora} ${java.part.test.android} ${java.part.test.oculusvr}"
+ fork="yes"
+ includeAntRuntime="false"
+ memoryMaximumSize="${javac.memorymax}"
diff --git a/jogl2.spec b/jogl2.spec
index 2ed0b2a..ea3a393 100644
--- a/jogl2.spec
+++ b/jogl2.spec
@@ -1,6 +1,6 @@
Name: jogl2
-Version: 2.0.2
-Release: 5%{?dist}
+Version: 2.2.4
+Release: 1%{?dist}
%global src_name jogl-v%{version}
Summary: Java bindings for the OpenGL API
@@ -14,11 +14,13 @@ Source1: %{name}-pom.xml
# https://github.com/sgothel/jogl/pull/51
Patch1: %{name}-0001-fix-gluegen-gl-classpath.patch
Patch2: %{name}-0002-deactivate-debug-printf.patch
+Patch3: %{name}-0003-delete-not-supported-API.patch
+Patch4: %{name}-0004-disable-some-tests.patch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
BuildRequires: p7zip
-BuildRequires: gluegen2-devel
+BuildRequires: gluegen2-devel = %{version}
BuildRequires: eclipse-swt
BuildRequires: libXt-devel
BuildRequires: libXrender-devel
@@ -28,7 +30,7 @@ BuildRequires: maven-local
Requires: java >= 1:1.6.0
Requires: jpackage-utils
-Requires: gluegen2
+Requires: gluegen2 = %{version}
%description
The JOGL project hosts the development version of the Java Binding for
@@ -68,6 +70,8 @@ chmod -Rf a+rX,u+w,g-w,o-w .
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
# Remove bundled dependencies
find -name "*.jar" -type f -exec rm {} \;
@@ -75,6 +79,7 @@ find -name "*.apk" -type f -exec rm {} \;
rm -fr make/lib
# Restore the gluegen2 source code from gluegen2-devel
+rm -fr ../gluegen
cp -rdf %{_datadir}/gluegen2 ../gluegen
# Fix file-not-utf8
@@ -95,7 +100,7 @@ export TARGET_PLATFORM_ROOT=/
xargs -t ant <<EOF
-Dc.compiler.debug=true
- -Djavacdebug=false
+ -Djavacdebug=true
%ifarch x86_64
-Djavac.memorymax=1024m
%else
@@ -110,7 +115,9 @@ xargs -t ant <<EOF
-Dgluegen.jar=%{_javadir}/gluegen2.jar
-Dgluegen-rt.jar=%{_jnidir}/gluegen2-rt.jar
-Dswt.jar=%{_libdir}/eclipse/swt.jar
-
+
+ -Djava.excludes.all='com/jogamp/newt/util/applet/* com/jogamp/audio/**/*.java'
+
-Djavadoc.link=%{_javadocdir}/java
-Dgluegen.link=%{_javadocdir}/gluegen2
@@ -160,6 +167,9 @@ find %{buildroot}%{_docdir}/%{name} -name '*.html' \
%{_docdir}/%{name}
%changelog
+* Thu Oct 16 2014 Clément David <c.david86 at gmail.com> - 2.2.4-1
+- Update version
+
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
More information about the scm-commits
mailing list