Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs
In directory vz-cvs-3.sog:/tmp/cvs-serv22262/libs
Added Files:
libxine1.patch libxine1-10.6.info libxine1-10.6.patch
Log Message:
missed a "cvs add" on a few
--- NEW FILE: libxine1-10.6.info ---
Info4: <<
Package: libxine1
Version: 1.1.19
Revision: 101
Distribution: 10.6
Description: Xine video/media player library
License: LGPL
Maintainer: Benjamin Reed <[email protected]>
Depends: %N-shlibs (= %v-%r)
BuildDepends: <<
a52dec-dev,
aalib,
amrnb-dev,
audiofile,
bzip2-dev,
dbus1.3-dev (>= 1.2.24-1),
dbus-glib1.2-dev (>= 0.84-1),
esound (>= 0.2.38-1),
expat1,
faac-dev,
fink (>= 0.30.0-1),
fink-package-precedence (>= 0.7-1),
ffmpeg-dev,
fontconfig2-dev (>= 2.8.0-6),
freetype219 (>= 2.4.4-2),
gconf2-dev (>= 2.20.0-1),
gettext-bin,
gettext-tools,
glib2-dev (>= 2.22.0-1),
gnome-vfs2-unified-dev (>= 1:2.24.2-1),
gsm,
gtk+2-dev (>= 2.18.0-1),
imagemagick1-dev,
jack-dev,
lame-dev,
lcms,
libavahi-client3-dev,
libavahi-common3-dev,
libavahi-glib1-dev,
libavcodec-dev,
libavutil-dev,
libbonobo2-dev (>= 2.20.0-1),
libcaca-dev (>= 0.99.beta16-1),
libcdio-dev,
libdvdnav,
libdvdread.3,
libfaad1-dev,
libflac8-dev,
libgettext8-dev,
libgnugetopt,
libiconv-dev,
libiso9660-dev,
libjpeg8,
libmad,
libmng2,
libmodplug1,
libmpcdec5,
libncurses5 (>= 5.4-20041023-1006),
libncursesw5,
libogg,
libopencore-amr0,
libpostproc-dev,
libtheora0,
libtiff,
libtool2,
libvcd-dev (>= 0.7.21-10),
libvorbis0,
libx264-98-dev,
libxml2 (>= 2.6.32-1),
orbit2-dev (>= 2.14.9-1),
pkgconfig (>= 0.23-1),
popt,
pth2-dev,
sdl (>= 1.2.9-1001),
slang,
speex3,
wavpack1-dev,
x11-dev,
xvidcore
<<
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.bz2
Source-MD5: a410a0f0617e1d6309f0cbe907f73f8a
PatchScript: <<
%{default_script}
perl -pi -e 's,libXv.so,libXv.dylib,g; s,x\*\.so\),x*.dylib),;
s,s/\\\.so\$//,s/\.dylib\$//,' configure
if [ "%m" = "x86_64" ]; then perl -pi -e 's, deinterlace , ,'
src/post/Makefile.in; fi
<<
PatchFile: libxine1-10.6.patch
PatchFile-MD5: 096d62d92f03ddc0632580997974808a
SetCFLAGS: -Os -fomit-frame-pointer -fexpensive-optimizations -ffast-math
-I%p/lib/fontconfig2/include
SetLDFLAGS:
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
-L%p/lib/fontconfig2/lib
UseMaxBuildJobs: true
ConfigureParams: <<
--target=%m-apple-darwin`uname -r|cut -f1 -d.` \
--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/lib/fontconfig2/include:%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}
[ "%m" = "powerpc" ] && export EXTRA_CONFIG_PARAMS="--enable-altivec"
./configure %c $EXTRA_CONFIG_PARAMS
make
fink-package-precedence --prohibit-bdep %N .
<<
InstallScript: <<
make -j1 install DESTDIR=%d
perl -pi -e 's/-framework /-Wl,-framework,/g' %i/lib/*.la
rm -f %i/lib/*.la
<<
DocFiles: AUTHORS COPYING CREDITS ChangeLog INSTALL NEWS README TODO
SplitOff: <<
Package: %N-shlibs
Depends: <<
a52dec-shlibs,
aalib-shlibs,
amrnb-shlibs,
audiofile-shlibs,
bzip2-shlibs,
dbus1.3-shlibs (>= 1.2.24-1),
esound-shlibs (>= 0.2.38-1),
expat1-shlibs,
faac-shlibs,
fontconfig2-shlibs (>= 2.8.0-6),
freetype219-shlibs (>= 2.4.4-2),
gconf2-shlibs (>= 2.20.0-1),
glib2-shlibs (>= 2.22.0-1),
gnome-vfs2-unified-shlibs (>= 1:2.24.2-1),
gtk+2-shlibs (>= 2.18.0-1),
imagemagick1-shlibs,
jack-shlibs,
lame-shlibs,
lcms-shlibs,
libavahi-client3-shlibs,
libavahi-common3-shlibs,
libavahi-glib1-shlibs,
libavcodec51-shlibs,
libavutil49-shlibs,
libbonobo2-shlibs (>= 2.20.0-1),
libcaca-shlibs (>= 0.99.beta16-1),
libcdio7-shlibs,
libdvdnav4-shlibs,
libdvdread.3-shlibs,
libfaad1-shlibs,
libflac8,
libgettext8-shlibs,
libgnugetopt-shlibs,
libiconv,
libiso96605-shlibs,
libjpeg8-shlibs,
libmad-shlibs,
libmng2-shlibs,
libmodplug1-shlibs,
libmpcdec5-shlibs,
libncurses5-shlibs (>= 5.4-20041023-1006),
libncursesw5-shlibs,
libogg-shlibs,
libopencore-amr0-shlibs,
libpostproc51-shlibs,
libtheora0-shlibs,
libtiff-shlibs,
libtool2-shlibs,
libvcd0-shlibs (>= 0.7.21-10),
libvorbis0-shlibs,
libx264-98-shlibs,
libxml2-shlibs (>= 2.6.32-1),
orbit2-shlibs (>= 2.14.9-1),
sdl-shlibs (>= 1.2.9-1001),
slang-shlibs,
speex3-shlibs,
wavpack1-shlibs,
x11-shlibs,
xvidcore-shlibs
<<
Provides: libxine-shlibs
Conflicts: libxine-shlibs
Replaces: <<
libxine-shlibs,
libxine
<<
DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README
Files: <<
lib/libxine*.*.dylib
lib/xine
share/xine
<<
Shlibs: <<
%p/lib/libxine.1.dylib 31.0.0 %n (>= 1.1.19-1)
%p/lib/libxineMacOSXVideo.1.dylib 31.0.0 %n (>= 1.1.19-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 ;-)
<<
DescPackaging: <<
Had to disable the deinterlacer on x86_64, because of asm issues beyond
my capabilities to solve. If anyone wants to look at it, remove the
perl -pi on Makefile.in in PatchScript. :)
Add missing #include to avoid needing older OSX SDKs. See:
https://trac.macports.org/ticket/23102
<<
<<
--- NEW FILE: libxine1-10.6.patch ---
diff -Nurd xine-lib-1.1.19/configure xine-lib-1.1.19-new/configure
--- xine-lib-1.1.19/configure 2010-07-25 10:40:24.000000000 -0400
+++ xine-lib-1.1.19-new/configure 2010-10-03 18:15:19.000000000 -0400
@@ -19871,7 +19871,7 @@
-host_or_hostalias="$host"
+host_or_hostalias="$target"
if test "$host_or_hostalias" = ""; then
host_or_hostalias="$host_alias"
fi
diff -Nurd xine-lib-1.1.19/src/audio_out/Makefile.in
xine-lib-1.1.19-new/src/audio_out/Makefile.in
--- xine-lib-1.1.19/src/audio_out/Makefile.in 2010-07-25 10:40:01.000000000
-0400
+++ xine-lib-1.1.19-new/src/audio_out/Makefile.in 2010-10-03
18:38:36.000000000 -0400
@@ -691,11 +691,10 @@
# 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,AudioUnit -framework AudioUnit \
- -avoid-version -module
+ -Wl,-framework,Cocoa -Wl,-framework,CoreAudio \
+ -Wl,-framework,AudioUnit -avoid-version -module
-xineplug_ao_out_coreaudio_la_CFLAGS = -framework CoreAudio -framework
AudioUnit $(VISIBILITY_FLAG)
+xineplug_ao_out_coreaudio_la_CFLAGS = -Wl,-framework,CoreAudio
-Wl,-framework,AudioUnit $(VISIBILITY_FLAG)
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.19/src/audio_out/audio_coreaudio_out.c
xine-lib-1.1.19-new/src/audio_out/audio_coreaudio_out.c
--- xine-lib-1.1.19/src/audio_out/audio_coreaudio_out.c 2010-03-09
17:17:05.000000000 -0500
+++ xine-lib-1.1.19-new/src/audio_out/audio_coreaudio_out.c 2011-06-07
11:33:04.000000000 -0400
@@ -51,6 +51,7 @@
#include <AudioUnit/AudioUnitProperties.h>
#include <AudioUnit/AudioUnitParameters.h>
#include <AudioUnit/AudioOutputUnit.h>
+#include <CoreServices/CoreServices.h>
#define AO_OUT_COREAUDIO_IFACE_VERSION 8
diff -Nurd xine-lib-1.1.19/src/libxinevdec/Makefile.in
xine-lib-1.1.19-new/src/libxinevdec/Makefile.in
--- xine-lib-1.1.19/src/libxinevdec/Makefile.in 2010-07-25 10:40:16.000000000
-0400
+++ xine-lib-1.1.19-new/src/libxinevdec/Makefile.in 2010-10-03
18:18:03.000000000 -0400
@@ -483,7 +483,7 @@
xinepostdir = $(XINE_PLUGINDIR)/post
vidixdir = $(XINE_PLUGINDIR)/vidix
AM_CFLAGS = $(VISIBILITY_FLAG)
-AM_LDFLAGS = $(xineplug_ldflags)
+AM_LDFLAGS = $(xineplug_ldflags) $(X_LIBS)
EXTRA_DIST = foovideo.c
@HAVE_WAND_TRUE@image_module = xineplug_decode_image.la
@HAVE_GDK_PIXBUF_TRUE@gdkpixbuf_module = xineplug_decode_gdk_pixbuf.la
diff -Nurd xine-lib-1.1.19/src/post/deinterlace/plugins/Makefile.in
xine-lib-1.1.19-new/src/post/deinterlace/plugins/Makefile.in
--- xine-lib-1.1.19/src/post/deinterlace/plugins/Makefile.in 2010-07-25
10:40:17.000000000 -0400
+++ xine-lib-1.1.19-new/src/post/deinterlace/plugins/Makefile.in
2010-10-03 18:18:47.000000000 -0400
@@ -72,9 +72,7 @@
libdeinterlaceplugins_la-linearblend.lo \
libdeinterlaceplugins_la-vfir.lo \
libdeinterlaceplugins_la-weave.lo \
- libdeinterlaceplugins_la-greedy2frame.lo \
libdeinterlaceplugins_la-scalerbob.lo \
- libdeinterlaceplugins_la-kdetv_greedyh.lo \
libdeinterlaceplugins_la-kdetv_tomsmocomp.lo
libdeinterlaceplugins_la_OBJECTS = \
$(am_libdeinterlaceplugins_la_OBJECTS)
@@ -463,9 +461,7 @@
linearblend.c \
vfir.c \
weave.c \
- greedy2frame.c \
scalerbob.c \
- kdetv_greedyh.c \
kdetv_tomsmocomp.c
libdeinterlaceplugins_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS)
@@ -525,8 +521,6 @@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libdeinterlaceplugins_la-double.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libdeinterlaceplugins_la-greedy.Plo@am__quote@
-@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libdeinterlaceplugins_la-greedy2frame.Plo@am__quote@
-@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libdeinterlaceplugins_la-kdetv_greedyh.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libdeinterlaceplugins_la-kdetv_tomsmocomp.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libdeinterlaceplugins_la-linear.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libdeinterlaceplugins_la-linearblend.Plo@am__quote@
diff -Nurd xine-lib-1.1.19/src/xine-engine/Makefile.in
xine-lib-1.1.19-new/src/xine-engine/Makefile.in
--- xine-lib-1.1.19/src/xine-engine/Makefile.in 2010-07-25 10:40:20.000000000
-0400
+++ xine-lib-1.1.19-new/src/xine-engine/Makefile.in 2010-10-03
21:22:15.000000000 -0400
@@ -441,7 +441,7 @@
vidixdir = $(XINE_PLUGINDIR)/vidix
LIBXINEPOSIX = $(top_builddir)/lib/libxineposix.la
AM_CFLAGS = $(X_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(VISIBILITY_FLAG)
-AM_CPPFLAGS = $(ZLIB_CPPFLAGS) -DXINE_LIBRARY_COMPILE
+AM_CPPFLAGS = $(ZLIB_CPPFLAGS) -DXINE_LIBRARY_COMPILE $(FT2_CFLAGS)
$(FONTCONFIG_CFLAGS)
lib_LTLIBRARIES = libxine.la
XINEUTILS_LIB = $(top_builddir)/src/xine-utils/libxineutils.la
DEF_FILE = libxine-$(XINE_MAJOR).def
diff -Nurd xine-lib-1.1.19/src/xine-engine/demux.c
xine-lib-1.1.19-new/src/xine-engine/demux.c
--- xine-lib-1.1.19/src/xine-engine/demux.c 2010-07-21 15:10:49.000000000
-0400
+++ xine-lib-1.1.19-new/src/xine-engine/demux.c 2010-10-03 18:19:08.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
--- NEW FILE: libxine1.patch ---
diff -Nurd xine-lib-1.1.19/configure xine-lib-1.1.19-new/configure
--- xine-lib-1.1.19/configure 2010-07-25 10:40:24.000000000 -0400
+++ xine-lib-1.1.19-new/configure 2010-10-03 18:15:19.000000000 -0400
@@ -19871,7 +19871,7 @@
-host_or_hostalias="$host"
+host_or_hostalias="$target"
if test "$host_or_hostalias" = ""; then
host_or_hostalias="$host_alias"
fi
diff -Nurd xine-lib-1.1.19/src/audio_out/Makefile.in
xine-lib-1.1.19-new/src/audio_out/Makefile.in
--- xine-lib-1.1.19/src/audio_out/Makefile.in 2010-07-25 10:40:01.000000000
-0400
+++ xine-lib-1.1.19-new/src/audio_out/Makefile.in 2010-10-03
18:38:36.000000000 -0400
@@ -691,11 +691,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,AudioUnit -framework AudioUnit \
- -avoid-version -module
+ -F/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks
-F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks \
+ -Wl,-framework,Cocoa -Wl,-framework,CoreAudio \
+ -Wl,-framework,AudioUnit -avoid-version -module
-xineplug_ao_out_coreaudio_la_CFLAGS = -framework CoreAudio -framework
AudioUnit $(VISIBILITY_FLAG)
+xineplug_ao_out_coreaudio_la_CFLAGS =
-F/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks
-F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks \
+ -Wl,-framework,CoreAudio -Wl,-framework,AudioUnit $(VISIBILITY_FLAG)
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.19/src/libxinevdec/Makefile.in
xine-lib-1.1.19-new/src/libxinevdec/Makefile.in
--- xine-lib-1.1.19/src/libxinevdec/Makefile.in 2010-07-25 10:40:16.000000000
-0400
+++ xine-lib-1.1.19-new/src/libxinevdec/Makefile.in 2010-10-03
18:18:03.000000000 -0400
@@ -483,7 +483,7 @@
xinepostdir = $(XINE_PLUGINDIR)/post
vidixdir = $(XINE_PLUGINDIR)/vidix
AM_CFLAGS = $(VISIBILITY_FLAG)
-AM_LDFLAGS = $(xineplug_ldflags)
+AM_LDFLAGS = $(xineplug_ldflags) $(X_LIBS)
EXTRA_DIST = foovideo.c
@HAVE_WAND_TRUE@image_module = xineplug_decode_image.la
@HAVE_GDK_PIXBUF_TRUE@gdkpixbuf_module = xineplug_decode_gdk_pixbuf.la
diff -Nurd xine-lib-1.1.19/src/post/deinterlace/plugins/Makefile.in
xine-lib-1.1.19-new/src/post/deinterlace/plugins/Makefile.in
--- xine-lib-1.1.19/src/post/deinterlace/plugins/Makefile.in 2010-07-25
10:40:17.000000000 -0400
+++ xine-lib-1.1.19-new/src/post/deinterlace/plugins/Makefile.in
2010-10-03 18:18:47.000000000 -0400
@@ -72,9 +72,7 @@
libdeinterlaceplugins_la-linearblend.lo \
libdeinterlaceplugins_la-vfir.lo \
libdeinterlaceplugins_la-weave.lo \
- libdeinterlaceplugins_la-greedy2frame.lo \
libdeinterlaceplugins_la-scalerbob.lo \
- libdeinterlaceplugins_la-kdetv_greedyh.lo \
libdeinterlaceplugins_la-kdetv_tomsmocomp.lo
libdeinterlaceplugins_la_OBJECTS = \
$(am_libdeinterlaceplugins_la_OBJECTS)
@@ -463,9 +461,7 @@
linearblend.c \
vfir.c \
weave.c \
- greedy2frame.c \
scalerbob.c \
- kdetv_greedyh.c \
kdetv_tomsmocomp.c
libdeinterlaceplugins_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS)
@@ -525,8 +521,6 @@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libdeinterlaceplugins_la-double.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libdeinterlaceplugins_la-greedy.Plo@am__quote@
-@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libdeinterlaceplugins_la-greedy2frame.Plo@am__quote@
-@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libdeinterlaceplugins_la-kdetv_greedyh.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libdeinterlaceplugins_la-kdetv_tomsmocomp.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libdeinterlaceplugins_la-linear.Plo@am__quote@
@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/libdeinterlaceplugins_la-linearblend.Plo@am__quote@
diff -Nurd xine-lib-1.1.19/src/xine-engine/Makefile.in
xine-lib-1.1.19-new/src/xine-engine/Makefile.in
--- xine-lib-1.1.19/src/xine-engine/Makefile.in 2010-07-25 10:40:20.000000000
-0400
+++ xine-lib-1.1.19-new/src/xine-engine/Makefile.in 2010-10-03
21:22:15.000000000 -0400
@@ -441,7 +441,7 @@
vidixdir = $(XINE_PLUGINDIR)/vidix
LIBXINEPOSIX = $(top_builddir)/lib/libxineposix.la
AM_CFLAGS = $(X_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(VISIBILITY_FLAG)
-AM_CPPFLAGS = $(ZLIB_CPPFLAGS) -DXINE_LIBRARY_COMPILE
+AM_CPPFLAGS = $(ZLIB_CPPFLAGS) -DXINE_LIBRARY_COMPILE $(FT2_CFLAGS)
$(FONTCONFIG_CFLAGS)
lib_LTLIBRARIES = libxine.la
XINEUTILS_LIB = $(top_builddir)/src/xine-utils/libxineutils.la
DEF_FILE = libxine-$(XINE_MAJOR).def
diff -Nurd xine-lib-1.1.19/src/xine-engine/demux.c
xine-lib-1.1.19-new/src/xine-engine/demux.c
--- xine-lib-1.1.19/src/xine-engine/demux.c 2010-07-21 15:10:49.000000000
-0400
+++ xine-lib-1.1.19-new/src/xine-engine/demux.c 2010-10-03 18:19:08.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
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2d-oct
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
