Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv17858/main/finkinfo/libs
Modified Files: Tag: pangocairo-branch caca.info libgpod3.info libxine1.info libxine1.patch Log Message: lots of pangocairo fixes, libxine1 builds everywhere again, and some other misc build fixes Index: libxine1.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libxine1.info,v retrieving revision 1.15.2.16 retrieving revision 1.15.2.17 diff -u -d -r1.15.2.16 -r1.15.2.17 --- libxine1.info 5 Mar 2008 03:52:41 -0000 1.15.2.16 +++ libxine1.info 3 May 2008 03:54:59 -0000 1.15.2.17 @@ -1,12 +1,85 @@ Package: libxine1 -Version: 1.1.2 -Revision: 1024 +Version: 1.1.12 +Revision: 1 Description: Xine video/media player library License: GPL Maintainer: Justin F. Hallett <[EMAIL PROTECTED]> +# # otool_deps libxine1-shlibs +# a52dec-shlibs, aalib-shlibs, amrnb-shlibs, arts-shlibs, audiofile-shlibs, bzip2-shlibs, dbus-shlibs, esound-shlibs, expat1-shlibs, +# faac-shlibs, fontconfig2-shlibs, freetype219-shlibs, gconf2-shlibs, glib2-shlibs, gnome-vfs2-unified-shlibs, gtk+2-shlibs, +# imagemagick1-shlibs, jack-shlibs, lame-shlibs, lcms-shlibs, libavahi1-shlibs, libavcodec51-shlibs, libavutil49-shlibs, +# libbonobo2-shlibs, libcdio7-shlibs, libdvdnav4-shlibs, libfaad1-shlibs, libflac8, libgettext3-shlibs, libgnugetopt-shlibs, +# libiconv, libiso96605-shlibs, libjpeg-shlibs, libmad-shlibs, libmng2-shlibs, libmpcdec5-shlibs, libncurses5-shlibs, +# libogg-shlibs, libpostproc51-shlibs, libtheora0-shlibs, libtiff-shlibs, libvcd0-shlibs, libvorbis0-shlibs, libx264-57-shlibs, +# libxml2-shlibs, orbit2-shlibs, sdl-shlibs, speex3-shlibs, wavpack1-shlibs, xorg-shlibs, xvidcore-shlibs +## removed lipng3, qt3, libtool2 from deps and bdeps. popt ?.. to be checked more carefully.. + Depends: %N-shlibs (= %v-%r) -BuildDepends: fink (>= 0.24-1), aalib, arts-dev (>= 1.4.0-2041), audiofile, avahi-dev, bzip2-shlibs, dbus-dev (>= 1.0-1), esound (>= 0.2.38-1), freetype219, gconf2-dev (>= 2.20.0-1), gettext-bin, gettext-tools, glib2-dev (>= 2.12.0-1), gnome-vfs2-unified-dev (>= 1:2.20.0-1), imagemagick-dev (>= 6.1.8-1002) | imagemagick10-dev (>= 6.1.8-1002), lcms, libavahi-glib1-dev, libbonobo2-dev (>= 2.20.0-1), libcaca-dev, libcdio-dev, libflac8-dev, libgettext3-dev, libiconv-dev, libiso9660-dev, libjpeg, libmng2, libncurses5 (>= 5.4-20041023-1006), libogg, libpng3, libtheora0, libtiff, libtool14, libvcd-dev (>= 0.7.21-10), libvorbis0, libxml2, orbit2-dev (>= 2.14.9-1), pkgconfig (>= 0.21-1), popt, pth, qt3 (>= 3.3.6-1027), sdl (>= 1.2.9-1001), slang, speex3, x11-dev +BuildDepends: << + a52dec-dev, + aalib, + amrnb-dev, + arts-dev (>= 1.5.9-1), + audiofile, + avahi-dev, + bzip2-dev, + dbus-dev (>= 1.0-1), + esound (>= 0.2.38-1), + expat1, + faac-dev, + fink (>= 0.26.0-1), + ffmpeg-dev, + fink (>= 0.24-1), + fontconfig2-dev (>= 2.4.1-1), + freetype219 (>= 2.3.5-1), + gconf2-dev (>= 2.20.0-1), + gettext-bin, + gettext-tools, + glib2-dev (>= 2.14.0-1), + gnome-vfs2-unified-dev (>= 1:2.20.0-1), + gtk+2-dev (>= 2.12.0-1), + imagemagick1-dev, + jack-dev, + lame-dev, + lcms, + libavahi-glib1-dev, + libavcodec-dev, + libavutil-dev, + libbonobo2-dev (>= 2.20.0-1), + libcaca-dev (>= 0.99-1), + libcdio-dev, + libdvdnav, + libfaad1-dev, + libflac8-dev, + libgettext3-dev, + libiconv-dev, + libiso9660-dev, + libjpeg, + libmad, + libmng2, + libmpcdec5, + libncurses5 (>= 5.4-20041023-1006), + libncursesw5, + libogg, + libpostproc-dev, + libtheora0, + libtiff, + libvcd-dev (>= 0.7.21-10), + libvorbis0, + libx264-dev, + libxml2 (>= 2.6.30-1), + orbit2-dev (>= 2.14.9-1), + pkgconfig (>= 0.22-3), + popt, + pth2-dev, + sdl (>= 1.2.9-1001), + slang, + speex3, + wavpack1-dev, + x11-dev, + xvidcore +<< Provides: libxine Conflicts: libxine, libxine-docs Replaces: libxine, libxine-shlibs, libxine-docs @@ -14,61 +87,105 @@ BuildDependsOnly: true Source: mirror:sourceforge:xine/xine-lib-%v.tar.bz2 -Source-MD5: c4dd262c47caae6f428eb902ac8ec0e8 -Patch: %n.patch +Source-MD5: b7254614c78c8b0f1652b8dc06f80b3a +PatchFile: %n.patch +PatchFile-MD5: 767185e7e384d92eed5c5f6189368b40 + PatchScript: << - perl -pi -e 's,-faltivec,-faltivec -maltivec,g' configure - perl -pi -e 's,libX11.so,libX11.dylib,g; s,libXv.so,libXv.dylib,g;' configure - perl -pi -e 's/-avoid-version/-Wl,-read_only_relocs,warning/g;' src/libffmpeg/Makefile.in src/post/deinterlace/Makefile.in src/post/planar/Makefile.in - find . -name \*.c -o -name \*.h | xargs grep balign | cut -d: -f1 | sort -u | xargs perl -pi -e 's,.balign 16,.align 4,g; s,.balign 8,.align 3,g;' - # -O3 considered harmful on OSX :P - perl -pi -e 's,-O3,-Os,g' configure -# perl -pi -e 's|(OPENGL_LIBS=).*|$1"-lGL -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"|g' configure + %{default_script} + perl -pi -e 's,libXv.so,libXv.dylib,g; s,x\*\.so\),x*.dylib),; s,s/\\\.so\$//,s/\.dylib\$//,' configure + perl -pi -e 's/x\$\"ac_have/\"x\$ac_have/g' configure + # from http://hg.debian.org/hg/xine-lib/xine-lib?cmd=changeset;node=d8e1305c1382;style=gitweb : + sed -i -e '/current_atom_size *> *trak_atom_size/,/}/d' src/demuxers/demux_qt.c +<< +SetLDFLAGS: -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib +ConfigureParams: << + --libexecdir=%p/lib/libxine --mandir=%p/share/man (%m = powerpc) --enable-altivec \ + --disable-dependency-tracking --enable-static --enable-shared --enable-ipv6 --enable-coreaudio --enable-macosx-video \ + --with-arts --with-wavpack --with-libflac --with-x --with-fontconfig --with-freetype --enable-antialiasing \ + --with-external-dvdnav --with-external-ffmpeg --with-external-a52dec --with-external-libmad --with-external-libmpcdec << - -SetCPPFLAGS: -fno-common -I%p/lib/freetype219/include/freetype2 -I%p/lib/freetype219/include -I/usr/X11R6/include -I%p/include -SetLDFLAGS: -L%p/lib/freetype219/lib -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -SetLIBS: -L%p/lib -SetMAKEFLAGS: -j1 -NoSetCPPFLAGS: true -NoSetLDFLAGS: true -NoSetMAKEFLAGS: true -ConfigureParams: --enable-fpic --with-pic --enable-static --enable-shared --disable-alsa --disable-alsatest --disable-dxr3 --enable-macosx-video --enable-coreaudio --disable-fb --disable-directfb --disable-vis --disable-mlib --libexecdir=%p/lib/libxine --mandir=%p/share/man --disable-sdltest (%m = powerpc) --enable-altivec (%m = i386) --disable-altivec --disable-w32dll --disable-dependency-tracking CompileScript: << #!/bin/sh -ev - - export PATH="%p/lib/freetype219/bin:$PATH" - export PKG_CONFIG_PATH="%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH" - if [ "%m" = "i386" ]; then - export CPPFLAGS="$CPPFLAGS -UHAVE_MMX -UHAVE_MMX2" - fi + export CPATH=%p/include:/usr/X11R6/include + export PKG_CONFIG_PATH=%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pkgconfig:/usr/X11R6/lib/pkgconfig:${PKG_CONFIG_PATH} ./configure %c - - if [ "%m" = "i386" ]; then - echo "#define HAVE_DARWIN_CDROM 1" >> config.h - fi - + echo "#define HAVE_DARWIN_CDROM 1" >> config.h make << -InstallScript: make install DESTDIR=%d +InstallScript: make -j1 install DESTDIR=%d DocFiles: AUTHORS COPYING CREDITS ChangeLog INSTALL NEWS README TODO SplitOff: << Package: %N-shlibs - Depends: aalib-shlibs, arts-shlibs (>= 1.4.0-2041), audiofile-shlibs, bzip2-shlibs, esound-shlibs (>= 0.2.38-1), freetype219-shlibs, gconf2-shlibs (>= 2.20.0-1), glib2-shlibs (>= 2.12.0-1), gnome-vfs2-unified-shlibs (>= 1:2.20.0-1), imagemagick-shlibs (>= 6.1.8-1002), lcms-shlibs, libbonobo2-shlibs (>= 2.20.0-1), libcdio7-shlibs (>= 0.77-12), libflac8, libgettext3-shlibs, libiconv, libiso96605-shlibs, libjpeg-shlibs, libmng2-shlibs, libncurses5-shlibs (>= 5.4-20041023-1006), libogg-shlibs, libpng3-shlibs, libtheora0-shlibs, libtiff-shlibs, libtool14-shlibs, libvcd0-shlibs (>= 0.7.21-10), libvorbis0-shlibs, libxml2-shlibs, orbit2-shlibs (>= 2.14.9-1), popt-shlibs, qt3-shlibs (>= 3.3.6-1027), sdl-shlibs (>= 1.2.9-1001), slang-shlibs, speex3-shlibs, x11-shlibs + Depends: << + a52dec-shlibs, + aalib-shlibs, + amrnb-shlibs, + arts-shlibs (>= 1.5.9-1), + audiofile-shlibs, + bzip2-shlibs, + dbus-shlibs (>= 1.0-1), + esound-shlibs (>= 0.2.38-1), + expat1-shlibs, + faac-shlibs, + fontconfig2-shlibs (>= 2.4.1-1), + freetype219-shlibs (>= 2.3.5-1), + gconf2-shlibs (>= 2.20.0-1), + glib2-shlibs (>= 2.14.0-1), + gnome-vfs2-unified-shlibs (>= 1:2.20.0-1), + gtk+2-shlibs (>= 2.12.0-1), + imagemagick1-shlibs, + jack-shlibs, + lame-shlibs, + lcms-shlibs, + libavahi-glib1-shlibs, + libavcodec51-shlibs, + libavutil49-shlibs, + libbonobo2-shlibs (>= 2.20.0-1), + libcaca-shlibs (>= 0.99-1), + libcdio7-shlibs, + libdvdnav4-shlibs, + libfaad1-shlibs, + libflac8, + libgettext3-shlibs, + libgnugetopt-shlibs, + libiconv, + libiso96605-shlibs, + libjpeg-shlibs, + libmad-shlibs, + libmng2-shlibs, + libmpcdec5-shlibs, + libncurses5-shlibs (>= 5.4-20041023-1006), + libncursesw5-shlibs, + libogg-shlibs, + libpostproc51-shlibs, + libtheora0-shlibs, + libtiff-shlibs, + libvcd0-shlibs (>= 0.7.21-10), + libvorbis0-shlibs, + libx264-57-shlibs, + libxml2-shlibs (>= 2.6.30-1), + orbit2-shlibs (>= 2.14.9-1), + sdl-shlibs (>= 1.2.9-1001), + slang-shlibs, + speex3-shlibs, + wavpack1-shlibs, + x11-shlibs, + xvidcore-shlibs + << Provides: libxine-shlibs Conflicts: libxine-shlibs Replaces: libxine-shlibs, libxine DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README Files: << - lib/libxine.*.dylib - lib/libxineMacOSXVideo.*.dylib + lib/libxine*.*.dylib lib/xine share/xine << Shlibs: << - %p/lib/libxine.1.dylib 16.0.0 %n (>= 1.0.1-1) - %p/lib/libxineMacOSXVideo.1.dylib 16.0.0 %n (>= 1.0.1-1) + %p/lib/libxine.1.dylib 23.0.0 %n (>= 1.1.12-1) + %p/lib/libxineMacOSXVideo.1.dylib 23.0.0 %n (>= 1.1.12-1) << << @@ -84,4 +201,3 @@ The xine-ui package provides one for your convenience, so you can just start watching your VCDs ;-) << - Index: libgpod3.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libgpod3.info,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- libgpod3.info 5 Mar 2008 03:33:37 -0000 1.1.2.2 +++ libgpod3.info 3 May 2008 03:54:59 -0000 1.1.2.3 @@ -1,16 +1,27 @@ Package: libgpod3 Version: 0.6.0 -Revision: 1 +Revision: 2 Depends: %N-shlibs (>= %v-%r) BuildDepends: << - atk1, - glib2-dev, - gtk+2-dev, + atk1 (>= 1.20.0-1), + cairo (>= 1.6-1), + expat1, + fontconfig2-dev (>= 2.4.1-1), + freetype219 (>= 2.3.5-1), + gettext-tools, + glib2-dev (>= 2.14.0-1), + glitz, + gtk+2-dev (>= 2.12.0-1), intltool, libgettext3-dev, libiconv-dev, - pango1-xft2-dev, - pkgconfig + libjpeg, + libpng3 (>= 1.2.5-4), + libtiff, + pango1-xft2-ft219-dev (>= 1.18.4-4), + pkgconfig (>= 0.22-3), + x11-dev, + xft2-dev << BuildDependsOnly: true @@ -26,8 +37,8 @@ Package: %N-shlibs Description: Shared libraries for libgpod Depends: << - glib2-shlibs, - gtk+2-shlibs, + glib2-shlibs (>= 2.14.0-1), + gtk+2-shlibs (>= 2.12.0-1), libgettext3-shlibs, libiconv << Index: libxine1.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libxine1.patch,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -d -r1.3 -r1.3.2.1 --- libxine1.patch 22 Nov 2006 22:32:49 -0000 1.3 +++ libxine1.patch 3 May 2008 03:54:59 -0000 1.3.2.1 @@ -1,161 +1,13 @@ - ---- xine-lib-1.1.2/configure 2006-07-09 10:51:14.000000000 -0400 -+++ xine-lib-1.1.2-patched/configure 2006-07-15 10:54:01.000000000 -0400 -@@ -33088,8 +33088,8 @@ - ac_have_xv_static="yes" - XV_LIB="$xv_path/$XV_LIB" - ;; -- x*.so) -- XV_LIB=`echo $XV_LIB | sed 's/^lib/-l/; s/\.so$//'` -+ x*.dylib) -+ XV_LIB=`echo $XV_LIB | sed 's/^lib/-l/; s/\.dylib$//'` - ;; - *) - { { echo "$as_me:$LINENO: error: sorry, I don't know about $XV_LIB" >&5 -@@ -52649,7 +52649,7 @@ - k7cpu="i686" - fi - -- CFLAGS="-O3 -pipe -fomit-frame-pointer $f_af $f_al $f_aj $m_wm $m_psb -fexpensive-optimizations $f_si -ffast-math $INLINE_FUNCTIONS $CFLAGS" -+ CFLAGS="-Os -pipe -fno-strict-aliasing -ffast-math $INLINE_FUNCTIONS -no-cpp-precomp -D_INTL_REDIRECT_MACROS $CFLAGS" - - DEBUG_CFLAGS="-O $DEBUG_CFLAGS" - -@@ -52805,7 +52805,7 @@ - enable_armv4l="no" - - case "$host_or_hostalias" in -- i?86-* | k?-* | athlon-* | pentium*-) -+ i?86-*-linux* | k?-* | athlon-* | pentium*-) - - cat >>confdefs.h <<_ACEOF - #define ARCH_X86 -@@ -52838,7 +52838,7 @@ - - enable_ffmmx="yes" - ;; -- *darwin*) -+ *-darwin*) - HOST_OS_DARWIN=1 - - cat >>confdefs.h <<_ACEOF -@@ -52848,14 +52848,22 @@ - - AS="$CC" - --cat >>confdefs.h <<_ACEOF -+case "$host_or_hostalias" in -+ i?86-*-darwin*) -+ cat >>confdefs.h <<_ACEOF -+#define FPM_INTEL -+#define ARCH_X86 -+_ACEOF -+ ;; -+ powerpc-*-darwin*) -+ cat >>confdefs.h <<_ACEOF - #define FPM_PPC -+#define ARCH_PPC - _ACEOF -+ ;; -+esac - - --cat >>confdefs.h <<_ACEOF --#define ARCH_PPC --_ACEOF - - - OBJC=${CC:-gcc} ---- xine-lib-1.1.2/misc/cdda_server.c 2006-07-09 10:37:05.000000000 -0400 -+++ xine-lib-1.1.2-patched/misc/cdda_server.c 2006-07-15 10:33:12.000000000 -0400 -@@ -335,7 +335,9 @@ - - /* dlopening libdvdcss */ - --#ifndef _MSC_VER -+#if defined(__APPLE__) -+ dvdcss_library = dlopen("libdvdcss.2.dylib", RTLD_LAZY); -+#elif !defined(_MSC_VER) - dvdcss_library = dlopen("libdvdcss.so.2", RTLD_LAZY); - #else - dvdcss_library = dlopen("libdvdcss.dll", RTLD_LAZY); -@@ -371,7 +373,7 @@ - dvdcss_library = NULL; - } else if(!dvd_open || !dvd_close || !dvd_title || !dvd_seek - || !dvd_read || !dvd_error || !dvdcss_version) { -- fprintf(stderr, "libdvdread: Missing symbols in libdvdcss.so.2, " -+ fprintf(stderr, "libdvdread: Missing symbols in libdvdcss, " - "this shouldn't happen !\n"); - dlclose(dvdcss_library); - } ---- xine-lib-1.1.2/src/input/input_dvd.c 2006-07-09 10:37:35.000000000 -0400 -+++ xine-lib-1.1.2-patched/src/input/input_dvd.c 2006-07-15 10:33:12.000000000 -0400 -@@ -1784,7 +1784,11 @@ - "DVD drive, which you intend to use for playing DVDs."), - 10, device_change_cb, (void *)this); - -+#ifdef __APPLE__ -+ if ((dvdcss = dlopen("libdvdcss.2.dylib", RTLD_LAZY)) != NULL) { -+#else - if ((dvdcss = dlopen("libdvdcss.so.2", RTLD_LAZY)) != NULL) { -+#endif - /* we have found libdvdcss, enable the specific config options */ - char *raw_device; - static char *decrypt_modes[] = { "key", "disc", "title", NULL }; ---- xine-lib-1.1.2/src/input/libdvdnav/bswap.h 2003-05-26 19:11:44.000000000 -0400 -+++ xine-lib-1.1.2-patched/src/input/libdvdnav/bswap.h 2006-07-15 10:33:12.000000000 -0400 -@@ -41,6 +41,12 @@ - #define B2N_32(x) x = bswap_32(x) - #define B2N_64(x) x = bswap_64(x) - -+#elif defined(__APPLE__) -+#include <libkern/OSByteOrder.h> -+#define B2N_16(x) x = OSSwapBigToHostInt16(x) -+#define B2N_32(x) x = OSSwapBigToHostInt32(x) -+#define B2N_64(x) x = OSSwapBigToHostInt64(x) -+ - #elif defined(__NetBSD__) - #include <sys/endian.h> - #define B2N_16(x) BE16TOH(x) ---- xine-lib-1.1.2/src/input/libdvdnav/dvd_input.c 2006-07-09 10:37:37.000000000 -0400 -+++ xine-lib-1.1.2-patched/src/input/libdvdnav/dvd_input.c 2006-07-15 10:33:12.000000000 -0400 -@@ -364,7 +364,9 @@ - #else - /* dlopening libdvdcss */ - --#ifndef WIN32 -+#ifdef __APPLE__ -+ dvdcss_library = dlopen("libdvdcss.2.dylib", RTLD_LAZY); -+#elif !defined(WIN32) - dvdcss_library = dlopen("libdvdcss.so.2", RTLD_LAZY); - #else - dvdcss_library = dlopen("libdvdcss.dll", RTLD_LAZY); -@@ -400,7 +402,7 @@ - dvdcss_library = NULL; - } else if(!DVDcss_open || !DVDcss_close || !DVDcss_title || !DVDcss_seek - || !DVDcss_read || !DVDcss_error || !dvdcss_version) { -- fprintf(stderr, "libdvdread: Missing symbols in libdvdcss.so.2, " -+ fprintf(stderr, "libdvdread: Missing symbols in libdvdcss, " - "this shouldn't happen !\n"); - dlclose(dvdcss_library); - } ---- xine-lib-1.1.2/src/post/planar/eq.c 2006-07-09 10:40:08.000000000 -0400 -+++ xine-lib-1.1.2-patched/src/post/planar/eq.c 2006-07-15 10:33:12.000000000 -0400 -@@ -27,6 +27,7 @@ - #include "post.h" - #include "xineutils.h" - #include <pthread.h> -+#undef ARCH_X86 - +diff -Nurd xine-lib-1.1.12/src/post/deinterlace/plugins/kdetv_tomsmocomp.c xine-lib-1.1.12-new/src/post/deinterlace/plugins/kdetv_tomsmocomp.c +--- xine-lib-1.1.12/src/post/deinterlace/plugins/kdetv_tomsmocomp.c 2008-03-28 10:24:50.000000000 -0400 ++++ xine-lib-1.1.12-new/src/post/deinterlace/plugins/kdetv_tomsmocomp.c 2008-05-01 12:04:03.000000000 -0400 +@@ -38,6 +38,9 @@ + #include "speedy.h" + #include "plugins.h" - #if defined(ARCH_X86) || defined(ARCH_X86_64) ---- xine-lib-1.1.2/src/post/planar/eq2.c 2006-07-09 10:40:08.000000000 -0400 -+++ xine-lib-1.1.2-patched/src/post/planar/eq2.c 2006-07-15 10:33:12.000000000 -0400 -@@ -32,6 +32,7 @@ - #include "xineutils.h" - #include <math.h> - #include <pthread.h> +#undef ARCH_X86 ++#undef ARCH_X86_64 ++ + #if defined (ARCH_X86) || defined (ARCH_X86_64) - - /* Per channel parameters */ + static int Fieldcopy(void *dest, const void *src, size_t count, Index: caca.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/caca.info,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -u -d -r1.4 -r1.4.2.1 --- caca.info 10 Nov 2006 02:49:30 -0000 1.4 +++ caca.info 3 May 2008 03:54:59 -0000 1.4.2.1 @@ -1,34 +1,87 @@ Package: caca -Version: 0.9 +Version: 0.99.beta13b Revision: 1013 ### -Depends: x11-shlibs, libncurses5-shlibs (>= 5.4-20041023-1006), imlib2-shlibs, slang-shlibs, freetype219-shlibs -Builddepends: doxygen, tetex-base, x11-dev, libncurses5 (>= 5.4-20041023-1006), imlib2, slang, freetype219 +Depends: << + libcaca-shlibs (>= %v-%r), + freetype219-shlibs (>= 2.3.5-3), + imlib2-shlibs +<< +Builddepends: << + cairo (>= 1.6-1), + doxygen, + expat1, + fontconfig2-dev (>= 2.4.1-1), + freeglut, + freetype219 (>= 2.3.5-3), + glib2-dev (>= 2.14.0-1), + glitz, + imlib2, + libgettext3-dev, + libiconv-dev, + libncursesw5 (>= 5.4-20041023-1001), + libpng3 (>= 1.2.5-4), + pango1-xft2-ft219-dev (>= 1.20.0-1), + pixman (>= 0.10.0-1), + pkgconfig (>= 0.22-3), + slang, + tetex-base, + x11-dev, + xft2-dev (>= 2.1.2-5) +<< ### -Source: http://sam.zoy.org/projects/libcaca/libcaca-%v.tar.bz2 -Source-MD5: c7d5c46206091a9203fcb214abb25e4a +Source: http://libcaca.zoy.org/files/libcaca-%v.tar.gz +Source-MD5: 36ae1521461bf0b8b133dc152b56c4c1 ### PatchScript: << + perl -pi -e 's,ifndef __intptr_t_defined,if !defined(__intptr_t_defined) && !defined(_UINTPTR_T),' src/mygetopt.c perl -pi -e 's,man/man3,man/man3caca,g' doc/Makefile.in + perl -pi -e 's,^libcaca___la_LIBADD.*,$& libcucul++.la,' cxx/Makefile.in + perl -pi -e 's,lGL -lglut,$& -lGLU,; s,/usr/share/texmf,%p/share/texmf,' configure + # Get rid of the SDK stuff + perl -pi -e 's, \${MACOSX_SDK_[A-Z]*},,; s/-syslibroot,\${MACOSX_SDK},//; s, *\${ARCH} *,,' configure << ### SetCFLAGS: -DREAL_UNIX_SYSTEM -fno-common +SetLDFLAGS: -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib ### -ConfigureParams: --enable-shared --enable-static --with-pic --mandir=%i/share/man --infodir=%p/share/info --libexecdir=%p/lib +ConfigureParams: --enable-shared --enable-static --with-pic --mandir=%p/share/man --infodir=%p/share/info --libexecdir=%p/lib --with-x --enable-cxx --enable-plugins --disable-cocoa --disable-csharp ### -DocFiles: AUTHORS BUGS COPYING ChangeLog INSTALL NEWS NOTES README THANKS TODO +DocFiles: AUTHORS COPYING ChangeLog NEWS NOTES README THANKS TODO ### +CompileScript: << + #!/bin/sh -ev + export PKG_CONFIG_PATH=%p/lib/pango-ft219/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:${PKG_CONFIG_PATH} + %{default_script} +<< +InstallScript: << + make -j1 install DESTDIR="%d" + mv %i/share/doc/libcucul-dev %i/share/doc/libcaca-dev +<< SplitOff: << + Package: libcaca-shlibs + Depends: freeglut-shlibs, libncursesw5-shlibs (>= 5.4-20041023-1001), slang-shlibs, x11-shlibs + Files: lib/lib*.0*.dylib lib/caca/*.so + DocFiles: COPYING + Shlibs: << + %p/lib/libcaca.0.dylib 100.0.0 %n (>= 0.99.beta12-1) + %p/lib/libcaca++.0.dylib 100.0.0 %n (>= 0.99.beta12-1) + %p/lib/libcucul.0.dylib 100.0.0 %n (>= 0.99.beta12-1) + %p/lib/libcucul++.0.dylib 100.0.0 %n (>= 0.99.beta12-1) + << +<< +SplitOff2: << Package: libcaca-dev BuildDependsOnly: true + Depends: libcaca-shlibs (= %v-%r) Files: << bin/caca-config include lib - share/doc/libcaca-dev share/man/man3 + share/doc/%n << - DocFiles: AUTHORS BUGS COPYING ChangeLog INSTALL NEWS NOTES README THANKS TODO + DocFiles: AUTHORS COPYING ChangeLog NEWS NOTES README THANKS TODO << ### Description: Colour AsCii Art library @@ -40,4 +93,4 @@ ### License: LGPL Maintainer: Justin F. Hallett <[EMAIL PROTECTED]> -Homepage: http://sam.zoy.org/projects/libcaca/ +Homepage: http://libcaca.zoy.org/ ------------------------------------------------------------------------- This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs