Author: ranger
Date: Thu Oct 15 16:02:23 2009
New Revision: 1646

URL: 
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1646&repname=user%3a+ranger>
Log:
new caca!

Added:
    trunk/experimental/3rdparty/common/main/finkinfo/libs/caca.info
    trunk/experimental/common/main/finkinfo/libs/libxine1-10.6.info
      - copied, changed from r1645, 
trunk/experimental/3rdparty/common/main/finkinfo/libs/libxine1-10.6.info
    trunk/experimental/common/main/finkinfo/libs/libxine1.info
      - copied unchanged from r1645, 
trunk/experimental/3rdparty/common/main/finkinfo/libs/libxine1.info
    trunk/experimental/common/main/finkinfo/libs/libxine1.patch
      - copied unchanged from r1645, 
trunk/experimental/3rdparty/common/main/finkinfo/libs/libxine1.patch
Removed:
    trunk/experimental/3rdparty/common/main/finkinfo/libs/libxine1-10.6.info
    trunk/experimental/3rdparty/common/main/finkinfo/libs/libxine1.info
    trunk/experimental/3rdparty/common/main/finkinfo/libs/libxine1.patch
Modified:
    trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia4-mac.info
    trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia4-x11.info
    trunk/experimental/common/main/finkinfo/kde/kdemultimedia4.info.in

Modified: trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia4-mac.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia4-mac.info&rev=1646&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia4-mac.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia4-mac.info Thu Oct 
15 16:02:23 2009
@@ -10,7 +10,6 @@
 Depends: <<
        dragonplayer4-%type_pkg[kde] (>= %v-%r),
        juk4-%type_pkg[kde] (>= %v-%r),
-       kioslave4-audiocd-%type_pkg[kde] (>= %v-%r),
        kmix4-%type_pkg[kde] (>= %v-%r)
 <<
 BuildDepends: <<
@@ -26,7 +25,6 @@
        kdelibs4-%type_pkg[kde]-dev (>= 4.3.2-1),
        lame,
        lame-dev,
-       libcdparanoia0-dev,
        libflac8-dev,
        libgettext3-dev,
        libmusicbrainz4,
@@ -54,12 +52,10 @@
 
        export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[kde]"
        . %p/sbin/kde4-buildenv.sh
-       export CMAKE_INCLUDE_PATH="%p/include/libcdparanoia:$CMAKE_INCLUDE_PATH"
-       export CPPFLAGS="-I%p/include/libcdparanoia $CPPFLAGS"
 
        mkdir -p build
        pushd build
-               cmake $KDE4_CMAKE_ARGS ..
+               cmake -DBUILD_kioslave:BOOL=OFF $KDE4_CMAKE_ARGS ..
                make VERBOSE=1
        popd
 <<
@@ -128,29 +124,6 @@
        <<
        PostInstScript: %p/opt/kde4/%type_pkg[kde]/bin/kde4-postinst.sh || :
 <<
