Author: ranger
Date: Thu Oct 15 17:18:35 2009
New Revision: 1647
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1647&repname=user%3a+ranger>
Log:
libxine updates
Modified:
trunk/experimental/common/main/finkinfo/libs/libxine1-10.6.info
trunk/experimental/common/main/finkinfo/libs/libxine1.info
trunk/experimental/common/main/finkinfo/libs/libxine1.patch
Modified: trunk/experimental/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=1647&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/libxine1-10.6.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/libxine1-10.6.info Thu Oct 15
17:18:35 2009
@@ -1,3 +1,4 @@
+Info4: <<
Package: libxine1
Version: 1.1.16.3
Revision: 1
@@ -5,25 +6,12 @@
License: GPL
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
-# 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,
libavahi-client3-shlibs, libavahi-common3-shlibs,
-# libavahi-glib1-shlibs, libavcodec51-shlibs, libavutil49-shlibs,
libcaca-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,
libncursesw5-shlibs, libogg-shlibs,
-# libpostproc51-shlibs, libtheora0-shlibs, libtiff-shlibs, libtool2-shlibs,
libvcd0-shlibs, libvorbis0-shlibs, libx264-57-shlibs,
-# libxml2-shlibs, orbit2-shlibs, sdl-shlibs, slang-shlibs, speex3-shlibs,
wavpack1-shlibs, xorg-shlibs, xvidcore-shlibs
-## removed lipng3, qt3 from deps and bdeps. popt ?.. to be checked more
carefully..
-
Distribution: 10.6
Depends: %N-shlibs (= %v-%r)
BuildDepends: <<
a52dec-dev,
aalib,
amrnb-dev,
- arts-dev (>= 1.5.9-1),
audiofile,
avahi-dev,
bzip2-dev,
@@ -95,9 +83,13 @@
BuildDependsOnly: true
Source: mirror:sourceforge:xine/xine-lib-%v.tar.bz2
-Source-MD5: b94512098dde28dc230f5a24037d2e18
+Source-MD5: 4f508abf088cf427a731f85634c8260d
PatchFile: libxine1.patch
-PatchFile-MD5: e08124ef6914ad89087b253862135a75
+PatchFile-MD5: fdf59fb11590683da53ffe86ec21044d
+PatchScript: <<
+ %{default_script}
+ perl -pi -e 's,libXv.so,libXv.dylib,g; s,x\*\.so\),x*.dylib),;
s,s/\\\.so\$//,s/\.dylib\$//,' configure
+<<
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
@@ -106,7 +98,6 @@
--disable-dependency-tracking \
--libexecdir=%p/lib/libxine \
--mandir=%p/share/man \
- (%m = powerpc) --enable-altivec \
--enable-static \
--enable-shared \
--enable-antialiasing \
@@ -153,19 +144,15 @@
--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
+ --enable-vcd
+
<<
CompileScript: <<
#!/bin/sh -ev
- export CPATH=%p/include:/usr/X11R6/include
+ export CPATH=%p/include:/usr/X11R6/include:/usr/X11/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
- echo "#define HAVE_DARWIN_CDROM 1" >> config.h
+ [ "%m" = "powerpc" ] && export EXTRA_CONFIG_PARAMS="--enable-altivec"
+ ./configure %c $EXTRA_CONFIG_PARAMS
make
<<
@@ -177,7 +164,6 @@
a52dec-shlibs,
aalib-shlibs,
amrnb-shlibs,
- arts-shlibs (>= 1.5.9-1),
audiofile-shlibs,
bzip2-shlibs,
dbus-shlibs (>= 1.0-1),
@@ -260,3 +246,4 @@
The xine-ui package provides one for your convenience, so you can just
start watching your VCDs ;-)
<<
+<<
Modified: trunk/experimental/common/main/finkinfo/libs/libxine1.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/libxine1.info&rev=1647&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/libxine1.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/libxine1.info Thu Oct 15
17:18:35 2009
@@ -1,21 +1,10 @@
+Info4: <<
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>
-
-## left as a check: if anybody gets a different list it means bdeps are
missing
-# # 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,
libavahi-client3-shlibs, libavahi-common3-shlibs,
-# libavahi-glib1-shlibs, libavcodec51-shlibs, libavutil49-shlibs,
libcaca-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,
libncursesw5-shlibs, libogg-shlibs,
-# libpostproc51-shlibs, libtheora0-shlibs, libtiff-shlibs, libtool2-shlibs,
libvcd0-shlibs, libvorbis0-shlibs, libx264-57-shlibs,
-# libxml2-shlibs, orbit2-shlibs, sdl-shlibs, slang-shlibs, speex3-shlibs,
wavpack1-shlibs, xorg-shlibs, xvidcore-shlibs
-## removed lipng3, qt3 from deps and bdeps. popt ?.. to be checked more
carefully..
+Maintainer: Benjamin Reed <libxi...@fink.raccoonfink.com>
Distribution: 10.4, 10.5
Depends: %N-shlibs (= %v-%r)
@@ -23,7 +12,6 @@
a52dec-dev,
aalib,
amrnb-dev,
- arts-dev (>= 1.5.9-1),
audiofile,
avahi-dev,
bzip2-dev,
@@ -63,6 +51,7 @@
libjpeg,
libmad,
libmng2,
+ libmodplug,
libmpcdec5,
libncurses5 (>= 5.4-20041023-1006),
libncursesw5,
@@ -93,25 +82,76 @@
BuildDependsOnly: true
Source: mirror:sourceforge:xine/xine-lib-%v.tar.bz2
-Source-MD5: b94512098dde28dc230f5a24037d2e18
-
+Source-MD5: 4f508abf088cf427a731f85634c8260d
+PatchFile: libxine1.patch
+PatchFile-MD5: fdf59fb11590683da53ffe86ec21044d
PatchScript: <<
- if [ `uname -r|sed 's,\..*,,'` = 9 ] ; then perl -pi -e 's,defined
\(ARCH_X86.*,false,' src/post/deinterlace/plugins/kdetv_tomsmocomp.c ; fi
- perl -pi -e 's,libXv.so,libXv.dylib,g; s,x\*\.so\),x*.dylib),;
s,s/\\\.so\$//,s/\.dylib\$//,' configure
-<<
+ %{default_script}
+ perl -pi -e 's,libXv.so,libXv.dylib,g; s,x\*\.so\),x*.dylib),;
s,s/\\\.so\$//,s/\.dylib\$//,' configure
+ if [ `sw_vers -productVersion | cut -d. -f1-2` = "10.4" ]; then
+ perl -pi -e 's,MacOSX10.5.sdk,MacOSX10.4u.sdk,g'
src/audio_out/Makefile.in
+ fi
+<<
+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
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 \
+ --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
<<
CompileScript: <<
#!/bin/sh -ev
- export CPATH=%p/include:/usr/X11R6/include
+ export CPATH=%p/include:/usr/X11R6/include:/usr/X11/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
- echo "#define HAVE_DARWIN_CDROM 1" >> config.h
+ [ "%m" = "powerpc" ] && export EXTRA_CONFIG_PARAMS="--enable-altivec"
+ ./configure %c $EXTRA_CONFIG_PARAMS
make
<<
@@ -123,7 +163,6 @@
a52dec-shlibs,
aalib-shlibs,
amrnb-shlibs,
- arts-shlibs (>= 1.5.9-1),
audiofile-shlibs,
bzip2-shlibs,
dbus-shlibs (>= 1.0-1),
@@ -158,6 +197,7 @@
libjpeg-shlibs,
libmad-shlibs,
libmng2-shlibs,
+ libmodplug-shlibs,
libmpcdec5-shlibs,
libncurses5-shlibs (>= 5.4-20041023-1006),
libncursesw5-shlibs,
@@ -205,3 +245,4 @@
The xine-ui package provides one for your convenience, so you can just
start watching your VCDs ;-)
<<
+<<
Modified: trunk/experimental/common/main/finkinfo/libs/libxine1.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/libxine1.patch&rev=1647&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/libxine1.patch (original)
+++ trunk/experimental/common/main/finkinfo/libs/libxine1.patch Thu Oct 15
17:18:35 2009
@@ -1,191 +1,12 @@
-diff -Nurd xine-lib-1.1.13/configure xine-lib-1.1.13-new/configure
---- xine-lib-1.1.13/configure 2008-06-14 19:16:03.000000000 -0400
-+++ xine-lib-1.1.13-new/configure 2009-10-09 23:33:06.000000000 -0400
-@@ -30693,10 +30693,10 @@
- #define LIBX11_SO "${x_lib_location:-libX11.so}"
- _ACEOF
-
--x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libXv.so"*
"${x_libraries:-/usr/lib}/libXv.so"* 2>/dev/null | sed -e
\"${soname_script}\"`"
-+x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libXv.dylib"*
"${x_libraries:-/usr/lib}/libXv.dylib"* 2>/dev/null | sed -e
\"${soname_script}\"`"
-
- cat >>confdefs.h <<_ACEOF
--#define LIBXV_SO "${x_lib_location:-libXv.so}"
-+#define LIBXV_SO "${x_lib_location:-libXv.dylib}"
- _ACEOF
-
-
-@@ -32278,20 +32278,20 @@
-
- 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_LIBS="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_LIBS="libXv.dylib"
- else
-- if test -f "/usr/lib/libXv.so"; then
-- { echo "$as_me:$LINENO: result: found libXv.so in /usr/lib" >&5
--echo "${ECHO_T}found libXv.so in /usr/lib" >&6; }
-- XV_LIBS="libXv.so"
-+ if test -f "/usr/lib/libXv.dylib"; then
-+ { echo "$as_me:$LINENO: result: found libXv.dylib in /usr/lib" >&5
-+echo "${ECHO_T}found libXv.dylib in /usr/lib" >&6; }
-+ XV_LIBS="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
- fi
-
-@@ -32320,20 +32320,20 @@
- if test x$XV_LIBS = 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_LIBS="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_LIBS="libXv.dylib"
- else
-- if test -f "/usr/lib/libXv.so"; then
-- { echo "$as_me:$LINENO: result: found libXv.so in /usr/lib" >&5
--echo "${ECHO_T}found libXv.so in /usr/lib" >&6; }
-- XV_LIBS="libXv.so"
-+ if test -f "/usr/lib/libXv.dylib"; then
-+ { echo "$as_me:$LINENO: result: found libXv.dylib in /usr/lib" >&5
-+echo "${ECHO_T}found libXv.dylib in /usr/lib" >&6; }
-+ XV_LIBS="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
- fi
-
-@@ -32441,8 +32441,8 @@
- ac_have_xv_static="yes"
- XV_LIBS="$xv_path/$XV_LIBS"
- ;;
-- x*.so)
-- XV_LIBS=`echo $XV_LIBS | sed 's/^lib/-l/; s/\.so$//'`
-+ x*.dylib)
-+ XV_LIBS=`echo $XV_LIBS | sed 's/^lib/-l/; s/.dylib$//'`
- ;;
- *)
- { { echo "$as_me:$LINENO: error: sorry, I don't know about $XV_LIBS"
>&5
-@@ -32475,20 +32475,20 @@
-
- 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_LIBS="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_LIBS="libXv.dylib"
- else
-- if test -f "/usr/lib/libXv.so"; then
-- { echo "$as_me:$LINENO: result: found libXv.so in /usr/lib" >&5
--echo "${ECHO_T}found libXv.so in /usr/lib" >&6; }
-- XV_LIBS="libXv.so"
-+ if test -f "/usr/lib/libXv.dylib"; then
-+ { echo "$as_me:$LINENO: result: found libXv.dylib in /usr/lib" >&5
-+echo "${ECHO_T}found libXv.dylib in /usr/lib" >&6; }
-+ XV_LIBS="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
- fi
-
-@@ -32517,20 +32517,20 @@
- if test x$XV_LIBS = 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_LIBS="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_LIBS="libXv.dylib"
- else
-- if test -f "/usr/lib/libXv.so"; then
-- { echo "$as_me:$LINENO: result: found libXv.so in /usr/lib" >&5
--echo "${ECHO_T}found libXv.so in /usr/lib" >&6; }
-- XV_LIBS="libXv.so"
-+ if test -f "/usr/lib/libXv.dylib"; then
-+ { echo "$as_me:$LINENO: result: found libXv.dylib in /usr/lib" >&5
-+echo "${ECHO_T}found libXv.dylib in /usr/lib" >&6; }
-+ XV_LIBS="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
- fi
-
-@@ -32638,8 +32638,8 @@
- ac_have_xv_static="yes"
- XV_LIBS="$xv_path/$XV_LIBS"
- ;;
-- x*.so)
-- XV_LIBS=`echo $XV_LIBS | sed 's/^lib/-l/; s/\.so$//'`
-+ x*.dylib)
-+ XV_LIBS=`echo $XV_LIBS | sed 's/^lib/-l/; s/.dylib$//'`
- ;;
- *)
- { { echo "$as_me:$LINENO: error: sorry, I don't know about $XV_LIBS"
>&5
-@@ -32695,7 +32695,7 @@
- hppa*)
- if test "x$ac_have_xv_static" = "xyes"; then
- echo "warning: hppa linker - disabling static libXv"
-- XV_LIBS="libXv.so"
-+ XV_LIBS="libXv.dylib"
- fi
- ;;
-
-diff -Nurd xine-lib-1.1.13/src/audio_out/Makefile.in
xine-lib-1.1.13-new/src/audio_out/Makefile.in
---- xine-lib-1.1.13/src/audio_out/Makefile.in 2008-06-14 19:15:47.000000000
-0400
-+++ xine-lib-1.1.13-new/src/audio_out/Makefile.in 2009-10-09
23:33:13.000000000 -0400
-@@ -639,11 +639,11 @@
+diff -Nurd xine-lib-1.1.16.3/src/audio_out/Makefile.in
xine-lib-1.1.16.3-patched/src/audio_out/Makefile.in
+--- xine-lib-1.1.16.3/src/audio_out/Makefile.in 2009-04-02
14:45:51.000000000 -0400
++++ xine-lib-1.1.16.3-patched/src/audio_out/Makefile.in 2009-10-15
10:20:20.000000000 -0400
+@@ -650,11 +650,12 @@
# The "-Wl,-framework -Wl,..." is needed for libtool versions before
# 1.5.x (1.257): the default version that ships with Mac OS X is 1.5 (1.1220)
xineplug_ao_out_coreaudio_la_LDFLAGS = \
-- -Wl,-framework -Wl,Cocoa -framework CoreAudio \
-+ -Wl,-framework -Wl,Cocoa -isysroot /Developer/SDKs/MacOSX10.5.sdk
-framework CoreAudio \
++ -isysroot /Developer/SDKs/MacOSX10.5.sdk \
+ -Wl,-framework -Wl,Cocoa -framework CoreAudio \
-Wl,-framework -Wl,AudioUnit -framework AudioUnit \
-avoid-version -module
@@ -194,10 +15,10 @@
xineplug_ao_out_pulseaudio_la_SOURCES = audio_pulse_out.c
xineplug_ao_out_pulseaudio_la_LIBADD = $(XINE_LIB) $(PULSEAUDIO_LIBS)
$(LTLIBINTL)
xineplug_ao_out_pulseaudio_la_CFLAGS = $(VISIBILITY_FLAG) $(PULSEAUDIO_CFLAGS)
-diff -Nurd xine-lib-1.1.13/src/post/deinterlace/plugins/Makefile.in
xine-lib-1.1.13-new/src/post/deinterlace/plugins/Makefile.in
---- xine-lib-1.1.13/src/post/deinterlace/plugins/Makefile.in 2008-06-14
19:15:57.000000000 -0400
-+++ xine-lib-1.1.13-new/src/post/deinterlace/plugins/Makefile.in
2009-10-09 23:30:57.000000000 -0400
-@@ -66,9 +66,7 @@
+diff -Nurd xine-lib-1.1.16.3/src/post/deinterlace/plugins/Makefile.in
xine-lib-1.1.16.3-patched/src/post/deinterlace/plugins/Makefile.in
+--- xine-lib-1.1.16.3/src/post/deinterlace/plugins/Makefile.in 2009-04-02
14:46:02.000000000 -0400
++++ xine-lib-1.1.16.3-patched/src/post/deinterlace/plugins/Makefile.in
2009-10-15 10:37:05.000000000 -0400
+@@ -69,9 +69,7 @@
libdeinterlaceplugins_la-linearblend.lo \
libdeinterlaceplugins_la-vfir.lo \
libdeinterlaceplugins_la-weave.lo \
@@ -207,16 +28,7 @@
libdeinterlaceplugins_la-kdetv_tomsmocomp.lo
libdeinterlaceplugins_la_OBJECTS = \
$(am_libdeinterlaceplugins_la_OBJECTS)
-@@ -418,7 +416,7 @@
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--EXTRA_DIST = greedy2frame_template.c greedyh.asm \
-+EXTRA_DIST = greedyh.asm \
- tomsmocomp/SearchLoop0A.inc tomsmocomp/SearchLoopBottom.inc \
- tomsmocomp/SearchLoopEdgeA.inc tomsmocomp/SearchLoopEdgeA8.inc \
- tomsmocomp/SearchLoopOddA.inc tomsmocomp/SearchLoopOddA2.inc \
-@@ -442,9 +440,7 @@
+@@ -452,9 +450,7 @@
linearblend.c \
vfir.c \
weave.c \
@@ -226,7 +38,7 @@
kdetv_tomsmocomp.c
libdeinterlaceplugins_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS)
-@@ -503,8 +499,6 @@
+@@ -513,8 +509,6 @@
@AMDEP_TRUE@@am__include@
@am__qu...@./$(DEPDIR)/libdeinterlaceplugins_la-double....@am__quote@
@AMDEP_TRUE@@am__include@
@am__qu...@./$(DEPDIR)/libdeinterlaceplugins_la-greedy....@am__quote@
@@ -235,3 +47,34 @@
@AMDEP_TRUE@@am__include@
@am__qu...@./$(DEPDIR)/libdeinterlaceplugins_la-kdetv_tomsmocomp....@am__quote@
@AMDEP_TRUE@@am__include@
@am__qu...@./$(DEPDIR)/libdeinterlaceplugins_la-linear....@am__quote@
@AMDEP_TRUE@@am__include@
@am__qu...@./$(DEPDIR)/libdeinterlaceplugins_la-linearblend....@am__quote@
+diff -Nurd xine-lib-1.1.16.3/src/xine-engine/demux.c
xine-lib-1.1.16.3-patched/src/xine-engine/demux.c
+--- xine-lib-1.1.16.3/src/xine-engine/demux.c 2009-02-25 19:27:03.000000000
-0500
++++ xine-lib-1.1.16.3-patched/src/xine-engine/demux.c 2009-10-15
10:17:21.000000000 -0400
+@@ -50,6 +50,27 @@
+ #include <winsock.h>
+ #endif
+
++#ifndef CLOCK_REALTIME
++#include <time.h>
++
++#define CLOCK_REALTIME 0
++static int clock_gettime(int clk_id /*ignored*/, struct timespec *tp)
++{
++ struct timeval now;
++
++ int rv = gettimeofday(&now, NULL);
++
++ if (rv != 0) {
++ return rv;
++ }
++
++ tp->tv_sec = now.tv_sec;
++ tp->tv_nsec = now.tv_usec * 1000;
++
++ return 0;
++}
++#endif
++
+ /*
+ * Flush audio and video buffers. It is called from demuxers on
+ * seek/stop, and may be useful when user input changes a stream and
------------------------------------------------------------------------------
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
