Hello list,
together with Mark Collins we've been hacking together a working
libxine1.info and libxine1.patch. We deleted the kdetv-deinterlacer.
Mark Collins is able to use it with something like "muxine" from
http://xinehq.de/index.php/samplecode
while on my computer it shows only a black window. Anybody else ready to
have a look at it, please?
Mac OS 10.5.2
XCode 3.0
fink 0.28.1
Thanks,
Linus
Package: libxine1
Version: 1.1.10.1
Revision: 1027
Description: Xine video/media player library
License: GPL
Maintainer: Justin F. Hallett <[EMAIL PROTECTED]>
Depends: %N-shlibs (= %v-%r), libpostproc51-shlibs, libavutil49-shlibs,
libavformat52-shlibs
BuildDepends: fink (>= 0.24-1), aalib, arts-dev (>= 1.4.0-2041), audiofile,
bzip2-shlibs, esound, libflac8-dev , 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, libhowl-dev, libavcodec-dev,
libavutil-dev, libpostproc-dev
Provides: libxine
Conflicts: libxine, libxine-docs
Replaces: libxine, libxine-shlibs, libxine-docs
Recommends: libdvdcss-shlibs
BuildDependsOnly: true
Source:
http://kent.dl.sourceforge.net/sourceforge/xine/xine-lib-1.1.10.1.tar.bz2
Source-MD5: 83ec06946afff92afbe129774699a25e
Patch: %n.patch
PatchScript: <<
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
# perl -pi -e 's|(OPENGL_LIBS=).*|$1"-lGL -dylib_file
/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"|g'
configure
<<
SetCPPFLAGS: -fno-common -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I/usr/X11R6/include -I%p/include
SetLDFLAGS: -L%p/lib/freetype219/lib
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
SetLIBS: -L%p/lib
SetMAKEFLAGS: -j1
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
NoSetMAKEFLAGS: true
ConfigureParams: --with-external-ffmpeg --enable-static --enable-shared
--disable-alsa --disable-alsatest --disable-dxr3 --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
--disable-dependency-tracking
CompileScript: <<
#!/bin/sh -ev
export PATH="%p/lib/freetype219/bin:$PATH"
export
PKG_CONFIG_PATH="%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
if [ "%m" = "i386" ]; then
export CPPFLAGS="$CPPFLAGS -UHAVE_MMX -UHAVE_MMX2"
fi
./configure %c
if [ "%m" = "i386" ]; then
echo "#define HAVE_DARWIN_CDROM 1" >> config.h
fi
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-2041), audiofile-shlibs,
bzip2-shlibs, esound-shlibs, libflac8, 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
DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README
Files: <<
lib/libxine.*.dylib
lib/xine
share/xine
<<
Shlibs: <<
%p/lib/libxine.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 ;-)
<<
diff -Naur xine-lib-1.1.11/configure xine-lib-1.1.11.new/configure
--- xine-lib-1.1.11/configure 2008-03-19 14:08:45.000000000 +0100
+++ xine-lib-1.1.11.new/configure 2008-03-26 21:29:35.000000000 +0100
@@ -4482,7 +4482,7 @@
case "$host_os" in
- *darwin*)
+ *-darwin*)
ac_ext=m
ac_cpp='$OBJCPP $CPPFLAGS'
ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -32735,8 +32735,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_LIB=`echo $XV_LIB | sed 's/^lib/-l/; s/\.dylib$//'`
;;
*)
{ { echo "$as_me:$LINENO: error: sorry, I don't know about $XV_LIBS"
>&5
@@ -49393,7 +49393,7 @@
k7cpu="i686"
fi
- 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"
@@ -49478,7 +49478,7 @@
CFLAGS="-O3 -mieee $CFLAGS"
DEBUG_CFLAGS="-O3 -mieee $DEBUG_CFLAGS"
;;
- *darwin*)
+ *-darwin*)
CFLAGS="-O3 -pipe -fomit-frame-pointer $m_wm $m_psb
-fexpensive-optimizations $f_si -ffast-math $INLINE_FUNCTIONS -no-cpp-precomp
-D_INTL_REDIRECT_MACROS $CFLAGS"
DEBUG_CFLAGS="-O3 $DEBUG_CFLAGS"
;;
@@ -49549,7 +49549,7 @@
enable_armv4l="no"
case "$host_or_hostalias" in
- i?86-* | k?-* | athlon-* | pentium*-)
+ i?86-*-linux* | k?-* | athlon-* | pentium*-)
cat >>confdefs.h <<_ACEOF
#define ARCH_X86_32
@@ -49585,14 +49585,22 @@
powerpc-*-darwin*)
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
if test "${ac_cv_header_altivec_h+set}" = set; then
diff -Naur xine-lib-1.1.11/src/post/deinterlace/plugins/Makefile.in
xine-lib-1.1.11.new/src/post/deinterlace/plugins/Makefile.in
--- xine-lib-1.1.11/src/post/deinterlace/plugins/Makefile.in 2008-03-19
14:15:56.000000000 +0100
+++ xine-lib-1.1.11.new/src/post/deinterlace/plugins/Makefile.in
2008-03-26 21:29:35.000000000 +0100
@@ -67,9 +67,7 @@
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-scalerbob.lo
libdeinterlaceplugins_la_OBJECTS = \
$(am_libdeinterlaceplugins_la_OBJECTS)
libdeinterlaceplugins_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
diff -Naur xine-lib-1.1.11/src/post/deinterlace/plugins/plugins.h
xine-lib-1.1.11.new/src/post/deinterlace/plugins/plugins.h
--- xine-lib-1.1.11/src/post/deinterlace/plugins/plugins.h 2008-01-23
06:11:53.000000000 +0100
+++ xine-lib-1.1.11.new/src/post/deinterlace/plugins/plugins.h 2008-03-26
21:57:01.000000000 +0100
@@ -36,8 +36,6 @@
deinterlace_method_t *scalerbob_get_method( void );
deinterlace_method_t *linearblend_get_method( void );
deinterlace_method_t *vfir_get_method( void );
-deinterlace_method_t *dscaler_tomsmocomp_get_method( void );
-deinterlace_method_t *dscaler_greedyh_get_method( void );
deinterlace_method_t *greedy_get_method( void );
deinterlace_method_t *weave_get_method( void );
deinterlace_method_t *weavetff_get_method( void );
diff -Naur xine-lib-1.1.11/src/post/deinterlace/xine_plugin.c
xine-lib-1.1.11.new/src/post/deinterlace/xine_plugin.c
--- xine-lib-1.1.11/src/post/deinterlace/xine_plugin.c 2008-01-23
06:11:53.000000000 +0100
+++ xine-lib-1.1.11.new/src/post/deinterlace/xine_plugin.c 2008-03-26
21:57:13.000000000 +0100
@@ -314,8 +314,6 @@
register_deinterlace_method( double_get_method() );
register_deinterlace_method( vfir_get_method() );
register_deinterlace_method( scalerbob_get_method() );
- register_deinterlace_method( dscaler_greedyh_get_method() );
- register_deinterlace_method( dscaler_tomsmocomp_get_method() );
filter_deinterlace_methods( config_flags, 5 /*fieldsavailable*/ );
if( !get_num_deinterlace_methods() ) {
diff -Naur xine-lib-1.1.11/src/post/planar/eq.c
xine-lib-1.1.11.new/src/post/planar/eq.c
--- xine-lib-1.1.11/src/post/planar/eq.c 2008-01-23 06:11:53.000000000
+0100
+++ xine-lib-1.1.11.new/src/post/planar/eq.c 2008-03-26 21:29:35.000000000
+0100
@@ -25,6 +25,7 @@
#include "post.h"
#include "xineutils.h"
#include <pthread.h>
+#undef ARCH_X86
#if defined(ARCH_X86) || defined(ARCH_X86_64)
diff -Naur xine-lib-1.1.11/src/post/planar/eq2.c
xine-lib-1.1.11.new/src/post/planar/eq2.c
--- xine-lib-1.1.11/src/post/planar/eq2.c 2008-01-23 06:11:53.000000000
+0100
+++ xine-lib-1.1.11.new/src/post/planar/eq2.c 2008-03-26 21:29:35.000000000
+0100
@@ -30,6 +30,7 @@
#include "xineutils.h"
#include <math.h>
#include <pthread.h>
+#undef ARCH_X86
/* Per channel parameters */
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Fink-devel mailing list
Fink-devel@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.devel