-SplitOff3: <<
-       Package: kioslave4-audiocd-%type_pkg[kde]
-       Description: KDE4 - audio CD support
-       Depends: <<
-               libcdparanoia0-shlibs,
-               libflac8,
-               libogg-shlibs,
-               libvorbis0-shlibs,
-               %N-base (>= %v-%r)
-       <<
-       Files: <<
-               opt/kde4/%type_pkg[kde]/lib/kde4/*audiocd*
-               opt/kde4/%type_pkg[kde]/lib/libaudiocdplugins.4*.dylib
-               opt/kde4/%type_pkg[kde]/share/apps/kconf_update/audiocd*
-               
opt/kde4/%type_pkg[kde]/share/apps/kconf_update/upgrade-metadata.sh
-               
opt/kde4/%type_pkg[kde]/share/apps/konqsidebartng/virtual_folders/services/audiocd*
-               opt/kde4/%type_pkg[kde]/share/config.kcfg/audiocd*
-               opt/kde4/%type_pkg[kde]/share/doc/HTML/en/kioslave/audiocd
-               opt/kde4/%type_pkg[kde]/share/kde4/services/audiocd*
-       <<
-       Shlibs: %p/opt/kde4/%type_pkg[kde]/lib/libaudiocdplugins.4.dylib 4.0.0 
%n (>= 4.2.4-1)
-       PostInstScript: %p/opt/kde4/%type_pkg[kde]/bin/kde4-postinst.sh || :
-<<
 SplitOff4: <<
        Package: kmix4-%type_pkg[kde]
        Description: KDE4 - volume control and mixer
@@ -183,7 +156,6 @@
        BuildDependsOnly: true
        Files: <<
                opt/kde4/%type_pkg[kde]/include
-               opt/kde4/%type_pkg[kde]/lib/libaudiocdplugins.dylib
                opt/kde4/%type_pkg[kde]/lib/libkcddb.dylib
                opt/kde4/%type_pkg[kde]/lib/libkcompactdisc.dylib
        <<

Modified: trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia4-x11.info
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia4-x11.info&rev=1646&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia4-x11.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdemultimedia4-x11.info Thu Oct 
15 16:02:23 2009
@@ -10,7 +10,6 @@
 Depends: <<
        dragonplayer4-%type_pkg[kde] (>= %v-%r),
        juk4-%type_pkg[kde] (>= %v-%r),
-       kioslave4-audiocd-%type_pkg[kde] (>= %v-%r),
        kmix4-%type_pkg[kde] (>= %v-%r)
 <<
 BuildDepends: <<
@@ -26,7 +25,6 @@
        kdelibs4-%type_pkg[kde]-dev (>= 4.3.2-1),
        lame,
        lame-dev,
-       libcdparanoia0-dev,
        libflac8-dev,
        libgettext3-dev,
        libmusicbrainz4,
@@ -54,12 +52,10 @@
 
        export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[kde]"
        . %p/sbin/kde4-buildenv.sh
-       export CMAKE_INCLUDE_PATH="%p/include/libcdparanoia:$CMAKE_INCLUDE_PATH"
-       export CPPFLAGS="-I%p/include/libcdparanoia $CPPFLAGS"
 
        mkdir -p build
        pushd build
-               cmake $KDE4_CMAKE_ARGS ..
+               cmake -DBUILD_kioslave:BOOL=OFF $KDE4_CMAKE_ARGS ..
                make VERBOSE=1
        popd
 <<
@@ -128,29 +124,6 @@
        <<
        PostInstScript: %p/opt/kde4/%type_pkg[kde]/bin/kde4-postinst.sh || :
 <<
-SplitOff3: <<
-       Package: kioslave4-audiocd-%type_pkg[kde]
-       Description: KDE4 - audio CD support
-       Depends: <<
-               libcdparanoia0-shlibs,
-               libflac8,
-               libogg-shlibs,
-               libvorbis0-shlibs,
-               %N-base (>= %v-%r)
-       <<
-       Files: <<
-               opt/kde4/%type_pkg[kde]/lib/kde4/*audiocd*
-               opt/kde4/%type_pkg[kde]/lib/libaudiocdplugins.4*.dylib
-               opt/kde4/%type_pkg[kde]/share/apps/kconf_update/audiocd*
-               
opt/kde4/%type_pkg[kde]/share/apps/kconf_update/upgrade-metadata.sh
-               
opt/kde4/%type_pkg[kde]/share/apps/konqsidebartng/virtual_folders/services/audiocd*
-               opt/kde4/%type_pkg[kde]/share/config.kcfg/audiocd*
-               opt/kde4/%type_pkg[kde]/share/doc/HTML/en/kioslave/audiocd
-               opt/kde4/%type_pkg[kde]/share/kde4/services/audiocd*
-       <<
-       Shlibs: %p/opt/kde4/%type_pkg[kde]/lib/libaudiocdplugins.4.dylib 4.0.0 
%n (>= 4.2.4-1)
-       PostInstScript: %p/opt/kde4/%type_pkg[kde]/bin/kde4-postinst.sh || :
-<<
 SplitOff4: <<
        Package: kmix4-%type_pkg[kde]
        Description: KDE4 - volume control and mixer
@@ -183,7 +156,6 @@
        BuildDependsOnly: true
        Files: <<
                opt/kde4/%type_pkg[kde]/include
-               opt/kde4/%type_pkg[kde]/lib/libaudiocdplugins.dylib
                opt/kde4/%type_pkg[kde]/lib/libkcddb.dylib
                opt/kde4/%type_pkg[kde]/lib/libkcompactdisc.dylib
        <<

Added: trunk/experimental/3rdparty/common/main/finkinfo/libs/caca.info
URL: 
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/3rdparty/common/main/finkinfo/libs/caca.info&rev=1646&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/3rdparty/common/main/finkinfo/libs/caca.info (added)
+++ trunk/experimental/3rdparty/common/main/finkinfo/libs/caca.info Thu Oct 15 
16:02:23 2009
@@ -1,0 +1,95 @@
+Package: caca
+Version: 0.99.beta16
+Revision: 1
+###
+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://caca.zoy.org/files/libcaca/libcaca-%v.tar.gz
+Source-MD5: 3953bf4a803747b63a99f50125563151
+###
+PatchScript: <<
+  perl -pi -e 's,ifndef __intptr_t_defined,if !defined(__intptr_t_defined) && 
!defined(_UINTPTR_T),' src/mygetopt.c
+  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=%p/share/man --infodir=%p/share/info --libexecdir=%p/lib --with-x 
--enable-cxx --enable-plugins --disable-cocoa --disable-csharp --disable-ruby
+###
+DocFiles: AUTHORS COPYING ChangeLog NEWS NOTES README THANKS
+###
+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)
+  <<
+<<
+SplitOff2: <<
+  Package: libcaca-dev
+  BuildDependsOnly: true
+  Depends: libcaca-shlibs (= %v-%r)
+  Files: <<
+    bin/caca-config
+    include
+    lib
+    share/man/man3
+    share/doc/%n
+  <<
+  DocFiles: AUTHORS COPYING ChangeLog NEWS NOTES README THANKS
+<<
+###
+Description: Colour AsCii Art library
+DescDetail: <<
+  The libcaca library is a graphics library that outputs text instead of
+  pixels, so that it can work on older video cards or text terminals. It
+  is not unlike the famous AAlib library except it supports colour output.
+<<
+DescPort: <<
+  We disable ruby to avoid the mess of /usr/bin/ruby vs. %p/bin/ruby.
+<<
+###
+License: LGPL
+Maintainer: Justin F. Hallett <the...@users.sourceforge.net>
+Homepage: http://libcaca.zoy.org/

Modified: trunk/experimental/common/main/finkinfo/kde/kdemultimedia4.info.in
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdemultimedia4.info.in&rev=1646&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdemultimedia4.info.in 
(original)
+++ trunk/experimental/common/main/finkinfo/kde/kdemultimedia4.info.in Thu Oct 
15 16:02:23 2009
@@ -23,7 +23,6 @@
 Depends: <<
        dragonplayer4-%type_pkg[kde] (>= %v-%r),
        juk4-%type_pkg[kde] (>= %v-%r),
-       kioslave4-audiocd-%type_pkg[kde] (>= %v-%r),
        kmix4-%type_pkg[kde] (>= %v-%r),
 <<
 
@@ -40,7 +39,6 @@
        kdelibs4-%type_pkg[kde]-dev (>= 4.2.0-1),
        lame,
        lame-dev,
-       libcdparanoia0-dev,
        libflac8-dev,
        libgettext3-dev,
        libmusicbrainz4,
@@ -63,12 +61,10 @@
 
        export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[kde]"
        . %p/sbin/kde4-buildenv.sh
-       export CMAKE_INCLUDE_PATH="%p/include/libcdparanoia:$CMAKE_INCLUDE_PATH"
-       export CPPFLAGS="-I%p/include/libcdparanoia $CPPFLAGS"
 
        mkdir -p build
        pushd build
-               cmake $KDE4_CMAKE_ARGS ..
+               cmake -DBUILD_kioslave:BOOL=OFF $KDE4_CMAKE_ARGS ..
                make VERBOSE=1
        popd
 <<
@@ -138,29 +134,6 @@
        <<
        PostInstScript: %p/opt/kde4/%type_pkg[kde]/bin/kde4-postinst.sh || :
 <<
-SplitOff3: <<
-       Package: kioslave4-audiocd-%type_pkg[kde]
-       Description: KDE4 - audio CD support
-       Depends: <<
-               libcdparanoia0-shlibs,
-               libflac8,
-               libogg-shlibs,
-               libvorbis0-shlibs,
-               %N-base (>= %v-%r),
-       <<
-       Files: <<
-               opt/kde4/%type_pkg[kde]/lib/kde4/*audiocd*
-               opt/kde4/%type_pkg[kde]/lib/libaudiocdplugins.4*.dylib
-               opt/kde4/%type_pkg[kde]/share/apps/kconf_update/audiocd*
-               
opt/kde4/%type_pkg[kde]/share/apps/kconf_update/upgrade-metadata.sh
-               
opt/kde4/%type_pkg[kde]/share/apps/konqsidebartng/virtual_folders/services/audiocd*
-               opt/kde4/%type_pkg[kde]/share/config.kcfg/audiocd*
-               opt/kde4/%type_pkg[kde]/share/doc/HTML/en/kioslave/audiocd
-               opt/kde4/%type_pkg[kde]/share/kde4/services/audiocd*
-       <<
-       Shlibs: %p/opt/kde4/%type_pkg[kde]/lib/libaudiocdplugins.4.dylib 4.0.0 
%n (>= 4.2.4-1)
-       PostInstScript: %p/opt/kde4/%type_pkg[kde]/bin/kde4-postinst.sh || :
-<<
 SplitOff4: <<
        Package: kmix4-%type_pkg[kde]
        Description: KDE4 - volume control and mixer
@@ -193,7 +166,6 @@
        Depends: %N (>= %v-%r)
        Files: <<
                opt/kde4/%type_pkg[kde]/include
-               opt/kde4/%type_pkg[kde]/lib/libaudiocdplugins.dylib
                opt/kde4/%type_pkg[kde]/lib/libkcddb.dylib
                opt/kde4/%type_pkg[kde]/lib/libkcompactdisc.dylib
        <<

Copied: trunk/experimental/common/main/finkinfo/libs/libxine1-10.6.info (from 
r1645, trunk/experimental/3rdparty/common/main/finkinfo/libs/libxine1-10.6.info)
URL: 
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/libxine1-10.6.info&rev=1646&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/3rdparty/common/main/finkinfo/libs/libxine1-10.6.info 
(original)
+++ trunk/experimental/common/main/finkinfo/libs/libxine1-10.6.info Thu Oct 15 
16:02:23 2009
@@ -1,9 +1,9 @@
 Package: libxine1
-Version: 1.1.13
-Revision: 13
+Version: 1.1.16.3
+Revision: 1
 Description: Xine video/media player library
 License: GPL
-Maintainer: Justin F. Hallett <the...@users.sourceforge.net>
+Maintainer: Benjamin Reed <libxi...@fink.raccoonfink.com>
 
 ## left as a check: if anybody gets a different list it means bdeps are 
missing 
 # # otool_deps libxine1-shlibs
@@ -51,7 +51,7 @@
        libavcodec-dev,
        libavutil-dev,
        libbonobo2-dev (>= 2.20.0-1),
-       libcaca-dev (>= 0.99-1),
+       libcaca-dev (>= 0.99.beta14-1),
        libcdio-dev,
        libdvdnav,
        libfaad1-dev,
@@ -63,6 +63,7 @@
        libjpeg,
        libmad,
        libmng2,
+       libmodplug,
        libmpcdec5,
        libncurses5 (>= 5.4-20041023-1006),
        libncursesw5,
@@ -98,13 +99,66 @@
 PatchFile: libxine1.patch
 PatchFile-MD5: e08124ef6914ad89087b253862135a75
 
+SetCFLAGS: -Os -fomit-frame-pointer -fexpensive-optimizations -ffast-math
 SetLDFLAGS: 
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
 SetMACOSX_DEPLOYMENT_TARGET: 10.5
 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
+       --disable-dependency-tracking \
+       --libexecdir=%p/lib/libxine \
+       --mandir=%p/share/man \
+       (%m = powerpc) --enable-altivec \
+       --enable-static \
+       --enable-shared \
+       --enable-antialiasing \
+       --disable-optimizations \
+       \
+       --without-arts \
+       --disable-dts \
+       --without-fusionsound \
+       --disable-oss \
+       --without-pulseaudio \
+       --disable-samba \
+       \
+       --with-caca \
+       --with-external-a52dec \
+       --with-external-dvdnav \
+       --with-external-ffmpeg \
+       --with-external-libfaad \
+       --with-external-libmad \
+       --with-external-libmpcdec \
+       --with-fontconfig \
+       --with-freetype \
+       --with-imagemagick \
+       --with-jack \
+       --with-libflac \
+       --with-sdl \
+       --with-speex \
+       --with-theora \
+       --with-vorbis \
+       \
+       --enable-a52dec \
+       --enable-aalib \
+       --enable-asf \
+       --enable-coreaudio \
+       --enable-faad \
+       --enable-gdkpixbuf \
+       --enable-glu \
+       --enable-gnomevfs \
+       --enable-ipv6 \
+       --enable-macosx-video \
+       --enable-mad \
+       --enable-musepack \
+       --enable-mng \
+       --enable-modplug \
+       --enable-nosefart \
+       --enable-opengl \
+       --enable-real-codecs \
+       --enable-vcd \
+       
+       
+       --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
 <<
 CompileScript: <<
 #!/bin/sh -ev
@@ -146,7 +200,7 @@
                libavcodec51-shlibs,
                libavutil49-shlibs,
                libbonobo2-shlibs (>= 2.20.0-1),
-               libcaca-shlibs (>= 0.99-1),
+               libcaca-shlibs (>= 0.99.beta14-1),
                libcdio7-shlibs,
                libdvdnav4-shlibs,
                libfaad1-shlibs,
@@ -158,6 +212,7 @@
                libjpeg-shlibs,
                libmad-shlibs,
                libmng2-shlibs,
+               libmodplug-shlibs,
                libmpcdec5-shlibs,
                libncurses5-shlibs (>= 5.4-20041023-1006),
                libncursesw5-shlibs,


------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to