Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory
fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16129/main/finkinfo/graphics
Modified Files:
imlib2-loaders.info imlib2.info imlib2.patch
Log Message:
new upstream
Index: imlib2-loaders.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/imlib2-loaders.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- imlib2-loaders.info 24 Aug 2007 13:20:55 -0000 1.4
+++ imlib2-loaders.info 3 Nov 2008 20:50:24 -0000 1.5
@@ -1,12 +1,14 @@
+Info3: <<
Package: imlib2-loaders
-Version: 1.4.0
-Revision: 1021
+Version: 1.4.2
+Revision: 1
Description: Image handling library (extra loaders)
License: GPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Depends: imlib2-shlibs (>= %v-1)
BuildDepends: <<
+ fink (>= 0.28-1),
imlib2 (>= %v-1),
libgettext3-dev,
gettext-bin,
@@ -15,12 +17,12 @@
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
+Source: mirror:sourceforge:enlightenment/imlib2_loaders-%v.tar.bz2
+Source-MD5: 972f64c179035014b72243ccd6245c5e
+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
+ConfigureParams: --enable-visibility-hiding --disable-dependency-tracking
--with-imlib2-config=%p/bin/imlib2-config --disable-edb --disable-eet
InstallScript: make install DESTDIR=%d
DocFiles: AUTHORS COPYING* ChangeLog INSTALL NEWS README
@@ -34,4 +36,4 @@
This package contains extra image loaders for the Imlib2 library.
<<
-
+<<
Index: imlib2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/imlib2.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- imlib2.info 26 Aug 2008 02:53:20 -0000 1.11
+++ imlib2.info 3 Nov 2008 20:50:24 -0000 1.12
@@ -1,12 +1,14 @@
+Info3: <<
Package: imlib2
-Version: 1.4.0
-Revision: 1022
+Version: 1.4.2
+Revision: 1
Description: Image handling library for X11
License: BSD
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Depends: %N-shlibs (= %v-%r)
BuildDepends: <<
+ fink (>= 0.28-1),
freetype219,
libgettext3-dev,
gettext-bin,
@@ -23,12 +25,14 @@
Replaces: %N-shlibs (<< 1.1.0-14)
BuildDependsOnly: true
-Source: mirror:sourceforge:enlightenment/%n-%v.tar.gz
-Source-MD5: 69f7ee996c943142332b4c98597b095c
+Source: mirror:sourceforge:enlightenment/%n-%v.tar.bz2
+Source-MD5: 9f15568e76ebda9092c571e0df261f54
UpdateLibtoolInDirs: libltdl
+PatchFile: %n.patch
+PatchFile-MD5: 37c9c3c2524238327e20b6c9da3cb918
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
+ sed -e 's,@FINKPREFIX@,%p,g' < %{PatchFile} | patch -p1
<<
SetCPPFLAGS: -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/include -I/usr/X11R6/include
@@ -36,7 +40,7 @@
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: --enable-visibility-hiding --mandir=%p/share/man
--disable-dependency-tracking
--with-freetype-config=%p/lib/freetype219/bin/freetype-config
CompileScript: <<
#!/bin/sh -ev
@@ -71,4 +75,4 @@
without any problems since they are effectively different libraries, but
they have very similar functionality.
<<
-
+<<
Index: imlib2.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/imlib2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- imlib2.patch 24 Aug 2007 13:20:55 -0000 1.3
+++ imlib2.patch 3 Nov 2008 20:50:24 -0000 1.4
@@ -1,105 +1,12 @@
-
---- 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 @@
+diff -Nurd imlib2-1.4.2/imlib2.pc.in imlib2-1.4.2-new/imlib2.pc.in
+--- imlib2-1.4.2/imlib2.pc.in 2008-08-17 05:39:14.000000000 -0400
++++ imlib2-1.4.2-new/imlib2.pc.in 2008-11-03 15:41:07.000000000 -0500
+@@ -6,6 +6,5 @@
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}
-
---- 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)
- {
+++Cflags: [EMAIL PROTECTED]@/lib/freetype219/include -I${includedir}
-------------------------------------------------------------------------
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
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
