Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6680/10.4/unstable/main/finkinfo/libs
Modified Files: libxine1.info libxine1.patch Log Message: new upstream, got maintainer approval a while ago, but forgot to release :P Index: libxine1.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libxine1.info,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- libxine1.info 6 Sep 2006 17:21:08 -0000 1.14 +++ libxine1.info 22 Nov 2006 22:32:49 -0000 1.15 @@ -1,33 +1,38 @@ Package: libxine1 -Version: 1.1.1 -Revision: 1025 +Version: 1.1.2 +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), dbus-dev (>= 0.60-1), libhowl-dev, 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, libcdio-dev, libgettext3-dev, libiconv-dev, libiso9660-dev, libjpeg, libmng2, libncurses5 (>= 5.4-20041023-1006), libogg, libpng3, libtheora0, libtiff, libtool14, libvcd-dev, libvorbis0, libxml2, orbit2-dev, pkgconfig, popt, pth, qt3 (>= 3.3.6-1022), sdl (>= 1.2.9-1001), slang, speex3, x11-dev +BuildDepends: fink (>= 0.24-1), aalib, arts-dev (>= 1.4.0-2041), audiofile, bzip2-shlibs, esound, flac (>= 1.1.1-1011), freetype219, gconf2-dev, gettext-bin, gettext-tools, glib2-dev (>= 2.8.6-123), gnome-vfs2-ssl-dev | gnome-vfs2-dev, imagemagick-dev (>= 6.1.8-1002) | imagemagick10-dev (>= 6.1.8-1002), lcms, libbonobo2-dev, libcaca-dev, libcdio-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, pkgconfig, popt, pth, qt3 (>= 3.3.6-1027), sdl (>= 1.2.9-1001), 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 -Source-MD5: b1f42602c776bb93e3cbf127e220cbfd +Source: mirror:sourceforge:xine/xine-lib-%v.tar.bz2 +Source-MD5: c4dd262c47caae6f428eb902ac8ec0e8 Patch: %n.patch PatchScript: << - if [ "%m" = "powerpc" ]; then perl -pi -e 's,-faltivec,-faltivec -maltivec,g' configure; else perl -pi -e 's,-faltivec,,g' configure; fi + 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 << SetCPPFLAGS: -fno-common -no-cpp-precomp -I%p/lib/freetype219/include/freetype2 -I%p/lib/freetype219/include -I/usr/X11R6/include -I%p/include SetLDFLAGS: -L%p/lib/freetype219/lib SetLIBS: -L%p/lib +SetMAKEFLAGS: -j1 NoSetCPPFLAGS: true NoSetLDFLAGS: true NoSetMAKEFLAGS: true -SetMAKEFLAGS: -j1 -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 +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 CompileScript: << #!/bin/sh -e @@ -39,20 +44,17 @@ ./configure %c if [ "%m" = "i386" ]; then - perl -pi -e 's,ARCH_PPC,ARCH_X86,; s,\#define ENABLE_ALTIVEC,,; s,FPM_PPC,FPM_INTEL,' config.h - cat <<<"#define HAVE_DARWIN_CDROM 1" >> config.h + echo "#define HAVE_DARWIN_CDROM 1" >> config.h fi - make OBJC=gcc -<< -InstallScript: << - make install DESTDIR=%d OBJC=gcc + make << +InstallScript: make install DESTDIR=%d DocFiles: AUTHORS COPYING CREDITS ChangeLog INSTALL NEWS README TODO SplitOff: << 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, libcdio7-shlibs (>= 0.77-12), 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.23-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 + Depends: aalib-shlibs, arts-shlibs (>= 1.4.0-2041), audiofile-shlibs, bzip2-shlibs, esound-shlibs, flac-shlibs (>= 1.1.1-1011), freetype219-shlibs, gconf2-shlibs, glib2-shlibs (>= 2.8.6-123), gnome-vfs2-ssl-shlibs | gnome-vfs2-shlibs, imagemagick-shlibs (>= 6.1.8-1002), lcms-shlibs, libbonobo2-shlibs, libcdio7-shlibs (>= 0.77-12), 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, popt-shlibs, qt3-shlibs (>= 3.3.6-1027), sdl-shlibs (>= 1.2.9-1001), slang-shlibs, speex3-shlibs, x11-shlibs Provides: libxine-shlibs Conflicts: libxine-shlibs Replaces: libxine-shlibs, libxine Index: libxine1.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libxine1.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- libxine1.patch 2 Jul 2006 22:26:29 -0000 1.2 +++ libxine1.patch 22 Nov 2006 22:32:49 -0000 1.3 @@ -1,55 +1,7 @@ -diff -uNr xine-lib-1.1.1/configure xine-lib-1.1.1-new/configure ---- xine-lib-1.1.1/configure 2005-11-15 06:40:27.000000000 -0500 -+++ xine-lib-1.1.1-new/configure 2006-07-02 12:17:45.000000000 -0400 -@@ -29793,15 +29793,15 @@ - - if test "x$xv_prefer_shared" = "xyes"; then - -- echo "$as_me:$LINENO: checking for libXv.so" >&5 --echo $ECHO_N "checking for libXv.so... $ECHO_C" >&6 -- if test -f "$xv_path/libXv.so"; then -- echo "$as_me:$LINENO: result: found libXv.so in $xv_path" >&5 --echo "${ECHO_T}found libXv.so in $xv_path" >&6 -- XV_LIB="libXv.so" -+ echo "$as_me:$LINENO: checking for libXv.dylib" >&5 -+echo $ECHO_N "checking for libXv.dylib... $ECHO_C" >&6 -+ if test -f "$xv_path/libXv.dylib"; then -+ echo "$as_me:$LINENO: result: found libXv.dylib in $xv_path" >&5 -+echo "${ECHO_T}found libXv.dylib in $xv_path" >&6 -+ XV_LIB="libXv.dylib" - else -- echo "$as_me:$LINENO: result: libXv.so not found in $xv_path" >&5 --echo "${ECHO_T}libXv.so not found in $xv_path" >&6 -+ echo "$as_me:$LINENO: result: libXv.dylib not found in $xv_path" >&5 -+echo "${ECHO_T}libXv.dylib not found in $xv_path" >&6 - fi - - else -@@ -29823,15 +29823,15 @@ - if test x$XV_LIB = x; then - if ! test "x$xv_prefer_shared" = "xyes"; then - -- echo "$as_me:$LINENO: checking for libXv.so" >&5 --echo $ECHO_N "checking for libXv.so... $ECHO_C" >&6 -- if test -f "$xv_path/libXv.so"; then -- echo "$as_me:$LINENO: result: found libXv.so in $xv_path" >&5 --echo "${ECHO_T}found libXv.so in $xv_path" >&6 -- XV_LIB="libXv.so" -+ echo "$as_me:$LINENO: checking for libXv.dylib" >&5 -+echo $ECHO_N "checking for libXv.dylib... $ECHO_C" >&6 -+ if test -f "$xv_path/libXv.dylib"; then -+ echo "$as_me:$LINENO: result: found libXv.dylib in $xv_path" >&5 -+echo "${ECHO_T}found libXv.dylib in $xv_path" >&6 -+ XV_LIB="libXv.dylib" - else -- echo "$as_me:$LINENO: result: libXv.so not found in $xv_path" >&5 --echo "${ECHO_T}libXv.so not found in $xv_path" >&6 -+ echo "$as_me:$LINENO: result: libXv.dylib not found in $xv_path" >&5 -+echo "${ECHO_T}libXv.dylib not found in $xv_path" >&6 - fi - - else -@@ -29935,8 +29935,8 @@ + +--- 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" ;; @@ -60,25 +12,16 @@ ;; *) { { echo "$as_me:$LINENO: error: sorry, I don't know about $XV_LIB" >&5 -@@ -29980,7 +29980,7 @@ - hppa*) - if test x$ac_have_xv_static = "xyes"; then - echo "warning: hppa linker - disabling static libXv" -- XV_LIB="libXv.so" -+ XV_LIB="libXv.dylib" - fi - ;; +@@ -52649,7 +52649,7 @@ + k7cpu="i686" + fi -@@ -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-*) -@@ -46339,7 +46339,7 @@ +- 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 @@ -87,20 +30,44 @@ cat >>confdefs.h <<_ACEOF #define ARCH_X86 -@@ -46354,6 +46354,10 @@ - enable_w32dll="yes" +@@ -52838,7 +52838,7 @@ - case "$host_or_hostalias" in -+ *-*-darwin) -+ enable_ffmmx="no" -+ enable_w32dll="no" -+ ;; - *-*-mingw*) - enable_w32dll="no" - ;; -diff -uNr xine-lib-1.1.1/misc/cdda_server.c xine-lib-1.1.1-new/misc/cdda_server.c ---- 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-07-02 12:17:43.000000000 -0400 + 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 */ @@ -121,9 +88,8 @@ "this shouldn't happen !\n"); dlclose(dvdcss_library); } -diff -uNr xine-lib-1.1.1/src/input/input_dvd.c xine-lib-1.1.1-new/src/input/input_dvd.c ---- 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-07-02 12:17:43.000000000 -0400 +--- 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); @@ -136,9 +102,8 @@ /* we have found libdvdcss, enable the specific config options */ char *raw_device; static char *decrypt_modes[] = { "key", "disc", "title", NULL }; -diff -uNr xine-lib-1.1.1/src/input/libdvdnav/bswap.h xine-lib-1.1.1-new/src/input/libdvdnav/bswap.h ---- xine-lib-1.1.1/src/input/libdvdnav/bswap.h 2003-05-26 19:11:44.000000000 -0400 -+++ xine-lib-1.1.1-new/src/input/libdvdnav/bswap.h 2006-07-02 12:17:43.000000000 -0400 +--- 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) @@ -152,10 +117,9 @@ #elif defined(__NetBSD__) #include <sys/endian.h> #define B2N_16(x) BE16TOH(x) -diff -uNr xine-lib-1.1.1/src/input/libdvdnav/dvd_input.c xine-lib-1.1.1-new/src/input/libdvdnav/dvd_input.c ---- 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-07-02 12:17:43.000000000 -0400 -@@ -287,7 +287,9 @@ +--- 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 */ @@ -166,7 +130,7 @@ dvdcss_library = dlopen("libdvdcss.so.2", RTLD_LAZY); #else dvdcss_library = dlopen("libdvdcss.dll", RTLD_LAZY); -@@ -323,7 +325,7 @@ +@@ -400,7 +402,7 @@ dvdcss_library = NULL; } else if(!DVDcss_open || !DVDcss_close || !DVDcss_title || !DVDcss_seek || !DVDcss_read || !DVDcss_error || !dvdcss_version) { @@ -175,50 +139,8 @@ "this shouldn't happen !\n"); dlclose(dvdcss_library); } -diff -uNr xine-lib-1.1.1/src/libffmpeg/Makefile.in xine-lib-1.1.1-new/src/libffmpeg/Makefile.in ---- xine-lib-1.1.1/src/libffmpeg/Makefile.in 2005-11-15 06:39:53.000000000 -0500 -+++ xine-lib-1.1.1-new/src/libffmpeg/Makefile.in 2006-07-02 12:17:43.000000000 -0400 -@@ -568,11 +568,11 @@ - @[EMAIL PROTECTED] = xine_decoder.c audio_decoder.c video_decoder.c \ - @HAVE_DXR3_TRUE@ xine_encoder.c mpeg_parser.c - [EMAIL PROTECTED]@xineplug_decode_ff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ [EMAIL PROTECTED]@xineplug_decode_ff_la_LDFLAGS = -Wl,-read_only_relocs,warning -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ - # The dxr3 uses ffmpegs MPEG encoder by dlopen()ing the ffmpeg plugin and - # dlsym()ing the necessary function. Therefore we must allow more exported - # symbols and cannot use @XINE_PLUGIN_MIN_SYMS@ [EMAIL PROTECTED]@xineplug_decode_ff_la_LDFLAGS = -avoid-version -module [EMAIL PROTECTED]@xineplug_decode_ff_la_LDFLAGS = -Wl,-read_only_relocs,warning -avoid-version -module - xineplug_decode_ff_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) -lm $(ZLIB_LIBS) \ - $(link_ffmpeg) $(THREAD_LIBS) - -diff -uNr xine-lib-1.1.1/src/post/deinterlace/Makefile.in xine-lib-1.1.1-new/src/post/deinterlace/Makefile.in ---- xine-lib-1.1.1/src/post/deinterlace/Makefile.in 2005-11-15 06:40:13.000000000 -0500 -+++ xine-lib-1.1.1-new/src/post/deinterlace/Makefile.in 2006-07-02 12:17:43.000000000 -0400 -@@ -537,7 +537,7 @@ - xineplug_post_tvtime_la_LIBADD = $(XINE_LIB) \ - $(top_builddir)/src/post/deinterlace/plugins/libdeinterlaceplugins.la - --xineplug_post_tvtime_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ -+xineplug_post_tvtime_la_LDFLAGS = -avoid-version -Wl,-read_only_relocs,warning -module @XINE_PLUGIN_MIN_SYMS@ - noinst_HEADERS = deinterlace.h pulldown.h speedtools.h speedy.h tvtime.h - all: all-recursive - -diff -uNr xine-lib-1.1.1/src/post/planar/Makefile.in xine-lib-1.1.1-new/src/post/planar/Makefile.in ---- xine-lib-1.1.1/src/post/planar/Makefile.in 2005-11-15 06:40:15.000000000 -0500 -+++ xine-lib-1.1.1-new/src/post/planar/Makefile.in 2006-07-02 12:17:43.000000000 -0400 -@@ -537,7 +537,7 @@ - - xineplug_post_planar_la_DEPENDENCIES = $(postproc_dep) - xineplug_post_planar_la_LIBADD = $(XINE_LIB) $(postproc_lib) -lm $(THREAD_LIBS) --xineplug_post_planar_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ -+xineplug_post_planar_la_LDFLAGS = -avoid-version -Wl,-read_only_relocs,warning -module @XINE_PLUGIN_MIN_SYMS@ - all: all-am - - .SUFFIXES: -diff -uNr xine-lib-1.1.1/src/post/planar/eq.c xine-lib-1.1.1-new/src/post/planar/eq.c ---- xine-lib-1.1.1/src/post/planar/eq.c 2004-04-17 15:54:32.000000000 -0400 -+++ xine-lib-1.1.1-new/src/post/planar/eq.c 2006-07-02 12:17:43.000000000 -0400 +--- 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" @@ -226,10 +148,9 @@ +#undef ARCH_X86 - #ifdef ARCH_X86 -diff -uNr xine-lib-1.1.1/src/post/planar/eq2.c xine-lib-1.1.1-new/src/post/planar/eq2.c ---- xine-lib-1.1.1/src/post/planar/eq2.c 2004-04-17 15:54:32.000000000 -0400 -+++ xine-lib-1.1.1-new/src/post/planar/eq2.c 2006-07-02 12:17:43.000000000 -0400 + #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> @@ -238,54 +159,3 @@ /* Per channel parameters */ -diff -uNr xine-lib-1.1.1/src/video_out/Makefile.in xine-lib-1.1.1-new/src/video_out/Makefile.in ---- xine-lib-1.1.1/src/video_out/Makefile.in 2005-11-15 06:40:17.000000000 -0500 -+++ xine-lib-1.1.1-new/src/video_out/Makefile.in 2006-07-02 12:17:43.000000000 -0400 -@@ -338,7 +338,7 @@ - CYGPATH_W = @CYGPATH_W@ - DATADIRNAME = @DATADIRNAME@ - DEBUG_CFLAGS = @DEBUG_CFLAGS@ --DEFS = @DEFS@ -+DEFS = @DEFS@ -DXINE_COMPILE - DEPCOMP = @DEPCOMP@ - DEPDIR = @DEPDIR@ - DEPMOD = @DEPMOD@ -diff -uNr xine-lib-1.1.1/src/video_out/macosx/Makefile.in xine-lib-1.1.1-new/src/video_out/macosx/Makefile.in ---- xine-lib-1.1.1/src/video_out/macosx/Makefile.in 2005-11-15 06:40:20.000000000 -0500 -+++ xine-lib-1.1.1-new/src/video_out/macosx/Makefile.in 2006-07-02 12:17:44.000000000 -0400 -@@ -153,7 +153,7 @@ - CYGPATH_W = @CYGPATH_W@ - DATADIRNAME = @DATADIRNAME@ - DEBUG_CFLAGS = @DEBUG_CFLAGS@ --DEFS = @DEFS@ -+DEFS = @DEFS@ -DXINE_COMPILE - DEPCOMP = @DEPCOMP@ - DEPDIR = @DEPDIR@ - DEPMOD = @DEPMOD@ -diff -uNr xine-lib-1.1.1/src/xine-utils/xine_check.c xine-lib-1.1.1-new/src/xine-utils/xine_check.c ---- 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-07-02 12:17:44.000000000 -0400 -@@ -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, ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits