Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory
sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv32444/stable/main/finkinfo/graphics
Modified Files:
imlib2.info imlib2.patch
Added Files:
imlib2-loaders.info
Log Message:
sync new version and misc fixes from unstable
--- NEW FILE: imlib2-loaders.info ---
Package: imlib2-loaders
Version: 1.4.0
Revision: 1021
Description: Image handling library (extra loaders)
License: GPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Depends: imlib2-shlibs (>= %v-1)
BuildDepends: <<
imlib2 (>= %v-1),
libgettext3-dev,
gettext-bin,
gettext-tools,
libiconv-dev,
x11-dev
<<
Source: mirror:sourceforge:enlightenment/imlib2_loaders-%v.tar.gz
Source-MD5: 6f51ef8d566769b9ac17c640a34fb1c8
PatchScript: perl -pi -e 's,need_relink=yes,need_relink=no,g;
s,hardcode_direct=yes,hardcode_direct=no,g; s,-flat_namespace -undefined
suppress,-undefined dynamic_lookup,g' ltmain.sh configure
SetLIBS: -L%p/lib
ConfigureParams: --disable-dependency-tracking
--with-imlib2-config=%p/bin/imlib2-config --disable-edb --disable-eet
--disable-mmx
InstallScript: make install DESTDIR=%d
DocFiles: AUTHORS COPYING* ChangeLog INSTALL NEWS README
Homepage: http://enlightenment.sourceforge.net/Libraries/Imlib2/
DescDetail: <<
Imlib2 is the successor to Imlib. It is not just a newer version, it is a
completely new library. Imlib2 can be installed alongside Imlib 1.x
without any problems since they are effectively different libraries, but
they have very similar functionality.
This package contains extra image loaders for the Imlib2 library.
<<
Index: imlib2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/imlib2.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- imlib2.info 13 Jan 2007 19:15:42 -0000 1.3
+++ imlib2.info 10 Aug 2008 15:48:13 -0000 1.4
@@ -1,35 +1,60 @@
Package: imlib2
-Version: 1.2.1
+Version: 1.4.0
Revision: 1022
Description: Image handling library for X11
License: BSD
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Depends: %N-shlibs (= %v-%r)
-BuildDepends: freetype219, gettext-dev, gettext-bin, gettext-tools,
libiconv-dev, libjpeg, libpng3, libtiff, giflib | libungif, x11-dev
-Replaces: %N-shlibs (<<1.1.0-14)
+BuildDepends: <<
+ freetype219,
+ libgettext3-dev,
+ gettext-bin,
+ gettext-tools,
+ libid3tag,
+ libiconv-dev,
+ libjpeg,
+ libpng3,
+ libtiff,
+ giflib | libungif,
+ x11-dev
+<<
+Replaces: %N-shlibs (<< 1.1.0-14)
BuildDependsOnly: true
Source: mirror:sourceforge:enlightenment/%n-%v.tar.gz
-Source-MD5: e32970d03d8aee2885782312d0a7f15f
+Source-MD5: 69f7ee996c943142332b4c98597b095c
UpdateLibtoolInDirs: libltdl
-PatchScript: perl -pi.bak -e 's,need_relink=yes,need_relink=no,g;
s,hardcode_direct=yes,hardcode_direct=no,g; s,-flat_namespace -undefined
suppress,-undefined dynamic_lookup,g' ltmain.sh configure
+PatchScript: <<
+ perl -pi -e 's,need_relink=yes,need_relink=no,g;
s,hardcode_direct=yes,hardcode_direct=no,g; s,-flat_namespace -undefined
suppress,-undefined dynamic_lookup,g' ltmain.sh configure
+ sed -e 's,@FINKPREFIX@,%p,g' < %a/%n.patch | patch -p1
+<<
-SetCPPFLAGS: -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/include
-SetLDFLAGS: -L%p/lib/freetype219/lib
+SetCPPFLAGS: -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/include -I/usr/X11R6/include
+SetLDFLAGS: -L%p/lib/freetype219/lib -L/usr/X11R6/lib
SetLIBS: -L%p/lib
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
-ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
--with-freetype-config=%p/lib/freetype219/bin/freetype-config --disable-mmx
+ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
--with-freetype-config=%p/lib/freetype219/bin/freetype-config --disable-mmx
-InstallScript: make install DESTDIR=%d
+InstallScript: make install DESTDIR=%d
DocFiles: AUTHORS COPYING ChangeLog README TODO doc/*.html doc/*.gif
SplitOff: <<
Package: %N-shlibs
- Depends: freetype219-shlibs, gettext, libiconv, libjpeg-shlibs,
libpng3-shlibs (>= 1.2.5-4), libtiff-shlibs, giflib-shlibs | libungif-shlibs,
x11
+ Depends: <<
+ freetype219-shlibs,
+ libgettext3-shlibs,
+ libiconv,
+ libid3tag-shlibs,
+ libjpeg-shlibs,
+ libpng3-shlibs (>= 1.2.5-4),
+ libtiff-shlibs,
+ giflib-shlibs | libungif-shlibs,
+ x11
+ <<
DocFiles: COPYING
Files: lib/libImlib2.*.dylib lib/imlib2
- Shlibs: %p/lib/libImlib2.1.dylib 4.0.0 %n (>= 1.2.0-1)
+ Shlibs: %p/lib/libImlib2.1.dylib 6.0.0 %n (>= 1.4.0-1)
<<
Homepage: http://enlightenment.sourceforge.net/Libraries/Imlib2/
Index: imlib2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/imlib2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- imlib2.patch 20 Jan 2006 20:12:53 -0000 1.1
+++ imlib2.patch 10 Aug 2008 15:48:13 -0000 1.2
@@ -1,44 +1,105 @@
-diff -ru imlib2-1.1.0/configure imlib2-1.1.0-patched/configure
---- imlib2-1.1.0/configure Mon Nov 25 10:28:47 2002
-+++ imlib2-1.1.0-patched/configure Tue Nov 26 18:03:26 2002
-@@ -3716,11 +3716,11 @@
- ;;
+
+--- imlib2-1.4.0/imlib2.pc.in 2007-03-23 05:32:39.000000000 -0400
++++ imlib2-1.4.0-new/imlib2.pc.in 2007-08-23 12:29:22.000000000 -0400
+@@ -6,6 +6,6 @@
+ Name: imlib2
+ Description: Powerful image loading and rendering library
+ Version: @VERSION@
+-Libs: -L${libdir} -lImlib2
+-Cflags: -I${includedir}
++Libs: [EMAIL PROTECTED]@/lib/freetype219/lib -L${libdir} -lImlib2 -lfreetype
++Cflags: [EMAIL PROTECTED]@/lib/freetype219/include -I${includedir}
- darwin* | rhapsody*)
-- allow_undefined_flag='-undefined suppress'
-+ allow_undefined_flag='-undefined dynamic_lookup'
- # FIXME: Relying on posixy $() will cause problems for
- # cross-compilation, but unfortunately the echo tests do not
- # yet detect zsh echo's removal of \ escapes.
-- archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts
-install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 &&
echo $verstring)'
-+ archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts $(test
.$module != .yes && echo -install_name $rpath/$soname $tmp_verstring)'
- # We need to add '_' to the symbols in $export_symbols first
- #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
- hardcode_direct=yes
---- imlib2-1.1.0/ltmain.sh.orig Sun Sep 7 19:12:11 2003
-+++ imlib2-1.1.0/ltmain.sh Tue Nov 4 20:26:40 2003
-@@ -2858,7 +2858,23 @@
- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
- eval cmds=\"$archive_expsym_cmds\"
- else
-- eval cmds=\"$archive_cmds\"
-+ if test "x$verstring" = "x0.0"; then
-+ tmp_verstring=
-+ else
-+ tmp_verstring="$verstring"
-+ fi
-+ save_deplibs="$deplibs"
-+ for conv in $convenience; do
-+ tmp_deplibs=
-+ for test_deplib in $deplibs; do
-+ if test "$test_deplib" != "$conv"; then
-+ tmp_deplibs="$tmp_deplibs $test_deplib"
-+ fi
-+ done
-+ deplibs="$tmp_deplibs"
-+ done
-+ eval cmds=\"$archive_cmds\"
-+ deplibs="$save_deplibs"
- fi
- IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
+--- imlib2-1.4.0/src/modules/loaders/loader_argb.c 2007-04-09
18:40:40.000000000 -0400
++++ imlib2-1.4.0-new/src/modules/loaders/loader_argb.c 2007-08-23
12:36:18.000000000 -0400
+@@ -10,7 +10,7 @@
+ load(ImlibImage * im, ImlibProgressFunction progress,
+ char progress_granularity, char immediate_load)
+ {
+- int w, h, alpha;
++ int w=0, h=0, alpha=0;
+ FILE *f;
+
+ if (im->data)
+@@ -23,6 +23,8 @@
+ {
+ char buf[256], buf2[256];
+
++ memset(buf, 0, sizeof(buf));
++ memset(buf2, 0, sizeof(buf));
+ if (!fgets(buf, 255, f))
+ {
+ fclose(f);
+--- imlib2-1.4.0/src/modules/loaders/loader_jpeg.c 2007-04-09
18:40:40.000000000 -0400
++++ imlib2-1.4.0-new/src/modules/loaders/loader_jpeg.c 2007-08-23
12:37:51.000000000 -0400
+@@ -94,8 +94,9 @@
+ im->w = w = cinfo.output_width;
+ im->h = h = cinfo.output_height;
+
+- if (cinfo.rec_outbuf_height > 16)
++ if (cinfo.rec_outbuf_height > 16 || w < 1 || h < 1 || w > 8192 || h >
8192)
+ {
++ im->w = im->h = 0;
+ jpeg_destroy_decompress(&cinfo);
+ fclose(f);
+ return 0;
+--- imlib2-1.4.0/src/modules/loaders/loader_lbm.c 2007-04-09
18:40:40.000000000 -0400
++++ imlib2-1.4.0-new/src/modules/loaders/loader_lbm.c 2007-08-23
12:37:03.000000000 -0400
+@@ -437,6 +437,7 @@
+ }
+ }
+ if (!full || !ok) {
++ im->w = im->h = 0;
+ freeilbm(&ilbm);
+ return ok;
+ }
+@@ -451,12 +452,13 @@
+ cancel = 0;
+ plane[0] = NULL;
+
++ n = ilbm.depth;
++ if (ilbm.mask == 1) n++;
++
+ im->data = malloc(im->w * im->h * sizeof(DATA32));
+- if (im->data) {
+- n = ilbm.depth;
+- if (ilbm.mask == 1) n++;
++ plane[0] = malloc(((im->w + 15) / 16) * 2 * n);
++ if (im->data && plane[0]) {
+
+- plane[0] = malloc(((im->w + 15) / 16) * 2 * n);
+ for (i = 1; i < n; i++) plane[i] = plane[i - 1] + ((im->w + 15) / 16)
* 2;
+
+ z = ((im->w + 15) / 16) * 2 * n;
+@@ -495,6 +497,7 @@
+ * the memory for im->data.
+ *----------*/
+ if (!ok) {
++ im->w = im->h = 0;
+ if (im->data) free(im->data);
+ im->data = NULL;
+ }
+--- imlib2-1.4.0/src/modules/loaders/loader_pnm.c 2007-04-09
18:40:40.000000000 -0400
++++ imlib2-1.4.0-new/src/modules/loaders/loader_pnm.c 2007-08-23
12:28:37.000000000 -0400
+@@ -68,7 +68,7 @@
+ int i = 0;
+
+ /* read numbers */
+- while (c != EOF && !isspace(c))
++ while (c != EOF && i+1 < sizeof(buf) && !isspace(c))
+ {
+ buf[i++] = c;
+ c = fgetc(f);
+--- imlib2-1.4.0/src/modules/loaders/loader_tga.c 2007-04-09
18:40:40.000000000 -0400
++++ imlib2-1.4.0-new/src/modules/loaders/loader_tga.c 2007-08-23
12:44:11.000000000 -0400
+@@ -350,7 +350,9 @@
+ else
+ dataptr = im->data + (y * im->w);
+
+- for (x = 0; x < im->w; x++) /* for each pixel in the row
*/
++ for (x = 0;
++ x < im->w && bufptr+bpp/8 < bufend;
++ x++) /* for each pixel in the row */
+ {
+ switch (bpp)
+ {
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
