Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs
In directory 
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv17874/10.3/unstable/main/finkinfo/libs

Modified Files:
        libcdio1-shlibs.info 
Added Files:
        libcdio5-shlibs.info libxine1.info libxine1.patch 
Log Message:
libxine update, libcdio fixes, totem updates to match new deps

--- NEW FILE: libcdio5-shlibs.info ---
Package: libcdio5-shlibs
Version: 0.73
Revision: 2
###
Builddepends: popt, libcddb0-dev, pkgconfig, libcddb0-shlibs, libiconv, 
libiconv-dev
###
Source: ftp://ftp.gnu.org/pub/gnu/libcdio/libcdio-%v.tar.gz
Source-MD5: 50eae24f732232c28d391a4dd563321f
###
PatchScript: <<
  perl -pi -e 's,SUBDIRS = doc include lib src test example,SUBDIRS = include 
lib,g' Makefile.in

  perl -pi -e 's/\\"(-Wl.*)\\"/\1/' configure
  perl -pi -e 's/(-Wl,-framework) -Wl(,\S+)/\1\2/g' configure

  ### Fix for 10.4
  perl -pi -e 's,darwin6\*\|darwin7\*,darwin6\*\|darwin7\*\|darwin8\*,g' 
configure
<<
###
ConfigureParams: --without-versioned-libs --disable-vcd-info 
--with-libpopt-prefix=%p --disable-dependency-tracking --enable-shared 
--enable-static --with-pic --mandir=%i/share/man --infodir=%p/share/info 
--libexecdir=%p/lib
CompileScript: <<
        ./configure %c
        DISTCC_HOSTS='' make
<<
###
NoSetLDFLAGS: true
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
###
DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README* THANKS TODO 
###
Shlibs: <<
  %p/lib/libcdio.5.dylib 6.0.0 libcdio5-shlibs (>= 0.73-10)
  %p/lib/libcdio_cdda.0.dylib 1.0.0 libcdio5-shlibs (>= 0.73-10)
  %p/lib/libcdio_paranoia.0.dylib 1.0.0 libcdio5-shlibs (>= 0.73-10)
<<
###
SplitOff: <<
  Package: libiso96604-shlibs
  Depends: libcdio5-shlibs (= %v-%r)
  Files: <<
    lib/libiso9660.*.dylib
  <<
  Shlibs: <<
    %p/lib/libiso9660.4.dylib 5.0.0 libiso96604-shlibs (>= 0.73-10)
  <<
  DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
<<
SplitOff2: <<
  Package: libcdio5-dev
  Depends: libcdio5-shlibs (= %v-%r)
  Conflicts: libcdio0-dev, libcdio-dev, libcdio1-dev
  Replaces: libcdio0-dev, libcdio-dev, libcdio1-dev
  BuildDependsOnly: true
  Files: <<
    include/cdio/bytesex.h
    include/cdio/bytesex_asm.h
    include/cdio/cdtext.h
    include/cdio/ds.h
    include/cdio/dvd.h
    include/cdio/cd_types.h
    include/cdio/cdio.h
    include/cdio/logging.h
    include/cdio/scsi_mmc.h
    include/cdio/sector.h
    include/cdio/types.h
    include/cdio/util.h
    include/cdio/version.h
    include/cdio/xa.h
    include/cdio/audio.h
    include/cdio/cdda.h
    include/cdio/cdio_config.h
    include/cdio/device.h
    include/cdio/disc.h
    include/cdio/mmc.h
    include/cdio/paranoia.h
    include/cdio/read.h
    include/cdio/rock.h
    include/cdio/track.h
    lib/pkgconfig/libcdio.pc
    lib/pkgconfig/libcdio_cdda.pc
    lib/pkgconfig/libcdio_paranoia.pc
    lib/libcdio.a
    lib/libcdio.la
    lib/libcdio.dylib
    lib/libcdio_cdda.a
    lib/libcdio_cdda.la
    lib/libcdio_cdda.dylib
    lib/libcdio_paranoia.a
    lib/libcdio_paranoia.la
    lib/libcdio_paranoia.dylib
  <<
  DocFiles: COPYING README
<<
SplitOff3: <<
  Package: libiso96604-dev
  Depends: libcdio5-shlibs (= %v-%r), libiso96604-shlibs (= %v-%r)
  Replaces: libcdio0-dev, libcdio-dev, libiso96602-dev, libiso96603-dev
  Conflicts: libiso96602-dev, libiso96603-dev
  BuildDependsOnly: true
  Files: <<
    include/cdio/iso9660.h
    lib/pkgconfig/libiso9660.pc
    lib/libiso9660.a
    lib/libiso9660.la
    lib/libiso9660.dylib
  <<
  DocFiles: COPYING README
