Author: ranger
Date: Sat Feb 10 04:40:00 2007
New Revision: 641
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=641&repname=user%3a+ranger>
Log:
libxine
Modified:
trunk/experimental/3rdparty/10.3/main/finkinfo/libs/libxine1.info
trunk/experimental/3rdparty/10.3/main/finkinfo/libs/libxine1.patch
trunk/experimental/3rdparty/10.4/main/finkinfo/libs/libxine1.info
trunk/experimental/3rdparty/10.4/main/finkinfo/libs/libxine1.patch
trunk/experimental/3rdparty/common/main/finkinfo/libs/libxine1.info
trunk/experimental/3rdparty/common/main/finkinfo/libs/libxine1.patch
Modified: trunk/experimental/3rdparty/10.3/main/finkinfo/libs/libxine1.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/3rdparty/10.3/main/finkinfo/libs/libxine1.info&rev=641&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/3rdparty/10.3/main/finkinfo/libs/libxine1.info (original)
+++ trunk/experimental/3rdparty/10.3/main/finkinfo/libs/libxine1.info Sat Feb
10 04:40:00 2007
@@ -1,5 +1,5 @@
Package: libxine1
-Version: 1.1.2
+Version: 1.1.4
Revision: 11
Description: Xine video/media player library
License: GPL
@@ -7,20 +7,20 @@
Depends: %N-shlibs (= %v-%r)
BuildDepends: <<
- fink (>= 0.24-1),
+ fink (>= 0.26.0-1),
aalib,
- arts-dev (>= 1.4.0-1031),
+ arts-dev (>= 1.4.0-11),
audiofile,
bzip2-shlibs,
esound,
- flac (>= 1.1.1-1011),
+ flac (>= 1.1.1-1),
freetype219,
gconf2-dev,
gettext-bin,
gettext-tools,
glib2-dev (>= 2.8.6-1),
- gnome-vfs2-ssl-dev | gnome-vfs2-dev,
- imagemagick-dev (>= 6.1.8-1002) | imagemagick-nox-dev (>= 6.1.8-1002),
+ gnome-vfs2-unified-dev,
+ imagemagick10-dev,
lcms,
libbonobo2-dev,
libcaca-dev,
@@ -44,7 +44,7 @@
popt,
pth,
qt3 (>= 3.3.6-17),
- sdl (>= 1.2.9-1001),
+ sdl (>= 1.2.9-1),
slang,
speex3,
x11-dev
@@ -63,18 +63,17 @@
BuildDependsOnly: true
Source: mirror:sourceforge:xine/xine-lib-%v.tar.bz2
-Source-MD5: c4dd262c47caae6f428eb902ac8ec0e8
+Source-MD5: e8ecc022457d8ffc9fec91681c5fff2b
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
+ perl -pi -e 's/libXv.so/libXv.dylib/g' configure
+ perl -pi -e 's/-avoid-version/-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
+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
SetLIBS: -L%p/lib
SetMAKEFLAGS: -j1
@@ -99,22 +98,22 @@
make
<<
-InstallScript: make install DESTDIR=%d
+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-1031),
+ arts-shlibs (>= 1.4.0-11),
audiofile-shlibs,
bzip2-shlibs,
esound-shlibs,
- flac-shlibs (>= 1.1.1-1011),
+ flac-shlibs (>= 1.1.1-1),
freetype219-shlibs,
gconf2-shlibs,
glib2-shlibs (>= 2.8.6-1),
- gnome-vfs2-ssl-shlibs | gnome-vfs2-shlibs,
- imagemagick-shlibs (>= 6.1.8-1002),
+ gnome-vfs2-unified-shlibs,
+ imagemagick10-shlibs,
lcms-shlibs,
libbonobo2-shlibs,
libcdio7-shlibs (>= 0.77-12),
@@ -135,7 +134,7 @@
orbit2-shlibs,
popt-shlibs,
qt3-shlibs (>= 3.3.6-17),
- sdl-shlibs (>= 1.2.9-1001),
+ sdl-shlibs (>= 1.2.9-1),
slang-shlibs,
speex3-shlibs,
x11-shlibs
Modified: trunk/experimental/3rdparty/10.3/main/finkinfo/libs/libxine1.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/3rdparty/10.3/main/finkinfo/libs/libxine1.patch&rev=641&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/3rdparty/10.3/main/finkinfo/libs/libxine1.patch
(original)
+++ trunk/experimental/3rdparty/10.3/main/finkinfo/libs/libxine1.patch Sat Feb
10 04:40:00 2007
@@ -1,109 +1,81 @@
---- 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 @@
+--- xine-lib-1.1.4/configure 2007-01-28 13:57:56.000000000 -0500
++++ xine-lib-1.1.4-patched/configure 2007-02-09 16:01:52.000000000 -0500
+@@ -29182,7 +29182,7 @@
+ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n
's/^$ac_var=//p'\`"
+ done
+ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+- for ac_extension in a so sl; do
++ for ac_extension in a so dylib sl; do
+ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
+ test -f "$ac_im_libdir/libX11.$ac_extension"; then
+ ac_im_usrlibdir=$ac_im_libdir; break
+@@ -29358,7 +29358,7 @@
+ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+ do
+ # Don't even attempt the hair of trying to link an X program!
+- for ac_extension in a so sl; do
++ for ac_extension in a so dylib sl; do
+ if test -r "$ac_dir/libXt.$ac_extension"; then
+ ac_x_libraries=$ac_dir
+ break 2
+@@ -34568,6 +34568,9 @@
ac_have_xv_static="yes"
- XV_LIB="$xv_path/$XV_LIB"
+ XV_LIBS="$xv_path/$XV_LIBS"
;;
-- x*.so)
-- XV_LIB=`echo $XV_LIB | sed 's/^lib/-l/; s/\.so$//'`
+ x*.dylib)
-+ XV_LIB=`echo $XV_LIB | sed 's/^lib/-l/; s/\.dylib$//'`
++ XV_LIBS=`echo $XV_LIBS | sed 's/^lib/-l/; s/\.dylib$//'`
++ ;;
+ x*.so)
+ XV_LIBS=`echo $XV_LIBS | sed 's/^lib/-l/; s/\.so$//'`
;;
- *)
- { { echo "$as_me:$LINENO: error: sorry, I don't know about $XV_LIB"
>&5
-@@ -52649,7 +52649,7 @@
+@@ -34786,6 +34789,9 @@
+ ac_have_xv_static="yes"
+ XV_LIBS="$xv_path/$XV_LIBS"
+ ;;
++ x*.dylib)
++ XV_LIBS=`echo $XV_LIBS | sed 's/^lib/-l/; s/\.dylib$//'`
++ ;;
+ x*.so)
+ XV_LIBS=`echo $XV_LIBS | sed 's/^lib/-l/; s/\.so$//'`
+ ;;
+@@ -52014,7 +52020,7 @@
+ DEBUG_CFLAGS="$wall ${DEBUG_CFLAGS}"
+
+ case "$host_or_hostalias" in
+- i?86-* | k?-* | athlon-* | pentium*)
++ i?86-*-linux* | k?-* | athlon-* | pentium*)
+ if test "$GCC" = yes -o "${CC##*/}x" = "iccx" ; then
+
+ if test "$GCC" = yes; then
+@@ -52304,7 +52310,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"
++ CFLAGS="-Os -pipe -fno-strict-aliasing -ffast-math
$INLINE_FUNCTIONS -D_INTL_REDIRECT_MACROS $CFLAGS"
DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
-@@ -52805,7 +52805,7 @@
- enable_armv4l="no"
+@@ -52390,7 +52396,7 @@
+ DEBUG_CFLAGS="-O3 -mieee $DEBUG_CFLAGS"
+ ;;
+ *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"
++ CFLAGS="-Os -pipe -fno-strict-aliasing -ffast-math $INLINE_FUNCTIONS
-D_INTL_REDIRECT_MACROS $CFLAGS"
+ DEBUG_CFLAGS="-O3 $DEBUG_CFLAGS"
+ ;;
+ ppc-*-linux* | powerpc-*)
+@@ -52500,7 +52506,6 @@
+ #define FPM_PPC
+ _ACEOF
- case "$host_or_hostalias" in
-- i?86-* | k?-* | athlon-* | pentium*-)
-+ i?86-*-linux* | k?-* | athlon-* | pentium*-)
-
+-
cat >>confdefs.h <<_ACEOF
- #define ARCH_X86
-@@ -52838,7 +52838,7 @@
-
- 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
+ #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 */
-
--#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.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);
-
-+#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.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
+--- xine-lib-1.1.4/src/input/libdvdnav/bswap.h 2006-09-17 09:01:07.000000000
-0400
++++ xine-lib-1.1.4-patched/src/input/libdvdnav/bswap.h 2007-02-09
16:03:09.000000000 -0500
@@ -41,6 +41,12 @@
#define B2N_32(x) x = bswap_32(x)
#define B2N_64(x) x = bswap_64(x)
@@ -117,45 +89,42 @@
#elif defined(__NetBSD__)
#include <sys/endian.h>
#define B2N_16(x) BE16TOH(x)
---- 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 */
+--- xine-lib-1.1.4/src/video_out/Makefile.in 2007-01-28 17:57:54.000000000
-0500
++++ xine-lib-1.1.4-patched/src/video_out/Makefile.in 2007-02-09
18:01:31.000000000 -0500
+@@ -14,6 +14,7 @@
--#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);
-@@ -400,7 +402,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.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"
- #include <pthread.h>
-+#undef ARCH_X86
+ @SET_MAKE@
++AM_OBJCFLAGS = -DXINE_COMPILE
- #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>
- #include <pthread.h>
-+#undef ARCH_X86
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+--- xine-lib-1.1.4/src/video_out/macosx/Makefile.in 2007-01-28
17:57:58.000000000 -0500
++++ xine-lib-1.1.4-patched/src/video_out/macosx/Makefile.in 2007-02-09
17:05:10.000000000 -0500
+@@ -14,6 +14,7 @@
+ @SET_MAKE@
- /* Per channel parameters */
++AM_CPPFLAGS=-DXINE_COMPILE
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+--- xine-lib-1.1.4/src/xine-engine/Makefile.in 2007-01-28 17:58:00.000000000
-0500
++++ xine-lib-1.1.4-patched/src/xine-engine/Makefile.in 2007-02-09
17:20:03.000000000 -0500
+@@ -14,7 +14,6 @@
+
+ @SET_MAKE@
+
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -530,7 +529,7 @@
+ xineplugdir = $(XINE_PLUGINDIR)
+ 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 -DXINE_COMPILE
+ lib_LTLIBRARIES = libxine.la
+ XINEUTILS_LIB = $(top_builddir)/src/xine-utils/libxineutils.la
+ DEF_FILE = libxine-$(XINE_MAJOR).def
Modified: trunk/experimental/3rdparty/10.4/main/finkinfo/libs/libxine1.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/3rdparty/10.4/main/finkinfo/libs/libxine1.info&rev=641&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/3rdparty/10.4/main/finkinfo/libs/libxine1.info (original)
+++ trunk/experimental/3rdparty/10.4/main/finkinfo/libs/libxine1.info Sat Feb
10 04:40:00 2007
@@ -1,5 +1,5 @@
Package: libxine1
-Version: 1.1.2
+Version: 1.1.4
Revision: 1021
Description: Xine video/media player library
License: GPL
@@ -7,9 +7,9 @@
Depends: %N-shlibs (= %v-%r)
BuildDepends: <<
- fink (>= 0.24-1),
+ fink (>= 0.26.0-1),
aalib,
- arts-dev (>= 1.4.0-2041),
+ arts-dev (>= 1.4.0-1021),
audiofile,
bzip2-shlibs,
esound,
@@ -19,8 +19,8 @@
gettext-bin,
gettext-tools,
glib2-dev (>= 2.12.0-1),
- gnome-vfs2-ssl-dev | gnome-vfs2-dev,
- imagemagick-dev (>= 6.1.8-1002) | imagemagick10-dev (>= 6.1.8-1002),
+ gnome-vfs2-unified-dev,
+ imagemagick10-dev,
lcms,
libbonobo2-dev,
libcaca-dev,
@@ -63,18 +63,17 @@
BuildDependsOnly: true
Source: mirror:sourceforge:xine/xine-lib-%v.tar.bz2
-Source-MD5: c4dd262c47caae6f428eb902ac8ec0e8
+Source-MD5: e8ecc022457d8ffc9fec91681c5fff2b
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
+ perl -pi -e 's/libXv.so/libXv.dylib/g' configure
+ perl -pi -e 's/-avoid-version/-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
+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
SetLIBS: -L%p/lib
SetMAKEFLAGS: -j1
@@ -99,13 +98,13 @@
make
<<
-InstallScript: make install DESTDIR=%d
+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),
+ arts-shlibs (>= 1.4.0-1021),
audiofile-shlibs,
bzip2-shlibs,
esound-shlibs,
@@ -113,8 +112,8 @@
freetype219-shlibs,
gconf2-shlibs,
glib2-shlibs (>= 2.12.0-1),
- gnome-vfs2-ssl-shlibs | gnome-vfs2-shlibs,
- imagemagick-shlibs (>= 6.1.8-1002),
+ gnome-vfs2-unified-shlibs,
+ imagemagick10-shlibs,
lcms-shlibs,
libbonobo2-shlibs,
libcdio7-shlibs (>= 0.77-12),
Modified: trunk/experimental/3rdparty/10.4/main/finkinfo/libs/libxine1.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/3rdparty/10.4/main/finkinfo/libs/libxine1.patch&rev=641&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/3rdparty/10.4/main/finkinfo/libs/libxine1.patch
(original)
+++ trunk/experimental/3rdparty/10.4/main/finkinfo/libs/libxine1.patch Sat Feb
10 04:40:00 2007
@@ -1,109 +1,81 @@
---- 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 @@
+--- xine-lib-1.1.4/configure 2007-01-28 13:57:56.000000000 -0500
++++ xine-lib-1.1.4-patched/configure 2007-02-09 16:01:52.000000000 -0500
+@@ -29182,7 +29182,7 @@
+ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n
's/^$ac_var=//p'\`"
+ done
+ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+- for ac_extension in a so sl; do
++ for ac_extension in a so dylib sl; do
+ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
+ test -f "$ac_im_libdir/libX11.$ac_extension"; then
+ ac_im_usrlibdir=$ac_im_libdir; break
+@@ -29358,7 +29358,7 @@
+ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+ do
+ # Don't even attempt the hair of trying to link an X program!
+- for ac_extension in a so sl; do
++ for ac_extension in a so dylib sl; do
+ if test -r "$ac_dir/libXt.$ac_extension"; then
+ ac_x_libraries=$ac_dir
+ break 2
+@@ -34568,6 +34568,9 @@
ac_have_xv_static="yes"
- XV_LIB="$xv_path/$XV_LIB"
+ XV_LIBS="$xv_path/$XV_LIBS"
;;
-- x*.so)
-- XV_LIB=`echo $XV_LIB | sed 's/^lib/-l/; s/\.so$//'`
+ x*.dylib)
-+ XV_LIB=`echo $XV_LIB | sed 's/^lib/-l/; s/\.dylib$//'`
++ XV_LIBS=`echo $XV_LIBS | sed 's/^lib/-l/; s/\.dylib$//'`
++ ;;
+ x*.so)
+ XV_LIBS=`echo $XV_LIBS | sed 's/^lib/-l/; s/\.so$//'`
;;
- *)
- { { echo "$as_me:$LINENO: error: sorry, I don't know about $XV_LIB"
>&5
-@@ -52649,7 +52649,7 @@
+@@ -34786,6 +34789,9 @@
+ ac_have_xv_static="yes"
+ XV_LIBS="$xv_path/$XV_LIBS"
+ ;;
++ x*.dylib)
++ XV_LIBS=`echo $XV_LIBS | sed 's/^lib/-l/; s/\.dylib$//'`
++ ;;
+ x*.so)
+ XV_LIBS=`echo $XV_LIBS | sed 's/^lib/-l/; s/\.so$//'`
+ ;;
+@@ -52014,7 +52020,7 @@
+ DEBUG_CFLAGS="$wall ${DEBUG_CFLAGS}"
+
+ case "$host_or_hostalias" in
+- i?86-* | k?-* | athlon-* | pentium*)
++ i?86-*-linux* | k?-* | athlon-* | pentium*)
+ if test "$GCC" = yes -o "${CC##*/}x" = "iccx" ; then
+
+ if test "$GCC" = yes; then
+@@ -52304,7 +52310,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"
++ CFLAGS="-Os -pipe -fno-strict-aliasing -ffast-math
$INLINE_FUNCTIONS -D_INTL_REDIRECT_MACROS $CFLAGS"
DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
-@@ -52805,7 +52805,7 @@
- enable_armv4l="no"
+@@ -52390,7 +52396,7 @@
+ DEBUG_CFLAGS="-O3 -mieee $DEBUG_CFLAGS"
+ ;;
+ *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"
++ CFLAGS="-Os -pipe -fno-strict-aliasing -ffast-math $INLINE_FUNCTIONS
-D_INTL_REDIRECT_MACROS $CFLAGS"
+ DEBUG_CFLAGS="-O3 $DEBUG_CFLAGS"
+ ;;
+ ppc-*-linux* | powerpc-*)
+@@ -52500,7 +52506,6 @@
+ #define FPM_PPC
+ _ACEOF
- case "$host_or_hostalias" in
-- i?86-* | k?-* | athlon-* | pentium*-)
-+ i?86-*-linux* | k?-* | athlon-* | pentium*-)
-
+-
cat >>confdefs.h <<_ACEOF
- #define ARCH_X86
-@@ -52838,7 +52838,7 @@
-
- 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
+ #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 */
-
--#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.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);
-
-+#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.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
+--- xine-lib-1.1.4/src/input/libdvdnav/bswap.h 2006-09-17 09:01:07.000000000
-0400
++++ xine-lib-1.1.4-patched/src/input/libdvdnav/bswap.h 2007-02-09
16:03:09.000000000 -0500
@@ -41,6 +41,12 @@
#define B2N_32(x) x = bswap_32(x)
#define B2N_64(x) x = bswap_64(x)
@@ -117,45 +89,42 @@
#elif defined(__NetBSD__)
#include <sys/endian.h>
#define B2N_16(x) BE16TOH(x)
---- 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 */
+--- xine-lib-1.1.4/src/video_out/Makefile.in 2007-01-28 17:57:54.000000000
-0500
++++ xine-lib-1.1.4-patched/src/video_out/Makefile.in 2007-02-09
18:01:31.000000000 -0500
+@@ -14,6 +14,7 @@
--#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);
-@@ -400,7 +402,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.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"
- #include <pthread.h>
-+#undef ARCH_X86
+ @SET_MAKE@
++AM_OBJCFLAGS = -DXINE_COMPILE
- #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>
- #include <pthread.h>
-+#undef ARCH_X86
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+--- xine-lib-1.1.4/src/video_out/macosx/Makefile.in 2007-01-28
17:57:58.000000000 -0500
++++ xine-lib-1.1.4-patched/src/video_out/macosx/Makefile.in 2007-02-09
17:05:10.000000000 -0500
+@@ -14,6 +14,7 @@
+ @SET_MAKE@
- /* Per channel parameters */
++AM_CPPFLAGS=-DXINE_COMPILE
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+--- xine-lib-1.1.4/src/xine-engine/Makefile.in 2007-01-28 17:58:00.000000000
-0500
++++ xine-lib-1.1.4-patched/src/xine-engine/Makefile.in 2007-02-09
17:20:03.000000000 -0500
+@@ -14,7 +14,6 @@
+
+ @SET_MAKE@
+
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -530,7 +529,7 @@
+ xineplugdir = $(XINE_PLUGINDIR)
+ 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 -DXINE_COMPILE
+ lib_LTLIBRARIES = libxine.la
+ XINEUTILS_LIB = $(top_builddir)/src/xine-utils/libxineutils.la
+ DEF_FILE = libxine-$(XINE_MAJOR).def
Modified: trunk/experimental/3rdparty/common/main/finkinfo/libs/libxine1.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/3rdparty/common/main/finkinfo/libs/libxine1.info&rev=641&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/3rdparty/common/main/finkinfo/libs/libxine1.info
(original)
+++ trunk/experimental/3rdparty/common/main/finkinfo/libs/libxine1.info Sat Feb
10 04:40:00 2007
@@ -1,12 +1,12 @@
Package: libxine1
-Version: 1.1.2
+Version: 1.1.4
Revision: 1
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, 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-1022), sdl (>= 1.2.9-1001), slang, speex3, x11-dev
+BuildDepends: fink (>= 0.24-1), aalib, arts-dev (>= 1.4.0-1), audiofile,
bzip2-shlibs, esound, flac (>= 1.1.1-1), freetype219, gconf2-dev, gettext-bin,
gettext-tools, glib2-dev (>= 2.8.6-1), gnome-vfs2-unified-dev,
imagemagick10-dev, lcms, libbonobo2-dev, libcaca-dev, libcdio-dev,
libgettext3-dev, libiconv-dev, libiso9660-dev, libjpeg, libmng2, libncurses5
(>= 5.4-20041023-1), libogg, libpng3, libtheora0, libtiff, libtool14,
libvcd-dev (>= 0.7.21-10), libvorbis0, libxml2, orbit2-dev, pkgconfig, popt,
pth, qt3 (>= 3.3.6-1), sdl (>= 1.2.9-1), slang, speex3, x11-dev
Provides: libxine
Conflicts: libxine, libxine-docs
Replaces: libxine, libxine-shlibs, libxine-docs
@@ -14,24 +14,23 @@
BuildDependsOnly: true
Source: mirror:sourceforge:xine/xine-lib-%v.tar.bz2
-Source-MD5: c4dd262c47caae6f428eb902ac8ec0e8
+Source-MD5: e8ecc022457d8ffc9fec91681c5fff2b
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
+ perl -pi -e 's/libXv.so/libXv.dylib/g' configure
+ perl -pi -e 's/-avoid-version/-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
+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
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 (%m =
powerpc) --enable-altivec (%m = i386) --disable-altivec --disable-w32dll
CompileScript: <<
#!/bin/sh -e
@@ -49,14 +48,12 @@
make
<<
-InstallScript: <<
- make install DESTDIR=%d
-<<
+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.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
+ Depends: aalib-shlibs, arts-shlibs (>= 1.4.0-1), audiofile-shlibs,
bzip2-shlibs, esound-shlibs, flac-shlibs (>= 1.1.1-1), freetype219-shlibs,
gconf2-shlibs, glib2-shlibs (>= 2.8.6-1), gnome-vfs2-unified-shlibs,
imagemagick10-shlibs, lcms-shlibs, libbonobo2-shlibs, libcdio7-shlibs (>=
0.77-12), libgettext3-shlibs, libiconv, libiso96605-shlibs, libjpeg-shlibs,
libmng2-shlibs, libncurses5-shlibs (>= 5.4-20041023-1), 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-1), sdl-shlibs (>= 1.2.9-1),
slang-shlibs, speex3-shlibs, x11-shlibs
Provides: libxine-shlibs
Conflicts: libxine-shlibs
Replaces: libxine-shlibs, libxine
Modified: trunk/experimental/3rdparty/common/main/finkinfo/libs/libxine1.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/3rdparty/common/main/finkinfo/libs/libxine1.patch&rev=641&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/3rdparty/common/main/finkinfo/libs/libxine1.patch
(original)
+++ trunk/experimental/3rdparty/common/main/finkinfo/libs/libxine1.patch Sat
Feb 10 04:40:00 2007
@@ -1,112 +1,82 @@
-diff -uNr xine-lib-1.1.2/configure xine-lib-1.1.2-patched/configure
---- 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 @@
+diff -uNr xine-lib-1.1.4/configure xine-lib-1.1.4-patched/configure
+--- xine-lib-1.1.4/configure 2007-01-28 13:57:56.000000000 -0500
++++ xine-lib-1.1.4-patched/configure 2007-02-09 16:01:52.000000000 -0500
+@@ -29182,7 +29182,7 @@
+ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n
's/^$ac_var=//p'\`"
+ done
+ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+- for ac_extension in a so sl; do
++ for ac_extension in a so dylib sl; do
+ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
+ test -f "$ac_im_libdir/libX11.$ac_extension"; then
+ ac_im_usrlibdir=$ac_im_libdir; break
+@@ -29358,7 +29358,7 @@
+ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+ do
+ # Don't even attempt the hair of trying to link an X program!
+- for ac_extension in a so sl; do
++ for ac_extension in a so dylib sl; do
+ if test -r "$ac_dir/libXt.$ac_extension"; then
+ ac_x_libraries=$ac_dir
+ break 2
+@@ -34568,6 +34568,9 @@
ac_have_xv_static="yes"
- XV_LIB="$xv_path/$XV_LIB"
+ XV_LIBS="$xv_path/$XV_LIBS"
;;
-- x*.so)
-- XV_LIB=`echo $XV_LIB | sed 's/^lib/-l/; s/\.so$//'`
+ x*.dylib)
-+ XV_LIB=`echo $XV_LIB | sed 's/^lib/-l/; s/\.dylib$//'`
++ XV_LIBS=`echo $XV_LIBS | sed 's/^lib/-l/; s/\.dylib$//'`
++ ;;
+ x*.so)
+ XV_LIBS=`echo $XV_LIBS | sed 's/^lib/-l/; s/\.so$//'`
;;
- *)
- { { echo "$as_me:$LINENO: error: sorry, I don't know about $XV_LIB"
>&5
-@@ -52649,7 +52649,7 @@
+@@ -34786,6 +34789,9 @@
+ ac_have_xv_static="yes"
+ XV_LIBS="$xv_path/$XV_LIBS"
+ ;;
++ x*.dylib)
++ XV_LIBS=`echo $XV_LIBS | sed 's/^lib/-l/; s/\.dylib$//'`
++ ;;
+ x*.so)
+ XV_LIBS=`echo $XV_LIBS | sed 's/^lib/-l/; s/\.so$//'`
+ ;;
+@@ -52014,7 +52020,7 @@
+ DEBUG_CFLAGS="$wall ${DEBUG_CFLAGS}"
+
+ case "$host_or_hostalias" in
+- i?86-* | k?-* | athlon-* | pentium*)
++ i?86-*-linux* | k?-* | athlon-* | pentium*)
+ if test "$GCC" = yes -o "${CC##*/}x" = "iccx" ; then
+
+ if test "$GCC" = yes; then
+@@ -52304,7 +52310,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"
++ CFLAGS="-Os -pipe -fno-strict-aliasing -ffast-math
$INLINE_FUNCTIONS -D_INTL_REDIRECT_MACROS $CFLAGS"
DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
-@@ -52805,7 +52805,7 @@
- enable_armv4l="no"
+@@ -52390,7 +52396,7 @@
+ DEBUG_CFLAGS="-O3 -mieee $DEBUG_CFLAGS"
+ ;;
+ *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"
++ CFLAGS="-Os -pipe -fno-strict-aliasing -ffast-math $INLINE_FUNCTIONS
-D_INTL_REDIRECT_MACROS $CFLAGS"
+ DEBUG_CFLAGS="-O3 $DEBUG_CFLAGS"
+ ;;
+ ppc-*-linux* | powerpc-*)
+@@ -52500,7 +52506,6 @@
+ #define FPM_PPC
+ _ACEOF
- case "$host_or_hostalias" in
-- i?86-* | k?-* | athlon-* | pentium*-)
-+ i?86-*-linux* | k?-* | athlon-* | pentium*-)
-
+-
cat >>confdefs.h <<_ACEOF
- #define ARCH_X86
-@@ -52838,7 +52838,7 @@
-
- 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
+ #define ARCH_PPC
_ACEOF
-+ ;;
-+esac
-
-
--cat >>confdefs.h <<_ACEOF
--#define ARCH_PPC
--_ACEOF
-
-
- OBJC=${CC:-gcc}
-diff -uNr xine-lib-1.1.2/misc/cdda_server.c
xine-lib-1.1.2-patched/misc/cdda_server.c
---- 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 */
-
--#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);
- }
-diff -uNr xine-lib-1.1.2/src/input/input_dvd.c
xine-lib-1.1.2-patched/src/input/input_dvd.c
---- 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);
-
-+#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 };
-diff -uNr xine-lib-1.1.2/src/input/libdvdnav/bswap.h
xine-lib-1.1.2-patched/src/input/libdvdnav/bswap.h
---- 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
+diff -uNr xine-lib-1.1.4/src/input/libdvdnav/bswap.h
xine-lib-1.1.4-patched/src/input/libdvdnav/bswap.h
+--- xine-lib-1.1.4/src/input/libdvdnav/bswap.h 2006-09-17 09:01:07.000000000
-0400
++++ xine-lib-1.1.4-patched/src/input/libdvdnav/bswap.h 2007-02-09
16:03:09.000000000 -0500
@@ -41,6 +41,12 @@
#define B2N_32(x) x = bswap_32(x)
#define B2N_64(x) x = bswap_64(x)
@@ -120,48 +90,45 @@
#elif defined(__NetBSD__)
#include <sys/endian.h>
#define B2N_16(x) BE16TOH(x)
-diff -uNr xine-lib-1.1.2/src/input/libdvdnav/dvd_input.c
xine-lib-1.1.2-patched/src/input/libdvdnav/dvd_input.c
---- 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 */
+diff -uNr xine-lib-1.1.4/src/video_out/Makefile.in
xine-lib-1.1.4-patched/src/video_out/Makefile.in
+--- xine-lib-1.1.4/src/video_out/Makefile.in 2007-01-28 17:57:54.000000000
-0500
++++ xine-lib-1.1.4-patched/src/video_out/Makefile.in 2007-02-09
18:01:31.000000000 -0500
+@@ -14,6 +14,7 @@
--#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);
-@@ -400,7 +402,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);
- }
-diff -uNr xine-lib-1.1.2/src/post/planar/eq.c
xine-lib-1.1.2-patched/src/post/planar/eq.c
---- 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"
- #include <pthread.h>
-+#undef ARCH_X86
+ @SET_MAKE@
++AM_OBJCFLAGS = -DXINE_COMPILE
- #if defined(ARCH_X86) || defined(ARCH_X86_64)
-diff -uNr xine-lib-1.1.2/src/post/planar/eq2.c
xine-lib-1.1.2-patched/src/post/planar/eq2.c
---- 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>
- #include <pthread.h>
-+#undef ARCH_X86
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+diff -uNr xine-lib-1.1.4/src/video_out/macosx/Makefile.in
xine-lib-1.1.4-patched/src/video_out/macosx/Makefile.in
+--- xine-lib-1.1.4/src/video_out/macosx/Makefile.in 2007-01-28
17:57:58.000000000 -0500
++++ xine-lib-1.1.4-patched/src/video_out/macosx/Makefile.in 2007-02-09
17:05:10.000000000 -0500
+@@ -14,6 +14,7 @@
+ @SET_MAKE@
- /* Per channel parameters */
++AM_CPPFLAGS=-DXINE_COMPILE
+
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+diff -uNr xine-lib-1.1.4/src/xine-engine/Makefile.in
xine-lib-1.1.4-patched/src/xine-engine/Makefile.in
+--- xine-lib-1.1.4/src/xine-engine/Makefile.in 2007-01-28 17:58:00.000000000
-0500
++++ xine-lib-1.1.4-patched/src/xine-engine/Makefile.in 2007-02-09
17:20:03.000000000 -0500
+@@ -14,7 +14,6 @@
+
+ @SET_MAKE@
+
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -530,7 +529,7 @@
+ xineplugdir = $(XINE_PLUGINDIR)
+ 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 -DXINE_COMPILE
+ lib_LTLIBRARIES = libxine.la
+ XINEUTILS_LIB = $(top_builddir)/src/xine-utils/libxineutils.la
+ DEF_FILE = libxine-$(XINE_MAJOR).def
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
