Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv29439
Modified Files:
cairo.info fnlib.info freetype219.info gimp2.info gpaint2.info
imagemagick.info mplayer.info
Log Message:
fnlib.info
Index: mplayer.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/mplayer.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mplayer.info 15 Mar 2007 16:36:56 -0000 1.6
+++ mplayer.info 30 Nov 2007 01:44:32 -0000 1.7
@@ -1,8 +1,7 @@
Package: mplayer
-Version: 1.0.0pre6a
+Version: 1.0.0rc1
Revision: 1012
-Architecture: powerpc
-Source: mirror:custom:MPlayer-1.0pre6a.tar.bz2
+Source: mirror:custom:MPlayer-1.0rc1.tar.bz2
CustomMirror: <<
eur-HU: http://www1.mplayerhq.hu/MPlayer/releases/
eur-HU: http://www2.mplayerhq.hu/MPlayer/releases/
@@ -15,11 +14,19 @@
eur-BG: ftp://ftp8.mplayerhq.hu/MPlayer/releases/
<<
-Source-MD5: a812d945b884c2e2fa7f90c57cd76bff
+Source-MD5: 18c05d88e22c3b815a43ca8d7152ccdc
-BuildDepends: lame, gtk+, glib, libpng3, aalib (>= 1.4rc5-2), libogg,
libvorbis0, libdv4, libmad, sdl (>= 1.2.9-1001), arts-dev (>= 1.1.0-2),
gettext-dev, gettext-bin, gettext-tools, libiconv-dev, xvidcore, x11-dev, fink
(>= 0.17.0-1), xmms, libjpeg, giflib, glib2-dev (>= 2.12.0-1), esound, audiofile
+BuildDepends: lame, gtk+, glib, libpng3, aalib (>= 1.4rc5-2), libogg,
libvorbis0, libdv4, libmad, sdl (>= 1.2.9-1001), arts-dev (>= 1.1.0-2),
libgettext3-dev, gettext-bin, gettext-tools, libiconv-dev, xvidcore, x11-dev,
fink (>= 0.17.0-1), xmms, libjpeg, giflib, glib2-dev (>= 2.12.0-1), esound,
audiofile
Depends: x11, gtk+-shlibs, glib-shlibs, libpng3-shlibs, aalib-shlibs (>=
1.4rc5-2), sdl-shlibs (>= 1.2.9-1001), libogg-shlibs, libvorbis0-shlibs,
libmad-shlibs, lame-shlibs, lynx | lynx-ssl | www-browser, libdv4-shlibs,
arts-shlibs, mplayer-skin, xvidcore-shlibs, xmms-shlibs, libjpeg-shlibs,
giflib-shlibs, glib2-shlibs (>= 2.12.0-1), esound-shlibs, audiofile-shlibs
+# still to fix deps and bdeps; following may help:
+## # otool_deps mplayer
+### ( w/o the 'export CPATH', libcdparanoia0-shlibs gets replaced by
"libcdio-common, libcdio7-shlibs" )
+# aalib-shlibs, arts-shlibs, atk1-shlibs, audiofile-shlibs, esound-shlibs,
faac-shlibs, fribidi-shlibs, \
+# giflib-shlibs, glib2-shlibs, gtk+2-shlibs, jack-shlibs, lame-shlibs,
libcdparanoia0-shlibs, \
+# libdv4-shlibs, libgettext3-shlibs, libggi2-shlibs, libiconv, libjpeg-shlibs,
libmad-shlibs, libmpcdec3-shlibs, \
+# libncurses5-shlibs, libogg-shlibs, libpng3-shlibs, libtheora0-shlibs,
lzo-shlibs, pango1-xft2-shlibs, \
+# sdl-shlibs, slang-shlibs, speex3-shlibs, twolame-shlibs, xmms-shlibs,
xorg-shlibs, xvidcore-shlibs
Replaces: mplayer-altivec, mplayer-custom, mplayer0.9
Conflicts: mplayer-altivec, mplayer-custom, mplayer0.9
@@ -28,10 +35,32 @@
PatchScript: <<
#!/bin/bash -ev
touch .developer
-patch -p1 < %a/%n.patch
+sed -i.bak -e 's, \-isysroot /Developer/SDKs/MacOSX10\.4u\.sdk,,' configure
+sed -i.bak -e 's,soname,dylib_install_name,' {libdha,vidix/drivers}/Makefile
+# reckless to put flags to . after others ..
+sed -i.bak -e 's,\$\(OPTFLAGS\) \-I\. \$\(LIBAV_INC\),-I. $(LIBAV_INC)
$(OPTFLAGS),' Makefile
+# comment next out till fink's (olld !) libdvdread is updated to > 9.4; else
l.588 in stream/stream_dvd.c
+# causes "Undefined symbol: _UDFFindFile" when linking mplayer, because
libmpdvdkit2/dvd_udf.c didn't get compiled...
+# sed -i.tmp -e '/if darwin; then/,/_dvdnav=/s/_dvdnav=no/_dvdnav=auto/'
configure
<<
-ConfigureParams: --with-extralibdir="%p/lib" --with-extraincdir="%p/include"
--mandir="%p/share/man" --enable-menu --enable-gui --disable-cpu-optimization
--disable-altivec --enable-xmms
+NoSetLDFLAGS: true
+SetLDFLAGS: -lIOKit
+SetLIBRARY_PATH: %p/lib
+NoSetCPPFLAGS: true
+SetCPPFLAGS: -I/usr/X11R6/include/freetype2
+# --enable-dynamic-plugins --enable-xvmc --enable-joystick
--enable-largefiles ?
+ConfigureParams: <<
+ --with-freetype-config=/usr/X11R6/bin/freetype-config
--with-dvdnav-config=%p/bin/dvdnav-config \
+ --disable-win32 --disable-mp3lib --disable-network \
+ --mandir="%p/share/man" --enable-menu --enable-gui --disable-altivec
--enable-xmms
+<<
+# ' --with-extralibdir="%p/lib" --with-extraincdir="%p/include" ' deleted
(else bconflict with freetype1)
+## "--enable-vidix-internal" -> already undefined symbols in libdha (eg,
_disable_os_io)
+# _ "should" be defined in the included "sysdep/pci_x86.c" _ or whatever
other...)
+## "--enable-libfame" : missing libfame subdir ?
+
+CompileScript: export CPATH=%p/include/libcdparanoia:%p/include ; ./configure
%c ; make
InstallScript: <<
make install DESTDIR=%d
Index: fnlib.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/fnlib.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fnlib.info 24 Jan 2006 16:14:57 -0000 1.1
+++ fnlib.info 30 Nov 2007 01:44:31 -0000 1.2
@@ -1,7 +1,7 @@
Package: fnlib
Version: 0.5
-Revision: 4
-BuildDepends: libpng3, glib, gtk+, libjpeg, libtiff, netpbm, giflib, imlib
+Revision: 5
+BuildDepends: libpng3, glib, gtk+, libjpeg, libtiff, netpbm10, giflib, imlib
Depends: %N-shlibs (= %v-%r)
BuildDependsOnly: True
CustomMirror: <<
@@ -17,7 +17,7 @@
SplitOff: <<
Package: %N-shlibs
Replaces: %N (<= 0.5-2)
- Depends: imlib-shlibs
+ Depends: imlib-shlibs, giflib-shlibs
Files: lib/libFnlib.0.5.0.dylib lib/libFnlib.0.dylib
Shlibs: %p/lib/libFnlib.0.dylib 6.0.0 %n (>= 0.5-4)
DocFiles: README COPYING COPYING.LIB AUTHORS
Index: gpaint2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/gpaint2.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gpaint2.info 7 Jun 2007 05:45:43 -0000 1.4
+++ gpaint2.info 30 Nov 2007 01:44:32 -0000 1.5
@@ -41,4 +41,4 @@
License: GPL
DescPackaging: Formerly maintained by Michele Garoche
Maintainer: None <[EMAIL PROTECTED]>
-Homepage: http://gpaint.sourceforge.net
\ No newline at end of file
+Homepage: http://gpaint.sourceforge.net
Index: cairo.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/cairo.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- cairo.info 17 Sep 2007 16:00:45 -0000 1.14
+++ cairo.info 30 Nov 2007 01:44:31 -0000 1.15
@@ -46,7 +46,7 @@
#!/bin/sh -ex
export lt_cv_sys_max_cmd_len=65536
export PATH="%p/lib/freetype219/bin:%p/lib/fontconfig2/bin:$PATH"
- export
PKG_CONFIG_PATH="%p/lib/freetype219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:`pwd`:$PKG_CONFIG_PATH"
+ export
PKG_CONFIG_PATH="%p/lib/freetype219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/pango-ft219/lib/pkgconfig:`pwd`:$PKG_CONFIG_PATH"
./configure %c
find . -name Makefile | xargs perl -pi -e 's,^CAIRO_CFLAGS =
,CAIRO_CFLAGS = -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2 -I%p/lib/fontconfig2/include ,'
make
Index: freetype219.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/freetype219.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- freetype219.info 26 Aug 2007 15:42:00 -0000 1.13
+++ freetype219.info 30 Nov 2007 01:44:31 -0000 1.14
@@ -20,6 +20,8 @@
patch -p1 < debian/patches-freetype/374902-composite-glyphs
patch -p1 < debian/patches-freetype/CVE-2007-2754_ttgload
patch -p1 < debian/patches-freetype/CVE-2006-3467_pcf-strlen
+ perl -pi.bak -e 's/.*(#define.*SYSTEM_ZLIB).*/\1/;
s/.*(#define.*INCREMENTAL).*/\1/' include/freetype/config/ftoption.h
+ perl -pi -e 's/.*(#define.*BYTECODE_INTERPRETER).*/\1/'
include/freetype/config/ftoption.h
<<
NoSetCPPFLAGS: true
NoSetMAKEFLAGS: true
Index: imagemagick.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/imagemagick.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- imagemagick.info 21 Aug 2007 17:30:43 -0000 1.17
+++ imagemagick.info 30 Nov 2007 01:44:32 -0000 1.18
@@ -2,24 +2,35 @@
Package: imagemagick%type_pkg[-nox]
Type: -nox (boolean)
Version: 6.3.5
-Revision: 1003
+Revision: 1004
GCC: 4.0
Source: mirror:sourceforge:imagemagick/ImageMagick-%v-6.tar.gz
Source-MD5: 54c2c91eafb416ae3419a78bb8d0162c
SourceDirectory: ImageMagick-%v
-Depends: %N10-shlibs (= %v-%r), (%type_raw[-nox] = .) x11-shlibs,
(%type_raw[-nox] = .) x11
-BuildDepends: pango1-xft2-dev, pkgconfig, (%type_raw[-nox] = .) x11-dev,
bzip2-dev, libjpeg, lcms, libpng3 (>= 1:1.2.18-1), libtiff, libxml2,
libiconv-dev, librsvg2 (>= 2.9.5-11), libdjvulibre15-dev
+Depends: %N10-shlibs (= %v-%r)
+BuildDepends: <<
+ pkgconfig, bzip2-dev, freetype219, libjpeg, lcms, libpng3 (>= 1:1.2.18-1),
libtiff, libxml2, libiconv-dev, libdjvulibre15-dev,
+ (%type_raw[-nox] = .) gconf2-dev, (%type_raw[-nox] = .) glib2-dev,
(%type_raw[-nox] = .) gnome-vfs2-unified-dev,
+ (%type_raw[-nox] = .) gtk+2-dev, (%type_raw[-nox] = .) libart2,
(%type_raw[-nox] = .) libbonobo2-dev,
+ (%type_raw[-nox] = .) libcroco3, (%type_raw[-nox] = .) libgettext3-dev,
(%type_raw[-nox] = .) libgsf-dev,
+ (%type_raw[-nox] = .) librsvg2 (>= 2.9.5-11), (%type_raw[-nox] = .)
orbit2-dev, (%type_raw[-nox] = .) pango1-xft2-dev,
+ (%type_raw[-nox] = .) popt, (%type_raw[-nox] = .) x11-dev
+<<
Conflicts: imagemagick, imagemagick-nox
Replaces: imagemagick, imagemagick-nox
-Provides: (%type_raw[-nox] = -nox) imagemagick
-ConfigureParams: --without-perl --mandir='${prefix}/share/man' --with-bzlib
--without-dps --without-fpx --without-fontconfig
--with-gs-font-dir=%p/share/ghostscript/fonts --without-gslib --without-gvc
--without-jbig --with-jpeg --without-jp2 --with-lcms --with-magic-plus-plus
--without-openexr --with-png --with-rsvg --with-tiff --without-wmf --with-xml
--with-zlib --with-djvu
+Provides: (%type_raw[-nox] = .) imagemagick-nox
+#SetCPPFLAGS: -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2
+SetLDFLAGS: -L%p/lib/freetype219/lib
+ConfigureParams: --without-perl --mandir='${prefix}/share/man' --with-bzlib
--without-dps --without-fpx --without-fontconfig
--with-gs-font-dir=%p/share/ghostscript/fonts --without-gslib --without-gvc
--without-jbig --with-jpeg --without-jp2 --with-lcms --with-magic-plus-plus
--without-openexr --with-png --with-tiff --without-wmf --with-xml --with-zlib
--with-djvu
+# please --enable-libtool-verbose
CompileScript: <<
#!/bin/sh -ev
+ export PATH=%p/lib/freetype219/bin:$PATH
if [ "%type_raw[-nox]" == "." ]; then
- PKG_CONFIG=%p/bin/pkg-config ac_cv_func_poll=no ./configure %c --with-x
+ PKG_CONFIG=%p/bin/pkg-config ac_cv_func_poll=no ./configure %c --with-x
--with-rsvg
fi
if [ "%type_raw[-nox]" == "-nox" ]; then
- PKG_CONFIG=%p/bin/pkg-config ac_cv_func_poll=no ./configure %c --without-x
+ PKG_CONFIG=%p/bin/pkg-config ac_cv_func_poll=no ./configure %c --without-x
--without-rsvg
fi
make
<<
@@ -31,6 +42,7 @@
perl -pi -e "s|-lXext -lSM -lICE -lX11||g" %i/lib/libMagick*la
perl -pi -e "s|-L/usr/X11R6/lib||g" %i/lib/libMagick*la
fi
+ perl -pi -e 's,-L%p/lib ,,g; s, -L%p/lib/freetype219/lib,,' %i/bin/*-config
/bin/rm -f %i/lib/libltdl*
<<
DescDetail: <<
@@ -61,10 +73,14 @@
<<
SplitOff: <<
Package: %N10-shlibs
- Depends: ghostscript%type_pkg[-nox], (%type_raw[-nox] = .) x11,
(%type_raw[-nox] = .) x11-shlibs, bzip2-shlibs, libjpeg-shlibs, lcms-shlibs,
libpng3-shlibs, libtiff-shlibs, libxml2-shlibs, libiconv, libdjvulibre15-shlibs
+ Depends: <<
+ bzip2-shlibs, freetype219-shlibs, ghostscript |
ghostscript%type_pkg[-nox], lcms-shlibs, libdjvulibre15-shlibs,
+ (%type_raw[-nox] = .) glib2-shlibs, (%type_raw[-nox] = .) gtk+2-shlibs,
libjpeg-shlibs,
+ libpng3-shlibs, (%type_raw[-nox] = .) librsvg2-shlibs, libtiff-shlibs,
libxml2-shlibs
+ <<
Conflicts: imagemagick10-shlibs, imagemagick-nox10-shlibs
Replaces: imagemagick10-shlibs, imagemagick-nox10-shlibs
- Provides: (%type_raw[-nox] = -nox) imagemagick10-shlibs
+ Provides: (%type_raw[-nox] = .) imagemagick-nox10-shlibs
Files: lib/lib*.*.dylib %p/lib/ImageMagick-%v
Shlibs: <<
%p/lib/libMagick++.10.dylib 11.0.0 %n (>= 6.2.8-1)
@@ -75,10 +91,10 @@
<<
SplitOff2: <<
Package: %N10-dev
- Depends: %N10-shlibs (= %v-%r), (%type_raw[-nox] = .) x11-shlibs,
(%type_raw[-nox] = .) x11
+ Depends: %N10-shlibs (= %v-%r)
Conflicts: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev
Replaces: imagemagick-dev, imagemagick-nox-dev, imagemagick10-dev,
imagemagick-nox10-dev
- Provides: (%type_raw[-nox] = -nox) imagemagick10-dev
+# Provides: (%type_raw[-nox] = .) imagemagick-nox10-dev
Files: include lib/lib*.* lib/pkgconfig %p/bin/*-config
BuildDependsOnly: True
DocFiles: LICENSE README.txt ChangeLog NEWS
Index: gimp2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/gimp2.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gimp2.info 28 Aug 2007 18:39:31 -0000 1.12
+++ gimp2.info 30 Nov 2007 01:44:31 -0000 1.13
@@ -16,7 +16,8 @@
Replaces: gimp2,gimp2-svg,gimp2-noprint,gimp2-svg-noprint
Recommends: %N-default (= %v-%r)
BuildDepends: <<
-libpng3, libjpeg, libtiff, glib2-dev (>= 2.12.0-1), netpbm, giflib, imlib,
aalib (>= 1.4rc5-2), libgettext3-dev, gettext-bin, gettext-tools, libiconv-dev,
gtk-doc, x11-dev, (%type_raw[-noprint] = nevertrue) gimp-print7-dev,
libexif-dev, gtk+2-dev, libart2, libmng2, expat, fontconfig2-dev, lcms, libwmf,
pango1-xft2-dev, atk1, intltool, freetype219,
+libpng3, libjpeg, libtiff, glib2-dev (>= 2.12.0-1), netpbm10, giflib, imlib,
aalib (>= 1.4rc5-2), libgettext3-dev,
+gettext-bin, gettext-tools, libiconv-dev, gtk-doc, x11-dev,
(%type_raw[-noprint] = nevertrue) gimp-print7-dev, libexif-dev, gtk+2-dev,
libart2, libmng2, expat, fontconfig2-dev, lcms, libwmf, pango1-xft2-dev, atk1,
intltool, freetype219,
(%type_raw[-svg] = -svg) librsvg2 (>= 2.9.5-11),
(%type_raw[-svg] = -svg) audiofile,
(%type_raw[-svg] = -svg) gail17-dev,
@@ -126,7 +127,7 @@
SplitOff2: <<
Package: %N-shlibs
- Depends: (%type_raw[-noprint] = nevertrue) gimp-print7-shlibs,
libpng3-shlibs, libjpeg-shlibs, libtiff-shlibs, glib2-shlibs (>= 2.12.0-1),
gtk+2-shlibs, netpbm-shlibs, giflib-shlibs, imlib-shlibs, aalib-shlibs,
libgettext3-shlibs, libiconv, libexif-shlibs, libart2-shlibs, libmng2-shlibs,
expat-shlibs, lcms-shlibs, (%type_raw[-svg] = -svg) librsvg2-shlibs (>=
2.9.5-11), (%type_raw[-svg] = -svg) libgtkhtml2-shlibs, atk1-shlibs,
pango1-xft2-shlibs, libncurses5-shlibs, freetype219-shlibs, fontconfig2-shlibs
+ Depends: (%type_raw[-noprint] = nevertrue) gimp-print7-shlibs,
libpng3-shlibs, libjpeg-shlibs, libtiff-shlibs, glib2-shlibs (>= 2.12.0-1),
gtk+2-shlibs, netpbm10-shlibs, giflib-shlibs, imlib-shlibs, aalib-shlibs,
libgettext3-shlibs, libiconv, libexif-shlibs, libart2-shlibs, libmng2-shlibs,
expat-shlibs, lcms-shlibs, (%type_raw[-svg] = -svg) librsvg2-shlibs (>=
2.9.5-11), (%type_raw[-svg] = -svg) libgtkhtml2-shlibs, atk1-shlibs,
pango1-xft2-shlibs, libncurses5-shlibs, freetype219-shlibs, fontconfig2-shlibs
Conflicts:
gimp2-shlibs,gimp2-svg-shlibs,gimp2-noprint-shlibs,gimp2-svg-noprint-shlibs
Replaces: <<
gimp2,gimp2-svg,gimp2-noprint,gimp2-svg-noprint,
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
