changeset 2241:627620efacc8

Fixed missing JNI link to native function OGLContext.getOGLIdString() which causes many OpenGL-related regression tests to fail.
author ptisnovs
date Thu, 26 Aug 2010 11:03:17 +0200
parents 1fc64b023005
children ead30a628023
files ChangeLog Makefile.am patches/opengl-jni-fix.patch
diffstat 3 files changed, 20 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Aug 25 15:49:56 2010 -0400
+++ b/ChangeLog	Thu Aug 26 11:03:17 2010 +0200
@@ -1,3 +1,11 @@
+2010-08-16  Pavel Tisnovsky  <ptisnovs@redhat.com>
+
+	* Makefile.am:
+	* patches/opengl-jni-fix.patch:
+	Fixed missing JNI link to native function
+	OGLContext.getOGLIdString() which causes
+	many OpenGL-related regression tests to fail.
+
 2010-08-25  Omair Majid  <omajid@redhat.com>
 
 	Fixes RH569121, S6438179
--- a/Makefile.am	Wed Aug 25 15:49:56 2010 -0400
+++ b/Makefile.am	Thu Aug 26 11:03:17 2010 +0200
@@ -325,7 +325,8 @@
 if ENABLE_XRENDER
 ICEDTEA_PATCHES += patches/openjdk/6725214-direct3d-01.patch \
 	patches/openjdk/6307603-xrender-01.patch \
-	patches/openjdk/6961633-xrender-02.patch
+	patches/openjdk/6961633-xrender-02.patch \
+        patches/opengl-jni-fix.patch
 endif
 
 if ENABLE_NIO2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/opengl-jni-fix.patch	Thu Aug 26 11:03:17 2010 +0200
@@ -0,0 +1,10 @@
+--- openjdk-old/jdk/make/sun/xawt/mapfile-vers	2010-08-16 16:54:21.000000000 +0200
++++ openjdk/jdk/make/sun/xawt/mapfile-vers	2010-08-16 16:54:21.000000000 +0200
+@@ -300,6 +300,7 @@
+         Java_java_awt_FileDialog_initIDs;
+         Java_sun_awt_X11_XWindow_initIDs;
+ 
++        Java_sun_java2d_opengl_OGLContext_getOGLIdString;
+         Java_sun_java2d_opengl_OGLMaskFill_maskFill;
+         Java_sun_java2d_opengl_OGLRenderer_drawPoly;
+         Java_sun_java2d_opengl_OGLRenderQueue_flushBuffer;