Mercurial > hg > release > icedtea7-2.0
changeset 2149:f4ec4881ecef
Support libjpeg8 and always choose the dlopen invocation at build time.
2010-01-25 Andrew John Hughes <ahughes@redhat.com>
* patches/icedtea-libraries.patch:
Make all dlopen choices at build-time,
not just one. Support libjpeg8 as well.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Fri, 14 May 2010 17:24:15 +0100 |
| parents | bdd90e8c8ba7 |
| children | 6f8b8cfe8663 |
| files | ChangeLog patches/icedtea-libraries.patch |
| diffstat | 2 files changed, 16 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri May 14 17:19:28 2010 +0100 +++ b/ChangeLog Fri May 14 17:24:15 2010 +0100 @@ -1,3 +1,9 @@ +2010-01-25 Andrew John Hughes <ahughes@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@redhat.com> PR icedtea/433
--- a/patches/icedtea-libraries.patch Fri May 14 17:19:28 2010 +0100 +++ b/patches/icedtea-libraries.patch Fri May 14 17:24:15 2010 +0100 @@ -700,18 +700,22 @@ } -@@ -2341,6 +2401,146 @@ +@@ -2341,6 +2401,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"); + if (jpegstderror == NULL) { @@ -20988,15 +20992,19 @@ /* Initialize the Java VM instance variable when the library is first loaded */ JavaVM *jvm; -@@ -462,6 +490,72 @@ +@@ -462,6 +490,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); +#else + void *handle = dlopen("libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL); +#endif ++#endif + + jpegstderror = (fn_jpegstderror)dlsym(handle, "jpeg_std_error"); + if (jpegstderror == NULL) {