PATCH: libgif
Marcus Meissner
meissner at suse.de
Tue Sep 14 09:51:11 CDT 2004
Hi,
Libgif is back ... Welcome our good old friend to configure and olepicture :)
Ciao, Marcus
Changelog:
Autodetect libgif so extension and try to load it.
--- wine-20040813/dlls/oleaut32/olepicture.c.xx 2004-09-14 16:35:55.837995863 +0200
+++ wine-20040813/dlls/oleaut32/olepicture.c 2004-09-14 16:42:29.566335084 +0200
@@ -50,9 +50,12 @@
*/
#ifdef HAVE_GIF_LIB_H
# include <gif_lib.h>
-#ifndef SONAME_LIBUNGIF
-#define SONAME_LIBUNGIF "libungif.so"
-#endif
+# ifndef SONAME_LIBUNGIF
+# define SONAME_LIBUNGIF "libungif.so"
+# endif
+# ifndef SONAME_LIBGIF
+# define SONAME_LIBGIF "libgif.so"
+# endif
#endif
#define NONAMELESSUNION
@@ -903,7 +906,9 @@
static void *load_libungif(void)
{
- if((libungif_handle = wine_dlopen(SONAME_LIBUNGIF, RTLD_NOW, NULL, 0)) != NULL) {
+ if(((libungif_handle = wine_dlopen(SONAME_LIBUNGIF, RTLD_NOW, NULL, 0)) != NULL) ||
+ ((libungif_handle = wine_dlopen(SONAME_LIBGIF , RTLD_NOW, NULL, 0)) != NULL)
+ ) {
#define LOAD_FUNCPTR(f) \
if((p##f = wine_dlsym(libungif_handle, #f, NULL, 0)) == NULL) { \
@@ -1012,7 +1017,7 @@
if(!libungif_handle) {
if(!load_libungif()) {
- FIXME("Failed reading GIF because unable to find %s\n", SONAME_LIBUNGIF);
+ FIXME("Failed reading GIF because unable to find %s/%s\n", SONAME_LIBUNGIF, SONAME_LIBGIF);
return E_FAIL;
}
}
--- wine-20040813/configure.ac.xx 2004-09-14 15:33:17.000000000 +0200
+++ wine-20040813/configure.ac 2004-09-14 15:33:27.000000000 +0200
@@ -1018,6 +1018,7 @@
WINE_GET_SONAME(curses,waddch)
WINE_GET_SONAME(jpeg,jpeg_start_decompress)
WINE_GET_SONAME(ungif,DGifOpen)
+ WINE_GET_SONAME(gif,DGifOpen)
fi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20040914/623ba446/attachment.pgp
More information about the wine-patches
mailing list