Author: ranger
Date: Wed Nov 5 17:46:28 2008
New Revision: 1289
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1289&repname=user%3a+ranger>
Log:
updated stuff
Removed:
trunk/experimental/10.4/main/finkinfo/graphics/imlib.info
trunk/experimental/10.4/main/finkinfo/graphics/imlib2-loaders.info
trunk/experimental/10.4/main/finkinfo/graphics/imlib2.info
trunk/experimental/10.4/main/finkinfo/graphics/imlib2.patch
Modified:
trunk/experimental/common/main/finkinfo/graphics/cairo.info
trunk/experimental/common/main/finkinfo/graphics/imlib.info
trunk/experimental/common/main/finkinfo/graphics/imlib2-loaders.info
trunk/experimental/common/main/finkinfo/graphics/imlib2.info
trunk/experimental/common/main/finkinfo/graphics/imlib2.patch
Modified: trunk/experimental/common/main/finkinfo/graphics/cairo.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/graphics/cairo.info&rev=1289&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/graphics/cairo.info (original)
+++ trunk/experimental/common/main/finkinfo/graphics/cairo.info Wed Nov 5
17:46:28 2008
@@ -21,6 +21,7 @@
<<
BuildDepends: <<
expat1,
+ fink (>= 0.28-1),
fontconfig2-dev,
freetype219 (>= 2.3.7-7),
glitz (>= 0.5.6-1),
Modified: trunk/experimental/common/main/finkinfo/graphics/imlib.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/graphics/imlib.info&rev=1289&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/graphics/imlib.info (original)
+++ trunk/experimental/common/main/finkinfo/graphics/imlib.info Wed Nov 5
17:46:28 2008
@@ -1,34 +1,65 @@
+Info3: <<
Package: imlib
Version: 1.9.15
-Revision: 6
+Revision: 1026
+Description: Image handling library for X11 and Gtk
+License: GPL/LGPL
+Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
+
+Depends: %N-shlibs (>= %v-%r)
+BuildDepends: <<
+ fink (>= 0.28-1),
+ freetype219,
+ libjpeg,
+ libtiff,
+ libpng3,
+ netpbm,
+ giflib,
+ glib,
+ gtk+ (>= 1.2.10-20),
+ libgettext3-dev,
+ gettext-bin,
+ gettext-tools,
+ libiconv-dev,
+ x11-dev
+<<
+BuildDependsOnly: true
+
Source: gnome
Source-MD5: 2a5561457e7f8b2e04d88f73508fd13a
-Depends: %N-shlibs (>= %v-%r)
-BuildDependsOnly: true
-BuildDepends: freetype219 (>= 2.3.7-7), libjpeg, libtiff, libpng3, netpbm,
giflib, glib, gtk+ (>= 1.2.10-20), libgettext3-dev, gettext-bin, gettext-tools,
libiconv-dev, x11-dev
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
perl -pi -e 's/(AC_DEFUN\()([^[]+)(,)/\1\[\2]\3/' imlib.m4
<<
-DescPackaging: <<
- Uses pkgconfig.
- Any package which BuildDepends on this one must also BuildDepend on:
- glib, gtk+
-<<
-NoSetCPPFLAGS: true
+
SetCPPFLAGS: -w -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/include
-NoSetLDFLAGS: true
SetLDFLAGS: -L%p/lib/freetype219/lib
SetLIBS: -L%p/lib -L/usr/X11R6/lib -lX11 -lXext
+NoSetCPPFLAGS: true
+NoSetLDFLAGS: true
ConfigureParams: --disable-shm --mandir=%p/share/man --disable-mmx
+
InstallScript: <<
make install DESTDIR=%d
perl -pi -e 's,^target=.*,target=x11,; s,^Cflags: ,Cflags:
-I%p/lib/freetype219/include ,' %i/lib/pkgconfig/*.pc
<<
+DocFiles: COPYING COPYING.LIB README AUTHORS
SplitOff: <<
Package: %N-shlibs
+ Depends: <<
+ freetype219-shlibs,
+ gtk+-shlibs (>= 1.2.10-20),
+ libgettext3-shlibs,
+ libiconv,
+ libjpeg-bin,
+ libtiff-bin,
+ giflib-bin | libungif-bin,
+ libpng3-shlibs,
+ netpbm-bin,
+ x11-shlibs
+ <<
Replaces: %N (<= 1.9.14-2)
- Depends: freetype219-shlibs (>= 2.3.7-7), gtk+-shlibs (>= 1.2.10-20),
libgettext3-shlibs, libiconv, libjpeg-bin, libtiff-bin, giflib-bin |
libungif-bin, libpng3-shlibs, netpbm-bin, x11-shlibs
+ DocFiles: COPYING COPYING.LIB README AUTHORS
Files: <<
lib/libgdk_imlib.*.dylib
lib/libImlib.*.dylib
@@ -38,17 +69,19 @@
%p/lib/libgdk_imlib.1.dylib 11.0.0 %n (>= 1.9.10-9)
%p/lib/libImlib.1.dylib 11.0.0 %n (>= 1.9.10-9)
<<
- DocFiles: COPYING COPYING.LIB README AUTHORS
<<
-DocFiles: COPYING COPYING.LIB README AUTHORS
+
ConfFiles: %p/etc/imrc
-#
-Description: Image handling library for X11 and Gtk
+
+Homepage: http://www.enlightenment.org/pages/imlib.html
DescDetail: <<
Imlib1 provides common image handling routines plus loaders for a
range of image formats. It's designed to be used with Xlib or with
Gtk.
<<
-License: GPL/LGPL
-Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
-Homepage: http://www.enlightenment.org/pages/imlib.html
+DescPackaging: <<
+ Uses pkgconfig.
+ Any package which BuildDepends on this one must also BuildDepend on:
+ glib, gtk+
+<<
+<<
Modified: trunk/experimental/common/main/finkinfo/graphics/imlib2-loaders.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/graphics/imlib2-loaders.info&rev=1289&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/graphics/imlib2-loaders.info
(original)
+++ trunk/experimental/common/main/finkinfo/graphics/imlib2-loaders.info Wed
Nov 5 17:46:28 2008
@@ -1,20 +1,33 @@
+Info3: <<
Package: imlib2-loaders
-Version: 1.4.0
+Version: 1.4.2
Revision: 1
-Source: mirror:sourceforge:enlightenment/imlib2_loaders-%v.tar.gz
-Source-MD5: 6f51ef8d566769b9ac17c640a34fb1c8
-BuildDepends: imlib2 (>= %v-1), libgettext3-dev, gettext-bin, gettext-tools,
libiconv-dev, x11-dev
+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,
+ gettext-tools,
+ libiconv-dev,
+ x11-dev
+<<
+
+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
-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
-<<
-InstallScript: <<
- make install DESTDIR=%d
-<<
+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
-Description: Image handling library (extra loaders)
+
+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
@@ -23,6 +36,4 @@
This package contains extra image loaders for the Imlib2 library.
<<
-License: GPL
-Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
-Homepage: http://enlightenment.sourceforge.net/Libraries/Imlib2/
+<<
Modified: trunk/experimental/common/main/finkinfo/graphics/imlib2.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/graphics/imlib2.info&rev=1289&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/graphics/imlib2.info (original)
+++ trunk/experimental/common/main/finkinfo/graphics/imlib2.info Wed Nov 5
17:46:28 2008
@@ -1,43 +1,78 @@
+Info3: <<
Package: imlib2
-Version: 1.4.0
+Version: 1.4.2
Revision: 1
-Source: mirror:sourceforge:enlightenment/%n-%v.tar.gz
-Source-MD5: 69f7ee996c943142332b4c98597b095c
-BuildDepends: freetype219 (>= 2.3.7-7), libgettext3-dev, gettext-bin,
gettext-tools, libid3tag, libiconv-dev, libjpeg, libpng3, libtiff, giflib |
libungif, x11-dev
+Description: Image handling library for X11
+License: BSD
+Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
+
Depends: %N-shlibs (= %v-%r)
-Replaces: %N-shlibs (<<1.1.0-14)
+BuildDepends: <<
+ fink (>= 0.28-1),
+ freetype219,
+ libgettext3-dev,
+ gettext-bin,
+ gettext-tools,
+ libid3tag,
+ libiconv-dev,
+ libjpeg,
+ libpng3,
+ libtiff,
+ giflib | libungif,
+ x11-dev,
+ xmkmf (>= 1.0.2-3)
+<<
+Replaces: %N-shlibs (<< 1.1.0-14)
BuildDependsOnly: true
+
+Source: mirror:sourceforge:enlightenment/%n-%v.tar.bz2
+Source-MD5: 9f15568e76ebda9092c571e0df261f54
UpdateLibtoolInDirs: libltdl
-NoSetCPPFLAGS: true
-SetCPPFLAGS: -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/include
-NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/freetype219/lib
-SetLIBS: -L%p/lib
-ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
--with-freetype-config=%p/lib/freetype219/bin/freetype-config --disable-mmx
+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
<<
-InstallScript: <<
- make install DESTDIR=%d
+
+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: --enable-visibility-hiding --mandir=%p/share/man
--disable-dependency-tracking
--with-freetype-config=%p/lib/freetype219/bin/freetype-config
+
+CompileScript: <<
+#!/bin/sh -ev
+ export PATH=%p/lib/xmkmf/bin:$PATH
+ ./configure %c
+ make
<<
+InstallScript: make install DESTDIR=%d
+DocFiles: AUTHORS COPYING ChangeLog README TODO doc/*.html doc/*.gif
SplitOff: <<
Package: %N-shlibs
- Depends: freetype219-shlibs (>= 2.3.7-7), libgettext3-shlibs, libiconv,
libid3tag-shlibs, 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 6.0.0 %n (>= 1.4.0-1)
- <<
+ Shlibs: %p/lib/libImlib2.1.dylib 6.0.0 %n (>= 1.4.0-1)
<<
-DocFiles: AUTHORS COPYING ChangeLog README TODO doc/*.html doc/*.gif
-Description: Image handling library for X11
+
+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.
<<
-License: BSD
-Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
-Homepage: http://enlightenment.sourceforge.net/Libraries/Imlib2/
+<<
Modified: trunk/experimental/common/main/finkinfo/graphics/imlib2.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/graphics/imlib2.patch&rev=1289&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/graphics/imlib2.patch (original)
+++ trunk/experimental/common/main/finkinfo/graphics/imlib2.patch Wed Nov 5
17:46:28 2008
@@ -1,110 +1,12 @@
-diff -uNr imlib2-1.4.0/imlib2.pc.in imlib2-1.4.0-new/imlib2.pc.in
---- 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}
-
-diff -uNr imlib2-1.4.0/src/modules/loaders/loader_argb.c
imlib2-1.4.0-new/src/modules/loaders/loader_argb.c
---- 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);
-diff -uNr imlib2-1.4.0/src/modules/loaders/loader_jpeg.c
imlib2-1.4.0-new/src/modules/loaders/loader_jpeg.c
---- 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;
-diff -uNr imlib2-1.4.0/src/modules/loaders/loader_lbm.c
imlib2-1.4.0-new/src/modules/loaders/loader_lbm.c
---- 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;
- }
-diff -uNr imlib2-1.4.0/src/modules/loaders/loader_pnm.c
imlib2-1.4.0-new/src/modules/loaders/loader_pnm.c
---- 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);
-diff -uNr imlib2-1.4.0/src/modules/loaders/loader_tga.c
imlib2-1.4.0-new/src/modules/loaders/loader_tga.c
---- 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
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
