From: <enl...@li...> - 2004-07-25 21:50:46
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2 Modified Files: imlib2.spec Log Message: Sun Jul 25 17:45:53 2004 Michael Jennings (mej) Fixed up lots of spec files here. I haven't been able to test the emotion spec file, but hopefully I didn't break anything too terrible. :-) Also fixed an etox problem with the conditional test build. ---------------------------------------------------------------------- =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/imlib2.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- imlib2.spec 20 Jul 2004 21:24:37 -0000 1.24 +++ imlib2.spec 25 Jul 2004 21:50:40 -0000 1.25 @@ -1,13 +1,14 @@ Summary: Powerful image loading and rendering library Name: imlib2 Version: 1.1.2 -Release: 1 +Release: 1.%(date '+%Y%m%d') Copyright: BSD Group: System Environment/Libraries Source: ftp://ftp.enlightenment.org/pub/enlightenment/e17/libs/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-root Packager: Michael Jennings <me...@et...> URL: http://www.rasterman.com/raster/imlib.html +#BuildSuggests: freetype-devel xorg-x11-devel Requires: %{name}-loader_jpeg = %{version} Requires: %{name}-loader_png = %{version} Requires: %{name}-loader_argb = %{version} @@ -103,51 +104,32 @@ gz compressed image loader/saver for Imlib2 %prep -rm -rf $RPM_BUILD_ROOT - %setup -q %build - -if [ -f configure ] -then - %configure --prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} --includedir=%{_includedir} -else - # can't build as root? gah. ;) - sed <autogen.sh 's@$USER@ANNOYING@' >autogen.sh1 - mv -f autogen.sh1 autogen.sh - chmod 0700 autogen.sh - ./autogen.sh --prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} --includedir=%{_includedir} -fi - -if [ "$SMP" != "" ]; then - (make "MAKE=make -k -j $SMP"; exit 0) - make -else - make -fi +%{configure} --prefix=%{_prefix} +%{__make} %{?_smp_mflags} %{?mflags} %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +%{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install %clean -rm -rf $RPM_BUILD_ROOT +test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT %post -test -x /sbin/ldconfig && /sbin/ldconfig +/sbin/ldconfig %postun -test -x /sbin/ldconfig && /sbin/ldconfig +/sbin/ldconfig %files -%defattr(-,root,root,0755) -%doc AUTHORS README COPYING ChangeLog doc/index.html doc/imlib2.gif doc/blank.gif +%defattr(-, root, root) +%doc AUTHORS COPYING README ChangeLog doc/index.html doc/imlib2.gif doc/blank.gif %{_libdir}/lib*.so.* %{_bindir}/* %files devel -%defattr(-,root,root,0755) +%defattr(-, root, root, 0755) %{_libdir}/libImlib2.so %{_libdir}/*.a %{_libdir}/*.la @@ -190,28 +172,4 @@ %files loader_gz %attr(755,root,root) %{_libdir}/imlib2_loaders/image/zlib.* - - %changelog -* Mon Jan 8 2001 The Rasterman <ra...@ra...> -- Fix Requires & BuildRequires for freetype. - -* Sat Sep 30 2000 Lyle Kempler <te...@ke...> -- Bring back building imlib2 as root via autogen.sh for the lazy (me) -- Some minor changes - -* Sat Sep 30 2000 Joakim Bodin <bo...@dr...> -- Linux-Mandrake:ise the spec file - -* Tue Sep 12 2000 The Rasterman <ra...@ra...> -- Redo spec file - -* Wed Aug 30 2000 Lyle Kempler <ke...@ut...> -- Include imlib2-config - -* Sat May 20 2000 Lyle Kempler <ke...@ut...> -- Fixed problems with requiring imlib2_view -- Went back to imlib2_view (not imlib2-view) - -* Tue Nov 2 1999 Lyle Kempler <ke...@ut...> -- Mangled imlib 1.9.8 imlib spec file into imlib2 spec file |
From: <enl...@li...> - 2004-08-25 19:55:08
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/src Modified Files: image.h Log Message: Wed Aug 25 15:53:59 2004 Michael Jennings (mej) Never mind. I did it myself. :) ---------------------------------------------------------------------- =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/image.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- image.h 10 Feb 2004 18:28:10 -0000 1.11 +++ image.h 25 Aug 2004 19:54:59 -0000 1.12 @@ -6,7 +6,7 @@ #include <X11/Xlib.h> #endif -#include "ltdl.h" /* for lt_dlhandle definition */ +#include <ltdl.h> /* for lt_dlhandle definition */ typedef struct _imlibimage ImlibImage; #ifndef X_DISPLAY_MISSING |
From: <enl...@li...> - 2004-08-25 19:55:12
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2 Modified Files: configure.in imlib2.spec Log Message: Wed Aug 25 15:53:59 2004 Michael Jennings (mej) Never mind. I did it myself. :) ---------------------------------------------------------------------- =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/configure.in,v retrieving revision 1.77 retrieving revision 1.78 diff -u -3 -r1.77 -r1.78 --- configure.in 21 Jul 2004 00:43:59 -0000 1.77 +++ configure.in 25 Aug 2004 19:54:58 -0000 1.78 @@ -212,6 +212,7 @@ dnl /here was freetype headers checking AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl) +AC_CHECK_LIB(ltdl, lt_dlopen, ltdlopen_libs=-lltdl) EXTRA_LIBS="-L/usr/local/lib -L/usr/X11R6/lib" @@ -403,6 +404,7 @@ AC_SUBST(x_ldflags) AC_SUBST(x_libs) AC_SUBST(dlopen_libs) +AC_SUBST(ltdlopen_libs) AC_SUBST(freetype_cflags) AC_SUBST(freetype_libs) =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/imlib2.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- imlib2.spec 25 Jul 2004 21:50:40 -0000 1.25 +++ imlib2.spec 25 Aug 2004 19:54:58 -0000 1.26 @@ -1,6 +1,6 @@ Summary: Powerful image loading and rendering library Name: imlib2 -Version: 1.1.2 +Version: 1.1.1 Release: 1.%(date '+%Y%m%d') Copyright: BSD Group: System Environment/Libraries |
From: <enl...@li...> - 2004-08-26 17:26:17
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/loaders Modified Files: loader_bmp.c Added Files: loader_lbm.c Log Message: Thu Aug 26 13:25:22 2004 Michael Jennings (mej) BMP loader fix and new ILBM loader from John Bickers <jbi...@ih...>. ---------------------------------------------------------------------- =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/loaders/loader_bmp.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- loader_bmp.c 9 Feb 2004 01:26:03 -0000 1.13 +++ loader_bmp.c 26 Aug 2004 17:26:10 -0000 1.14 @@ -146,12 +146,14 @@ if (headSize == 12) { ncols /= 3; + if (ncols > 256) ncols = 256; for (i = 0; i < ncols; i++) fread(&rgbQuads[i], 3, 1, f); } else { ncols /= 4; + if (ncols > 256) ncols = 256; fread(rgbQuads, 4, ncols, f); } } |
From: <enl...@li...> - 2005-01-04 03:52:41
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2 Modified Files: configure.in imlib2.spec Log Message: Ditto. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/configure.in,v retrieving revision 1.85 retrieving revision 1.86 diff -u -3 -r1.85 -r1.86 --- configure.in 12 Nov 2004 02:24:00 -0000 1.85 +++ configure.in 4 Jan 2005 03:52:32 -0000 1.86 @@ -17,31 +17,35 @@ AM_ENABLE_SHARED AM_PROG_LIBTOOL -if test "x${exec_prefix}" = "xNONE"; then - if test "x${prefix}" = "xNONE"; then - bindir="${ac_default_prefix}/bin"; - else - bindir="${prefix}/bin"; - fi -else - if test "x${prefix}" = "xNONE"; then - bindir="${ac_default_prefix}/bin"; +if test "x${bindir}" = 'x${exec_prefix}/bin'; then + if test "x${exec_prefix}" = "xNONE"; then + if test "x${prefix}" = "xNONE"; then + bindir="${ac_default_prefix}/bin"; + else + bindir="${prefix}/bin"; + fi else - bindir="${prefix}/bin"; + if test "x${prefix}" = "xNONE"; then + bindir="${ac_default_prefix}/bin"; + else + bindir="${prefix}/bin"; + fi fi fi -if test "x${exec_prefix}" = "xNONE"; then - if test "x${prefix}" = "xNONE"; then - libdir="${ac_default_prefix}/lib"; - else - libdir="${prefix}/lib"; - fi -else - if test "x${prefix}" = "xNONE"; then - libdir="${ac_default_prefix}/lib"; +if test "x${libdir}" = 'x${exec_prefix}/lib'; then + if test "x${exec_prefix}" = "xNONE"; then + if test "x${prefix}" = "xNONE"; then + libdir="${ac_default_prefix}/lib"; + else + libdir="${prefix}/lib"; + fi else - libdir="${prefix}/lib"; + if test "x${prefix}" = "xNONE"; then + libdir="${ac_default_prefix}/lib"; + else + libdir="${prefix}/lib"; + fi fi fi =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/imlib2.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- imlib2.spec 1 Nov 2004 09:45:27 -0000 1.30 +++ imlib2.spec 4 Jan 2005 03:52:32 -0000 1.31 @@ -4,14 +4,17 @@ Release: 1.%(date '+%Y%m%d') Copyright: BSD Group: System Environment/Libraries -Source: ftp://ftp.enlightenment.org/pub/enlightenment/e17/libs/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-root -Packager: Michael Jennings <me...@et...> URL: http://www.rasterman.com/raster/imlib.html -#BuildSuggests: freetype-devel xorg-x11-devel +Source: ftp://ftp.enlightenment.org/pub/enlightenment/e17/libs/%{name}-%{version}.tar.gz +Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <me...@et...>} +Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)} +Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}} +#BuildSuggests: xorg-x11-devel +BuildRequires: freetype-devel XFree86-devel Requires: %{name}-loader_jpeg = %{version} Requires: %{name}-loader_png = %{version} Requires: %{name}-loader_argb = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Imlib2 is an advanced replacement library for libraries like libXpm that |
From: <enl...@li...> - 2005-01-04 05:52:54
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2 Modified Files: imlib2.spec Log Message: Copyright -> License =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/imlib2.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -3 -r1.31 -r1.32 --- imlib2.spec 4 Jan 2005 03:52:32 -0000 1.31 +++ imlib2.spec 4 Jan 2005 05:52:45 -0000 1.32 @@ -2,7 +2,7 @@ Name: imlib2 Version: 1.2.0 Release: 1.%(date '+%Y%m%d') -Copyright: BSD +License: BSD Group: System Environment/Libraries URL: http://www.rasterman.com/raster/imlib.html Source: ftp://ftp.enlightenment.org/pub/enlightenment/e17/libs/%{name}-%{version}.tar.gz |
From: <enl...@li...> - 2005-01-04 14:47:12
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/test Added Files: .cvsignore Log Message: Ssssh! |
From: <enl...@li...> - 2005-01-04 14:47:47
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/loaders Added Files: .cvsignore Log Message: Ssssh! |
From: <enl...@li...> - 2005-01-04 14:47:48
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/doc Added Files: .cvsignore Log Message: Ssssh! |
From: <enl...@li...> - 2005-01-04 14:48:03
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/src Added Files: .cvsignore Log Message: Ssssh! |
From: <enl...@li...> - 2005-01-04 14:48:04
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2 Modified Files: imlib2.spec Added Files: .cvsignore Log Message: Ssssh! =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/imlib2.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -3 -r1.32 -r1.33 --- imlib2.spec 4 Jan 2005 05:52:45 -0000 1.32 +++ imlib2.spec 4 Jan 2005 14:47:03 -0000 1.33 @@ -26,6 +26,7 @@ Summary: Imlib2 headers, static libraries and documentation Group: System Environment/Libraries Requires: %{name} = %{version} +Requires: freetype-devel >= 2 %description devel Headers, static libraries and documentation for Imlib2. |
From: <enl...@li...> - 2005-01-04 14:48:04
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/demo Added Files: .cvsignore Log Message: Ssssh! |
From: <enl...@li...> - 2005-01-04 14:48:04
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/filters Added Files: .cvsignore Log Message: Ssssh! |
From: <enl...@li...> - 2005-01-06 15:28:28
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2 Modified Files: imlib2.spec Log Message: Thu Jan 6 10:27:24 2005 Michael Jennings (mej) Spec file fixes from Jason Williams <ja...@tu...>. ---------------------------------------------------------------------- =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/imlib2.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -3 -r1.33 -r1.34 --- imlib2.spec 4 Jan 2005 14:47:03 -0000 1.33 +++ imlib2.spec 6 Jan 2005 15:28:20 -0000 1.34 @@ -136,12 +136,18 @@ %defattr(-, root, root) %doc AUTHORS COPYING README ChangeLog doc/index.html doc/imlib2.gif doc/blank.gif %{_libdir}/lib*.so.* +/usr/share/imlib2/data/fonts/*.ttf +/usr/share/imlib2/data/images/*.png %{_bindir}/* %files devel %defattr(-, root, root, 0755) %{_libdir}/libImlib2.so %{_libdir}/*.a +%{_libdir}/imlib2/loaders/*.a +%{_libdir}/imlib2/loaders/*.la +%{_libdir}/imlib2/filters/*.a +%{_libdir}/imlib2/filters/*.la %{_libdir}/*.la %{_libdir}/pkgconfig/imlib2.pc %{_includedir}/* |
From: <enl...@li...> - 2005-01-16 18:23:54
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/src/lib Modified Files: Imlib2.h image.c image.h Log Message: Sun Jan 16 14:27:18 2005 Michael Jennings (mej) raster is the new Minister of Redundancy Minister. Thanks to D. Hageman <dha...@dr...>. ---------------------------------------------------------------------- =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/Imlib2.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Imlib2.h 1 Nov 2004 09:45:30 -0000 1.1 +++ Imlib2.h 16 Jan 2005 18:23:46 -0000 1.2 @@ -70,6 +70,7 @@ typedef enum _imlib_operation Imlib_Operation; typedef enum _imlib_load_error Imlib_Load_Error; +typedef enum _imlib_load_error ImlibLoadError; typedef enum _imlib_text_direction Imlib_Text_Direction; typedef enum _imlib_TTF_encoding Imlib_TTF_Encoding; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/image.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- image.c 1 Nov 2004 09:45:31 -0000 1.1 +++ image.c 16 Jan 2005 18:23:46 -0000 1.2 @@ -12,6 +12,7 @@ #include "image.h" #include "file.h" #include "loaderpath.h" +#include "Imlib2.h" static ImlibImage *images = NULL; @@ -1069,36 +1070,36 @@ if (er) { /* set to a default fo no error */ - *er = LOAD_ERROR_NONE; + *er = IMLIB_LOAD_ERROR_NONE; /* if the errno is set */ if (errno != 0) { /* default to unknown error */ - *er = LOAD_ERROR_UNKNOWN; + *er = IMLIB_LOAD_ERROR_UNKNOWN; /* standrad fopen() type errors translated */ if (errno == EEXIST) - *er = LOAD_ERROR_FILE_DOES_NOT_EXIST; + *er = IMLIB_LOAD_ERROR_FILE_DOES_NOT_EXIST; else if (errno == EISDIR) - *er = LOAD_ERROR_FILE_IS_DIRECTORY; + *er = IMLIB_LOAD_ERROR_FILE_IS_DIRECTORY; else if (errno == EISDIR) - *er = LOAD_ERROR_FILE_IS_DIRECTORY; + *er = IMLIB_LOAD_ERROR_FILE_IS_DIRECTORY; else if (errno == EACCES) - *er = LOAD_ERROR_PERMISSION_DENIED_TO_READ; + *er = IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_READ; else if (errno == ENAMETOOLONG) - *er = LOAD_ERROR_PATH_TOO_LONG; + *er = IMLIB_LOAD_ERROR_PATH_TOO_LONG; else if (errno == ENOENT) - *er = LOAD_ERROR_PATH_COMPONENT_NON_EXISTANT; + *er = IMLIB_LOAD_ERROR_PATH_COMPONENT_NON_EXISTANT; else if (errno == ENOTDIR) - *er = LOAD_ERROR_PATH_COMPONENT_NOT_DIRECTORY; + *er = IMLIB_LOAD_ERROR_PATH_COMPONENT_NOT_DIRECTORY; else if (errno == EFAULT) - *er = LOAD_ERROR_PATH_POINTS_OUTSIDE_ADDRESS_SPACE; + *er = IMLIB_LOAD_ERROR_PATH_POINTS_OUTSIDE_ADDRESS_SPACE; else if (errno == ELOOP) - *er = LOAD_ERROR_TOO_MANY_SYMBOLIC_LINKS; + *er = IMLIB_LOAD_ERROR_TOO_MANY_SYMBOLIC_LINKS; else if (errno == ENOMEM) - *er = LOAD_ERROR_OUT_OF_MEMORY; + *er = IMLIB_LOAD_ERROR_OUT_OF_MEMORY; else if (errno == EMFILE) - *er = LOAD_ERROR_OUT_OF_FILE_DESCRIPTORS; - if (*er != LOAD_ERROR_UNKNOWN) + *er = IMLIB_LOAD_ERROR_OUT_OF_FILE_DESCRIPTORS; + if (*er != IMLIB_LOAD_ERROR_UNKNOWN) { /* free the stuct we created */ __imlib_ConsumeImage(im); @@ -1248,7 +1249,7 @@ if (!file) { if (er) - *er = LOAD_ERROR_FILE_DOES_NOT_EXIST; + *er = IMLIB_LOAD_ERROR_FILE_DOES_NOT_EXIST; return; } /* ok - just check all our loaders are up to date */ @@ -1268,7 +1269,7 @@ if (!l) { if (er) - *er = LOAD_ERROR_NO_LOADER_FOR_FILE_FORMAT; + *er = IMLIB_LOAD_ERROR_NO_LOADER_FOR_FILE_FORMAT; /* set the filename back to the laoder image filename */ free(im->file); im->file = pfile; @@ -1276,7 +1277,7 @@ } /* if they want an error returned - assume none by default */ if (er) - *er = LOAD_ERROR_NONE; + *er = IMLIB_LOAD_ERROR_NONE; /* call the saver */ e = l->save(im, progress, progress_granularity); @@ -1287,32 +1288,32 @@ /* if there's an error return and the save faile (e = 0) figure it out */ if ((er) && (e == 0)) { - *er = LOAD_ERROR_UNKNOWN; + *er = IMLIB_LOAD_ERROR_UNKNOWN; if (errno == EEXIST) - *er = LOAD_ERROR_FILE_DOES_NOT_EXIST; + *er = IMLIB_LOAD_ERROR_FILE_DOES_NOT_EXIST; else if (errno == EISDIR) - *er = LOAD_ERROR_FILE_IS_DIRECTORY; + *er = IMLIB_LOAD_ERROR_FILE_IS_DIRECTORY; else if (errno == EISDIR) - *er = LOAD_ERROR_FILE_IS_DIRECTORY; + *er = IMLIB_LOAD_ERROR_FILE_IS_DIRECTORY; else if (errno == EACCES) - *er = LOAD_ERROR_PERMISSION_DENIED_TO_WRITE; + *er = IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_WRITE; else if (errno == ENAMETOOLONG) - *er = LOAD_ERROR_PATH_TOO_LONG; + *er = IMLIB_LOAD_ERROR_PATH_TOO_LONG; else if (errno == ENOENT) - *er = LOAD_ERROR_PATH_COMPONENT_NON_EXISTANT; + *er = IMLIB_LOAD_ERROR_PATH_COMPONENT_NON_EXISTANT; else if (errno == ENOTDIR) - *er = LOAD_ERROR_PATH_COMPONENT_NOT_DIRECTORY; + *er = IMLIB_LOAD_ERROR_PATH_COMPONENT_NOT_DIRECTORY; else if (errno == EFAULT) - *er = LOAD_ERROR_PATH_POINTS_OUTSIDE_ADDRESS_SPACE; + *er = IMLIB_LOAD_ERROR_PATH_POINTS_OUTSIDE_ADDRESS_SPACE; else if (errno == ELOOP) - *er = LOAD_ERROR_TOO_MANY_SYMBOLIC_LINKS; + *er = IMLIB_LOAD_ERROR_TOO_MANY_SYMBOLIC_LINKS; else if (errno == ENOMEM) - *er = LOAD_ERROR_OUT_OF_MEMORY; + *er = IMLIB_LOAD_ERROR_OUT_OF_MEMORY; else if (errno == EMFILE) - *er = LOAD_ERROR_OUT_OF_FILE_DESCRIPTORS; + *er = IMLIB_LOAD_ERROR_OUT_OF_FILE_DESCRIPTORS; else if (errno == ENOSPC) - *er = LOAD_ERROR_OUT_OF_DISK_SPACE; + *er = IMLIB_LOAD_ERROR_OUT_OF_DISK_SPACE; else if (errno == EROFS) - *er = LOAD_ERROR_PERMISSION_DENIED_TO_WRITE; + *er = IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_WRITE; } } =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/image.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- image.h 1 Nov 2004 09:45:31 -0000 1.1 +++ image.h 16 Jan 2005 18:23:47 -0000 1.2 @@ -7,6 +7,7 @@ #endif #include <dlfcn.h> +#include <Imlib2.h> typedef struct _imlibimage ImlibImage; #ifdef BUILD_X11 @@ -21,25 +22,6 @@ int update_w, int update_h); typedef void (*ImlibDataDestructorFunction)(ImlibImage *im, void *data); -enum _load_error -{ - LOAD_ERROR_NONE, - LOAD_ERROR_FILE_DOES_NOT_EXIST, - LOAD_ERROR_FILE_IS_DIRECTORY, - LOAD_ERROR_PERMISSION_DENIED_TO_READ, - LOAD_ERROR_NO_LOADER_FOR_FILE_FORMAT, - LOAD_ERROR_PATH_TOO_LONG, - LOAD_ERROR_PATH_COMPONENT_NON_EXISTANT, - LOAD_ERROR_PATH_COMPONENT_NOT_DIRECTORY, - LOAD_ERROR_PATH_POINTS_OUTSIDE_ADDRESS_SPACE, - LOAD_ERROR_TOO_MANY_SYMBOLIC_LINKS, - LOAD_ERROR_OUT_OF_MEMORY, - LOAD_ERROR_OUT_OF_FILE_DESCRIPTORS, - LOAD_ERROR_PERMISSION_DENIED_TO_WRITE, - LOAD_ERROR_OUT_OF_DISK_SPACE, - LOAD_ERROR_UNKNOWN -}; - enum _iflags { F_NONE = 0, @@ -55,7 +37,6 @@ }; typedef enum _iflags ImlibImageFlags; -typedef enum _load_error ImlibLoadError; struct _imlibborder { |
From: <enl...@li...> - 2005-01-19 21:07:14
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2 Modified Files: imlib2.spec Log Message: Wed Jan 19 17:10:29 2005 Michael Jennings (mej) Fix imlib2 and evas spec files to depend on /usr/bin/freetype-config so that they'll build on both RH/Fedora/cAos (freetype-devel) and SuSE (freetype2-devel). ---------------------------------------------------------------------- =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/imlib2.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- imlib2.spec 19 Jan 2005 12:28:53 -0000 1.36 +++ imlib2.spec 19 Jan 2005 21:07:06 -0000 1.37 @@ -1,7 +1,7 @@ Summary: Powerful image loading and rendering library Name: imlib2 Version: 1.2.0 -Release: 1.%(date '+%Y%m%d') +Release: 2.%(date '+%Y%m%d') License: BSD Group: System Environment/Libraries URL: http://www.enlightenment.org @@ -9,8 +9,8 @@ Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <me...@et...>} Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)} Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}} -#BuildSuggests: xorg-x11-devel -BuildRequires: freetype2-devel XFree86-devel +#BuildSuggests: xorg-x11-devel freetype-devel freetype2-devel +BuildRequires: /usr/bin/freetype-config XFree86-devel Requires: %{name}-loader_jpeg = %{version} Requires: %{name}-loader_png = %{version} Requires: %{name}-loader_argb = %{version} @@ -26,7 +26,8 @@ Summary: Imlib2 headers, static libraries and documentation Group: System Environment/Libraries Requires: %{name} = %{version} -Requires: freetype2-devel >= 2 +Requires: /usr/bin/freetype-config + %description devel Headers, static libraries and documentation for Imlib2. |
From: <enl...@li...> - 2005-01-21 04:53:21
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/data/fonts Added Files: .cvsignore Log Message: Fri Jan 21 00:57:08 2005 Michael Jennings (mej) I'm sick of seeing this crap. :P ---------------------------------------------------------------------- |
From: <enl...@li...> - 2005-01-21 04:53:21
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/data/images Added Files: .cvsignore Log Message: Fri Jan 21 00:57:08 2005 Michael Jennings (mej) I'm sick of seeing this crap. :P ---------------------------------------------------------------------- |
From: <enl...@li...> - 2005-01-21 04:53:21
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/data Added Files: .cvsignore Log Message: Fri Jan 21 00:57:08 2005 Michael Jennings (mej) I'm sick of seeing this crap. :P ---------------------------------------------------------------------- |
From: <enl...@li...> - 2005-01-21 04:53:22
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/src/lib Added Files: .cvsignore Log Message: Fri Jan 21 00:57:08 2005 Michael Jennings (mej) I'm sick of seeing this crap. :P ---------------------------------------------------------------------- |
From: <enl...@li...> - 2005-01-21 04:53:22
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/src/modules Added Files: .cvsignore Log Message: Fri Jan 21 00:57:08 2005 Michael Jennings (mej) I'm sick of seeing this crap. :P ---------------------------------------------------------------------- |
From: <enl...@li...> - 2005-01-21 04:53:22
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/src/bin Added Files: .cvsignore Log Message: Fri Jan 21 00:57:08 2005 Michael Jennings (mej) I'm sick of seeing this crap. :P ---------------------------------------------------------------------- |
From: <enl...@li...> - 2005-01-21 04:53:22
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/src/modules/loaders Added Files: .cvsignore Log Message: Fri Jan 21 00:57:08 2005 Michael Jennings (mej) I'm sick of seeing this crap. :P ---------------------------------------------------------------------- |
From: <enl...@li...> - 2005-01-21 04:53:23
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/src/modules/filters Added Files: .cvsignore Log Message: Fri Jan 21 00:57:08 2005 Michael Jennings (mej) I'm sick of seeing this crap. :P ---------------------------------------------------------------------- |
From: <enl...@li...> - 2005-01-21 04:53:51
|
Enlightenment CVS committal Author : mej Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2 Modified Files: .cvsignore Log Message: Fri Jan 21 00:57:08 2005 Michael Jennings (mej) I'm sick of seeing this crap. :P ---------------------------------------------------------------------- =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/imlib2/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- .cvsignore 4 Jan 2005 14:47:03 -0000 1.13 +++ .cvsignore 21 Jan 2005 04:53:13 -0000 1.14 @@ -22,3 +22,6 @@ *.orig *.rej *.la +autom4te* +depcomp +imlib2.c |