lists.zerezo.com
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Mingw-users] [SPAM] Re: Re: imlib2
- Date: Fri, 02 May 2008 00:50:35 +0100
- From: Ramiro Polla <ramiro@xxxxxxxxxxxxx>
- Subject: Re: [Mingw-users] [SPAM] Re: Re: imlib2
Ramiro Polla wrote:
Hello,
i'd tried Ramiro's patch already.
no diff to the problem i was having.
I think I updated autotools also as in
http://arrozcru.no-ip.org/ffmpeg_wiki/tiki-index.php?page=Installling+newest+autotools
And maybe I had to pass some -D parameter to CFLAGS too, I don't remember.
Install dlfcn-win32
Install FreeType2
tar zxfv imlib2-1.4.0.tar.gz
patch -p0 < imlib2-1.4.0.diff
cd imlib2-1.4.0
CFLAGS=-DBUILDING_DLL ./configure --without-x --disable-mmx
make
make install
I didn't bother trying to fix more stuff (like asm) because imlib2 will
probably be dropped from FFmpeg once libavfilter takes in...
I also attached the patch in case the server goes south again.
Ramiro Polla
diff -urw imlib2-1.4.0.orig/src/lib/dynamic_filters.c imlib2-1.4.0/src/lib/dynamic_filters.c
--- imlib2-1.4.0.orig/src/lib/dynamic_filters.c Tue Sep 5 00:37:07 2006
+++ imlib2-1.4.0/src/lib/dynamic_filters.c Sun Jun 10 00:09:07 2007
@@ -157,7 +157,7 @@
*num_ret = 0;
/* same for system loader path */
s = (char *)malloc(sizeof(SYS_LOADERS_PATH) + 8 + 1);
- sprintf(s, SYS_LOADERS_PATH "/filters");
+ sprintf(s, SYS_LOADERS_PATH FILTERS_STR);
#ifndef __EMX__
l = __imlib_FileDir(s, &num);
#else
@@ -172,7 +172,7 @@
s = (char *)realloc(s,
sizeof(SYS_LOADERS_PATH) + 9 + strlen(l[i]) +
1);
- sprintf(s, SYS_LOADERS_PATH "/filters/%s", l[i]);
+ sprintf(s, SYS_LOADERS_PATH FILTERS_STR"\\%s", l[i]);
#ifndef __EMX__
list[pi + i] = strdup(s);
#else
diff -urw imlib2-1.4.0.orig/src/lib/file.c imlib2-1.4.0/src/lib/file.c
--- imlib2-1.4.0.orig/src/lib/file.c Tue Sep 5 00:37:07 2006
+++ imlib2-1.4.0/src/lib/file.c Sun Jun 10 00:09:07 2007
@@ -10,7 +10,9 @@
#include <dirent.h>
#include <string.h>
#include <stdlib.h>
+#if 0
#include <pwd.h>
+#endif
#include "file.h"
static void __imlib_FileFieldWord(char *s, int num, char *wd);
@@ -231,7 +233,7 @@
fl = __imlib_FileRealFile(s);
if (!fl)
return 0;
- if (!(__imlib_FilePermissions(fl) & (S_IRUSR | S_IRGRP | S_IROTH)))
+ if (!(__imlib_FilePermissions(fl) & (S_IRUSR)))
{
free(fl);
return 0;
@@ -366,6 +368,7 @@
return st.st_ctime;
}
+#if 0
char *
__imlib_FileHomeDir(int uid)
{
@@ -400,6 +403,7 @@
#endif
return NULL;
}
+#endif
/* gets word number [num] in the string [s] and copies it into [wd] */
/* wd is NULL terminated. If word [num] does not exist wd = "" */
diff -urw imlib2-1.4.0.orig/src/lib/image.c imlib2-1.4.0/src/lib/image.c
--- imlib2-1.4.0.orig/src/lib/image.c Tue Sep 5 00:37:07 2006
+++ imlib2-1.4.0/src/lib/image.c Sun Jun 10 00:10:19 2007
@@ -602,7 +602,7 @@
*num_ret = 0;
/* same for system loader path */
s = (char *)malloc(sizeof(SYS_LOADERS_PATH) + 8 + 1);
- sprintf(s, SYS_LOADERS_PATH "/loaders");
+ sprintf(s, SYS_LOADERS_PATH LOADERS_STR);
#ifndef __EMX__
l = __imlib_FileDir(s, &num);
#else
@@ -618,7 +618,7 @@
s = (char *)realloc(s,
sizeof(SYS_LOADERS_PATH) + 9 + strlen(l[i]) +
1);
- sprintf(s, SYS_LOADERS_PATH "/loaders/%s", l[i]);
+ sprintf(s, SYS_LOADERS_PATH LOADERS_STR"\\%s", l[i]);
#ifndef __EMX__
list[pi + i] = strdup(s);
#else
@@ -660,9 +660,7 @@
continue;
ext = strrchr(list[i], '.');
if ((ext) && (
-#ifdef __CYGWIN__
(!strcasecmp(ext, ".dll")) ||
-#endif
(!strcasecmp(ext, ".so"))))
{
/* Don't add the same loader multiple times... */
@@ -736,13 +734,13 @@
/* ok - was the system loaders dir contents modified ? */
last_scan_time = current_time;
#ifndef __EMX__
- if (__imlib_FileIsDir(SYS_LOADERS_PATH "/loaders/"))
+ if (__imlib_FileIsDir(SYS_LOADERS_PATH LOADERS_STR))
#else
if (__imlib_FileIsDir(__XOS2RedirRoot(SYS_LOADERS_PATH "/loaders/")))
#endif
{
#ifndef __EMX__
- current_time = __imlib_FileModDate(SYS_LOADERS_PATH "/loaders/");
+ current_time = __imlib_FileModDate(SYS_LOADERS_PATH LOADERS_STR);
#else
current_time =
__imlib_FileModDate(__XOS2RedirRoot(SYS_LOADERS_PATH "/loaders/"));
@@ -1093,8 +1091,10 @@
*er = IMLIB_LOAD_ERROR_PATH_COMPONENT_NOT_DIRECTORY;
else if (errno == EFAULT)
*er = IMLIB_LOAD_ERROR_PATH_POINTS_OUTSIDE_ADDRESS_SPACE;
+#if 0
else if (errno == ELOOP)
*er = IMLIB_LOAD_ERROR_TOO_MANY_SYMBOLIC_LINKS;
+#endif
else if (errno == ENOMEM)
*er = IMLIB_LOAD_ERROR_OUT_OF_MEMORY;
else if (errno == EMFILE)
@@ -1305,8 +1305,10 @@
*er = IMLIB_LOAD_ERROR_PATH_COMPONENT_NOT_DIRECTORY;
else if (errno == EFAULT)
*er = IMLIB_LOAD_ERROR_PATH_POINTS_OUTSIDE_ADDRESS_SPACE;
+#if 0
else if (errno == ELOOP)
*er = IMLIB_LOAD_ERROR_TOO_MANY_SYMBOLIC_LINKS;
+#endif
else if (errno == ENOMEM)
*er = IMLIB_LOAD_ERROR_OUT_OF_MEMORY;
else if (errno == EMFILE)
diff -urw imlib2-1.4.0.orig/src/lib/loaderpath.h imlib2-1.4.0/src/lib/loaderpath.h
--- imlib2-1.4.0.orig/src/lib/loaderpath.h Tue Sep 5 00:37:07 2006
+++ imlib2-1.4.0/src/lib/loaderpath.h Sun Jun 10 00:09:07 2007
@@ -1,3 +1,5 @@
#include "config.h"
-#define SYS_LOADERS_PATH PACKAGE_LIB_DIR"/imlib2"
+#define SYS_LOADERS_PATH "imlib2"
+#define FILTERS_STR "\\filters"
+#define LOADERS_STR "\\loaders"
diff -urw imlib2-1.4.0.orig/src/modules/loaders/Makefile.in imlib2-1.4.0/src/modules/loaders/Makefile.in
--- imlib2-1.4.0.orig/src/modules/loaders/Makefile.in Sun May 6 13:40:10 2007
+++ imlib2-1.4.0/src/modules/loaders/Makefile.in Sun Jun 10 00:09:07 2007
@@ -86,9 +86,6 @@
pnm_la_DEPENDENCIES = $(top_builddir)/src/lib/libImlib2.la
am_pnm_la_OBJECTS = loader_pnm.lo
pnm_la_OBJECTS = $(am_pnm_la_OBJECTS)
-tga_la_DEPENDENCIES = $(top_builddir)/src/lib/libImlib2.la
-am_tga_la_OBJECTS = loader_tga.lo
-tga_la_OBJECTS = $(am_tga_la_OBJECTS)
tiff_la_DEPENDENCIES = $(top_builddir)/src/lib/libImlib2.la
am_tiff_la_OBJECTS = loader_tiff.lo
tiff_la_OBJECTS = $(am_tiff_la_OBJECTS)
@@ -114,12 +111,12 @@
SOURCES = $(argb_la_SOURCES) $(bmp_la_SOURCES) $(bz2_la_SOURCES) \
$(gif_la_SOURCES) $(id3_la_SOURCES) $(jpeg_la_SOURCES) \
$(lbm_la_SOURCES) $(png_la_SOURCES) $(pnm_la_SOURCES) \
- $(tga_la_SOURCES) $(tiff_la_SOURCES) $(xpm_la_SOURCES) \
+ $(tiff_la_SOURCES) $(xpm_la_SOURCES) \
$(zlib_la_SOURCES)
DIST_SOURCES = $(argb_la_SOURCES) $(bmp_la_SOURCES) $(bz2_la_SOURCES) \
$(gif_la_SOURCES) $(id3_la_SOURCES) $(jpeg_la_SOURCES) \
$(lbm_la_SOURCES) $(png_la_SOURCES) $(pnm_la_SOURCES) \
- $(tga_la_SOURCES) $(tiff_la_SOURCES) $(xpm_la_SOURCES) \
+ $(tiff_la_SOURCES) $(xpm_la_SOURCES) \
$(zlib_la_SOURCES)
ETAGS = etags
CTAGS = ctags
@@ -281,7 +278,6 @@
argb.la \
bmp.la \
xpm.la \
-tga.la \
lbm.la
EXTRA_DIST = loader_common.h
@@ -318,9 +314,6 @@
xpm_la_SOURCES = loader_xpm.c
xpm_la_LDFLAGS = -module -avoid-version
xpm_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la
-tga_la_SOURCES = loader_tga.c
-tga_la_LDFLAGS = -module -avoid-version
-tga_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la
lbm_la_SOURCES = loader_lbm.c
lbm_la_LDFLAGS = -module -avoid-version
lbm_la_LIBADD = $(top_builddir)/src/lib/libImlib2.la
@@ -402,8 +395,6 @@
$(LINK) $(am_png_la_rpath) $(png_la_LDFLAGS) $(png_la_OBJECTS) $(png_la_LIBADD) $(LIBS)
pnm.la: $(pnm_la_OBJECTS) $(pnm_la_DEPENDENCIES)
$(LINK) -rpath $(pkgdir) $(pnm_la_LDFLAGS) $(pnm_la_OBJECTS) $(pnm_la_LIBADD) $(LIBS)
-tga.la: $(tga_la_OBJECTS) $(tga_la_DEPENDENCIES)
- $(LINK) -rpath $(pkgdir) $(tga_la_LDFLAGS) $(tga_la_OBJECTS) $(tga_la_LIBADD) $(LIBS)
tiff.la: $(tiff_la_OBJECTS) $(tiff_la_DEPENDENCIES)
$(LINK) $(am_tiff_la_rpath) $(tiff_la_LDFLAGS) $(tiff_la_OBJECTS) $(tiff_la_LIBADD) $(LIBS)
xpm.la: $(xpm_la_OBJECTS) $(xpm_la_DEPENDENCIES)
@@ -426,7 +417,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loader_lbm.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loader_png.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loader_pnm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loader_tga.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loader_tiff.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loader_xpm.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loader_zlib.Plo@am__quote@
diff -urw imlib2-1.4.0.orig/src/modules/loaders/loader_jpeg.c imlib2-1.4.0/src/modules/loaders/loader_jpeg.c
--- imlib2-1.4.0.orig/src/modules/loaders/loader_jpeg.c Mon Apr 9 22:40:40 2007
+++ imlib2-1.4.0/src/modules/loaders/loader_jpeg.c Sun Jun 10 00:09:07 2007
@@ -4,7 +4,7 @@
struct ImLib_JPEG_error_mgr {
struct jpeg_error_mgr pub;
- sigjmp_buf setjmp_buffer;
+ jmp_buf setjmp_buffer;
};
typedef struct ImLib_JPEG_error_mgr *emptr;
@@ -15,7 +15,7 @@
errmgr = (emptr) cinfo->err;
/* cinfo->err->output_message(cinfo);*/
- siglongjmp(errmgr->setjmp_buffer, 1);
+ longjmp(errmgr->setjmp_buffer, 1);
return;
}
@@ -26,7 +26,7 @@
errmgr = (emptr) cinfo->err;
/* cinfo->err->output_message(cinfo);*/
-/* siglongjmp(errmgr->setjmp_buffer, 1);*/
+/* longjmp(errmgr->setjmp_buffer, 1);*/
return;
}
@@ -37,7 +37,7 @@
errmgr = (emptr) cinfo->err;
/* cinfo->err->output_message(cinfo);*/
-/* siglongjmp(errmgr->setjmp_buffer, 1);*/
+/* longjmp(errmgr->setjmp_buffer, 1);*/
return;
msg_level = 0;
}
@@ -60,7 +60,7 @@
jerr.pub.error_exit = _JPEGFatalErrorHandler;
jerr.pub.emit_message = _JPEGErrorHandler2;
jerr.pub.output_message = _JPEGErrorHandler;
- if (sigsetjmp(jerr.setjmp_buffer, 1))
+ if (setjmp(jerr.setjmp_buffer))
{
jpeg_destroy_decompress(&cinfo);
fclose(f);
@@ -250,7 +250,7 @@
jerr.pub.emit_message = _JPEGErrorHandler2;
jerr.pub.output_message = _JPEGErrorHandler;
cinfo.err = jpeg_std_error(&(jerr.pub));
- if (sigsetjmp(jerr.setjmp_buffer, 1))
+ if (setjmp(jerr.setjmp_buffer))
{
jpeg_destroy_compress(&cinfo);
free(buf);
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
MinGW-users mailing list
MinGW-users@xxxxxxxxxxxxxxxxxxxxx
You may change your MinGW Account Options or unsubscribe at:
https://lists.sourceforge.net/lists/listinfo/mingw-users