<<
###
Description: CD Input and Control Library
DescDetail: <<
  The Compact Disc Input and Control library encapsulates CD-ROM reading
  and control. Applications wishing to be oblivious of the OS- and
  device-dependent properties of a CD-ROM can use this library. Some support
  for disk image types like BIN/CUE and NRG is available, so applications
  that use this library also have the ability to read disc images as though
  they were CDs. A sample utility for displaying CD info is included, as is
  a library for working with ISO-9660 filesystems.
<<
DescPort: <<
  Use canonical form for multi-word flags so that pkg-config doesn't munge them.
<<
###
License: GPL
Maintainer: Justin F. Hallett <[EMAIL PROTECTED]>
Homepage: http://www.gnu.org/software/libcdio/

--- NEW FILE: libxine1.info ---
Package: libxine1
Version: 1.1.1
Revision: 11
Description: Xine video/media player library
License: GPL
Maintainer: Justin F. Hallett <[EMAIL PROTECTED]>

Depends: %N-shlibs (= %v-%r)
BuildDepends: fink (>= 0.9.9-1), aalib, arts-dev (>= 1.4.0-11), audiofile, 
bzip2-shlibs, esound, flac, freetype219, gconf2-dev, gettext-bin, 
gettext-tools, glib2-dev, gnome-vfs2-ssl-dev | gnome-vfs2-dev, imagemagick-dev 
| imagemagick-nox-dev, lcms, libbonobo2-dev, libcaca-dev, libcdio5-dev, 
libgettext3-dev, libiconv-dev, libiso96604-dev, libjpeg, libmng2, libncurses5, 
libogg, libpng3, libtheora0, libtiff, libtool14, libvcd0-dev (>= 0.7.21-10), 
libvorbis0, libxml2, orbit2-dev, pkgconfig, popt, pth, qt3 (>= 3.3.6-12), sdl, 
slang, speex3, x11-dev
Provides: libxine
Conflicts: libxine, libxine-docs
Replaces: libxine, libxine-shlibs, libxine-docs
Recommends: libdvdcss-shlibs
BuildDependsOnly: true

Source: mirror:sourceforge:xine/xine-lib-%v.tar.gz
Source2: http://ranger.befunk.com/fink/libavcodec-20060216.tar.bz2
Source2ExtractDir: xine-lib-%v/src/libffmpeg
Source-MD5: b1f42602c776bb93e3cbf127e220cbfd
Source2-MD5: a65547b0003f89bb653c7767c1120ab0
Patch: %n.patch
PatchScript: <<
        ### Altivec enhancement
        perl -pi -e 's,-faltivec,-faltivec -maltivec,g' configure
<<

SetCPPFLAGS: -no-cpp-precomp -I%p/lib/freetype219/include/freetype2 
-I%p/lib/freetype219/include -I%p/include
SetLDFLAGS: -L%p/lib/freetype219/lib
SetLIBS: -L%p/lib
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
ConfigureParams: --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
CompileScript: <<
#!/bin/sh -e

        export X_LIBS="-L/usr/X11R6/include -lX11"
        export PATH="%p/lib/freetype219/bin:$PATH"
        export 
PKG_CONFIG_PATH="%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
        ./configure %c
        make
<<

DocFiles: AUTHORS COPYING CREDITS ChangeLog INSTALL NEWS README TODO
SplitOff: <<
        Package: %N-shlibs
        Depends: aalib-shlibs, arts-shlibs (>= 1.4.0-11), audiofile-shlibs, 
bzip2-shlibs, esound-shlibs, flac-shlibs, freetype219-shlibs, gconf2-shlibs, 
glib2-shlibs, gnome-vfs2-ssl-shlibs | gnome-vfs2-shlibs, imagemagick-shlibs, 
lcms-shlibs, libbonobo2-shlibs, libcdio5-shlibs, libgettext3-shlibs, libiconv, 
libiso96604-shlibs, libjpeg-shlibs, libmng2-shlibs, libncurses5-shlibs, 
libogg-shlibs, libpng3-shlibs, libtheora0-shlibs, libtiff-shlibs, 
libtool14-shlibs, libvcd0-shlibs (>= 0.7.21-10), libvorbis0-shlibs, 
libxml2-shlibs, orbit2-shlibs, popt-shlibs, qt3-shlibs (>= 3.3.6-12), 
sdl-shlibs, slang-shlibs, speex3-shlibs, x11-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/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)
        <<
<<

Homepage: http://xine.sourceforge.net/
DescDetail: <<
        Libxine provides the complete infrastructure for a video/media player.
        It supports MPEG 1/2 and some AVI and Quicktime videos out of the box,
        so you can use it to play DVDs, (S)VCDs and most video files out there.
        It supports network streams, subtitles and even mp3 files. It's 
