/hg/release/icedtea6-1.7: Support libjpeg8 and always choose the...

[andrew at icedtea.classpath.org]

changeset 19a3df4fa61e in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=19a3df4fa61e
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jan 25 15:35:21 2010 +0000

	Support libjpeg8 and always choose the dlopen invocation at build
	time.

	2010-01-25 Andrew John Hughes <ahughes at redhat.com>

	 * patches/icedtea-libraries.patch: Make all dlopen
	choices at build-time, not just one. Support libjpeg8 as
	well.


diffstat:

2 files changed, 20 insertions(+), 5 deletions(-)
ChangeLog                       |    6 ++++++
patches/icedtea-libraries.patch |   19 ++++++++++++++-----

diffs (63 lines):

diff -r e303235cefa8 -r 19a3df4fa61e ChangeLog
--- a/ChangeLog	Thu Jan 21 16:11:56 2010 +0000
+++ b/ChangeLog	Mon Jan 25 15:35:21 2010 +0000
@@ -1,3 +1,9 @@ 2010-01-21  Andrew John Hughes  <ahughes
+2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-libraries.patch:
+	Make all dlopen choices at build-time,
+	not just one.  Support libjpeg8 as well.
+	
 2010-01-21  Andrew John Hughes  <ahughes at redhat.com>
 
 	PR icedtea/433
diff -r e303235cefa8 -r 19a3df4fa61e patches/icedtea-libraries.patch
--- a/patches/icedtea-libraries.patch	Thu Jan 21 16:11:56 2010 +0000
+++ b/patches/icedtea-libraries.patch	Mon Jan 25 15:35:21 2010 +0000
@@ -25045,17 +25045,21 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
  }
  
  
-@@ -2317,6 +2377,146 @@
+@@ -2317,6 +2377,150 @@
  
  /********************** end of destination manager ************/
  
 +METHODDEF(void)
 +initIDs()
 +{
++#if JPEG_LIB_VERSION >= 80
++    void *handle = dlopen("libjpeg.so.8", RTLD_LAZY | RTLD_GLOBAL);
++#else
 +#if JPEG_LIB_VERSION >= 70
 +    void *handle = dlopen("libjpeg.so.7", RTLD_LAZY | RTLD_GLOBAL);
 +#else
 +    void *handle = dlopen("libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
++#endif
 +#endif
 +    
 +    jpegstderror = (fn_jpegstderror)dlsym(handle, "jpeg_std_error");
@@ -25343,14 +25347,19 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
  /* Initialize the Java VM instance variable when the library is
     first loaded */
  JavaVM *jvm;
-@@ -462,6 +493,71 @@
+@@ -462,6 +493,76 @@
  Java_sun_awt_image_JPEGImageDecoder_initIDs(JNIEnv *env, jclass cls,
                                              jclass InputStreamClass)
  {
++#if JPEG_LIB_VERSION >= 80
++    void *handle = dlopen("libjpeg.so.8", RTLD_LAZY | RTLD_GLOBAL);
++#else
++#if JPEG_LIB_VERSION >= 70
 +    void *handle = dlopen("libjpeg.so.7", RTLD_LAZY | RTLD_GLOBAL);
-+    if (handle == NULL) {
-+       handle = dlopen("libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
-+    }
++#else
++    void *handle = dlopen("libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
++#endif
++#endif
 + 
 +    jpegstderror = (fn_jpegstderror)dlsym(handle, "jpeg_std_error");
 +    if (jpegstderror == NULL) {