Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv17874/10.4/unstable/main/finkinfo/libs
Modified Files:
libcdio1-shlibs.info libxine1.info
Added Files:
libxine1.patch
Log Message:
libxine update, libcdio fixes, totem updates to match new deps
Index: libxine1.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libxine1.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- libxine1.info 1 May 2006 09:16:27 -0000 1.8
+++ libxine1.info 22 Jun 2006 01:45:19 -0000 1.9
@@ -1,96 +1,75 @@
Package: libxine1
-Version: 1.0.1
-Revision: 1013
-Architecture: powerpc
-###
-Depends: libiconv, gettext, %N-shlibs (= %v-%r)
-BuildDepends: fink (>= 0.9.9), libiconv-dev, gettext-dev, x11-dev, aalib,
arts-dev, libvorbis0, esound, pkgconfig, pth, audiofile, libogg, sdl (>=
1.2.9-1001), gettext-tools, flac (>= 1.1.1-1011), speex3, sdl (>= 1.2.9-1001),
libiconv-dev, libmng2, gnome-vfs2-dev | gnome-vfs2-ssl-dev, libcdio5-dev,
libvcd0-dev (>= 0.7.21-10), libtheora0, libcaca-dev, libxml2, orbit2-dev, popt,
libpng3, libncurses5 (>= 5.4-20041023-1006), libjpeg, libiso96604-dev, lcms,
libbonobo2-dev, gconf2-dev, glib2-dev (>= 2.6.6-1111), gcc3.3
-BuildDependsOnly: true
+Version: 1.1.1
+Revision: 1021
+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-1021), audiofile,
bzip2-shlibs, esound, flac (>= 1.1.1-1011), freetype219, gconf2-dev,
gettext-bin, gettext-tools, glib2-dev (>= 2.6.6-1111), gnome-vfs2-ssl-dev |
gnome-vfs2-dev, imagemagick-dev (>= 6.1.8-1002) | imagemagick-nox-dev (>=
6.1.8-1002), lcms, libbonobo2-dev, libcaca-dev, libcdio5-dev, libgettext3-dev,
libiconv-dev, libiso96604-dev, libjpeg, libmng2, libncurses5 (>=
5.4-20041023-1006), libogg, libpng3, libtheora0, libtiff, libtool14,
libvcd0-dev (>= 0.7.21-10), libvorbis0, libxml2, orbit2-dev, pkgconfig, popt,
pth, qt3 (>= 3.3.6-1022), sdl (>= 1.2.9-1001), slang, speex3, x11-dev
+Provides: libxine
Conflicts: libxine, libxine-docs
Replaces: libxine, libxine-shlibs, libxine-docs
-Provides: libxine
-###
Recommends: libdvdcss-shlibs
-###
+BuildDependsOnly: true
+
Source: mirror:sourceforge:xine/xine-lib-%v.tar.gz
-Source-MD5: 9be804b337c6c3a2e202c5a7237cb0f8
-###
+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
- ### Fix dlopen
- perl -pi -e 's,libdvdcss\.so\.2,libdvdcss\.2\.dylib,g' misc/cdda_server.c
- perl -pi -e 's,libdvdcss\.so\.2,libdvdcss\.2\.dylib,g' src/input/input_dvd.c
- perl -pi -e 's,libdvdcss\.so\.2,libdvdcss\.2\.dylib,g'
src/input/libdvdnav/dvd_input.c
- perl -pi -e 's,libX11\.so,libX11\.dylib,g' src/xine-utils/xine_check.c
- perl -pi -e 's,libXv\.so,libXv\.dylib,g' src/xine-utils/xine_check.c
- ### Fix X11 on 10.3
- perl -pi -e 's,-lXext,-lXext -lX11,g' configure
- ### Fix to use Xv shared lib instead of static
- perl -pi -e 's,libXv\.so,libXv\.dylib,g' configure
- perl -pi -e 's,/\\\.so,/\\\.dylib,g' configure
- perl -pi -e 's,x\*\.so,x\*\.dylib,g' configure
+ ### 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
-# --with-external-ffmpeg=%p --enable-static-xv
-###
-SetCPPFLAGS: -no-cpp-precomp
-SetCC: gcc-3.3
-SetCXX: g++-3.3
CompileScript: <<
- #!/bin/sh -ev
- ./configure %c
- if [ %m = i386 ]; then
- # configure sees darwin-i386 as intel not darwin, so we'll
- # force some of the darwin results too and hope for the best
- echo "#define HOST_OS_DARWIN 1" >> config.h
- perl -pi -e 's/(OBJCFLAGS =)/\1 -D_INTL_REDIRECT_MACROS \$(CFLAGS) /'
src/video_out/macosx/Makefile
- make OBJC=gcc
- else
- make
- fi
+#!/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: COPYING README
-###
+
+DocFiles: AUTHORS COPYING CREDITS ChangeLog INSTALL NEWS README TODO
SplitOff: <<
- Package: %N-shlibs
- Depends: libiconv, gettext, x11-shlibs, libgl, sdl-shlibs (>= 1.2.9-1001),
%N-shlibs (= %v-%r), aalib-shlibs, arts-shlibs, audiofile-shlibs,
esound-shlibs, libogg-shlibs, libvorbis0-shlibs, flac-shlibs (>= 1.1.1-1011),
speex3-shlibs, sdl-shlibs (>= 1.2.9-1001), libfame1-shlibs, libmng2-shlibs,
gnome-vfs2-shlibs | gnome-vfs2-ssl-shlibs, gconf2-shlibs, glib2-shlibs (>=
2.6.6-1111), lcms-shlibs, libbonobo2-shlibs, libxml2-shlibs, orbit2-shlibs,
popt-shlibs, libcdio5-shlibs, libiso96604-shlibs, libvcd0-shlibs (>=
0.7.21-10), libtheora0-shlibs, libncurses5-shlibs (>= 5.4-20041023-1006)
- Conflicts: libxine-shlibs
- Replaces: libxine-shlibs, libxine
- Provides: libxine-shlibs
- Files: <<
- lib/libxine.*.dylib
- lib/libxineMacOSXVideo.*.dylib
- lib/xine
- share/xine
- <<
- Shlibs: <<
- %p/lib/libxine.1.dylib 13.0.0 %n (>= 1.0-10)
- %p/lib/libxineMacOSXVideo.1.dylib 13.0.0 %n (>= 1.0-10)
- <<
- DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README
+ Package: %N-shlibs
+ Depends: aalib-shlibs, arts-shlibs (>= 1.4.0-1021), audiofile-shlibs,
bzip2-shlibs, esound-shlibs, flac-shlibs (>= 1.1.1-1011), freetype219-shlibs,
gconf2-shlibs, glib2-shlibs (>= 2.6.6-1111), gnome-vfs2-ssl-shlibs |
gnome-vfs2-shlibs, imagemagick-shlibs (>= 6.1.8-1002), lcms-shlibs,
libbonobo2-shlibs, libcdio5-shlibs, libgettext3-shlibs, libiconv,
libiso96604-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, popt-shlibs, qt3-shlibs (>=
3.3.6-1022), sdl-shlibs (>= 1.2.9-1001), 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)
+ <<
<<
-###
-Description: Xine video/media player library
+
+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 ;-)
-<<
-DescPort: <<
- configure thinks intel and darwin are mutually exclusive (and
- detects "intel" first), so the flags needed on darwin aren't set.
- dmacks fixed some, but still work needed to get it to compile. See:
-
http://sourceforge.net/tracker/index.php?func=detail&aid=1479648&group_id=9655&atid=109655
+ 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 ;-)
<<
-###
-License: GPL
-Maintainer: Justin F. Hallett <[EMAIL PROTECTED]>
-Homepage: http://xine.sourceforge.net/
+
--- 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.4/unstable/main/finkinfo/libs/libcdio1-shlibs.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libcdio1-shlibs.info 20 Jan 2006 20:21:18 -0000 1.1
+++ libcdio1-shlibs.info 22 Jun 2006 01:45:19 -0000 1.2
@@ -1,6 +1,6 @@
Package: libcdio1-shlibs
Version: 0.71
-Revision: 113
+Revision: 114
###
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