extensible
        to your heart's content via plugins for audio_out, video_out, input 
media,
        demuxers (stream types), audio/video and subtitle codecs.
        Building a GUI (or text based) frontend around this should be quite 
easy.
        The xine-ui package provides one for your convenience, so you can just
        start watching your VCDs ;-)
<<


--- NEW FILE: libxine1.patch ---
--- xine-lib-1.1.1/misc/cdda_server.c   2004-12-12 17:00:50.000000000 -0500
+++ xine-lib-1.1.1-new/misc/cdda_server.c       2006-02-13 14:58:22.000000000 
-0500
@@ -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.1/src/input/input_dvd.c        2005-10-14 17:02:16.000000000 
-0400
+++ xine-lib-1.1.1-new/src/input/input_dvd.c    2006-02-13 14:58:29.000000000 
-0500
@@ -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.1/src/input/libdvdnav/dvd_input.c      2004-04-05 
14:01:09.000000000 -0400
+++ xine-lib-1.1.1-new/src/input/libdvdnav/dvd_input.c  2006-02-13 
14:57:36.000000000 -0500
@@ -287,7 +287,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);
@@ -323,7 +325,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.1/src/xine-utils/xine_check.c  2005-03-08 21:05:16.000000000 
-0500
+++ xine-lib-1.1.1-new/src/xine-utils/xine_check.c      2006-02-13 
16:26:12.000000000 -0500
@@ -369,7 +369,11 @@
   /* Majority of thi code was taken from or inspired by the xvinfo.c file of 
XFree86 */
 
   dlerror(); /* clear error code */
+#ifdef __APPLE__
+  x11_handle = dlopen("libX11.6.dylib", RTLD_LAZY);
+#else
   x11_handle = dlopen("libX11.so", RTLD_LAZY);
+#endif
   if(!x11_handle) {
     hc->msg = dlerror();
     hc->status = XINE_HEALTH_CHECK_FAIL;
@@ -395,7 +399,11 @@
   }
   
   dlerror(); /* clear error code */
+#ifdef __APPLE__
+  xv_handle = dlopen("libXv.1.dylib", RTLD_LAZY);
+#else
   xv_handle = dlopen("libXv.so", RTLD_LAZY);
+#endif
   if(!xv_handle) {
     hc->msg = dlerror();
     /* Xv might still work when linked statically into the output plugin,
--- xine-lib-1.1.1/configure    Tue Nov 15 06:40:27 2005
+++ xine-lib-1.1.1-new/configure        Wed Feb 15 16:54:31 2006
@@ -46268,7 +46268,7 @@
         DEBUG_CFLAGS="-O3 -mieee $DEBUG_CFLAGS"
         ;;
       *darwin*)
-        CFLAGS="-O3 -pipe -fomit-frame-pointer $m_wm $m_psb 
-fexpensive-optimizations $f_si $f_nsa -ffast-math $INLINE_FUNCTIONS 
-no-cpp-precomp -D_INTL_REDIRECT_MACROS $CFLAGS"
+        CFLAGS="-Os -pipe -fno-strict-aliasing -ffast-math $INLINE_FUNCTIONS 
-no-cpp-precomp -D_INTL_REDIRECT_MACROS $CFLAGS"
         DEBUG_CFLAGS="-O3 $DEBUG_CFLAGS"
         ;;
       ppc-*-linux* | powerpc-*)

Index: libcdio1-shlibs.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/libs/libcdio1-shlibs.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- libcdio1-shlibs.info        5 Jan 2006 04:44:21 -0000       1.7
+++ libcdio1-shlibs.info        22 Jun 2006 01:45:19 -0000      1.8
@@ -1,6 +1,6 @@
 Package: libcdio1-shlibs
 Version: 0.71
-Revision: 13
+Revision: 14
 ###
 Builddepends: popt, libcddb0-dev, pkgconfig
 Conflicts: libcdio0-shlibs (<< 0.69-10)
@@ -25,7 +25,7 @@
 DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README* THANKS TODO 
 ###
 Shlibs: <<
-  %p/lib/libcdio.0.dylib 4.0.0 libcdio0-shlibs (>= 0.71-10)
+  %p/lib/libcdio.0.dylib 4.0.0 libcdio1-shlibs (>= 0.71-10)
 <<
 ###
 SplitOff: <<


All the advantages of Linux Managed Hosting--Without the Cost and Risk!
Fully trained technicians. The highest number of Red Hat certifications in
the hosting industry. Fanatical Support. Click to learn more
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=107521&bid=248729&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to